diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index f4b87366..6ff03b93 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -105,7 +105,7 @@ jobs:
       - name: cypress pre-requisites
         run: |
           cd ~/frappe-bench/apps/lms
-          yarn add cypress@^10 --no-lockfile
+          yarn add cypress@^10 --no-lockfile -W
 
       - name: UI Tests
         run: cd ~/frappe-bench/ && bench --site lms.test run-ui-tests lms --headless
diff --git a/commitlint.config.js b/commitlint.config.js
index 0c582f54..2b23e6a0 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	parserPreset: "conventional-changelog-conventionalcommits",
 	rules: {
 		"subject-empty": [2, "never"],
diff --git a/cypress.config.js b/cypress.config.js
index c7c1354e..b4ccfb3a 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -1,6 +1,6 @@
-const { defineConfig } = require("cypress");
+import { defineConfig } from "cypress";
 
-module.exports = defineConfig({
+export default defineConfig({
 	projectId: "vandxn",
 	adminPassword: "admin",
 	testUser: "frappe@example.com",
diff --git a/docker/init.sh b/docker/init.sh
index 178735c0..ed74f101 100644
--- a/docker/init.sh
+++ b/docker/init.sh
@@ -16,9 +16,9 @@ cd frappe-bench
 
 # Use containers instead of localhost
 bench set-mariadb-host mariadb
-bench set-redis-cache-host redis:6379
-bench set-redis-queue-host redis:6379
-bench set-redis-socketio-host redis:6379
+bench set-redis-cache-host redis://redis:6379
+bench set-redis-queue-host redis://redis:6379
+bench set-redis-socketio-host redis://redis:6379
 
 # Remove redis, watch from Procfile
 sed -i '/redis/d' ./Procfile
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 7b544e12..7bdb98c6 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -47,6 +47,7 @@ declare module 'vue' {
     Discussions: typeof import('./src/components/Discussions.vue')['default']
     EditCoverImage: typeof import('./src/components/Modals/EditCoverImage.vue')['default']
     EditProfile: typeof import('./src/components/Modals/EditProfile.vue')['default']
+    EmptyState: typeof import('./src/components/EmptyState.vue')['default']
     EvaluationModal: typeof import('./src/components/Modals/EvaluationModal.vue')['default']
     Evaluators: typeof import('./src/components/Evaluators.vue')['default']
     Event: typeof import('./src/components/Modals/Event.vue')['default']
diff --git a/frontend/package.json b/frontend/package.json
index 50f57d68..0a45681d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,7 +27,7 @@
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.141",
+    "frappe-ui": "^0.1.143",
     "highlight.js": "^11.11.1",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index c79397af..6097fe09 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,12 +1,13 @@
 <template>
-	<Layout>
-		<router-view />
-	</Layout>
-	<Dialogs />
-	<Toasts />
+	<FrappeUIProvider>
+		<Layout>
+			<router-view />
+		</Layout>
+		<Dialogs />
+	</FrappeUIProvider>
 </template>
 <script setup>
-import { Toasts } from 'frappe-ui'
+import { FrappeUIProvider } from 'frappe-ui'
 import { Dialogs } from '@/utils/dialogs'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useScreenSize } from './utils/composables'
diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue
index 05ed106d..94a5b8f6 100644
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -125,7 +125,7 @@
 							@click="redirectToWebsite()"
 						/>
 					</Tooltip>
-					<Tooltip :text="__('Help')">
+					<Tooltip v-if="showOnboarding" :text="__('Help')">
 						<CircleHelp
 							class="size-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
 							@click="
diff --git a/frontend/src/components/Assignment.vue b/frontend/src/components/Assignment.vue
index 38e3d4b5..4f78a9a2 100644
--- a/frontend/src/components/Assignment.vue
+++ b/frontend/src/components/Assignment.vue
@@ -191,10 +191,11 @@ import {
 	FileUploader,
 	FormControl,
 	TextEditor,
+	toast,
 } from 'frappe-ui'
 import { computed, inject, onMounted, onBeforeUnmount, ref, watch } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
-import { showToast, getFileSize } from '@/utils'
+import { getFileSize } from '@/utils'
 import { useRouter } from 'vue-router'
 
 const submissionFile = ref(null)
@@ -284,7 +285,7 @@ const submissionResource = createDocumentResource({
 	doctype: 'LMS Assignment Submission',
 	name: props.submissionName,
 	onError(err) {
-		showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+		toast.error(err.messages?.[0] || err)
 	},
 	auto: false,
 	cache: [user.data?.name, props.assignmentID],
@@ -338,7 +339,7 @@ const submitAssignment = () => {
 			},
 			{
 				onSuccess(data) {
-					showToast(__('Success'), __('Changes saved successfully'), 'check')
+					toast.success(__('Changes saved successfully'))
 				},
 			}
 		)
@@ -352,7 +353,7 @@ const addNewSubmission = () => {
 		{},
 		{
 			onSuccess(data) {
-				showToast('Success', 'Assignment submitted successfully.', 'check')
+				toast.success(__('Assignment submitted successfully'))
 				if (router.currentRoute.value.name == 'AssignmentSubmission') {
 					router.push({
 						name: 'AssignmentSubmission',
@@ -370,7 +371,7 @@ const addNewSubmission = () => {
 				submissionResource.reload()
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/BatchCourses.vue b/frontend/src/components/BatchCourses.vue
index 583acc1d..e988a16b 100644
--- a/frontend/src/components/BatchCourses.vue
+++ b/frontend/src/components/BatchCourses.vue
@@ -86,9 +86,9 @@ import {
 	ListRows,
 	ListView,
 	ListRowItem,
+	toast,
 } from 'frappe-ui'
 import { Plus, Trash2 } from 'lucide-vue-next'
-import { showToast } from '@/utils'
 const readOnlyMode = window.read_only_mode
 
 const showCourseModal = ref(false)
@@ -152,7 +152,7 @@ const removeCourses = (selections, unselectAll) => {
 		{
 			onSuccess(data) {
 				courses.reload()
-				showToast(__('Success'), __('Courses deleted successfully'), 'check')
+				toast.success(__('Courses deleted successfully'))
 				unselectAll()
 			},
 		}
diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index 7831eff3..5906a25b 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -2,7 +2,12 @@
 	<div v-if="batch.data" class="border-2 rounded-md p-5 lg:w-72">
 		<div
 			v-if="batch.data.seat_count && seats_left > 0"
-			class="text-xs bg-green-100 text-green-700 float-right px-2 py-0.5 rounded-md"
+			class="text-sm bg-green-100 text-green-700 px-2 py-1 rounded-md"
+			:class="
+				batch.data.amount || batch.data.courses.length
+					? 'float-right'
+					: 'w-fit mb-4'
+			"
 		>
 			{{ seats_left }}
 			<span v-if="seats_left > 1">
@@ -117,9 +122,9 @@
 </template>
 <script setup>
 import { inject, computed } from 'vue'
-import { Badge, Button, createResource } from 'frappe-ui'
+import { Badge, Button, createResource, toast } from 'frappe-ui'
 import { BookOpen, Clock, Globe } from 'lucide-vue-next'
-import { formatNumberIntoCurrency, formatTime, showToast } from '@/utils'
+import { formatNumberIntoCurrency, formatTime } from '@/utils'
 import DateRange from '@/components/Common/DateRange.vue'
 import { useRouter } from 'vue-router'
 
@@ -151,11 +156,7 @@ const enrollInBatch = () => {
 		{},
 		{
 			onSuccess(data) {
-				showToast(
-					__('Success'),
-					__('You have been enrolled in this batch'),
-					'check'
-				)
+				toast.success(__('You have been enrolled in this batch'))
 				router.push({
 					name: 'Batch',
 					params: {
diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue
index d122448e..43d315c0 100644
--- a/frontend/src/components/BatchStudents.vue
+++ b/frontend/src/components/BatchStudents.vue
@@ -1,12 +1,11 @@
 <template>
-	<div class="">
+	<div v-if="batch.data" class="">
 		<div class="w-full flex items-center justify-between pb-4">
 			<div class="font-medium text-ink-gray-7">
 				{{ __('Statistics') }}
 			</div>
 		</div>
 		<div class="grid grid-cols-4 gap-5 mb-8">
-
 			<NumberChart
 				class="border rounded-md"
 				:config="{ title: __('Students'), value: students.data?.length || 0 }"
@@ -14,7 +13,10 @@
 
 			<NumberChart
 				class="border rounded-md"
-				:config="{ title: __('Certified'), value: certificationCount.data || 0 }"
+				:config="{
+					title: __('Certified'),
+					value: certificationCount.data || 0,
+				}"
 			/>
 
 			<NumberChart
@@ -79,26 +81,26 @@
 						product: 'HomePod',
 						sales: 200,
 					},
-					],
-					title: __('Batch Summary'),
-					subtitle: __('Progress of students in courses and assessments'),
-					xAxis: {
-						key: 'product',
-						title: 'Product',
-						type: 'category',
+				],
+				title: __('Batch Summary'),
+				subtitle: __('Progress of students in courses and assessments'),
+				xAxis: {
+					key: 'product',
+					title: 'Product',
+					type: 'category',
+				},
+				yAxis: {
+					title: __('Number of Students'),
+				},
+				swapXY: true,
+				series: [
+					{
+						name: 'sales',
+						type: 'bar',
 					},
-					yAxis: {
-						title: __('Number of Students'),
-					},
-					swapXY: true,
-					series: [
-						{
-							name: 'sales',
-							type: 'bar',
-						},
-					],
-				}"
-			/>
+				],
+			}"
+		/>
 
 		<div v-if="showProgressChart" class="mb-8">
 			<div class="text-ink-gray-7 font-medium">
@@ -231,9 +233,10 @@
 	</div>
 
 	<StudentModal
-		:batch="props.batch.name"
+		:batch="props.batch.data.name"
 		v-model="showStudentModal"
 		v-model:reloadStudents="students"
+		v-model:batchModal="props.batch"
 	/>
 	<BatchStudentProgress
 		:student="selectedStudent"
@@ -255,6 +258,7 @@ import {
 	ListView,
 	ListRowItem,
 	NumberChart,
+	toast,
 } from 'frappe-ui'
 import {
 	BookOpen,
@@ -266,7 +270,6 @@ import {
 } from 'lucide-vue-next'
 import { ref, watch } from 'vue'
 import StudentModal from '@/components/Modals/StudentModal.vue'
-import { showToast } from '@/utils'
 import ProgressBar from '@/components/ProgressBar.vue'
 import BatchStudentProgress from '@/components/Modals/BatchStudentProgress.vue'
 import ApexChart from 'vue3-apexcharts'
@@ -290,15 +293,15 @@ const props = defineProps({
 
 const students = createResource({
 	url: 'lms.lms.utils.get_batch_students',
-	cache: ['students', props.batch.name],
 	params: {
-		batch: props.batch?.name,
+		batch: props.batch?.data?.name,
 	},
 	auto: true,
 	onSuccess(data) {
 		chartData.value = getChartData()
 		showProgressChart.value =
-			data.length && (props.batch?.courses?.length || assessmentCount.value)
+			data.length &&
+			(props.batch?.data?.courses?.length || assessmentCount.value)
 	},
 })
 
@@ -355,7 +358,8 @@ const removeStudents = (selections, unselectAll) => {
 		{
 			onSuccess(data) {
 				students.reload()
-				showToast(__('Success'), __('Students deleted successfully'), 'check')
+				props.batch.reload()
+				toast.success(__('Students deleted successfully'))
 				unselectAll()
 			},
 		}
@@ -366,10 +370,8 @@ const getChartData = () => {
 	let data = []
 	console.log(students.data)
 
-	students.data.forEach(row => {
-		row.assessments.forEach(assessment => {
-			
-		})
+	students.data.forEach((row) => {
+		row.assessments.forEach((assessment) => {})
 	})
 
 	/* let categories = {}
@@ -476,7 +478,7 @@ const certificationCount = createResource({
 	params: {
 		doctype: 'LMS Certificate',
 		filters: {
-			batch_name: props.batch.name,
+			batch_name: props.batch?.data?.name,
 		},
 	},
 	auto: true,
diff --git a/frontend/src/components/Categories.vue b/frontend/src/components/Categories.vue
index 3a57f0fa..2f5d99e8 100644
--- a/frontend/src/components/Categories.vue
+++ b/frontend/src/components/Categories.vue
@@ -5,10 +5,11 @@
 				{{ label }}
 			</div>
 			<Button @click="() => showCategoryForm()">
-				<template #icon>
+				<template #prefix>
 					<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
 					<X v-else class="h-3 w-3 stroke-1.5" />
 				</template>
+				{{ showForm ? __('Close') : __('New') }}
 			</Button>
 		</div>
 
@@ -28,12 +29,11 @@
 		</div>
 
 		<div class="overflow-y-scroll">
-			<div class="text-base divide-y space-y-2">
+			<div class="text-base space-y-2">
 				<FormControl
 					:value="cat.category"
 					type="text"
 					v-for="cat in categories.data"
-					class=""
 					@change.stop="(e) => update(cat.name, e.target.value)"
 				/>
 			</div>
diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue
index 856b8304..6427bf8a 100644
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -92,7 +92,10 @@
 													{{ option.label }}
 												</div>
 												<div
-													v-if="option.description"
+													v-if="
+														option.description &&
+														option.description != option.label
+													"
 													class="text-xs text-ink-gray-7"
 													v-html="option.description"
 												></div>
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index c26229a2..bab75896 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -34,7 +34,7 @@
 					<Button
 						variant="ghost"
 						class="w-full !justify-start"
-						label="Create New"
+						:label="__('Create New')"
 						@click="attrs.onCreate(value, close)"
 					>
 						<template #prefix>
diff --git a/frontend/src/components/Controls/MultiSelect.vue b/frontend/src/components/Controls/MultiSelect.vue
index db350681..678dfb28 100644
--- a/frontend/src/components/Controls/MultiSelect.vue
+++ b/frontend/src/components/Controls/MultiSelect.vue
@@ -4,78 +4,91 @@
 			{{ label }}
 			<span class="text-ink-red-3" v-if="required">*</span>
 		</label>
-		<div class="grid grid-cols-3 gap-2">
-			<Button
-				ref="emails"
-				v-for="value in values"
-				:key="value"
-				:label="value"
-				theme="gray"
-				variant="subtle"
-				class="rounded-md word-break-all"
-				@keydown.delete.capture.stop="removeLastValue"
-			>
-				<template #suffix>
-					<X @click="removeValue(value)" class="h-4 w-4 stroke-1.5" />
-				</template>
-			</Button>
-			<div class="">
-				<Combobox v-model="selectedValue" nullable>
-					<Popover class="w-full" v-model:show="showOptions">
-						<template #target="{ togglePopover }">
-							<ComboboxInput
-								ref="search"
-								class="search-input form-input w-full focus-visible:!ring-0"
-								type="text"
-								:value="query"
-								@change="
-									(e) => {
-										query = e.target.value
-										showOptions = true
-									}
-								"
-								autocomplete="off"
-								@focus="() => togglePopover()"
-								@keydown.delete.capture.stop="removeLastValue"
-							/>
-						</template>
-						<template #body="{ isOpen }">
-							<div v-show="isOpen">
-								<div
-									class="mt-1 rounded-lg bg-surface-white py-1 text-base border-2"
+		<div class="w-full">
+			<Combobox v-model="selectedValue" nullable>
+				<Popover class="w-full" v-model:show="showOptions">
+					<template #target="{ togglePopover }">
+						<ComboboxInput
+							ref="search"
+							class="search-input form-input w-full focus-visible:!ring-0"
+							type="text"
+							:value="query"
+							@change="
+								(e) => {
+									query = e.target.value
+									showOptions = true
+								}
+							"
+							autocomplete="off"
+							@focus="() => togglePopover()"
+							@keydown.delete.capture.stop="removeLastValue"
+						/>
+					</template>
+					<template #body="{ isOpen, close }">
+						<div v-show="isOpen">
+							<div
+								class="mt-1 rounded-lg bg-surface-white py-1 text-base border-2"
+							>
+								<ComboboxOptions
+									class="my-1 min-h-[6rem] max-h-[12rem] overflow-y-auto px-1.5"
+									static
 								>
-									<ComboboxOptions
-										class="my-1 max-h-[12rem] overflow-y-auto px-1.5"
-										static
+									<ComboboxOption
+										v-for="option in options"
+										:key="option.value"
+										:value="option"
+										v-slot="{ active }"
 									>
-										<ComboboxOption
-											v-for="option in options"
-											:key="option.value"
-											:value="option"
-											v-slot="{ active }"
+										<li
+											:class="[
+												'flex cursor-pointer items-center rounded px-2 py-1 text-base',
+												{ 'bg-surface-gray-2': active },
+											]"
 										>
-											<li
-												:class="[
-													'flex cursor-pointer items-center rounded px-2 py-1 text-base',
-													{ 'bg-surface-gray-2': active },
-												]"
-											>
-												<div class="flex flex-col gap-1 p-1">
-													<div class="text-base font-medium text-ink-gray-8">
-														{{ option.description }}
-													</div>
-													<div class="text-sm text-ink-gray-5">
-														{{ option.value }}
-													</div>
+											<div class="flex flex-col gap-1 p-1">
+												<div class="text-base font-medium text-ink-gray-8">
+													{{ option.description }}
 												</div>
-											</li>
-										</ComboboxOption>
-									</ComboboxOptions>
-								</div>
+												<div class="text-sm text-ink-gray-5">
+													{{ option.value }}
+												</div>
+											</div>
+										</li>
+									</ComboboxOption>
+									<div
+										v-if="attrs.onCreate"
+										class="absolute bottom-2 left-1 w-[98%] pt-2 bg-white border-t"
+									>
+										<Button
+											variant="ghost"
+											class="w-full !justify-start"
+											:label="__('Create New')"
+											@click="attrs.onCreate(close)"
+										>
+											<template #prefix>
+												<Plus class="h-4 w-4 stroke-1.5" />
+											</template>
+										</Button>
+									</div>
+								</ComboboxOptions>
 							</div>
-						</template>
-					</Popover>
-				</Combobox>
+						</div>
+					</template>
+				</Popover>
+			</Combobox>
+		</div>
+		<div v-if="values.length" class="grid grid-cols-2 gap-2 mt-1">
+			<div
+				v-for="value in values"
+				class="flex items-center justify-between break-all bg-surface-gray-2 text-ink-gray-7 word-wrap p-2 rounded-md mr-2"
+			>
+				<span class="break-all">
+					{{ value }}
+				</span>
+				<X
+					class="size-4 stroke-1.5 cursor-pointer"
+					@click="removeValue(value)"
+				/>
 			</div>
 		</div>
 		<!-- <ErrorMessage class="mt-2 pl-2" v-if="error" :message="error" /> -->
@@ -90,9 +103,9 @@ import {
 	ComboboxOption,
 } from '@headlessui/vue'
 import { createResource, Popover, Button } from 'frappe-ui'
-import { ref, computed, nextTick } from 'vue'
+import { ref, computed, nextTick, useAttrs } from 'vue'
 import { watchDebounced } from '@vueuse/core'
-import { X } from 'lucide-vue-next'
+import { X, Plus } from 'lucide-vue-next'
 
 const props = defineProps({
 	label: {
@@ -124,7 +137,7 @@ const props = defineProps({
 })
 
 const values = defineModel()
-
+const attrs = useAttrs()
 const emails = ref([])
 const search = ref(null)
 const error = ref(null)
diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index a046cdfb..1630ea6b 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -146,8 +146,8 @@
 <script setup>
 import { BookOpen, Users, Star, GraduationCap } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
-import { Badge, Button, createResource } from 'frappe-ui'
-import { showToast, formatAmount } from '@/utils/'
+import { Badge, Button, createResource, toast } from 'frappe-ui'
+import { formatAmount } from '@/utils/'
 import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 import CertificationLinks from '@/components/CertificationLinks.vue'
@@ -172,11 +172,7 @@ const video_link = computed(() => {
 
 function enrollStudent() {
 	if (!user.data) {
-		showToast(
-			__('Please Login'),
-			__('You need to login first to enroll for this course'),
-			'alert-circle'
-		)
+		toast.success(__('You need to login first to enroll for this course'))
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`
 		}, 1000)
@@ -192,11 +188,7 @@ function enrollStudent() {
 				capture('enrolled_in_course', {
 					course: props.course.data.name,
 				})
-				showToast(
-					__('Success'),
-					__('You have been enrolled in this course'),
-					'check'
-				)
+				toast.success(__('You have been enrolled in this course'))
 				setTimeout(() => {
 					router.push({
 						name: 'Lesson',
diff --git a/frontend/src/components/CourseOutline.vue b/frontend/src/components/CourseOutline.vue
index a0297084..ecbac74d 100644
--- a/frontend/src/components/CourseOutline.vue
+++ b/frontend/src/components/CourseOutline.vue
@@ -147,7 +147,7 @@
 	/>
 </template>
 <script setup>
-import { Button, createResource, Tooltip } from 'frappe-ui'
+import { Button, createResource, Tooltip, toast } from 'frappe-ui'
 import { getCurrentInstance, inject, ref } from 'vue'
 import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
@@ -162,7 +162,6 @@ import {
 } from 'lucide-vue-next'
 import { useRoute, useRouter } from 'vue-router'
 import ChapterModal from '@/components/Modals/ChapterModal.vue'
-import { showToast } from '@/utils'
 
 const route = useRoute()
 const router = useRouter()
@@ -215,7 +214,7 @@ const deleteLesson = createResource({
 	},
 	onSuccess() {
 		outline.reload()
-		showToast('Success', 'Lesson deleted successfully', 'check')
+		toast.success(__('Lesson deleted successfully'))
 	},
 })
 
@@ -230,7 +229,7 @@ const updateLessonIndex = createResource({
 		}
 	},
 	onSuccess() {
-		showToast('Success', 'Lesson moved successfully', 'check')
+		toast.success(__('Lesson moved successfully'))
 	},
 })
 
@@ -288,7 +287,7 @@ const deleteChapter = createResource({
 	},
 	onSuccess() {
 		outline.reload()
-		showToast('Success', 'Chapter deleted successfully', 'check')
+		toast.success(__('Chapter deleted successfully'))
 	},
 })
 
@@ -317,11 +316,7 @@ const redirectToChapter = (chapter) => {
 	event.preventDefault()
 	if (props.allowEdit) return
 	if (!user.data) {
-		showToast(
-			__('You are not enrolled'),
-			__('Please enroll for this course to view this lesson'),
-			'alert-circle'
-		)
+		toast.success(__('Please enroll for this course to view this lesson'))
 		return
 	}
 
diff --git a/frontend/src/components/DiscussionReplies.vue b/frontend/src/components/DiscussionReplies.vue
index 130e8c65..9e328587 100644
--- a/frontend/src/components/DiscussionReplies.vue
+++ b/frontend/src/components/DiscussionReplies.vue
@@ -93,12 +93,11 @@
 	</div>
 </template>
 <script setup>
-import { createResource, TextEditor, Button, Dropdown } from 'frappe-ui'
+import { createResource, TextEditor, Button, Dropdown, toast } from 'frappe-ui'
 import { timeAgo } from '../utils'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { ChevronLeft, MoreHorizontal } from 'lucide-vue-next'
 import { ref, inject, onMounted } from 'vue'
-import { createToast } from '../utils'
 
 const showTopics = defineModel('showTopics')
 const newReply = ref('')
@@ -192,14 +191,7 @@ const postReply = () => {
 				replies.reload()
 			},
 			onError(err) {
-				createToast({
-					title: 'Error',
-					text: err.messages?.[0] || err,
-					icon: 'x',
-					iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
-					position: 'top-center',
-					timeout: 10,
-				})
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/EmptyState.vue b/frontend/src/components/EmptyState.vue
new file mode 100644
index 00000000..8ca99cbd
--- /dev/null
+++ b/frontend/src/components/EmptyState.vue
@@ -0,0 +1,24 @@
+<template>
+	<div class="flex flex-col items-center justify-center mt-60">
+		<GraduationCap class="size-10 mx-auto stroke-1 text-ink-gray-5" />
+		<div class="text-lg font-semibold text-ink-gray-7 mb-2.5">
+			{{ __('No {0}').format(type?.toLowerCase()) }}
+		</div>
+		<div
+			class="leading-5 text-base w-2/5 text-base text-center text-ink-gray-7"
+		>
+			{{
+				__(
+					'There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!'
+				).format(type?.toLowerCase())
+			}}
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import { BookOpen, GraduationCap } from 'lucide-vue-next'
+
+const props = defineProps({
+	type: String,
+})
+</script>
diff --git a/frontend/src/components/Evaluators.vue b/frontend/src/components/Evaluators.vue
index 5e2b2e59..ba83204b 100644
--- a/frontend/src/components/Evaluators.vue
+++ b/frontend/src/components/Evaluators.vue
@@ -17,10 +17,11 @@
 					:debounce="300"
 				/>
 				<Button @click="() => (showForm = !showForm)">
-					<template #icon>
-						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
-						<X v-else class="h-3 w-3 stroke-1.5" />
+					<template #prefix>
+						<Plus v-if="!showForm" class="size-4 stroke-1.5" />
+						<X v-else class="size-4 stroke-1.5" />
 					</template>
+					{{ showForm ? __('Close') : __('New') }}
 				</Button>
 			</div>
 		</div>
diff --git a/frontend/src/components/Members.vue b/frontend/src/components/Members.vue
index 07bbc625..35462518 100644
--- a/frontend/src/components/Members.vue
+++ b/frontend/src/components/Members.vue
@@ -17,10 +17,11 @@
 					:debounce="300"
 				/>
 				<Button @click="() => (showForm = !showForm)">
-					<template #icon>
-						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
-						<X v-else class="h-3 w-3 stroke-1.5" />
+					<template #prefix>
+						<Plus v-if="!showForm" class="size-4 stroke-1.5" />
+						<X v-else class="size-4 stroke-1.5" />
 					</template>
+					{{ showForm ? __('Close') : __('New') }}
 				</Button>
 			</div>
 		</div>
diff --git a/frontend/src/components/Modals/AnnouncementModal.vue b/frontend/src/components/Modals/AnnouncementModal.vue
index bcb9f30e..01bfa983 100644
--- a/frontend/src/components/Modals/AnnouncementModal.vue
+++ b/frontend/src/components/Modals/AnnouncementModal.vue
@@ -31,6 +31,7 @@
 				<div class="mb-4">
 					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Announcement') }}
+						<span class="text-ink-red-3">*</span>
 					</div>
 					<TextEditor
 						:fixedMenu="true"
@@ -43,9 +44,8 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
+import { Dialog, Input, TextEditor, createResource, toast } from 'frappe-ui'
 import { reactive } from 'vue'
-import { showToast } from '@/utils/'
 
 const show = defineModel()
 
@@ -87,22 +87,21 @@ const makeAnnouncement = (close) => {
 		{
 			validate() {
 				if (!props.students.length) {
-					return 'No students in this batch'
+					return __('No students in this batch')
 				}
 				if (!announcement.subject) {
-					return 'Subject is required'
+					return __('Subject is required')
+				}
+				if (!announcement.announcement) {
+					return __('Announcement is required')
 				}
 			},
 			onSuccess() {
 				close()
-				showToast(
-					__('Success'),
-					__('Announcement has been sent successfully'),
-					'check'
-				)
+				toast.success(__('Announcement has been sent successfully'))
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'alert-circle')
+				toast.error(__(err.messages?.[0] || err))
 			},
 		}
 	)
diff --git a/frontend/src/components/Modals/AssessmentModal.vue b/frontend/src/components/Modals/AssessmentModal.vue
index 86bab7b5..b0a64d69 100644
--- a/frontend/src/components/Modals/AssessmentModal.vue
+++ b/frontend/src/components/Modals/AssessmentModal.vue
@@ -25,21 +25,39 @@
 					v-model="assessment"
 					:doctype="assessmentType"
 					:label="__('Assessment')"
+					:onCreate="
+						(value, close) => {
+							close()
+							if (assessmentType === 'LMS Quiz') {
+								router.push({
+									name: 'QuizForm',
+									params: {
+										quizID: 'new',
+									},
+								})
+							} else if (assessmentType === 'LMS Assignment') {
+								router.push({
+									name: 'Assignments',
+								})
+							}
+						}
+					"
 				/>
 			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FormControl, createResource } from 'frappe-ui'
+import { Dialog, FormControl, createResource, toast } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
 import { computed, ref } from 'vue'
-import { showToast } from '@/utils'
+import { useRouter } from 'vue-router'
 
 const show = defineModel()
 const assessmentType = ref(null)
 const assessment = ref(null)
 const assessments = defineModel('assessments')
+const router = useRouter()
 
 const props = defineProps({
 	batch: {
@@ -70,7 +88,7 @@ const addAssessment = (close) => {
 		{
 			onSuccess(data) {
 				assessments.value.reload()
-				showToast(__('Success'), __('Assessment added successfully'), 'check')
+				toast.success(__('Assessment added successfully'))
 				close()
 			},
 		}
diff --git a/frontend/src/components/Modals/AssignmentForm.vue b/frontend/src/components/Modals/AssignmentForm.vue
index d8e89f75..1c7ee18b 100644
--- a/frontend/src/components/Modals/AssignmentForm.vue
+++ b/frontend/src/components/Modals/AssignmentForm.vue
@@ -37,7 +37,7 @@
 							@change="(val) => (assignment.question = val)"
 							:editable="true"
 							:fixedMenu="true"
-							editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
+							editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[18rem] overflow-y-auto"
 						/>
 					</div>
 				</div>
@@ -64,9 +64,8 @@
 	</Dialog>
 </template>
 <script setup lang="ts">
-import { Button, Dialog, FormControl, TextEditor } from 'frappe-ui'
+import { Button, Dialog, FormControl, TextEditor, toast } from 'frappe-ui'
 import { computed, reactive, watch } from 'vue'
-import { showToast } from '@/utils'
 
 const show = defineModel()
 const assignments = defineModel<Assignments>('assignments')
@@ -123,11 +122,7 @@ const saveAssignment = () => {
 			{
 				onSuccess() {
 					show.value = false
-					showToast(
-						__('Success'),
-						__('Assignment created successfully'),
-						'check'
-					)
+					toast.success(__('Assignment created successfully'))
 				},
 			}
 		)
@@ -140,11 +135,7 @@ const saveAssignment = () => {
 			{
 				onSuccess() {
 					show.value = false
-					showToast(
-						__('Success'),
-						__('Assignment updated successfully'),
-						'check'
-					)
+					toast.success(__('Assignment updated successfully'))
 				},
 			}
 		)
diff --git a/frontend/src/components/Modals/BatchCourseModal.vue b/frontend/src/components/Modals/BatchCourseModal.vue
index a710466d..ee6fd583 100644
--- a/frontend/src/components/Modals/BatchCourseModal.vue
+++ b/frontend/src/components/Modals/BatchCourseModal.vue
@@ -19,32 +19,43 @@
 				v-model="course"
 				:label="__('Course')"
 				:required="true"
+				:onCreate="
+					(value, close) => {
+						close()
+						router.push({
+							name: 'CourseForm',
+							params: {
+								courseName: 'new',
+							},
+						})
+					}
+				"
 			/>
 			<Link
 				doctype="Course Evaluator"
 				v-model="evaluator"
 				:label="__('Evaluator')"
-				:onCreate="(value, close) => openSettings(close)"
+				:onCreate="(value, close) => openSettings('Evaluators', close)"
 				class="mt-4"
 			/>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource } from 'frappe-ui'
+import { Dialog, createResource, toast } from 'frappe-ui'
 import { ref, inject } from 'vue'
 import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils'
 import { useOnboarding } from 'frappe-ui/frappe'
-import { useSettings } from '@/stores/settings'
+import { openSettings } from '@/utils'
+import { useRouter } from 'vue-router'
 
 const show = defineModel()
 const course = ref(null)
 const evaluator = ref(null)
 const user = inject('$user')
 const courses = defineModel('courses')
+const router = useRouter()
 const { updateOnboardingStep } = useOnboarding('learning')
-const settingsStore = useSettings()
 
 const props = defineProps({
 	batch: {
@@ -83,15 +94,9 @@ const addCourse = (close) => {
 				evaluator.value = null
 			},
 			onError(err) {
-				showToast('Error', err.message[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
 }
-
-const openSettings = (close) => {
-	close()
-	settingsStore.activeTab = 'Evaluators'
-	settingsStore.isSettingsOpen = true
-}
 </script>
diff --git a/frontend/src/components/Modals/BatchStudentProgress.vue b/frontend/src/components/Modals/BatchStudentProgress.vue
index e2bf3add..8a5a96a4 100644
--- a/frontend/src/components/Modals/BatchStudentProgress.vue
+++ b/frontend/src/components/Modals/BatchStudentProgress.vue
@@ -14,7 +14,13 @@
 							<div class="text-xl font-semibold">
 								{{ student.full_name }}
 							</div>
-							<Badge :theme="student.progress === 100 ? 'green' : 'red'">
+							<Badge
+								v-if="
+									Object.keys(student.assessments).length ||
+									Object.keys(student.courses).length
+								"
+								:theme="student.progress === 100 ? 'green' : 'red'"
+							>
 								{{ student.progress }}% {{ __('Complete') }}
 							</Badge>
 						</div>
@@ -26,7 +32,10 @@
 
 				<div class="space-y-8">
 					<!-- Assessments -->
-					<div class="space-y-2 text-sm">
+					<div
+						v-if="Object.keys(student.assessments).length"
+						class="space-y-2 text-sm"
+					>
 						<div class="flex items-center border-b pb-1 font-medium">
 							<span class="flex-1">
 								{{ __('Assessment') }}
@@ -73,7 +82,10 @@
 					</div>
 
 					<!-- Courses -->
-					<div class="space-y-2 text-sm">
+					<div
+						v-if="Object.keys(student.courses).length"
+						class="space-y-2 text-sm"
+					>
 						<div class="flex items-center border-b pb-1 font-medium">
 							<span class="flex-1">
 								{{ __('Courses') }}
diff --git a/frontend/src/components/Modals/BulkCertificates.vue b/frontend/src/components/Modals/BulkCertificates.vue
index 49e8f42f..befc99ed 100644
--- a/frontend/src/components/Modals/BulkCertificates.vue
+++ b/frontend/src/components/Modals/BulkCertificates.vue
@@ -62,9 +62,8 @@
 </template>
 <script setup>
 import { inject, reactive } from 'vue'
-import { createResource, Dialog, FormControl, Switch } from 'frappe-ui'
+import { createResource, Dialog, FormControl, Switch, toast } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils'
 
 const show = defineModel()
 const dayjs = inject('$dayjs')
@@ -112,13 +111,13 @@ const generateCertificates = (close) => {
 			},
 			{
 				onError(err) {
-					showToast(__('Error'), err.messages?.[0] || err, 'x')
+					toast.error(err.messages?.[0] || err)
 				},
 			}
 		)
 	})
 	close()
-	showToast(__('Success'), __('Certificates generated successfully'), 'check')
+	toast.success(__('Certificates generated successfully'))
 }
 
 const getCourses = () => {
diff --git a/frontend/src/components/Modals/ChapterModal.vue b/frontend/src/components/Modals/ChapterModal.vue
index 7d3a340b..e76a2bce 100644
--- a/frontend/src/components/Modals/ChapterModal.vue
+++ b/frontend/src/components/Modals/ChapterModal.vue
@@ -76,9 +76,10 @@ import {
 	FileUploader,
 	FormControl,
 	Switch,
+	toast,
 } from 'frappe-ui'
 import { reactive, watch, inject } from 'vue'
-import { showToast, getFileSize } from '@/utils/'
+import { getFileSize } from '@/utils/'
 import { capture } from '@/telemetry'
 import { FileText, X } from 'lucide-vue-next'
 import { useOnboarding } from 'frappe-ui/frappe'
@@ -150,21 +151,17 @@ const addChapter = async (close) => {
 						onSuccess(data) {
 							cleanChapter()
 							outline.value.reload()
-							showToast(
-								__('Success'),
-								__('Chapter added successfully'),
-								'check'
-							)
+							toast.success(__('Chapter added successfully'))
 						},
 						onError(err) {
-							showToast(__('Error'), err.messages?.[0] || err, 'x')
+							toast.error(err.messages?.[0] || err)
 						},
 					}
 				)
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -196,11 +193,11 @@ const editChapter = (close) => {
 			},
 			onSuccess() {
 				outline.value.reload()
-				showToast(__('Success'), __('Chapter updated successfully'), 'check')
+				toast.success(__('Chapter updated successfully'))
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/Modals/DiscussionModal.vue b/frontend/src/components/Modals/DiscussionModal.vue
index 251413d4..a625b37e 100644
--- a/frontend/src/components/Modals/DiscussionModal.vue
+++ b/frontend/src/components/Modals/DiscussionModal.vue
@@ -34,9 +34,15 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
+import {
+	Dialog,
+	FormControl,
+	TextEditor,
+	createResource,
+	toast,
+} from 'frappe-ui'
 import { reactive } from 'vue'
-import { showToast, singularize } from '@/utils'
+import { singularize } from '@/utils'
 
 const topics = defineModel('reloadTopics')
 
@@ -115,7 +121,7 @@ const submitTopic = (close) => {
 				)
 			},
 			onError(err) {
-				showToast('Error', err.message, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/Modals/EditProfile.vue b/frontend/src/components/Modals/EditProfile.vue
index afca50c1..5cb27dea 100644
--- a/frontend/src/components/Modals/EditProfile.vue
+++ b/frontend/src/components/Modals/EditProfile.vue
@@ -93,10 +93,11 @@ import {
 	Button,
 	createResource,
 	TextEditor,
+	toast,
 } from 'frappe-ui'
 import { reactive, watch } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
-import { getFileSize, showToast, escapeHTML } from '@/utils'
+import { getFileSize, escapeHTML } from '@/utils'
 
 const reloadProfile = defineModel('reloadProfile')
 
@@ -155,7 +156,7 @@ const saveProfile = (close) => {
 				reloadProfile.value.reload()
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/Modals/EvaluationModal.vue b/frontend/src/components/Modals/EvaluationModal.vue
index 7491355a..8c48ccae 100644
--- a/frontend/src/components/Modals/EvaluationModal.vue
+++ b/frontend/src/components/Modals/EvaluationModal.vue
@@ -68,7 +68,7 @@
 <script setup>
 import { Dialog, createResource, Select, FormControl } from 'frappe-ui'
 import { reactive, watch, inject } from 'vue'
-import { createToast, formatTime } from '@/utils/'
+import { formatTime } from '@/utils/'
 
 const user = inject('$user')
 const dayjs = inject('$dayjs')
@@ -148,14 +148,7 @@ function submitEvaluation(close) {
 				unavailabilityMessage = false
 			}
 
-			createToast({
-				title: unavailabilityMessage ? __('Evaluator is Unavailable') : '',
-				text: message,
-				icon: unavailabilityMessage ? 'alert-circle' : 'x',
-				iconClasses: 'bg-yellow-600 text-ink-white rounded-md p-px',
-				position: 'top-center',
-				timeout: 10,
-			})
+			toast.warning(__('Evaluator is unavailable'))
 		},
 	})
 }
diff --git a/frontend/src/components/Modals/Event.vue b/frontend/src/components/Modals/Event.vue
index cfd7711f..a717a15d 100644
--- a/frontend/src/components/Modals/Event.vue
+++ b/frontend/src/components/Modals/Event.vue
@@ -144,6 +144,7 @@ import {
 	Tabs,
 	Tooltip,
 	Textarea,
+	toast,
 } from 'frappe-ui'
 import {
 	User,
@@ -157,7 +158,7 @@ import {
 	ClipboardList,
 } from 'lucide-vue-next'
 import { inject, reactive, watch, ref, computed } from 'vue'
-import { formatTime, showToast } from '@/utils'
+import { formatTime } from '@/utils'
 import Rating from '@/components/Controls/Rating.vue'
 import Link from '@/components/Controls/Link.vue'
 
@@ -252,7 +253,7 @@ const saveEvaluation = () => {
 				} else {
 					show.value = false
 				}
-				showToast(__('Success'), __('Evaluation saved successfully'), 'check')
+				toast.success(__('Evaluation saved successfully'))
 			},
 		}
 	)
@@ -307,7 +308,7 @@ const saveCertificate = () => {
 		{},
 		{
 			onSuccess: () => {
-				showToast(__('Success'), __('Certificate saved successfully'), 'check')
+				toast.success(__('Certificate saved successfully'))
 			},
 		}
 	)
diff --git a/frontend/src/components/Modals/JobApplicationModal.vue b/frontend/src/components/Modals/JobApplicationModal.vue
index faceb05a..f4d66e8c 100644
--- a/frontend/src/components/Modals/JobApplicationModal.vue
+++ b/frontend/src/components/Modals/JobApplicationModal.vue
@@ -64,10 +64,10 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FileUploader, Button, createResource } from 'frappe-ui'
+import { Dialog, FileUploader, Button, createResource, toast } from 'frappe-ui'
 import { FileText } from 'lucide-vue-next'
 import { ref, inject } from 'vue'
-import { createToast, getFileSize } from '@/utils/'
+import { getFileSize } from '@/utils/'
 
 const resume = ref(null)
 const show = defineModel()
@@ -112,24 +112,12 @@ const submitResume = (close) => {
 				}
 			},
 			onSuccess() {
-				createToast({
-					title: 'Success',
-					text: 'Your application has been submitted',
-					icon: 'check',
-					iconClasses: 'bg-surface-green-3 text-ink-white rounded-md p-px',
-				})
+				toast.success('Your application has been submitted successfully')
 				application.value.reload()
 				close()
 			},
 			onError(err) {
-				createToast({
-					title: 'Error',
-					text: err.messages?.[0] || err,
-					icon: 'x',
-					iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
-					position: 'top-center',
-					timeout: 10,
-				})
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/Modals/LiveClassModal.vue b/frontend/src/components/Modals/LiveClassModal.vue
index 7d260776..ca90f7c6 100644
--- a/frontend/src/components/Modals/LiveClassModal.vue
+++ b/frontend/src/components/Modals/LiveClassModal.vue
@@ -94,9 +94,10 @@ import {
 	Tooltip,
 	FormControl,
 	Autocomplete,
+	toast,
 } from 'frappe-ui'
 import { reactive, inject, onMounted } from 'vue'
-import { getTimezones, createToast, getUserTimezone } from '@/utils/'
+import { getTimezones, getUserTimezone } from '@/utils/'
 
 const liveClasses = defineModel('reloadLiveClasses')
 const show = defineModel()
@@ -202,14 +203,7 @@ const submitLiveClass = (close) => {
 			close()
 		},
 		onError(err) {
-			createToast({
-				title: 'Error',
-				text: err.messages?.[0] || err,
-				icon: 'x',
-				iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
-				position: 'top-center',
-				timeout: 10,
-			})
+			toast.error(err.messages?.[0] || err)
 		},
 	})
 }
diff --git a/frontend/src/components/Modals/PageModal.vue b/frontend/src/components/Modals/PageModal.vue
index 6c403168..44ee1c38 100644
--- a/frontend/src/components/Modals/PageModal.vue
+++ b/frontend/src/components/Modals/PageModal.vue
@@ -30,11 +30,10 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource } from 'frappe-ui'
+import { Dialog, createResource, toast } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
 import { reactive, watch } from 'vue'
 import IconPicker from '@/components/Controls/IconPicker.vue'
-import { showToast } from '@/utils'
 
 const sidebar = defineModel('reloadSidebar')
 const show = defineModel()
@@ -78,10 +77,10 @@ const addWebPage = (close) => {
 			onSuccess() {
 				sidebar.value.reload()
 				close()
-				showToast('Success', 'Web page added to sidebar', 'check')
+				toast.success(__('Web page added to sidebar'))
 			},
 			onError(err) {
-				showToast('Error', err.message[0] || err, 'x')
+				toast.error(err.message[0] || err)
 				close()
 			},
 		}
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 10b0a2ec..4f7a60d4 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -121,10 +121,10 @@ import {
 	createResource,
 	Switch,
 	Button,
+	toast,
 } from 'frappe-ui'
 import { computed, watch, reactive, ref, inject } from 'vue'
 import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils'
 import { useOnboarding } from 'frappe-ui/frappe'
 
 const show = defineModel()
@@ -260,7 +260,7 @@ const addQuestion = () => {
 					})
 				},
 				onError(err) {
-					showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+					toast.error(err.messages?.[0] || err)
 				},
 			}
 		)
@@ -278,12 +278,12 @@ const addQuestionRow = (question) => {
 					updateOnboardingStep('create_first_quiz')
 
 				show.value = false
-				showToast(__('Success'), __('Question added successfully'), 'check')
+				toast.success(__('Question added successfully'))
 				quiz.value.reload()
 				show.value = false
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				toast.error(err.messages?.[0] || err)
 				show.value = false
 			},
 		}
@@ -328,18 +328,14 @@ const updateQuestion = () => {
 					{
 						onSuccess() {
 							show.value = false
-							showToast(
-								__('Success'),
-								__('Question updated successfully'),
-								'check'
-							)
+							toast.success(__('Question updated successfully'))
 							quiz.value.reload()
 						},
 					}
 				)
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/Modals/ReviewModal.vue b/frontend/src/components/Modals/ReviewModal.vue
index 69b133e7..742204b6 100644
--- a/frontend/src/components/Modals/ReviewModal.vue
+++ b/frontend/src/components/Modals/ReviewModal.vue
@@ -32,10 +32,9 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, Textarea, createResource } from 'frappe-ui'
+import { Dialog, Textarea, createResource, toast } from 'frappe-ui'
 import { reactive } from 'vue'
 import Rating from '@/components/Controls/Rating.vue'
-import { createToast } from '@/utils/'
 
 const show = defineModel()
 const reviews = defineModel('reloadReviews')
@@ -78,11 +77,7 @@ function submitReview(close) {
 			hasReviewed.value.reload()
 		},
 		onError(err) {
-			createToast({
-				text: err.messages?.[0] || err,
-				icon: 'x',
-				iconClasses: 'text-ink-red-4 bg-surface-red-4',
-			})
+			toast.error(err.messages?.[0] || err)
 		},
 	})
 	close()
diff --git a/frontend/src/components/Modals/Settings.vue b/frontend/src/components/Modals/Settings.vue
index 315d066f..22a20006 100644
--- a/frontend/src/components/Modals/Settings.vue
+++ b/frontend/src/components/Modals/Settings.vue
@@ -1,5 +1,5 @@
 <template>
-	<Dialog v-model="show" :options="{ size: '4xl' }">
+	<Dialog v-model="show" :options="{ size: '5xl' }">
 		<template #body>
 			<div class="flex h-[calc(100vh_-_8rem)]">
 				<div class="flex w-52 shrink-0 flex-col bg-surface-gray-2 p-2">
diff --git a/frontend/src/components/Modals/StudentModal.vue b/frontend/src/components/Modals/StudentModal.vue
index 4045d859..df3acc3d 100644
--- a/frontend/src/components/Modals/StudentModal.vue
+++ b/frontend/src/components/Modals/StudentModal.vue
@@ -19,19 +19,25 @@
 					doctype="User"
 					v-model="student"
 					:filters="{ ignore_user_type: 1 }"
+					:onCreate="
+						(value, close) => {
+							openSettings('Members', close)
+						}
+					"
 				/>
 			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource } from 'frappe-ui'
+import { Dialog, createResource, toast } from 'frappe-ui'
 import { ref, inject } from 'vue'
 import Link from '@/components/Controls/Link.vue'
-import { showToast } from '@/utils'
 import { useOnboarding } from 'frappe-ui/frappe'
+import { openSettings } from '@/utils'
 
 const students = defineModel('reloadStudents')
+const batchModal = defineModel('batchModal')
 const student = ref()
 const user = inject('$user')
 const { updateOnboardingStep } = useOnboarding('learning')
@@ -66,11 +72,12 @@ const addStudent = (close) => {
 					updateOnboardingStep('add_batch_student')
 
 				students.value.reload()
+				batchModal.value.reload()
 				student.value = null
 				close()
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
index 4ac2dedd..c1b0f04a 100644
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -291,9 +291,9 @@ import {
 	ListView,
 	TextEditor,
 	FormControl,
+	toast,
 } from 'frappe-ui'
 import { ref, watch, reactive, inject, computed } from 'vue'
-import { createToast, showToast } from '@/utils/'
 import { CheckCircle, XCircle, MinusCircle } from 'lucide-vue-next'
 import { timeAgo } from '@/utils'
 import { useRouter } from 'vue-router'
@@ -494,12 +494,7 @@ const getAnswers = () => {
 const checkAnswer = () => {
 	let answers = getAnswers()
 	if (!answers.length) {
-		createToast({
-			title: 'Please select an option',
-			icon: 'alert-circle',
-			iconClasses: 'text-yellow-600 bg-yellow-100 rounded-full',
-			position: 'top-center',
-		})
+		toast.warning(__('Please select an option'))
 		return
 	}
 
@@ -589,7 +584,7 @@ const createSubmission = () => {
 				const errorTitle = err?.message || ''
 				if (errorTitle.includes('MaximumAttemptsExceededError')) {
 					const errorMessage = err.messages?.[0] || err
-					showToast(__('Error'), __(errorMessage), 'x')
+					toast.error(__(errorMessage))
 					setTimeout(() => {
 						window.location.reload()
 					}, 3000)
diff --git a/frontend/src/components/SettingDetails.vue b/frontend/src/components/SettingDetails.vue
index e4916e7b..c03867fa 100644
--- a/frontend/src/components/SettingDetails.vue
+++ b/frontend/src/components/SettingDetails.vue
@@ -27,9 +27,8 @@
 </template>
 
 <script setup>
-import { Button, Badge } from 'frappe-ui'
+import { Button, Badge, toast } from 'frappe-ui'
 import SettingFields from '@/components/SettingFields.vue'
-import { showToast } from '@/utils'
 
 const props = defineProps({
 	fields: {
@@ -61,7 +60,7 @@ const update = () => {
 		{},
 		{
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/pages/Assignments.vue b/frontend/src/pages/Assignments.vue
index 2f86283e..bf10174d 100644
--- a/frontend/src/pages/Assignments.vue
+++ b/frontend/src/pages/Assignments.vue
@@ -21,14 +21,28 @@
 	</header>
 
 	<div class="md:w-3/4 md:mx-auto py-5 mx-5">
-		<div class="grid grid-cols-3 gap-5 mb-5">
-			<FormControl v-model="titleFilter" :placeholder="__('Search by title')" />
-			<FormControl
-				v-model="typeFilter"
-				type="select"
-				:options="assignmentTypes"
-				:placeholder="__('Type')"
-			/>
+		<div class="flex items-center justify-between mb-5">
+			<div
+				v-if="assignmentCount"
+				class="text-xl font-semibold text-ink-gray-7 mb-4"
+			>
+				{{ __('{0} Assignments').format(assignmentCount) }}
+			</div>
+			<div
+				v-if="assignments.data?.length || assigmentCount > 0"
+				class="grid grid-cols-2 gap-5"
+			>
+				<FormControl
+					v-model="titleFilter"
+					:placeholder="__('Search by title')"
+				/>
+				<FormControl
+					v-model="typeFilter"
+					type="select"
+					:options="assignmentTypes"
+					:placeholder="__('Type')"
+				/>
+			</div>
 		</div>
 		<ListView
 			v-if="assignments.data?.length"
@@ -46,22 +60,7 @@
 			}"
 		>
 		</ListView>
-		<div
-			v-else
-			class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-		>
-			<Pencil class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-			<div class="text-xl font-medium">
-				{{ __('No assignments found') }}
-			</div>
-			<div class="leading-5">
-				{{
-					__(
-						'You have not created any assignments yet. To create a new assignment, click on the "New" button above.'
-					)
-				}}
-			</div>
-		</div>
+		<EmptyState v-else type="Assignments" />
 		<div
 			v-if="assignments.data && assignments.hasNextPage"
 			class="flex justify-center my-5"
@@ -81,16 +80,18 @@
 import {
 	Breadcrumbs,
 	Button,
+	call,
 	createListResource,
 	FormControl,
 	ListView,
 	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
-import { Plus, Pencil } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import { sessionStore } from '../stores/session'
 import AssignmentForm from '@/components/Modals/AssignmentForm.vue'
+import EmptyState from '@/components/EmptyState.vue'
 
 const user = inject('$user')
 const dayjs = inject('$dayjs')
@@ -98,6 +99,7 @@ const titleFilter = ref('')
 const typeFilter = ref('')
 const showAssignmentForm = ref(false)
 const assignmentID = ref('new')
+const assignmentCount = ref(0)
 const { brand } = sessionStore()
 const router = useRouter()
 const readOnlyMode = window.read_only_mode
@@ -106,7 +108,7 @@ onMounted(() => {
 	if (!user.data?.is_moderator && !user.data?.is_instructor) {
 		router.push({ name: 'Courses' })
 	}
-
+	getAssignmentCount()
 	titleFilter.value = router.currentRoute.value.query.title
 	typeFilter.value = router.currentRoute.value.query.type
 })
@@ -179,6 +181,14 @@ const assignmentColumns = computed(() => {
 	]
 })
 
+const getAssignmentCount = () => {
+	call('frappe.client.get_count', {
+		doctype: 'LMS Assignment',
+	}).then((data) => {
+		assignmentCount.value = data
+	})
+}
+
 const assignmentTypes = computed(() => {
 	let types = ['', 'Document', 'Image', 'PDF', 'URL', 'Text']
 	return types.map((type) => {
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue
index 2288b237..cf0b31fb 100644
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -67,7 +67,7 @@
 								<BatchDashboard :batch="batch" :isStudent="isStudent" />
 							</div>
 							<div v-else-if="tab.label == 'Dashboard'">
-								<BatchStudents :batch="batch.data" />
+								<BatchStudents :batch="batch" />
 							</div>
 							<div v-else-if="tab.label == 'Classes'">
 								<LiveClass :batch="batch.data.name" />
@@ -357,6 +357,9 @@ watch(tabIndex, () => {
 
 const canMakeAnnouncement = () => {
 	if (readOnlyMode) return false
+
+	if (!batch.data?.students?.length) return false
+
 	return user.data?.is_moderator || user.data?.is_evaluator
 }
 
diff --git a/frontend/src/pages/BatchDetail.vue b/frontend/src/pages/BatchDetail.vue
index 944b3d36..ecf28a9e 100644
--- a/frontend/src/pages/BatchDetail.vue
+++ b/frontend/src/pages/BatchDetail.vue
@@ -6,67 +6,45 @@
 			<Breadcrumbs :items="breadcrumbs" />
 		</header>
 		<div class="m-5 pb-10">
-			<div>
-				<div class="text-3xl font-semibold text-ink-gray-9">
-					{{ batch.data.title }}
-				</div>
-				<div class="my-3 leading-6 text-ink-gray-7">
-					{{ batch.data.description }}
-				</div>
-				<div
-					class="flex flex-col gap-2 lg:gap-0 lg:flex-row lg:items-center space-x-0 md:space-x-5 lg:w-1/2"
-				>
-					<div
-						v-if="batch.data?.courses?.length"
-						class="flex items-center text-ink-gray-7"
-					>
-						<BookOpen class="h-4 w-4 mr-2 stroke-1.5" />
-						<span> {{ batch.data?.courses?.length }} {{ __('Courses') }} </span>
+			<div class="flex justify-between w-full">
+				<div class="md:w-2/3">
+					<div class="text-3xl font-semibold text-ink-gray-9">
+						{{ batch.data.title }}
 					</div>
-					<span v-if="batch.data?.courses?.length" class="hidden lg:block"
-						>&middot;</span
-					>
-					<DateRange
-						:startDate="batch.data.start_date"
-						:endDate="batch.data.end_date"
-					/>
-					<span class="hidden lg:block" v-if="batch.data.start_date"
-						>&middot;</span
-					>
-					<div class="flex items-center text-ink-gray-7">
-						<Clock class="h-4 w-4 mr-2 stroke-1.5" />
-						<span>
-							{{ formatTime(batch.data.start_time) }} -
-							{{ formatTime(batch.data.end_time) }}
-						</span>
+					<div class="my-3 leading-6 text-ink-gray-7">
+						{{ batch.data.description }}
 					</div>
-				</div>
-				<div class="flex avatar-group overlap mt-3">
-					<div
-						class="h-6 mr-1"
-						:class="{
-							'avatar-group overlap': batch.data.instructors.length > 1,
-						}"
-					>
-						<UserAvatar
-							v-for="instructor in batch.data.instructors"
-							:user="instructor"
-						/>
+					<div class="flex avatar-group overlap">
+						<div
+							class="h-6 mr-1"
+							:class="{
+								'avatar-group overlap': batch.data.instructors.length > 1,
+							}"
+						>
+							<UserAvatar
+								v-for="instructor in batch.data.instructors"
+								:user="instructor"
+							/>
+						</div>
+						<CourseInstructors :instructors="batch.data.instructors" />
 					</div>
-					<CourseInstructors :instructors="batch.data.instructors" />
-				</div>
-			</div>
-			<div class="grid lg:grid-cols-[60%,20%] gap-4 lg:gap-20 mt-10">
-				<div class="order-2 lg:order-none">
 					<div
-						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-6"
+						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-10"
 						v-html="batch.data.batch_details"
 					></div>
+				</div>
+				<div class="hidden md:block">
+					<BatchOverlay :batch="batch" />
+				</div>
+			</div>
+			<!-- <div class="grid lg:grid-cols-[60%,20%] gap-4 lg:gap-20 mt-10">
+				<div class="order-2 lg:order-none">
+					
 				</div>
 				<div class="order-1 lg:order-none">
 					<BatchOverlay :batch="batch" />
 				</div>
-			</div>
+			</div> -->
 			<div v-if="batch.data.courses.length">
 				<div class="flex items-center mt-10">
 					<div class="text-2xl font-semibold">
diff --git a/frontend/src/pages/BatchForm.vue b/frontend/src/pages/BatchForm.vue
index 3daf352a..60415e81 100644
--- a/frontend/src/pages/BatchForm.vue
+++ b/frontend/src/pages/BatchForm.vue
@@ -8,13 +8,13 @@
 				{{ __('Save') }}
 			</Button>
 		</header>
-		<div class="w-3/4 mx-auto py-5">
-			<div class="">
+		<div class="py-5">
+			<div class="px-20 pb-5 space-y-5 border-b mb-5">
 				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
 					{{ __('Details') }}
 				</div>
-				<div class="space-y-10 mb-4">
-					<div class="space-y-4">
+				<div class="grid grid-cols-2 gap-5">
+					<div class="space-y-5">
 						<FormControl
 							v-model="batch.title"
 							:label="__('Title')"
@@ -26,31 +26,162 @@
 							doctype="User"
 							:label="__('Instructors')"
 							:required="true"
+							:onCreate="(close) => openSettings('Members', close)"
 							:filters="{ ignore_user_type: 1 }"
 						/>
 					</div>
+					<FormControl
+						v-model="batch.description"
+						:label="__('Short Description')"
+						type="textarea"
+						:rows="8"
+						:placeholder="__('Short description of the batch')"
+						:required="true"
+					/>
+				</div>
+			</div>
 
-					<div class="grid grid-cols-2 gap-10">
-						<div class="flex flex-col space-y-5">
-							<FormControl
-								v-model="batch.published"
-								type="checkbox"
-								:label="__('Published')"
-							/>
-							<FormControl
-								v-model="batch.allow_self_enrollment"
-								type="checkbox"
-								:label="__('Allow self enrollment')"
-							/>
-							<FormControl
-								v-model="batch.certification"
-								type="checkbox"
-								:label="__('Certification')"
-							/>
-						</div>
+			<div class="px-20 pb-5 space-y-5 border-b mb-5">
+				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
+					{{ __('Settings') }}
+				</div>
+				<div class="grid grid-cols-3 gap-5">
+					<FormControl
+						v-model="batch.published"
+						type="checkbox"
+						:label="__('Published')"
+					/>
+					<FormControl
+						v-model="batch.allow_self_enrollment"
+						type="checkbox"
+						:label="__('Allow self enrollment')"
+					/>
+					<FormControl
+						v-model="batch.certification"
+						type="checkbox"
+						:label="__('Certification')"
+					/>
+				</div>
+			</div>
 
+			<div class="px-20 pb-5 space-y-5 border-b mb-5">
+				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
+					{{ __('Date and Time') }}
+				</div>
+				<div class="grid grid-cols-3 gap-10">
+					<div class="space-y-5">
+						<FormControl
+							v-model="batch.start_date"
+							:label="__('Start Date')"
+							type="date"
+							class="mb-4"
+							:required="true"
+						/>
+						<FormControl
+							v-model="batch.end_date"
+							:label="__('End Date')"
+							type="date"
+							class="mb-4"
+							:required="true"
+						/>
+					</div>
+					<div class="space-y-5">
+						<FormControl
+							v-model="batch.start_time"
+							:label="__('Start Time')"
+							type="time"
+							class="mb-4"
+							:required="true"
+						/>
+						<FormControl
+							v-model="batch.end_time"
+							:label="__('End Time')"
+							type="time"
+							class="mb-4"
+							:required="true"
+						/>
+					</div>
+					<div class="space-y-5">
+						<FormControl
+							v-model="batch.timezone"
+							:label="__('Timezone')"
+							type="text"
+							:placeholder="__('Example: IST (+5:30)')"
+							class="mb-4"
+							:required="true"
+						/>
+						<FormControl
+							v-model="batch.evaluation_end_date"
+							:label="__('Evaluation End Date')"
+							type="date"
+							class="mb-4"
+						/>
+					</div>
+				</div>
+			</div>
+
+			<div class="px-20 pb-5 space-y-5 border-b mb-5">
+				<div>
+					<label class="block text-sm text-ink-gray-5 mb-1">
+						{{ __('Batch Details') }}
+						<span class="text-ink-red-3">*</span>
+					</label>
+					<TextEditor
+						:content="batch.batch_details"
+						@change="(val) => (batch.batch_details = val)"
+						:editable="true"
+						:fixedMenu="true"
+						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[20rem] overflow-y-scroll mb-4"
+					/>
+				</div>
+			</div>
+
+			<div class="px-20 pb-5 space-y-5 border-b mb-5">
+				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
+					{{ __('Configurations') }}
+				</div>
+				<div class="grid grid-cols-3 gap-10">
+					<div class="space-y-5">
+						<FormControl
+							v-model="batch.seat_count"
+							:label="__('Seat Count')"
+							type="number"
+							class="mb-4"
+							:placeholder="__('Number of seats available')"
+						/>
+						<Link
+							doctype="Email Template"
+							:label="__('Email Template')"
+							v-model="batch.confirmation_email_template"
+						/>
+					</div>
+					<div class="space-y-5">
+						<FormControl
+							v-model="batch.medium"
+							type="select"
+							:options="[
+								{
+									label: 'Online',
+									value: 'Online',
+								},
+								{
+									label: 'Offline',
+									value: 'Offline',
+								},
+							]"
+							:label="__('Medium')"
+							class="mb-4"
+						/>
+						<Link
+							doctype="LMS Category"
+							:label="__('Category')"
+							v-model="batch.category"
+							:onCreate="(value, close) => openSettings('Categories', close)"
+						/>
+					</div>
+					<div class="space-y-5">
 						<div>
-							<div class="text-xs text-ink-gray-5 mb-2">
+							<div class="text-xs text-ink-gray-5">
 								{{ __('Meta Image') }}
 							</div>
 							<FileUploader
@@ -70,11 +201,9 @@
 											<Button @click="openFileSelector">
 												{{ __('Upload') }}
 											</Button>
-											<div class="mt-2 text-ink-gray-5 text-sm">
+											<div class="mt-1 text-ink-gray-5 text-sm leading-5">
 												{{
-													__(
-														'Appears when the batch URL is shared on any online platform'
-													)
+													__('Appears when the batch URL is shared on socials')
 												}}
 											</div>
 										</div>
@@ -106,119 +235,16 @@
 				</div>
 			</div>
 
-			<div class="my-10">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
-					{{ __('Date and Time') }}
-				</div>
-				<div class="grid grid-cols-3 gap-10">
-					<div>
-						<FormControl
-							v-model="batch.start_date"
-							:label="__('Start Date')"
-							type="date"
-							class="mb-4"
-							:required="true"
-						/>
-						<FormControl
-							v-model="batch.end_date"
-							:label="__('End Date')"
-							type="date"
-							class="mb-4"
-							:required="true"
-						/>
-					</div>
-					<div>
-						<FormControl
-							v-model="batch.start_time"
-							:label="__('Start Time')"
-							type="time"
-							class="mb-4"
-							:required="true"
-						/>
-						<FormControl
-							v-model="batch.end_time"
-							:label="__('End Time')"
-							type="time"
-							class="mb-4"
-							:required="true"
-						/>
-					</div>
-					<div>
-						<FormControl
-							v-model="batch.timezone"
-							:label="__('Timezone')"
-							type="text"
-							:placeholder="__('Example: IST (+5:30)')"
-							class="mb-4"
-							:required="true"
-						/>
-					</div>
-				</div>
-			</div>
-
-			<div class="mb-10">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
-					{{ __('Settings') }}
-				</div>
-				<div class="grid grid-cols-3 gap-10">
-					<div>
-						<FormControl
-							v-model="batch.seat_count"
-							:label="__('Seat Count')"
-							type="number"
-							class="mb-4"
-							:placeholder="__('Number of seats available')"
-						/>
-						<FormControl
-							v-model="batch.evaluation_end_date"
-							:label="__('Evaluation End Date')"
-							type="date"
-							class="mb-4"
-						/>
-					</div>
-					<div>
-						<FormControl
-							v-model="batch.medium"
-							type="select"
-							:options="[
-								{
-									label: 'Online',
-									value: 'Online',
-								},
-								{
-									label: 'Offline',
-									value: 'Offline',
-								},
-							]"
-							:label="__('Medium')"
-							class="mb-4"
-						/>
-						<Link
-							doctype="LMS Category"
-							:label="__('Category')"
-							v-model="batch.category"
-						/>
-					</div>
-					<div>
-						<Link
-							doctype="Email Template"
-							:label="__('Email Template')"
-							v-model="batch.confirmation_email_template"
-						/>
-					</div>
-				</div>
-			</div>
-
-			<div class="">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
-					{{ __('Payment') }}
+			<div class="px-20 pb-5 space-y-5">
+				<div class="text-lg text-ink-gray-9 font-semibold">
+					{{ __('Pricing') }}
 				</div>
 				<FormControl
 					v-model="batch.paid_batch"
 					type="checkbox"
 					:label="__('Paid Batch')"
 				/>
-				<div class="grid grid-cols-3 gap-10 mt-4">
+				<div v-if="batch.paid_batch" class="grid grid-cols-3 gap-5">
 					<FormControl
 						v-model="batch.amount"
 						:label="__('Amount')"
@@ -232,33 +258,6 @@
 					/>
 				</div>
 			</div>
-
-			<div class="my-10">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
-					{{ __('Description') }}
-				</div>
-				<FormControl
-					v-model="batch.description"
-					:label="__('Short Description')"
-					type="textarea"
-					class="my-4"
-					:placeholder="__('Short description of the batch')"
-					:required="true"
-				/>
-				<div>
-					<label class="block text-sm text-ink-gray-5 mb-1">
-						{{ __('Batch Details') }}
-						<span class="text-ink-red-3">*</span>
-					</label>
-					<TextEditor
-						:content="batch.batch_details"
-						@change="(val) => (batch.batch_details = val)"
-						:editable="true"
-						:fixedMenu="true"
-						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] mb-4"
-					/>
-				</div>
-			</div>
 		</div>
 	</div>
 </template>
@@ -279,15 +278,16 @@ import {
 	TextEditor,
 	createResource,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import { useRouter } from 'vue-router'
-import { showToast } from '@/utils'
 import { Image } from 'lucide-vue-next'
 import { capture } from '@/telemetry'
 import { useOnboarding } from 'frappe-ui/frappe'
 import { sessionStore } from '../stores/session'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
 import Link from '@/components/Controls/Link.vue'
+import { openSettings } from '@/utils'
 
 const router = useRouter()
 const user = inject('$user')
@@ -459,7 +459,7 @@ const createNewBatch = () => {
 				})
 			},
 			onError(err) {
-				showToast('Message', err.messages?.[0] || err, 'alert-circle')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -478,7 +478,7 @@ const editBatchDetails = () => {
 				})
 			},
 			onError(err) {
-				showToast('Message', err.messages?.[0] || err, 'alert-circle')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue
index 08214868..fc636188 100644
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -20,12 +20,14 @@
 	</header>
 	<div class="p-5 pb-10">
 		<div
+			v-if="batchCount"
 			class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
 		>
 			<div class="text-lg text-ink-gray-9 font-semibold">
 				{{ __('All Batches') }}
 			</div>
 			<div
+				v-if="batches.data?.length || batchCount"
 				class="flex flex-col space-y-2 lg:space-y-0 lg:flex-row lg:items-center lg:space-x-4"
 			>
 				<TabButtons
@@ -70,22 +72,8 @@
 				<BatchCard :batch="batch" />
 			</router-link>
 		</div>
-		<div
-			v-else-if="!batches.list.loading"
-			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-48"
-		>
-			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-			<div class="text-lg font-medium mb-1">
-				{{ __('No batches found') }}
-			</div>
-			<div class="leading-5 w-2/5 text-center">
-				{{
-					__(
-						'There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!'
-					)
-				}}
-			</div>
-		</div>
+		<EmptyState v-else-if="!batches.list.loading" type="Batches" />
+
 		<div
 			v-if="!batches.list.loading && batches.hasNextPage"
 			class="flex justify-center mt-5"
@@ -100,6 +88,7 @@
 import {
 	Breadcrumbs,
 	Button,
+	call,
 	createListResource,
 	FormControl,
 	Select,
@@ -107,9 +96,10 @@ import {
 	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
-import { BookOpen, Plus } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
 import BatchCard from '@/components/BatchCard.vue'
+import EmptyState from '@/components/EmptyState.vue'
 
 const user = inject('$user')
 const dayjs = inject('$dayjs')
@@ -125,10 +115,12 @@ const is_student = computed(() => user.data?.is_student)
 const currentTab = ref(is_student.value ? 'All' : 'Upcoming')
 const orderBy = ref('start_date')
 const readOnlyMode = window.read_only_mode
+const batchCount = ref(0)
 
 onMounted(() => {
 	setFiltersFromQuery()
 	updateBatches()
+	getBatchCount()
 	categories.value = [
 		{
 			label: '',
@@ -306,6 +298,14 @@ const canCreateBatch = () => {
 	return false
 }
 
+const getBatchCount = () => {
+	call('frappe.client.get_count', {
+		doctype: 'LMS Batch',
+	}).then((data) => {
+		batchCount.value = data
+	})
+}
+
 const breadcrumbs = computed(() => [
 	{
 		label: __('Batches'),
diff --git a/frontend/src/pages/Billing.vue b/frontend/src/pages/Billing.vue
index 3fc52741..7b6b587c 100644
--- a/frontend/src/pages/Billing.vue
+++ b/frontend/src/pages/Billing.vue
@@ -156,9 +156,9 @@ import {
 	FormControl,
 	Breadcrumbs,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import { reactive, inject, onMounted, computed } from 'vue'
-import { showToast } from '@/utils/'
 import { sessionStore } from '../stores/session'
 import Link from '@/components/Controls/Link.vue'
 import NotPermitted from '@/components/NotPermitted.vue'
@@ -259,7 +259,7 @@ const generatePaymentLink = () => {
 				window.location.href = data
 			},
 			onError(err) {
-				showToast(__('Error'), err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -333,14 +333,7 @@ const validateAddress = () => {
 }
 
 const showError = (err) => {
-	createToast({
-		title: 'Error',
-		text: err.messages?.[0] || err,
-		icon: 'x',
-		iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
-		position: 'top-center',
-		timeout: 10,
-	})
+	toast.error(err.messages?.[0] || err)
 }
 
 const changeCurrency = (country) => {
diff --git a/frontend/src/pages/CertifiedParticipants.vue b/frontend/src/pages/CertifiedParticipants.vue
index 2510abf3..b7d0de83 100644
--- a/frontend/src/pages/CertifiedParticipants.vue
+++ b/frontend/src/pages/CertifiedParticipants.vue
@@ -3,7 +3,7 @@
 		class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
-		<router-link :to="{ name: 'Batches' }">
+		<router-link :to="{ name: 'Batches', query: { certification: true } }">
 			<Button>
 				<template #prefix>
 					<GraduationCap class="h-4 w-4 stroke-1.5" />
@@ -101,22 +101,7 @@
 			</Button>
 		</div>
 	</div>
-	<div
-		v-else
-		class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-48"
-	>
-		<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-		<div class="text-lg font-medium mb-1">
-			{{ __('No certified members') }}
-		</div>
-		<div class="leading-5 w-2/5 text-center">
-			{{
-				__(
-					'No certified members found. Please check again later or get certified yourself.'
-				)
-			}}
-		</div>
-	</div>
+	<EmptyState v-else type="Certified Members" />
 </template>
 <script setup>
 import {
@@ -130,8 +115,9 @@ import {
 	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref } from 'vue'
-import { BookOpen, GraduationCap } from 'lucide-vue-next'
+import { GraduationCap } from 'lucide-vue-next'
 import { sessionStore } from '../stores/session'
+import EmptyState from '@/components/EmptyState.vue'
 
 const currentCategory = ref('')
 const filters = ref({})
diff --git a/frontend/src/pages/CourseForm.vue b/frontend/src/pages/CourseForm.vue
index 2a2b2d07..3e9f090d 100644
--- a/frontend/src/pages/CourseForm.vue
+++ b/frontend/src/pages/CourseForm.vue
@@ -19,62 +19,112 @@
 						</Button>
 					</div>
 				</header>
-				<div class="mt-5 mb-10">
-					<div class="container mb-5">
+				<div class="mt-5 mb-5">
+					<div class="px-10 pb-5 mb-5 space-y-5 border-b">
 						<div class="text-lg font-semibold mb-4">
 							{{ __('Details') }}
 						</div>
-						<FormControl
-							v-model="course.title"
-							:label="__('Title')"
-							class="mb-4"
-							:required="true"
-						/>
-						<FormControl
-							v-model="course.short_introduction"
-							:label="__('Short Introduction')"
-							:placeholder="
-								__(
-									'A one line introduction to the course that appears on the course card'
-								)
-							"
-							class="mb-4"
-							:required="true"
-						/>
-						<div class="mb-4">
-							<div class="mb-1.5 text-sm text-ink-gray-5">
-								{{ __('Course Description') }}
-								<span class="text-ink-red-3">*</span>
-							</div>
-							<TextEditor
-								:content="course.description"
-								@change="(val) => (course.description = val)"
-								:editable="true"
-								:fixedMenu="true"
-								editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
+						<div class="grid grid-cols-2 gap-5">
+							<FormControl
+								v-model="course.title"
+								:label="__('Title')"
+								:required="true"
+							/>
+							<Link
+								doctype="LMS Category"
+								v-model="course.category"
+								:label="__('Category')"
+								:onCreate="(value, close) => openSettings('Categories', close)"
 							/>
 						</div>
-						<div class="mb-4">
-							<div class="text-xs text-ink-gray-5 mb-2">
-								{{ __('Course Image') }}
-								<span class="text-ink-red-3">*</span>
+						<div class="grid grid-cols-2 gap-5">
+							<MultiSelect
+								v-model="instructors"
+								doctype="User"
+								:label="__('Instructors')"
+								:filters="{ ignore_user_type: 1 }"
+								:onCreate="(close) => openSettings('Members', close)"
+								:required="true"
+							/>
+							<div>
+								<div class="mb-1.5 text-xs text-ink-gray-5">
+									{{ __('Tags') }}
+								</div>
+								<div class="flex items-center">
+									<div
+										v-if="course.tags"
+										v-for="tag in course.tags?.split(', ')"
+										class="flex items-center bg-surface-gray-2 text-ink-gray-7 p-2 rounded-md mr-2"
+									>
+										{{ tag }}
+										<X
+											class="stroke-1.5 w-3 h-3 ml-2 cursor-pointer"
+											@click="removeTag(tag)"
+										/>
+									</div>
+									<FormControl
+										v-model="newTag"
+										:placeholder="__('Add a keyword and then press enter')"
+										class="w-full"
+										@keyup.enter="updateTags()"
+										id="tags"
+									/>
+								</div>
 							</div>
-							<FileUploader
-								v-if="!course.course_image"
-								:fileTypes="['image/*']"
-								:validateFile="validateFile"
-								@success="(file) => saveImage(file)"
-							>
-								<template
-									v-slot="{ file, progress, uploading, openFileSelector }"
+						</div>
+						<div class="grid grid-cols-2 gap-5">
+							<FormControl
+								v-model="course.short_introduction"
+								type="textarea"
+								:rows="4"
+								:label="__('Short Introduction')"
+								:placeholder="
+									__(
+										'A one line introduction to the course that appears on the course card'
+									)
+								"
+								:required="true"
+							/>
+							<div class="mb-4">
+								<div class="text-xs text-ink-gray-5 mb-2">
+									{{ __('Course Image') }}
+									<span class="text-ink-red-3">*</span>
+								</div>
+								<FileUploader
+									v-if="!course.course_image"
+									:fileTypes="['image/*']"
+									:validateFile="validateFile"
+									@success="(file) => saveImage(file)"
 								>
-									<div class="flex items-center">
-										<div class="border rounded-md w-fit py-5 px-20">
-											<Image class="size-5 stroke-1 text-ink-gray-7" />
+									<template
+										v-slot="{ file, progress, uploading, openFileSelector }"
+									>
+										<div class="flex items-center">
+											<div class="border rounded-md w-fit py-5 px-20">
+												<Image class="size-5 stroke-1 text-ink-gray-7" />
+											</div>
+											<div class="ml-4">
+												<Button @click="openFileSelector">
+													{{ __('Upload') }}
+												</Button>
+												<div class="mt-1 text-ink-gray-5 text-sm leading-5">
+													{{
+														__('Appears on the course card in the course list')
+													}}
+												</div>
+											</div>
 										</div>
+									</template>
+								</FileUploader>
+								<div v-else class="mb-4">
+									<div class="flex items-center">
+										<img
+											:src="course.course_image.file_url"
+											class="border rounded-md w-40"
+										/>
 										<div class="ml-4">
-											<Button @click="openFileSelector">
-												{{ __('Upload') }}
+											<Button @click="removeImage()">
+												{{ __('Remove') }}
 											</Button>
 											<div class="mt-2 text-ink-gray-5 text-sm">
 												{{
@@ -83,85 +133,17 @@
 											</div>
 										</div>
 									</div>
-								</template>
-							</FileUploader>
-							<div v-else class="mb-4">
-								<div class="flex items-center">
-									<img
-										:src="course.course_image.file_url"
-										class="border rounded-md w-40"
-									/>
-									<div class="ml-4">
-										<Button @click="removeImage()">
-											{{ __('Remove') }}
-										</Button>
-										<div class="mt-2 text-ink-gray-5 text-sm">
-											{{ __('Appears on the course card in the course list') }}
-										</div>
-									</div>
 								</div>
 							</div>
 						</div>
-						<FormControl
-							v-model="course.video_link"
-							:label="__('Preview Video')"
-							:placeholder="
-								__(
-									'Paste the youtube link of a short video introducing the course'
-								)
-							"
-							class="mb-4"
-						/>
-						<div class="mb-4">
-							<div class="mb-1.5 text-xs text-ink-gray-5">
-								{{ __('Tags') }}
-							</div>
-							<div class="flex items-center">
-								<div
-									v-if="course.tags"
-									v-for="tag in course.tags?.split(', ')"
-									class="flex items-center bg-surface-gray-2 text-ink-gray-7 p-2 rounded-md mr-2"
-								>
-									{{ tag }}
-									<X
-										class="stroke-1.5 w-3 h-3 ml-2 cursor-pointer"
-										@click="removeTag(tag)"
-									/>
-								</div>
-								<FormControl
-									v-model="newTag"
-									:placeholder="__('Add a keyword and then press enter')"
-									class="w-72"
-									@keyup.enter="updateTags()"
-									id="tags"
-								/>
-							</div>
-						</div>
-						<div class="w-1/2 mb-4">
-							<Link
-								doctype="LMS Category"
-								v-model="course.category"
-								:label="__('Category')"
-								:onCreate="(value, close) => openSettings(close)"
-							/>
-						</div>
-						<MultiSelect
-							v-model="instructors"
-							doctype="User"
-							:label="__('Instructors')"
-							:filters="{ ignore_user_type: 1 }"
-							:required="true"
-						/>
 					</div>
-					<div class="container border-t">
-						<div class="text-lg font-semibold mt-5 mb-4">
+
+					<div class="px-10 pb-5 mb-5 space-y-5 border-b">
+						<div class="text-lg font-semibold">
 							{{ __('Settings') }}
 						</div>
-						<div class="grid grid-cols-2 gap-10 mb-4">
-							<div
-								v-if="user.data?.is_moderator"
-								class="flex flex-col space-y-4"
-							>
+						<div class="grid grid-cols-2 gap-5">
+							<div class="flex flex-col space-y-5">
 								<FormControl
 									type="checkbox"
 									v-model="course.published"
@@ -171,10 +153,9 @@
 									v-model="course.published_on"
 									:label="__('Published On')"
 									type="date"
-									class="mb-5"
 								/>
 							</div>
-							<div class="flex flex-col space-y-3">
+							<div class="flex flex-col space-y-5">
 								<FormControl
 									type="checkbox"
 									v-model="course.upcoming"
@@ -193,7 +174,34 @@
 							</div>
 						</div>
 					</div>
-					<div class="container border-t space-y-4">
+
+					<div class="px-10 pb-5 mb-5 space-y-5 border-b">
+						<div class="">
+							<div class="mb-1.5 text-sm text-ink-gray-5">
+								{{ __('Course Description') }}
+								<span class="text-ink-red-3">*</span>
+							</div>
+							<TextEditor
+								:content="course.description"
+								@change="(val) => (course.description = val)"
+								:editable="true"
+								:fixedMenu="true"
+								editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
+							/>
+						</div>
+
+						<FormControl
+							v-model="course.video_link"
+							:label="__('Preview Video')"
+							:placeholder="
+								__(
+									'Paste the youtube link of a short video introducing the course'
+								)
+							"
+						/>
+					</div>
+
+					<div class="px-10 pb-5 space-y-5">
 						<div class="text-lg font-semibold mt-5">
 							{{ __('Pricing and Certification') }}
 						</div>
@@ -214,19 +222,31 @@
 								:label="__('Paid Certificate')"
 							/>
 						</div>
-						<FormControl v-model="course.course_price" :label="__('Amount')" />
-						<Link
-							doctype="Currency"
-							v-model="course.currency"
-							:filters="{ enabled: 1 }"
-							:label="__('Currency')"
-						/>
-						<Link
-							v-if="course.paid_certificate"
-							doctype="Course Evaluator"
-							v-model="course.evaluator"
-							:label="__('Evaluator')"
-						/>
+						<div class="grid grid-cols-2 gap-5">
+							<div class="space-y-5">
+								<FormControl
+									v-if="course.paid_course || course.paid_certificate"
+									v-model="course.course_price"
+									:label="__('Amount')"
+								/>
+								<Link
+									v-if="course.paid_certificate"
+									doctype="Course Evaluator"
+									v-model="course.evaluator"
+									:label="__('Evaluator')"
+									:onCreate="
+										(value, close) => openSettings('Evaluators', close)
+									"
+								/>
+							</div>
+							<Link
+								v-if="course.paid_course || course.paid_certificate"
+								doctype="Currency"
+								v-model="course.currency"
+								:filters="{ enabled: 1 }"
+								:label="__('Currency')"
+							/>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -250,6 +270,7 @@ import {
 	FormControl,
 	FileUploader,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import {
 	inject,
@@ -261,13 +282,12 @@ import {
 	watch,
 	getCurrentInstance,
 } from 'vue'
-import { showToast } from '@/utils'
 import { Image, Trash2, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
 import { capture } from '@/telemetry'
 import { useOnboarding } from 'frappe-ui/frappe'
 import { sessionStore } from '../stores/session'
-import { useSettings } from '@/stores/settings'
+import { openSettings } from '@/utils'
 import Link from '@/components/Controls/Link.vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
@@ -277,7 +297,6 @@ const newTag = ref('')
 const { brand } = sessionStore()
 const router = useRouter()
 const instructors = ref([])
-const settingsStore = useSettings()
 const app = getCurrentInstance()
 const { updateOnboardingStep } = useOnboarding('learning')
 const { $dialog } = app.appContext.config.globalProperties
@@ -429,10 +448,10 @@ const submitCourse = () => {
 			},
 			{
 				onSuccess() {
-					showToast('Success', 'Course updated successfully', 'check')
+					toast.success(__('Course updated successfully'))
 				},
 				onError(err) {
-					showToast('Error', err.messages?.[0] || err, 'x')
+					toast.error(err.messages?.[0] || err)
 				},
 			}
 		)
@@ -446,14 +465,14 @@ const submitCourse = () => {
 				}
 
 				capture('course_created')
-				showToast('Success', 'Course created successfully', 'check')
+				toast.success(__('Course created successfully'))
 				router.push({
 					name: 'CourseForm',
 					params: { courseName: data.name },
 				})
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		})
 	}
@@ -467,7 +486,7 @@ const deleteCourse = createResource({
 		}
 	},
 	onSuccess() {
-		showToast(__('Success'), __('Course deleted successfully'), 'check')
+		toast.success(__('Course deleted successfully'))
 		router.push({ name: 'Courses' })
 	},
 })
@@ -531,12 +550,6 @@ const removeImage = () => {
 	course.course_image = null
 }
 
-const openSettings = (close) => {
-	close()
-	settingsStore.activeTab = 'Categories'
-	settingsStore.isSettingsOpen = true
-}
-
 const check_permission = () => {
 	let user_is_instructor = false
 	if (user.data?.is_moderator) return
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index e68f9eb7..29917587 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -20,12 +20,14 @@
 	</header>
 	<div class="p-5 pb-10">
 		<div
+			v-if="courseCount"
 			class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
 		>
 			<div class="text-lg text-ink-gray-9 font-semibold">
 				{{ __('All Courses') }}
 			</div>
 			<div
+				v-if="courses.data?.length || courseCount"
 				class="flex flex-col space-y-2 lg:space-y-0 lg:flex-row lg:items-center lg:space-x-4"
 			>
 				<TabButtons :buttons="courseTabs" v-model="currentTab" />
@@ -66,22 +68,7 @@
 				<CourseCard :course="course" />
 			</router-link>
 		</div>
-		<div
-			v-else-if="!courses.list.loading"
-			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
-		>
-			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-			<div class="text-lg font-medium mb-1">
-				{{ __('No courses found') }}
-			</div>
-			<div class="leading-5 w-2/5 text-center">
-				{{
-					__(
-						'There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!'
-					)
-				}}
-			</div>
-		</div>
+		<EmptyState v-else-if="!courses.list.loading" type="Courses" />
 		<div
 			v-if="!courses.list.loading && courses.hasNextPage"
 			class="flex justify-center mt-5"
@@ -104,10 +91,11 @@ import {
 	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
-import { BookOpen, Plus } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
 import { canCreateCourse } from '@/utils'
 import CourseCard from '@/components/CourseCard.vue'
+import EmptyState from '@/components/EmptyState.vue'
 import router from '../router'
 
 const user = inject('$user')
@@ -121,12 +109,12 @@ const certification = ref(false)
 const filters = ref({})
 const currentTab = ref('Live')
 const { brand } = sessionStore()
-const readOnlyMode = window.read_only_mode
+const courseCount = ref(0)
 
 onMounted(() => {
-	identifyUserPersona()
 	setFiltersFromQuery()
 	updateCourses()
+	getCourseCount()
 	categories.value = [
 		{
 			label: '',
@@ -175,19 +163,23 @@ const identifyUserPersona = async () => {
 	if (user.data?.is_system_manager && !user.data?.developer_mode) {
 		let personaCaptured = await isPersonaCaptured()
 		if (personaCaptured) return
-
-		call('frappe.client.get_count', {
-			doctype: 'LMS Course',
-		}).then((data) => {
-			if (!data) {
-				router.push({
-					name: 'PersonaForm',
-				})
-			}
-		})
+		if (!courseCount.value) {
+			router.push({
+				name: 'PersonaForm',
+			})
+		}
 	}
 }
 
+const getCourseCount = () => {
+	call('frappe.client.get_count', {
+		doctype: 'LMS Course',
+	}).then((data) => {
+		courseCount.value = data
+		identifyUserPersona()
+	})
+}
+
 const updateCourses = () => {
 	updateFilters()
 	courses.update({
diff --git a/frontend/src/pages/JobDetail.vue b/frontend/src/pages/JobDetail.vue
index 1712a785..c3b25ebd 100644
--- a/frontend/src/pages/JobDetail.vue
+++ b/frontend/src/pages/JobDetail.vue
@@ -94,6 +94,12 @@
 							{{ dayjs(job.data.creation).fromNow() }}
 						</Badge>
 						<Badge size="lg">
+							<template #prefix>
+								<ClipboardType class="size-3 stroke-2 text-ink-gray-7" />
+							</template>
+							{{ job.data.type }}
+						</Badge>
+						<Badge v-if="applicationCount.data" size="lg">
 							<template #prefix>
 								<SquareUserRound class="size-3 stroke-2 text-ink-gray-7" />
 							</template>
@@ -102,12 +108,6 @@
 								applicationCount.data == 1 ? __('applicant') : __('applicants')
 							}}
 						</Badge>
-						<Badge size="lg">
-							<template #prefix>
-								<ClipboardType class="size-3 stroke-2 text-ink-gray-7" />
-							</template>
-							{{ job.data.type }}
-						</Badge>
 					</div>
 				</div>
 
diff --git a/frontend/src/pages/JobForm.vue b/frontend/src/pages/JobForm.vue
index fe5e66da..80d87178 100644
--- a/frontend/src/pages/JobForm.vue
+++ b/frontend/src/pages/JobForm.vue
@@ -9,7 +9,7 @@
 			</Button>
 		</header>
 		<div class="py-5">
-			<div class="container border-b mb-4 pb-4">
+			<div class="container border-b mb-4 pb-5">
 				<div class="text-lg font-semibold mb-4">
 					{{ __('Job Details') }}
 				</div>
@@ -20,6 +20,15 @@
 							:label="__('Title')"
 							:required="true"
 						/>
+						<FormControl
+							v-model="job.type"
+							:label="__('Type')"
+							type="select"
+							:options="jobTypes"
+							:required="true"
+						/>
+					</div>
+					<div class="space-y-4">
 						<FormControl
 							v-model="job.location"
 							:label="__('City')"
@@ -31,17 +40,8 @@
 							:label="__('Country')"
 							:required="true"
 						/>
-					</div>
-					<div>
-						<FormControl
-							v-model="job.type"
-							:label="__('Type')"
-							type="select"
-							:options="jobTypes"
-							class="mb-4"
-							:required="true"
-						/>
 						<FormControl
+							v-if="jobName != 'new'"
 							v-model="job.status"
 							:label="__('Status')"
 							type="select"
@@ -51,7 +51,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="container border-b mb-4 pb-4">
+			<div class="container border-b mb-4 pb-5">
 				<div class="text-lg font-semibold mb-4">
 					{{ __('Company Details') }}
 				</div>
@@ -145,12 +145,13 @@ import {
 	TextEditor,
 	FileUploader,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import { computed, onMounted, reactive, inject } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
 import { useRouter } from 'vue-router'
-import { getFileSize, showToast } from '../utils'
+import { getFileSize } from '@/utils'
 
 const user = inject('$user')
 const router = useRouter()
@@ -259,7 +260,7 @@ const createNewJob = () => {
 				})
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -278,7 +279,7 @@ const editJobDetails = () => {
 				})
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/pages/Jobs.vue b/frontend/src/pages/Jobs.vue
index bddb3fe4..c3652347 100644
--- a/frontend/src/pages/Jobs.vue
+++ b/frontend/src/pages/Jobs.vue
@@ -26,15 +26,17 @@
 		</header>
 		<div>
 			<div
+				v-if="jobCount"
 				class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between w-full md:w-4/5 mx-auto p-5"
 			>
-				<div
-					v-if="jobCount"
-					class="text-xl font-semibold text-ink-gray-7 mb-4 md:mb-0"
-				>
+				<div class="text-xl font-semibold text-ink-gray-7 mb-4 md:mb-0">
 					{{ __('{0} Open Jobs').format(jobCount) }}
 				</div>
-				<div class="grid grid-cols-1 md:grid-cols-3 gap-2">
+
+				<div
+					v-if="jobs.data?.length || jobCount > 0"
+					class="grid grid-cols-1 md:grid-cols-3 gap-2"
+				>
 					<FormControl
 						type="text"
 						:placeholder="__('Search')"
@@ -79,21 +81,7 @@
 					</router-link>
 				</div>
 			</div>
-			<div
-				v-else
-				class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-56"
-			>
-				<Laptop class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-				<div class="text-lg font-medium mb-1">
-					{{ __('No jobs found') }}
-				</div>
-				<div class="leading-5 w-2/5 text-center">
-					{{ __('There are no jobs available at the moment.') }}
-				</div>
-				<div class="leading-5 w-1/5 text-center">
-					{{ __('Post a new job or check again later.') }}
-				</div>
-			</div>
+			<EmptyState v-else type="Job Openings" />
 		</div>
 	</div>
 </template>
@@ -106,11 +94,12 @@ import {
 	FormControl,
 	usePageMeta,
 } from 'frappe-ui'
-import { Laptop, Plus, Search } from 'lucide-vue-next'
+import { Plus, Search } from 'lucide-vue-next'
 import { sessionStore } from '../stores/session'
 import { inject, computed, ref, onMounted, watch } from 'vue'
 import JobCard from '@/components/JobCard.vue'
 import Link from '@/components/Controls/Link.vue'
+import EmptyState from '@/components/EmptyState.vue'
 
 const user = inject('$user')
 const jobType = ref(null)
diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index be961bf1..af6a34ce 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -334,7 +334,6 @@ const props = defineProps({
 
 onMounted(() => {
 	startTimer()
-	enablePlyr()
 	document.addEventListener('fullscreenchange', attachFullscreenEvent)
 })
 
@@ -473,6 +472,7 @@ watch(
 	() => lesson.data,
 	(data) => {
 		setupLesson(data)
+		enablePlyr()
 	}
 )
 
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index ff3243da..2d61e009 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -84,6 +84,7 @@ import {
 	createResource,
 	FormControl,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import {
 	computed,
@@ -97,7 +98,7 @@ import { sessionStore } from '../stores/session'
 import EditorJS from '@editorjs/editorjs'
 import LessonHelp from '@/components/LessonHelp.vue'
 import { ChevronRight } from 'lucide-vue-next'
-import { createToast, getEditorTools, enablePlyr } from '@/utils'
+import { getEditorTools, enablePlyr } from '@/utils'
 import { capture } from '@/telemetry'
 import { useOnboarding } from 'frappe-ui/frappe'
 
@@ -410,14 +411,14 @@ const createNewLesson = () => {
 								updateOnboardingStep('create_first_lesson')
 
 							capture('lesson_created')
-							showToast('Success', 'Lesson created successfully', 'check')
+							toast.success(__('Lesson created successfully'))
 							lessonDetails.reload()
 						},
 					}
 				)
 			},
 			onError(err) {
-				showToast('Error', err.message, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -434,11 +435,11 @@ const editCurrentLesson = () => {
 			},
 			onSuccess() {
 				showSuccessMessage
-					? showToast('Success', 'Lesson updated successfully', 'check')
+					? toast.success(__('Lesson updated successfully'))
 					: ''
 			},
 			onError(err) {
-				showToast('Error', err.message, 'x')
+				toast.error(err.message)
 			},
 		}
 	)
@@ -453,20 +454,6 @@ const validateLesson = () => {
 	}
 }
 
-const showToast = (title, text, icon) => {
-	createToast({
-		title: title,
-		text: text,
-		icon: icon,
-		iconClasses:
-			icon == 'check'
-				? 'bg-surface-green-3 text-ink-white rounded-md p-px'
-				: 'bg-surface-red-5 text-ink-white rounded-md p-px',
-		position: icon == 'check' ? 'bottom-right' : 'top-center',
-		timeout: icon == 'check' ? 5 : 10,
-	})
-}
-
 const breadcrumbs = computed(() => {
 	let crumbs = [
 		{
diff --git a/frontend/src/pages/PersonaForm.vue b/frontend/src/pages/PersonaForm.vue
index 6f74214d..4b9c9831 100644
--- a/frontend/src/pages/PersonaForm.vue
+++ b/frontend/src/pages/PersonaForm.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="flex h-screen overflow-hidden sm:bg-gray-50">
-		<div class="relative h-full z-10 mx-auto pt-8 sm:w-max sm:pt-32">
+		<div class="relative h-full z-10 mx-auto sm:w-max pt-40">
 			<div class="mx-auto flex items-center justify-center space-x-2">
 				<LMSLogo class="size-7" />
 				<span
@@ -18,7 +18,7 @@
 
 				<div class="mb-5">
 					<div class="text-sm text-gray-700 mb-2">
-						{{ __('What is your main use case for Frappe Learning?') }}
+						{{ __('What is your use case for Frappe Learning?') }}
 					</div>
 					<FormControl
 						v-model="persona.useCase"
@@ -29,12 +29,12 @@
 
 				<div class="mb-5">
 					<div class="text-sm text-gray-700 mb-2">
-						{{ __('How many students are you planning to teach?') }}
+						{{ __('What best describes your role?') }}
 					</div>
 					<FormControl
-						v-model="persona.noOfStudents"
+						v-model="persona.role"
 						type="select"
-						:options="noOfStudentsOptions"
+						:options="roleOptions"
 					/>
 				</div>
 
@@ -65,7 +65,7 @@ const router = useRouter()
 const { brand } = sessionStore()
 
 const persona = reactive({
-	noOfStudents: null,
+	role: null,
 	useCase: null,
 })
 
@@ -97,6 +97,24 @@ const skipPersonaForm = () => {
 	})
 }
 
+const roleOptions = computed(() => {
+	const options = [
+		'Trainer / Instructor',
+		'Freelancer / Consultant',
+		'HR / L&D Professional',
+		'School / University Admin',
+		'Software Developer',
+		'Community Manager',
+		'Business Owner / Team Lead',
+		'Other',
+	]
+
+	return options.map((option) => ({
+		label: option,
+		value: option,
+	}))
+})
+
 const noOfStudentsOptions = computed(() => {
 	const options = [
 		'Less than 50',
diff --git a/frontend/src/pages/ProfileEvaluator.vue b/frontend/src/pages/ProfileEvaluator.vue
index 5af0b0d7..a9637993 100644
--- a/frontend/src/pages/ProfileEvaluator.vue
+++ b/frontend/src/pages/ProfileEvaluator.vue
@@ -141,9 +141,9 @@
 	</div>
 </template>
 <script setup>
-import { createResource, FormControl, Button, Badge } from 'frappe-ui'
+import { createResource, FormControl, Button, Badge, toast } from 'frappe-ui'
 import { computed, reactive, ref, onMounted, inject } from 'vue'
-import { showToast, convertToTitleCase } from '@/utils'
+import { convertToTitleCase } from '@/utils'
 import { Plus, X, Check, CircleAlert } from 'lucide-vue-next'
 
 const user = inject('$user')
@@ -198,7 +198,7 @@ const createSlot = createResource({
 		}
 	},
 	onSuccess() {
-		showToast('Success', 'Slot added successfully', 'check')
+		toast.success(__('Slot added successfully'))
 		evaluator.reload()
 		showSlotsTemplate.value = 0
 		newSlot.day = ''
@@ -206,7 +206,7 @@ const createSlot = createResource({
 		newSlot.end_time = ''
 	},
 	onError(err) {
-		showToast('Error', err.messages?.[0] || err, 'x')
+		toast.error(err.messages?.[0] || err)
 	},
 })
 
@@ -221,10 +221,10 @@ const updateSlot = createResource({
 		}
 	},
 	onSuccess() {
-		showToast('Success', 'Availability updated successfully', 'check')
+		toast.success(__('Availability updated successfully'))
 	},
 	onError(err) {
-		showToast('Error', err.messages?.[0] || err, 'x')
+		toast.error(err.messages?.[0] || err)
 	},
 })
 
@@ -237,11 +237,11 @@ const deleteSlot = createResource({
 		}
 	},
 	onSuccess() {
-		showToast('Success', 'Slot deleted successfully', 'check')
+		toast.success(__('Slot deleted successfully'))
 		evaluator.reload()
 	},
 	onError(err) {
-		showToast('Error', err.messages?.[0] || err, 'x')
+		toast.error(err.messages?.[0] || err)
 	},
 })
 
@@ -256,10 +256,10 @@ const updateUnavailability = createResource({
 		}
 	},
 	onSuccess() {
-		showToast('Success', 'Unavailability updated successfully', 'check')
+		toast.success(__('Unavailability updated successfully'))
 	},
 	onError(err) {
-		showToast('Error', err.messages?.[0] || err, 'x')
+		toast.error(err.messages?.[0] || err)
 	},
 })
 
diff --git a/frontend/src/pages/ProfileRoles.vue b/frontend/src/pages/ProfileRoles.vue
index 326536b9..1ab5f519 100644
--- a/frontend/src/pages/ProfileRoles.vue
+++ b/frontend/src/pages/ProfileRoles.vue
@@ -44,9 +44,9 @@
 	</div>
 </template>
 <script setup>
-import { FormControl, createResource } from 'frappe-ui'
+import { FormControl, createResource, toast } from 'frappe-ui'
 import { ref } from 'vue'
-import { showToast, convertToTitleCase } from '@/utils'
+import { convertToTitleCase } from '@/utils'
 import { CircleAlert } from 'lucide-vue-next'
 
 const moderator = ref(false)
@@ -102,7 +102,7 @@ const changeRole = (role) => {
 		},
 		{
 			onSuccess(data) {
-				showToast('Success', 'Role updated successfully', 'check')
+				toast.success(__('Role updated successfully'))
 			},
 		}
 	)
diff --git a/frontend/src/pages/ProgramForm.vue b/frontend/src/pages/ProgramForm.vue
index 908aa0fb..88af175a 100644
--- a/frontend/src/pages/ProgramForm.vue
+++ b/frontend/src/pages/ProgramForm.vue
@@ -168,6 +168,7 @@
 					ignore_user_type: 1,
 				}"
 				:label="__('Program Member')"
+				:onCreate="(value, close) => openSettings('Members', close)"
 			/>
 		</template>
 	</Dialog>
@@ -187,12 +188,13 @@ import {
 	ListHeaderItem,
 	ListSelectBanner,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import { computed, ref } from 'vue'
 import { Plus, Trash2 } from 'lucide-vue-next'
-import { showToast } from '@/utils/'
 import { useRouter } from 'vue-router'
-import { sessionStore } from '../stores/session'
+import { sessionStore } from '@/stores/session'
+import { openSettings } from '@/utils'
 import Draggable from 'vuedraggable'
 import Link from '@/components/Controls/Link.vue'
 
@@ -229,11 +231,11 @@ const addProgramCourse = () => {
 			onSuccess(data) {
 				showDialog.value = false
 				course.value = null
-				showToast(__('Success'), __('Course added to program'), 'check')
+				toast.success(__('Course added to program'))
 				program.reload()
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -251,11 +253,11 @@ const addProgramMember = () => {
 			onSuccess(data) {
 				showDialog.value = false
 				member.value = null
-				showToast(__('Success'), __('Member added to program'), 'check')
+				toast.success(__('Member added to program'))
 				program.reload()
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -272,11 +274,11 @@ const remove = (selections, unselectAll, doctype) => {
 		{
 			onSuccess(data) {
 				unselectAll()
-				showToast(__('Success'), __('Items removed successfully'), 'check')
+				toast.success(__('Items removed successfully'))
 				program.reload()
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -298,11 +300,11 @@ const updateOrder = (e) => {
 		},
 		{
 			onSuccess(data) {
-				showToast(__('Success'), __('Course moved successfully'), 'check')
+				toast.success(__('Course moved successfully'))
 				program.reload()
 			},
 			onError(err) {
-				showToast('Error', err.messages?.[0] || err, 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
diff --git a/frontend/src/pages/Programs.vue b/frontend/src/pages/Programs.vue
index ce860b35..15cd828a 100644
--- a/frontend/src/pages/Programs.vue
+++ b/frontend/src/pages/Programs.vue
@@ -82,22 +82,7 @@
 			</div>
 		</div>
 	</div>
-	<div
-		v-else
-		class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-	>
-		<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-		<div class="text-xl font-medium">
-			{{ __('No programs found') }}
-		</div>
-		<div class="leading-5">
-			{{
-				__(
-					'There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!'
-				)
-			}}
-		</div>
-	</div>
+	<EmptyState v-else type="Programs" />
 
 	<Dialog
 		v-model="showDialog"
@@ -127,13 +112,14 @@ import {
 	Dialog,
 	FormControl,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref } from 'vue'
-import { BookOpen, Edit, Plus, LockKeyhole } from 'lucide-vue-next'
+import { Edit, Plus, LockKeyhole } from 'lucide-vue-next'
 import CourseCard from '@/components/CourseCard.vue'
+import EmptyState from '@/components/EmptyState.vue'
 import { useRouter } from 'vue-router'
 import { sessionStore } from '../stores/session'
-import { showToast } from '@/utils'
 import { useSettings } from '@/stores/settings'
 
 const { brand } = sessionStore()
@@ -198,7 +184,7 @@ const enrollMember = (program, course) => {
 			}
 		})
 		.catch((err) => {
-			showToast('Error', err.messages?.[0] || err, 'x')
+			toast.error(err.messages?.[0] || err)
 		})
 }
 
diff --git a/frontend/src/pages/QuizForm.vue b/frontend/src/pages/QuizForm.vue
index 200845f4..6324a9d0 100644
--- a/frontend/src/pages/QuizForm.vue
+++ b/frontend/src/pages/QuizForm.vue
@@ -198,6 +198,7 @@ import {
 	ListSelectBanner,
 	Button,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import {
 	computed,
@@ -210,7 +211,7 @@ import {
 } from 'vue'
 import { sessionStore } from '../stores/session'
 import { Plus, Trash2 } from 'lucide-vue-next'
-import { showToast, updateDocumentTitle } from '@/utils'
+import { updateDocumentTitle } from '@/utils'
 import { useRouter } from 'vue-router'
 import Question from '@/components/Modals/Question.vue'
 
@@ -340,14 +341,14 @@ const createQuiz = () => {
 		{},
 		{
 			onSuccess(data) {
-				showToast(__('Success'), __('Quiz created successfully'), 'check')
+				toast.success(__('Quiz created successfully'))
 				router.push({
 					name: 'QuizForm',
 					params: { quizID: data.name },
 				})
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -359,10 +360,10 @@ const updateQuiz = () => {
 		{
 			onSuccess(data) {
 				quiz.total_marks = data.total_marks
-				showToast(__('Success'), __('Quiz updated successfully'), 'check')
+				toast.success(__('Quiz updated successfully'))
 			},
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -428,7 +429,7 @@ const deleteQuestions = (selections, unselectAll) => {
 		},
 		{
 			onSuccess() {
-				showToast(__('Success'), __('Questions deleted successfully'), 'check')
+				toast.success(__('Questions deleted successfully'))
 				quizDetails.reload()
 				unselectAll()
 			},
diff --git a/frontend/src/pages/QuizSubmission.vue b/frontend/src/pages/QuizSubmission.vue
index dd3f4339..8ce00bee 100644
--- a/frontend/src/pages/QuizSubmission.vue
+++ b/frontend/src/pages/QuizSubmission.vue
@@ -2,10 +2,10 @@
 	<header
 		class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
 	>
-		<Breadcrumbs v-if="submisisonDetails.doc" :items="breadcrumbs" />
+		<Breadcrumbs v-if="submissionDetails.doc" :items="breadcrumbs" />
 		<div class="space-x-2">
 			<Badge
-				v-if="submisisonDetails.isDirty"
+				v-if="submissionDetails.isDirty"
 				:label="__('Not Saved')"
 				variant="subtle"
 				theme="orange"
@@ -15,19 +15,19 @@
 			</Button>
 		</div>
 	</header>
-	<div v-if="submisisonDetails.doc" class="w-1/2 mx-auto py-5 space-y-5">
-		<div class="text-xl font-semibold text-ink-gray-9">
-			{{ submisisonDetails.doc.member_name }}
+	<div v-if="submissionDetails.doc" class="w-2/3 border-x mx-auto py-5">
+		<div class="text-xl px-10 font-semibold text-ink-gray-9 mb-5">
+			{{ submissionDetails.doc.member_name }}
 		</div>
-		<div class="space-y-4 border p-5 rounded-md">
+		<div class="space-y-4 border-b pb-5 px-10">
 			<div class="grid grid-cols-2 gap-5">
 				<FormControl
-					v-model="submisisonDetails.doc.quiz_title"
+					v-model="submissionDetails.doc.quiz_title"
 					:label="__('Quiz')"
 					:disabled="true"
 				/>
 				<FormControl
-					v-model="submisisonDetails.doc.member_name"
+					v-model="submissionDetails.doc.member_name"
 					:label="__('Member')"
 					:disabled="true"
 				/>
@@ -35,39 +35,39 @@
 
 			<div class="grid grid-cols-2 gap-5">
 				<FormControl
-					v-model="submisisonDetails.doc.score"
+					v-model="submissionDetails.doc.score"
 					:label="__('Score')"
 					:disabled="true"
 				/>
 				<FormControl
-					v-model="submisisonDetails.doc.percentage"
+					v-model="submissionDetails.doc.percentage"
 					:label="__('Percentage')"
 					:disabled="true"
 				/>
 			</div>
 		</div>
 
-		<div
-			v-for="(row, index) in submisisonDetails.doc.result"
-			class="border p-5 rounded-md space-y-4"
-		>
-			<div class="flex items-start space-x-1 font-semibold text-ink-gray-9">
-				<!-- <span>
-					{{ index + 1 }}.
-				</span> -->
-				<span class="leading-5" v-html="row.question"> </span>
-			</div>
-			<div class="leading-5 text-ink-gray-7 space-x-1">
-				<span> {{ __('Answer') }}: </span>
-				<span v-html="row.answer"></span>
-			</div>
-			<div class="grid grid-cols-2 gap-5">
-				<FormControl v-model="row.marks" :label="__('Marks')" />
-				<FormControl
-					v-model="row.marks_out_of"
-					:label="__('Marks out of')"
-					:disabled="true"
-				/>
+		<div class="divide-y">
+			<div
+				v-for="(row, index) in submissionDetails.doc.result"
+				class="py-5 px-10 space-y-4"
+			>
+				<div class="text-ink-gray-9">
+					<span class="font-semibold"> {{ __('Question') }}: </span>
+					<span class="leading-5" v-html="row.question"> </span>
+				</div>
+				<div class="">
+					<span class="font-semibold"> {{ __('Answer') }} </span>
+					<span class="leading-5" v-html="row.answer"></span>
+				</div>
+				<div class="grid grid-cols-2 gap-5">
+					<FormControl v-model="row.marks" :label="__('Marks')" />
+					<FormControl
+						v-model="row.marks_out_of"
+						:label="__('Marks out of')"
+						:disabled="true"
+					/>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -80,10 +80,10 @@ import {
 	Button,
 	Badge,
 	usePageMeta,
+	toast,
 } from 'frappe-ui'
 import { computed, onBeforeUnmount, onMounted, inject } from 'vue'
 import { useRouter } from 'vue-router'
-import { showToast } from '@/utils'
 import { sessionStore } from '@/stores/session'
 
 const { brand } = sessionStore()
@@ -119,7 +119,7 @@ const props = defineProps({
 	},
 })
 
-const submisisonDetails = createDocumentResource({
+const submissionDetails = createDocumentResource({
 	doctype: 'LMS Quiz Submission',
 	name: props.submission,
 	auto: true,
@@ -132,22 +132,22 @@ const breadcrumbs = computed(() => {
 			route: {
 				name: 'QuizSubmissionList',
 				params: {
-					quizID: submisisonDetails.doc.quiz,
+					quizID: submissionDetails.doc.quiz,
 				},
 			},
 		},
 		{
-			label: submisisonDetails.doc.quiz_title,
+			label: submissionDetails.doc.quiz_title,
 		},
 	]
 })
 
 const saveSubmission = () => {
-	submisisonDetails.save.submit(
+	submissionDetails.save.submit(
 		{},
 		{
 			onError(err) {
-				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				toast.error(err.messages?.[0] || err)
 			},
 		}
 	)
@@ -155,7 +155,7 @@ const saveSubmission = () => {
 
 usePageMeta(() => {
 	return {
-		title: `${submisisonDetails.doc.quiz_title}`,
+		title: `${submissionDetails.doc?.quiz_title}`,
 		icon: brand.favicon,
 	}
 })
diff --git a/frontend/src/pages/QuizSubmissionList.vue b/frontend/src/pages/QuizSubmissionList.vue
index c832ff4d..4f5d8ee3 100644
--- a/frontend/src/pages/QuizSubmissionList.vue
+++ b/frontend/src/pages/QuizSubmissionList.vue
@@ -40,18 +40,7 @@
 			</Button>
 		</div>
 	</div>
-	<div
-		v-else
-		class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-	>
-		<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-		<div class="text-xl font-medium">
-			{{ __('No submissions') }}
-		</div>
-		<div class="leading-5">
-			{{ __('No quiz submissions found. Please check again later.') }}
-		</div>
-	</div>
+	<EmptyState v-else />
 </template>
 <script setup>
 import {
@@ -65,10 +54,10 @@ import {
 	ListHeaderItem,
 	usePageMeta,
 } from 'frappe-ui'
-import { BookOpen } from 'lucide-vue-next'
 import { computed, onMounted, inject } from 'vue'
 import { sessionStore } from '../stores/session'
 import { useRouter } from 'vue-router'
+import EmptyState from '@/components/EmptyState.vue'
 
 const { brand } = sessionStore()
 const router = useRouter()
diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue
index 0dde3b90..950e7f6f 100644
--- a/frontend/src/pages/Quizzes.vue
+++ b/frontend/src/pages/Quizzes.vue
@@ -21,6 +21,9 @@
 		</router-link>
 	</header>
 	<div v-if="quizzes.data?.length" class="md:w-3/4 md:mx-auto py-5 mx-5">
+		<div v-if="quizCount" class="text-xl font-semibold text-ink-gray-7 mb-4">
+			{{ __('{0} Quizzes').format(quizCount) }}
+		</div>
 		<ListView
 			:columns="quizColumns"
 			:rows="quizzes.data"
@@ -53,27 +56,13 @@
 			</Button>
 		</div>
 	</div>
-	<div
-		v-else
-		class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
-	>
-		<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
-		<div class="text-xl font-medium">
-			{{ __('No quizzes found') }}
-		</div>
-		<div class="leading-5">
-			{{
-				__(
-					'You have not created any quizzes yet. To create a new quiz, click on the "New Quiz" button above.'
-				)
-			}}
-		</div>
-	</div>
+	<EmptyState v-else type="Quizzes" />
 </template>
 <script setup>
 import {
 	Breadcrumbs,
 	Button,
+	call,
 	createListResource,
 	ListView,
 	ListRows,
@@ -83,19 +72,22 @@ import {
 	usePageMeta,
 } from 'frappe-ui'
 import { useRouter } from 'vue-router'
-import { computed, inject, onMounted } from 'vue'
-import { BookOpen, Plus } from 'lucide-vue-next'
+import { computed, inject, onMounted, ref } from 'vue'
+import { Plus } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
+import EmptyState from '@/components/EmptyState.vue'
 
 const { brand } = sessionStore()
 const user = inject('$user')
 const router = useRouter()
+const quizCount = ref(0)
 const readOnlyMode = window.read_only_mode
 
 onMounted(() => {
 	if (!user.data?.is_moderator && !user.data?.is_instructor) {
 		router.push({ name: 'Courses' })
 	}
+	getQuizCount()
 })
 
 const quizFilter = computed(() => {
@@ -114,6 +106,14 @@ const quizzes = createListResource({
 	orderBy: 'modified desc',
 })
 
+const getQuizCount = () => {
+	call('frappe.client.get_count', {
+		doctype: 'LMS Quiz',
+	}).then((data) => {
+		quizCount.value = data
+	})
+}
+
 const quizColumns = computed(() => {
 	return [
 		{
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index a80174bb..b2f79c9a 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -1,9 +1,10 @@
-import { toast } from 'frappe-ui'
 import { useTimeAgo } from '@vueuse/core'
 import { Quiz } from '@/utils/quiz'
 import { Assignment } from '@/utils/assignment'
 import { Upload } from '@/utils/upload'
 import { Markdown } from '@/utils/markdownParser'
+import { useSettings } from '@/stores/settings'
+import { usersStore } from '@/stores/user'
 import Header from '@editorjs/header'
 import Paragraph from '@editorjs/paragraph'
 import { CodeBox } from '@/utils/code'
@@ -14,19 +15,11 @@ import dayjs from '@/utils/dayjs'
 import Embed from '@editorjs/embed'
 import SimpleImage from '@editorjs/simple-image'
 import Table from '@editorjs/table'
-import { usersStore } from '../stores/user'
 import Plyr from 'plyr'
 import 'plyr/dist/plyr.css'
 
 const readOnlyMode = window.read_only_mode
 
-export function createToast(options) {
-	toast({
-		position: 'bottom-right',
-		...options,
-	})
-}
-
 export function timeAgo(date) {
 	return useTimeAgo(date).value
 }
@@ -97,26 +90,6 @@ export function getFileSize(file_size) {
 	return value
 }
 
-export function showToast(title, text, icon, iconClasses = null) {
-	if (!iconClasses) {
-		if (icon == 'check') {
-			iconClasses = 'bg-surface-green-3 text-ink-white rounded-md p-px'
-		} else if (icon == 'alert-circle') {
-			iconClasses = 'bg-yellow-600 text-ink-white rounded-md p-px'
-		} else {
-			iconClasses = 'bg-surface-red-5 text-ink-white rounded-md p-px'
-		}
-	}
-	createToast({
-		title: title,
-		text: htmlToText(text),
-		icon: icon,
-		iconClasses: iconClasses,
-		position: icon == 'check' ? 'bottom-right' : 'top-center',
-		timeout: icon != 'check' ? 10 : 5,
-	})
-}
-
 export function getImgDimensions(imgSrc) {
 	return new Promise((resolve) => {
 		let img = new Image()
@@ -558,24 +531,33 @@ export const enablePlyr = () => {
 		const videoElement = document.getElementsByClassName('video-player')
 		if (videoElement.length === 0) return
 
-		const src = videoElement[0].getAttribute('src')
-		if (src) {
-			let videoID = src.split('/').pop()
-			videoElement[0].setAttribute('data-plyr-embed-id', videoID)
-		}
-		new Plyr('.video-player', {
-			youtube: {
-				noCookie: true,
-			},
-			controls: [
-				'play-large',
-				'play',
-				'progress',
-				'current-time',
-				'mute',
-				'volume',
-				'fullscreen',
-			],
-		})
-	}, 500)
+		Array.from(videoElement).forEach((video) => {
+			const src = video.getAttribute('src')
+			if (src) {
+				let videoID = src.split('/').pop()
+				video.setAttribute('data-plyr-embed-id', videoID)
+			}
+			new Plyr(video, {
+				youtube: {
+					noCookie: true,
+				},
+				controls: [
+					'play-large',
+					'play',
+					'progress',
+					'current-time',
+					'mute',
+					'volume',
+					'fullscreen',
+				],
+			})
+		}, 500)
+	})
+}
+
+export const openSettings = (category, close) => {
+	const settingsStore = useSettings()
+	close()
+	settingsStore.activeTab = category
+	settingsStore.isSettingsOpen = true
 }
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 0d122bc3..dedec082 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -25,7 +25,7 @@ export default defineConfig({
 		}),
 	],
 	server: {
-		allowedHosts: ['fs', 'persona'],
+		allowedHosts: ['fs', 'per2'],
 	},
 	resolve: {
 		alias: {
diff --git a/lms/__init__.py b/lms/__init__.py
index f3862324..f604b6f4 100644
--- a/lms/__init__.py
+++ b/lms/__init__.py
@@ -1 +1 @@
-__version__ = "2.28.0"
+__version__ = "2.28.1"
diff --git a/lms/hooks.py b/lms/hooks.py
index c4017649..e51dd31b 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -21,7 +21,7 @@ app_license = "AGPL"
 # include js, css files in header of web template
 web_include_css = "lms.bundle.css"
 # web_include_css = "/assets/lms/css/lms.css"
-web_include_js = ["website.bundle.js"]
+web_include_js = []
 
 # include custom scss in every website theme (without file extension ".scss")
 # website_theme_scss = "lms/public/scss/website"
diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index cfb527bd..046b7f7c 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -21,9 +21,9 @@ from lms.lms.utils import (
 
 class LMSBatch(Document):
 	def validate(self):
-		if self.seat_count:
-			self.validate_seats_left()
+		self.validate_seats_left()
 		self.validate_batch_end_date()
+		self.validate_batch_time()
 		self.validate_duplicate_courses()
 		self.validate_payments_app()
 		self.validate_amount_and_currency()
@@ -40,6 +40,11 @@ class LMSBatch(Document):
 		if self.end_date < self.start_date:
 			frappe.throw(_("Batch end date cannot be before the batch start date"))
 
+	def validate_batch_time(self):
+		if self.start_time and self.end_time:
+			if get_time(self.start_time) >= get_time(self.end_time):
+				frappe.throw(_("Batch start time cannot be greater than or equal to end time."))
+
 	def validate_duplicate_courses(self):
 		courses = [row.course for row in self.courses]
 		duplicates = {course for course in courses if courses.count(course) > 1}
@@ -94,6 +99,9 @@ class LMSBatch(Document):
 					enrollment.save()
 
 	def validate_seats_left(self):
+		if cint(self.seat_count) < 0:
+			frappe.throw(_("Seat count cannot be negative."))
+
 		students = frappe.db.count("LMS Batch Enrollment", {"batch": self.name})
 		if cint(self.seat_count) < students:
 			frappe.throw(_("There are no seats available in this batch."))
@@ -208,86 +216,6 @@ def authenticate():
 	return response.json()["access_token"]
 
 
-@frappe.whitelist()
-def create_batch(
-	title,
-	start_date,
-	end_date,
-	description=None,
-	batch_details=None,
-	batch_details_raw=None,
-	meta_image=None,
-	seat_count=0,
-	start_time=None,
-	end_time=None,
-	medium="Online",
-	category=None,
-	paid_batch=0,
-	amount=0,
-	currency=None,
-	amount_usd=0,
-	name=None,
-	published=0,
-	evaluation_end_date=None,
-):
-	frappe.only_for("Moderator")
-	if name:
-		doc = frappe.get_doc("LMS Batch", name)
-	else:
-		doc = frappe.get_doc({"doctype": "LMS Batch"})
-
-	doc.update(
-		{
-			"title": title,
-			"start_date": start_date,
-			"end_date": end_date,
-			"description": description,
-			"batch_details": batch_details,
-			"batch_details_raw": batch_details_raw,
-			"meta_image": meta_image,
-			"seat_count": seat_count,
-			"start_time": start_time,
-			"end_time": end_time,
-			"medium": medium,
-			"category": category,
-			"paid_batch": paid_batch,
-			"amount": amount,
-			"currency": currency,
-			"amount_usd": amount_usd,
-			"published": published,
-			"evaluation_end_date": evaluation_end_date,
-		}
-	)
-	doc.save()
-	return doc
-
-
-@frappe.whitelist()
-def add_course(course, parent, name=None, evaluator=None):
-	frappe.only_for("Moderator")
-
-	if frappe.db.exists("Batch Course", {"course": course, "parent": parent}):
-		frappe.throw(_("Course already added to the batch."))
-
-	if name:
-		doc = frappe.get_doc("Batch Course", name)
-	else:
-		doc = frappe.new_doc("Batch Course")
-
-	doc.update(
-		{
-			"course": course,
-			"evaluator": evaluator,
-			"parent": parent,
-			"parentfield": "courses",
-			"parenttype": "LMS Batch",
-		}
-	)
-	doc.save()
-
-	return doc.name
-
-
 @frappe.whitelist()
 def get_batch_timetable(batch):
 	timetable = frappe.get_all(
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py
index f5acb29c..9936aa6e 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -96,9 +96,7 @@ def set_total_marks(questions):
 
 @frappe.whitelist()
 def quiz_summary(quiz, results):
-	score = 0
 	results = results and json.loads(results)
-	is_open_ended = False
 	percentage = 0
 
 	quiz_details = frappe.db.get_value(
@@ -108,7 +106,32 @@ def quiz_summary(quiz, results):
 		as_dict=1,
 	)
 
+	data = process_results(results, quiz)
+	results = data["results"]
+	score = data["score"]
+	is_open_ended = data["is_open_ended"]
+
 	score_out_of = quiz_details.total_marks
+	percentage = (score / score_out_of) * 100 if score_out_of else 0
+	submission = create_submission(
+		quiz, results, score_out_of, quiz_details.passing_percentage
+	)
+
+	save_progress_after_quiz(quiz_details, percentage)
+
+	return {
+		"score": score,
+		"score_out_of": score_out_of,
+		"submission": submission.name,
+		"pass": percentage == quiz_details.passing_percentage,
+		"percentage": percentage,
+		"is_open_ended": is_open_ended,
+	}
+
+
+def process_results(results, quiz):
+	score = 0
+	is_open_ended = False
 
 	for result in results:
 		question_details = frappe.db.get_value(
@@ -123,55 +146,28 @@ def quiz_summary(quiz, results):
 		result["marks_out_of"] = question_details.marks
 
 		if question_details.type != "Open Ended":
-			correct = result["is_correct"][0]
-			for point in result["is_correct"]:
-				correct = correct and point
-			result["is_correct"] = correct
+			if len(result["is_correct"]) > 0:
+				correct = result["is_correct"][0]
+				for point in result["is_correct"]:
+					correct = correct and point
+				result["is_correct"] = correct
+			else:
+				result["is_correct"] = 0
 
 			marks = question_details.marks if correct else 0
 			result["marks"] = marks
 			score += marks
 
 		else:
-			result["is_correct"] = 0
 			is_open_ended = True
-
-		percentage = (score / score_out_of) * 100
-		result["answer"] = re.sub(
-			r'<img[^>]*src\s*=\s*["\'](?=data:)(.*?)["\']', _save_file, result["answer"]
-		)
-
-	submission = frappe.new_doc("LMS Quiz Submission")
-	# Score and percentage are calculated by the controller function
-	submission.update(
-		{
-			"doctype": "LMS Quiz Submission",
-			"quiz": quiz,
-			"result": results,
-			"score": 0,
-			"score_out_of": score_out_of,
-			"member": frappe.session.user,
-			"percentage": 0,
-			"passing_percentage": quiz_details.passing_percentage,
-		}
-	)
-	submission.save(ignore_permissions=True)
-
-	if (
-		percentage >= quiz_details.passing_percentage
-		and quiz_details.lesson
-		and quiz_details.course
-	):
-		save_progress(quiz_details.lesson, quiz_details.course)
-	elif not quiz_details.passing_percentage:
-		save_progress(quiz_details.lesson, quiz_details.course)
+			result["is_correct"] = 0
+			result["answer"] = re.sub(
+				r'<img[^>]*src\s*=\s*["\'](?=data:)(.*?)["\']', _save_file, result["answer"]
+			)
 
 	return {
+		"results": results,
 		"score": score,
-		"score_out_of": score_out_of,
-		"submission": submission.name,
-		"pass": percentage == quiz_details.passing_percentage,
-		"percentage": percentage,
 		"is_open_ended": is_open_ended,
 	}
 
@@ -219,6 +215,36 @@ def get_corrupted_image_msg():
 	return _("Image: Corrupted Data Stream")
 
 
+def create_submission(quiz, results, score_out_of, passing_percentage):
+	submission = frappe.new_doc("LMS Quiz Submission")
+	# Score and percentage are calculated by the controller function
+	submission.update(
+		{
+			"doctype": "LMS Quiz Submission",
+			"quiz": quiz,
+			"result": results,
+			"score": 0,
+			"score_out_of": score_out_of,
+			"member": frappe.session.user,
+			"percentage": 0,
+			"passing_percentage": passing_percentage,
+		}
+	)
+	submission.save(ignore_permissions=True)
+	return submission
+
+
+def save_progress_after_quiz(quiz_details, percentage):
+	if (
+		percentage >= quiz_details.passing_percentage
+		and quiz_details.lesson
+		and quiz_details.course
+	):
+		save_progress(quiz_details.lesson, quiz_details.course)
+	elif not quiz_details.passing_percentage:
+		save_progress(quiz_details.lesson, quiz_details.course)
+
+
 @frappe.whitelist()
 def get_question_details(question):
 	if frappe.db.exists("LMS Quiz Question", question):
diff --git a/lms/lms/doctype/lms_settings/lms_settings.json b/lms/lms/doctype/lms_settings/lms_settings.json
index 8bf72de4..f2dd3ee5 100644
--- a/lms/lms/doctype/lms_settings/lms_settings.json
+++ b/lms/lms/doctype/lms_settings/lms_settings.json
@@ -403,7 +403,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-04-22 16:05:27.914422",
+ "modified": "2025-05-14 12:43:22.749850",
  "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Settings",
@@ -425,6 +425,16 @@
    "read": 1,
    "role": "LMS Student",
    "share": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Moderator",
+   "share": 1,
+   "write": 1
   }
  ],
  "row_format": "Dynamic",
diff --git a/lms/locale/ar.po b/lms/locale/ar.po
index 9db65584..c35e94f2 100644
--- a/lms/locale/ar.po
+++ b/lms/locale/ar.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr ""
 msgid "% completed"
 msgstr "% أكتمل"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr ""
 msgid "Active"
 msgstr "نشط"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "إضافة"
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "الكل"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -293,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -304,11 +288,10 @@ msgstr "مسجل بالفعل"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "كمية"
 
@@ -316,11 +299,10 @@ msgstr "كمية"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr ""
 msgid "Apps"
 msgstr "التطبيقات"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "أرشفة"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr "هل أنت متأكد أنك تريد تسجيل الدخول إلى ل
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "تعيينات"
 
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "وصف الباتش"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "تفاصيل الدفعة"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "الدفعات:"
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "تفاصيل الفاتورة"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "فئة"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "اسم التصنيف"
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr "تغيير"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr "التحقق من"
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "رمز العميل"
 msgid "Client Secret"
 msgstr "سر العميل"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "أغلق"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "أكتمل"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "أكد"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "عقد"
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "انشاء"
 
@@ -1456,6 +1477,11 @@ msgstr "انشاء"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "انشاء جديد"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "أنشأ"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "العملة"
 
@@ -1573,7 +1594,7 @@ msgstr "تاريخ"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1614,9 +1635,9 @@ msgstr "العملة الافتراضية"
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "حذف"
 
@@ -1624,27 +1645,27 @@ msgstr "حذف"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "وصف"
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr "تفاصيل"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr "تصحيح"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
@@ -1822,7 +1842,7 @@ msgstr "عنوان الايميل"
 msgid "Email Sent"
 msgstr "إرسال البريد الإلكتروني"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "قالب البريد الإلكتروني"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "نهاية التاريخ"
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "وقت الانتهاء"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "خطأ"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "تقييم"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "حدث"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr "تاريخ انتهاء الصلاحية"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "تفسير"
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "فشل"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "متميز"
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "نوع الملف"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "الاسم الأول"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "مجاني"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "الاسم الكامل"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "هوية شخصية"
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr "صورة"
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "المسمى الوظيفي"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "وظائف"
@@ -2742,7 +2740,7 @@ msgstr "وظائف"
 msgid "Join"
 msgstr "انضم"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "الروابط"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "تحميل المزيد"
 
@@ -3119,7 +3133,6 @@ msgstr "محلي"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "متوسط"
 
@@ -3236,7 +3248,7 @@ msgstr "متوسط"
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "متوسط:"
@@ -3259,7 +3271,7 @@ msgstr "متوسط:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr "ميتا الوصف"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "صورة ميتا"
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "جديد"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr "إخطارات"
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "الخيار"
@@ -3814,15 +3797,15 @@ msgstr "الخيار 3"
 msgid "Option 4"
 msgstr "الخيار 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "خيارات"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr "كلمة السر"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "معلق"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "النسبة المئوية"
@@ -4023,7 +4004,7 @@ msgstr "النسبة المئوية"
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr "يرجى التحقق من بريدك الالكتروني للتحقق"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr "بعد"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "الرمز البريدي"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr "معاينة الصورة"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "سابق"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "التسعير"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "نشرت"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "نشرت في"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr "مرجع نوع الوثيقة"
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr "مرفوض"
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr ""
 
@@ -4633,6 +4611,10 @@ msgstr "صلاحية"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "الصلاحيات"
@@ -4642,19 +4624,19 @@ msgstr "الصلاحيات"
 msgid "Route"
 msgstr "مسار"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr "السبت"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "حفظ"
 
@@ -4730,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "البحث"
 
@@ -4750,11 +4731,11 @@ msgstr "البحث"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "إعدادات"
@@ -4833,17 +4817,17 @@ msgstr "إعدادات"
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr "اسم المهارة"
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "تخطى"
 
@@ -4953,6 +4937,14 @@ msgstr "تخطى"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr "بداية"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "بداية الوقت"
 
@@ -5062,7 +5052,7 @@ msgstr "حالة"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr "موضوع"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr "تسجيل"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "نجاح"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "مدير النظام"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "بطاقات"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "اللقب"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr "إلى"
 msgid "To Date"
 msgstr "إلى تاريخ"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr "النوع"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr "رابط الانترنت"
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "تحديث"
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "تحميل"
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "صفحة على الإنترنت"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "الأربعاء"
 msgid "Welcome to {0}!"
 msgstr "أهلا وسهلا بك إلى {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "أنشطة"
 msgid "activity"
 msgstr "نشاط"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "من"
 msgid "out of"
 msgstr "من أصل"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/bs.po b/lms/locale/bs.po
index 034c2c13..893f30d1 100644
--- a/lms/locale/bs.po
+++ b/lms/locale/bs.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Bosnian\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr "Procjeni i Ocjeni"
 msgid "% completed"
 msgstr "% završeno"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr "1. Šta najbolje opisuje vašu ulogu?"
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr "2. Koliko učenika planirate podučavati?"
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr "3. Koji je vaš glavni slučaj korištenja Frappe Learninga?"
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr "4. Da li trenutno koristite neke Frappe proizvode?"
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr "<span style=\"font-size: 18px;\"><b>Statistika</b></span>"
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr "Kurs ne može imati i plaćeni certifikat i certifikat o završenom kursu."
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "Uvod u kurs u jednom redu koji se pojavljuje na kartici kursa"
 
@@ -123,13 +107,17 @@ msgstr "Dostignuća"
 msgid "Active"
 msgstr "Aktivan"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr "Aktivni Članovi"
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Dodaj"
@@ -168,7 +156,7 @@ msgstr "Dodaj Poglavlje"
 msgid "Add a course"
 msgstr "Dodaj Kurs"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr "Dodaj ključnu riječ, a zatim pritisnite enter"
 
@@ -176,7 +164,7 @@ msgstr "Dodaj ključnu riječ, a zatim pritisnite enter"
 msgid "Add a lesson"
 msgstr "Dodaj Lekciju"
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr "Dodaj novo pitanje"
@@ -193,10 +181,6 @@ msgstr "Dodaj Procjenu"
 msgid "Add an assignment to your lesson"
 msgstr "Dodaj zadatak svojoj lekciji"
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr "Dodaj postojeće pitanje"
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Dodaj barem jedan mogući odgovor na ovo pitanje: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Admin"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Sve"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr "Sve Grupe"
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Svi Kursevi"
 
@@ -293,7 +277,7 @@ msgstr "Dozvoli Samostalnu Registraciju"
 msgid "Allow accessing future dates"
 msgstr "Dozvoli Pristup Budućim Datumima"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "Dozvoli Samostalnu Registraciju"
 
@@ -304,11 +288,10 @@ msgstr "Već Registrovan"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Iznos"
 
@@ -316,11 +299,10 @@ msgstr "Iznos"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Iznos (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr "Iznos i Valuta su obavezni za plaćene grupe."
 
@@ -341,32 +323,36 @@ msgstr "Iznos sa PDV-om"
 msgid "Announcement"
 msgstr "Objava"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr "Objava je uspješno poslana"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr "Najava je obavezna"
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Odgovori"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr "Pojavljuje se na kartici kursa u listi kurseva"
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr "Pojavljuje se kada se grupni URL dijeli na bilo kojoj online platformi"
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "Prijave Primljene"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr "Pojavljuje se kada se URL grupe podijeli na društvenim mrežama"
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "Odobreno"
 msgid "Apps"
 msgstr "Aplikacije"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "Arhivirano"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "Jeste li sigurni da želite otkazati ovo ocjenjivanje? Ova radnja se ne može poništiti."
 
@@ -414,7 +400,7 @@ msgstr "Jeste li sigurni da se želite prijaviti na svoju Frappe Cloud Nadzornu
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "Procjena"
@@ -430,11 +416,11 @@ msgstr "Naziv Procjene"
 msgid "Assessment Type"
 msgstr "Tip Procjene"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr "Procjena je uspješno dodana"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Procjena {0} je već dodana ovoj grupi."
 
@@ -479,7 +465,7 @@ msgstr "Podnošenje Zadataka"
 msgid "Assignment Title"
 msgstr "Naziv Zadatka"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr "Zadatak je uspješno kreiran"
 
@@ -487,7 +473,11 @@ msgstr "Zadatak je uspješno kreiran"
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Zadatak za Lekciju {0} od {1} već postoji."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr "Zadatak uspješno predan"
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr "Zadatak je uspješno ažuriran"
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Zadatak će se pojaviti na dnu lekcije."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Dodjele"
 
@@ -525,6 +515,10 @@ msgstr "Automatski Dodjeli"
 msgid "Auto Recording"
 msgstr "Automatsko Snimanje"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr "Dostupnost je uspješno ažurirana"
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "Šablon Potvrde Grupe"
 msgid "Batch Course"
 msgstr "Grupni Kurs"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "Grupa Kreirana"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Opis Grupe"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Detalji Grupe"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "Detalji Grupe"
 
@@ -646,10 +634,6 @@ msgstr "Datum Početka Grupe:"
 msgid "Batch Title"
 msgstr "Naziv Grupe"
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr "Grupa Ažurirana"
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "Datum završetka grupe ne može biti prije datuma početka grupe"
@@ -662,6 +646,10 @@ msgstr "Grupa je već počela."
 msgid "Batch is sold out."
 msgstr "Grupa je rasprodata."
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr "Vrijeme početka grupe ne može biti kasnije ili isto vremenu završetka."
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Grupa:"
@@ -677,7 +665,7 @@ msgstr "Grupe"
 msgid "Begin Date"
 msgstr "Datum Početka"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "Srdačan Pozdrav"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Detalji Fakture"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr "Otkaži ovo ocjenjivanje?"
 
@@ -766,18 +754,16 @@ msgstr "Ležerna Odjeća"
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategorija"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Naziv kategorije"
 
@@ -801,7 +787,7 @@ msgstr "Veza Certifikata"
 msgid "Certificate of Completion"
 msgstr "Certifikat o Završetku"
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr "Certifikat je uspješno spremljen"
 
@@ -809,7 +795,7 @@ msgstr "Certifikat je uspješno spremljen"
 msgid "Certificates"
 msgstr "Certifikati"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr "Certifikati su uspješno generirani"
 
@@ -822,11 +808,11 @@ msgstr "Certifikati su uspješno generirani"
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "Naziv Certifikacije"
 msgid "Certified"
 msgstr "Certificirano"
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr "Certificirani Članovi"
 
@@ -862,7 +849,7 @@ msgstr "Certificirani Učesnici"
 msgid "Change"
 msgstr "Promjeni"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr "Promjene su uspješno spremljene"
 
@@ -880,11 +867,15 @@ msgstr "Poglavlje"
 msgid "Chapter Reference"
 msgstr "Referenca Poglavlja"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr "Poglavlje je uspješno dodano"
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr "Poglavlje uspješno izbrisano"
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr "Poglavlje je uspješno ažurirano"
 
@@ -901,6 +892,10 @@ msgstr "Provjeri"
 msgid "Check Discussion"
 msgstr "Provjerite Diskusiju"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr "Provjeri Podnošenja"
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "Pogledaj {0} da biste saznali više o certifikaciji."
@@ -916,21 +911,25 @@ msgstr "Pogledaj Kurseve"
 msgid "Choices"
 msgstr "Izbori"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Odaberi sve odgovore koji odgvaraju"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr "Odaberi postojeće pitanje"
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "Odaberi ikonu"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Odaberi jedan odgovor"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "ID klijenta"
 msgid "Client Secret"
 msgstr "Tajna klijenta"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Zatvori"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Web stranica Kompanije"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr "Završi upis - ne propusti!"
 msgid "Completed"
 msgstr "Završeno"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr "Studenti koji su Završili"
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "Završni Certifikat"
@@ -1164,6 +1169,10 @@ msgstr "Uslov mora biti važeći Python kod."
 msgid "Conduct Evaluation"
 msgstr "Provedi Ocjenjivanje"
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr "Konfiguracije"
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Potvrdi"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr "Nastavi sa Učenjem"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Ugovor"
@@ -1228,15 +1237,15 @@ msgstr "Korporativna Organizacija"
 msgid "Correct"
 msgstr "Tačno"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr "Tačan Odgovor"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "Poglavlje Kursa"
 msgid "Course Completed"
 msgstr "Kurs je Završen"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr "Završeni Kursevi"
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "Kreator Kursa"
 msgid "Course Data"
 msgstr "Podaci o kursu"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "Opis Kursa"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr "Upisi na Kurseve"
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "Ocjenjivač Kursa"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "Slika Kursa"
 
@@ -1364,7 +1381,7 @@ msgstr "Lista Kurseva"
 msgid "Course Name"
 msgstr "Naziv Kursa"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr "Pregled Kursa"
 
@@ -1396,23 +1413,27 @@ msgstr "Statistika Kursa"
 msgid "Course Title"
 msgstr "Naziv Kursa"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr "Kurs dodat programu"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "Kurs je već dodan u grupu."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr "Kurs je uspješno kreiran"
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr "Kurs uspješno izbrisan"
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr "Kurs uspješno pomjeren"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr "Kurs je uspješno ažuriran"
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Kurs {0} je već dodan ovoj grupi."
@@ -1421,13 +1442,13 @@ msgstr "Kurs {0} je već dodan ovoj grupi."
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr "Naslovna Slika"
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Kreiraj"
 
@@ -1456,6 +1477,11 @@ msgstr "Kreiraj"
 msgid "Create Certificate"
 msgstr "Kreiraj Certifikat"
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Kreiraj"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "Kreiraj Kurs"
@@ -1476,11 +1502,7 @@ msgstr "Kreiraj kurs"
 msgid "Create a live class"
 msgstr "Kreiraj čas uživo"
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr "Kreiraj novo pitanje"
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr "Kreiraj Zadatak"
 
@@ -1496,7 +1518,7 @@ msgstr "Kreiraj vaš prvi kurs"
 msgid "Create your first quiz"
 msgstr "Kreiraj vašj prvi kviz"
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Kreirano"
 
@@ -1511,11 +1533,10 @@ msgstr "Kreiranje kursa u toku"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Valuta"
 
@@ -1573,7 +1594,7 @@ msgstr "Datum"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "Datum i Vrijeme"
@@ -1614,9 +1635,9 @@ msgstr "Standard Valuta"
 msgid "Degree Type"
 msgstr "Tip Stepena"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -1624,27 +1645,27 @@ msgstr "Izbriši"
 msgid "Delete Chapter"
 msgstr "Izbriši Poglavlje"
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr "Izbriši Kurs"
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr "Izbriši ovo Poglavlje?"
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr "Izbriši ovu Lekciju?"
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "Brisanjem kursa izbrisat će se i sva njegova poglavlja i lekcije. Jeste li sigurni da želite izbrisati ovaj kurs?"
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "Brisanjem ovog poglavlja također će se izbrisati sve lekcije u njemu i trajno će se ukloniti iz kursa. Ova radnja se ne može poništiti. Jeste li sigurni da želite nastaviti?"
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "Brisanjem ove lekcije trajno će se ukloniti iz kursa. Ova radnja se ne može poništiti. Jeste li sigurni da želite nastaviti?"
 
@@ -1661,7 +1682,7 @@ msgstr "Brisanjem ove lekcije trajno će se ukloniti iz kursa. Ova radnja se ne
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr "Brisanjem ove lekcije trajno će se ukloniti iz kursa. Ova radnja se ne
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Opis"
 
@@ -1687,7 +1707,7 @@ msgstr "Radni Prostor"
 msgid "Details"
 msgstr "Detalji"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "Onemogući Samostalni Upis"
 
@@ -1768,7 +1788,7 @@ msgstr "E-pošta"
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "E-pošta"
 msgid "Edit"
 msgstr "Uredi"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr "Uredi Zadatak"
 
@@ -1808,8 +1828,8 @@ msgstr "Detalj Obrazovanja"
 msgid "Education Details"
 msgstr "Detalji Obrazovanja"
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "E-pošta"
 
@@ -1822,7 +1842,7 @@ msgstr "ID e-pošte"
 msgid "Email Sent"
 msgstr "E-pošta poslana"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "Šablon e-pošte"
 
@@ -1870,9 +1890,8 @@ msgstr "Ako ovo omogućite, certifikat će biti objavljen na stranici sa certifi
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Datum završetka"
 
@@ -1888,7 +1907,7 @@ msgstr "Datum Završetka (ili očekivani)"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "Datum Završetka (ili očekivani)"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Vrijeme Završetka"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr "Upišite se sada"
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr "Upisan"
 
@@ -1915,10 +1933,6 @@ msgstr "Upisan"
 msgid "Enrolled Students"
 msgstr "Upisani Studenti"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "Uspješno upisan(a)"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr "Potvrda upisa za {0}"
@@ -1928,7 +1942,7 @@ msgstr "Potvrda upisa za {0}"
 msgid "Enrollment Count"
 msgstr "Broj Upisa"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr "Upis nije uspio"
 
@@ -1955,31 +1969,13 @@ msgstr "Unesi Naziv i spremi kviz da nastavite"
 msgid "Enter the correct answer"
 msgstr "Unesite tačan odgovor"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Grеška"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr "Greška pri kreiranju časa uživo. Pokušaj ponovo. {0}"
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "Evaluacija"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr "Detalji Ocjenjivanja"
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr "Datum Yavršetka Ocjenjivanja"
 
@@ -2001,11 +1996,11 @@ msgstr "Datum Yavršetka Ocjenjivanja"
 msgid "Evaluation Request"
 msgstr "Zahtjev za Ocjenu"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "Datum završetka ocjenjivanja ne može biti prije od datuma završetka grupe."
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr "Evaluacija je uspješno sačuvana"
 
@@ -2016,9 +2011,9 @@ msgstr "Evaluacija je uspješno sačuvana"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr "Ime Ocjenjivača"
 msgid "Evaluator Schedule"
 msgstr "Raspored Ocjenjivača"
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr "Ocjenjivač je Nedostupan"
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr "Ocjenjivač je obavezan za plaćene certifikate."
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr "Ocjenjivač je nedostupan"
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr "Ocjenjivač je obavezan za plaćene certifikate."
 msgid "Event"
 msgstr "Događaj"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr "Primjer: IST (+5:30)"
 
@@ -2109,7 +2104,7 @@ msgstr "Datum Isteka Roka"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "Objašnjenje"
@@ -2128,7 +2123,7 @@ msgstr "Istraži Više"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Neuspjeh"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Istaknuto"
@@ -2166,7 +2161,7 @@ msgstr "Smjer/Studij"
 msgid "File Type"
 msgstr "Tip Datoteke"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Ime"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "Besplatno"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Slobodnjak"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Puno Ime"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Puno Radno Vrijeme"
@@ -2355,6 +2350,10 @@ msgstr "Pomozite drugima da nauče nešto novo kreiranjem kursa."
 msgid "Help us improve our course material."
 msgstr "Pomozi nam da poboljšamo naš materijal za kurs."
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr "Pomozi nam da razumijemo vaše potrebe"
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr "Tražim posao"
 msgid "I am unavailable"
 msgstr "Ja sam nedostupan/nedostupna"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "ID"
 
@@ -2444,7 +2443,7 @@ msgstr "Ako to ne učinite, kviz će biti automatski dostavljen kada se tajmer z
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr "Ako imate bilo kakvih pitanja ili vam je potrebna pomoć, slobodno se obratite našem timu za podršku."
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "Ako imate bilo kakvih pitanja ili vam je potrebna pomoć, slobodno nas k
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr "Ako ovdje postavite iznos, postavka u USD neće biti primijenjena."
 
@@ -2484,7 +2482,7 @@ msgstr "Slika"
 msgid "Image search powered by"
 msgstr "Pretraživanje slika pokreće"
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "Slika: Oštećen Tok Podataka"
 
@@ -2492,7 +2490,7 @@ msgstr "Slika: Oštećen Tok Podataka"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "Instruktor Napomene"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "Izdato"
 msgid "Items in Sidebar"
 msgstr "Stavke na Bočnoj Traci"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr "Stavke su uspješno uklonjene"
 
@@ -2732,7 +2730,7 @@ msgstr "Naziv Posla"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "Poslovi"
@@ -2742,7 +2740,7 @@ msgstr "Poslovi"
 msgid "Join"
 msgstr "Pridružite se"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr "Pridružite se Pozivu"
 
@@ -3038,6 +3036,22 @@ msgstr "Referenca Lekcije"
 msgid "Lesson Title"
 msgstr "Naziv Lekcije"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr "Lekcija je uspješno kreirana"
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr "Lekcija je uspješno izbrisana"
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr "Lekcija je uspješno premještena"
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr "Lekcija je uspješno ažurirana"
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Veze"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Uživo"
 
@@ -3103,12 +3117,12 @@ msgstr "Razred Uživo"
 msgid "LiveCode URL"
 msgstr "URL LiveCode"
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Učitaj Još"
 
@@ -3119,7 +3133,6 @@ msgstr "Lokal"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "Objavi"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr "Unesi ispravanu faktura adresu jer će se koristiti u vašoj fakturi."
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr "Upravljaj Grupom"
 
@@ -3195,10 +3208,10 @@ msgstr "Označi kao pročitano"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr "Bodovi za pitanje broj {0} ne mogu biti veći od bodova dodijeljenih za to pitanje."
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr "Bodova od mogućih"
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr "Maksimalnih Pokušaja"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Srednje"
 
@@ -3236,7 +3248,7 @@ msgstr "Srednje"
 msgid "Medium ID"
 msgstr "Medium ID"
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Srednje:"
@@ -3259,7 +3271,7 @@ msgstr "Srednje:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "Tip Člana"
 msgid "Member Username"
 msgstr "Korisničko Ime Člana"
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr "Član dodan u program"
 
@@ -3408,9 +3420,9 @@ msgstr "Meta Opis"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Meta Slika"
 
@@ -3444,6 +3456,7 @@ msgstr "Za pitanja sa više odgovora potrebne su najmanje dvije opcije."
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "Moj Kalendar"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Novi"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "Nova Grupa"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "Novi Kurs"
 
@@ -3512,7 +3528,7 @@ msgstr "Novi Posao"
 msgid "New Job Applicant"
 msgstr "Novi Kandidat za Posao"
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr "Novi Program"
 
@@ -3528,7 +3544,7 @@ msgstr "Novi Član Programa"
 msgid "New Question"
 msgstr "Novo Pitanje"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr "Novi Kviz"
@@ -3583,26 +3599,10 @@ msgstr "Nema Predstojećih Ocjenjivanja"
 msgid "No announcements"
 msgstr "Nema Objava"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr "Nije pronađen nijedan zadatak"
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr "Nijedna grupa nije pronađena"
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "Bez Certifikata"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr "Nema certificiranih članova"
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr "Nisu pronađeni certificirani članovi. Provjeri kasnije ili se sami certificirajte."
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr "Nema dodanih kurseva"
@@ -3611,10 +3611,6 @@ msgstr "Nema dodanih kurseva"
 msgid "No courses created"
 msgstr "Nema kreiranih kurseva"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr "Nije pronađen nijedan kurs"
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr "Nema kurseva u ovom programu"
@@ -3631,36 +3627,23 @@ msgstr "Još uvijek nema povratnih informacija."
 msgid "No introduction"
 msgstr "Nema Uvoda"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr "Nema pronađenih poslova"
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Nema zakazanih časova uživo"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr "Nije pronađen nijedan program"
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr "Nije pronađen nijedan podnešeni kviz. Provjeri ponovo kasnije."
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr "Nema pronađenih Kvizova"
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "Nema slobodnih termina za ovaj datum."
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr "Nema učenika u ovoj grupi"
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr "Nema prijava"
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Bez {0}"
 
@@ -3717,7 +3700,7 @@ msgstr "Obavještenja"
 msgid "Notify me when available"
 msgstr "Obavijesti me kada bude dostupno"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr "Broj slobodnih mjesta"
 
@@ -3757,11 +3740,11 @@ msgstr "Programu se mogu dodati samo kursevi za koje je samostalno učenje onemo
 msgid "Only files of type {0} will be accepted."
 msgstr "Samo datoteke tipa {0} će biti prihvaćeni."
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr "Dozvoljena je samo datoteka slike."
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr "Dozvoljene su samo zip datoteke"
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr "Otvoreni Završen"
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "Opcija"
@@ -3814,15 +3797,15 @@ msgstr "Opcija 3"
 msgid "Option 4"
 msgstr "Opcija 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Opcije"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "ID Naloga"
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr "Organizacija"
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "Stranice"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr "Plaćena Grupa"
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr "Plaćeni Certifikat"
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr "Plaćeni Certifikat nakon Ocjenjivanja"
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Plaćeni Kurs"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr "Pan Broj"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Honorarno"
@@ -3902,7 +3884,7 @@ msgstr "Djelomično Završeno"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "Procentualna Prolaznost"
 msgid "Password"
 msgstr "Lozinka"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr "Zalijepite youtube vezu kratkog videa koji predstavlja kurs"
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr "Aplikacija plaćanja nije instalirana"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "Na čekanju"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Procenat"
@@ -4023,7 +4004,7 @@ msgstr "Procenat"
 msgid "Percentage (e.g. 70%)"
 msgstr "Procenat (npr. 70%)"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr "Procentualno/Status"
 
@@ -4036,10 +4017,6 @@ msgstr "Persona Uhvaćena"
 msgid "Phone Number"
 msgstr "Broj Telefona"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr "Prijavi se"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr "Dodaj <a href='{0}'>{1}</a> za <a href='{2}'>{3}</a> za slanje kalendarskih pozivnica za ocjenjivanje."
@@ -4056,15 +4033,15 @@ msgstr "Provjeri e-poštu za potvrdu"
 msgid "Please click on the following button to set your new password"
 msgstr "Klikni na sljedeće dugme da postavite novu lozinku"
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "Završite prethodne kurseve u programu da biste se upisali na ovaj kurs."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Omogućite Zoom Postavke da koristite ovu funkciju."
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr "Prijavi se za ovaj kurs da prikažete ovu lekciju"
 
@@ -4072,7 +4049,7 @@ msgstr "Prijavi se za ovaj kurs da prikažete ovu lekciju"
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr "Popuni sva pitanja za {0} minuta."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr "Unesi Naziv"
 
@@ -4081,7 +4058,7 @@ msgstr "Unesi Naziv"
 msgid "Please enter a valid URL."
 msgstr "Unesi važeći URL."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr "Unesi važeće vrijeme u formatu HH:mm."
 
@@ -4093,7 +4070,7 @@ msgstr "Unesi URL za podnošenje zadatka."
 msgid "Please enter your answer"
 msgstr "Unesi svoj odgovor"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr "Instaliraj aplikaciju plaćanja da kreirate plaćenu grupu. Za više detalja pogledajte dokumentaciju. {0}"
 
@@ -4122,35 +4099,39 @@ msgstr "Prijavi se da nastaviš s plaćanjem."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Dobro se pripremi i dođi na vrijeme za ocjenjivanje."
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr "Zakaži ocjenjvanje kako biste dobili certifikat."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "Odaberi Datum."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr "Odaberi trajanje."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr "Odaberi budući datum i vrijeme."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr "Odaberi vrijeme."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr "Odaberi vremensku zonu."
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr "Odaberi opciju"
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr "Poduzmi odgovarajuće mjere na {0}"
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr "Učitaj SCORM Paket"
 
@@ -4163,7 +4144,11 @@ msgstr "Učitaj datoteku zadatka."
 msgid "Point of Score (e.g. 70)"
 msgstr "Bodova (npr. 70)"
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr "Mogućnosti"
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr "Mogućnost"
 
@@ -4192,18 +4177,10 @@ msgstr "Mogući Odgovor 4"
 msgid "Post"
 msgstr "Objava"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr "Objavi novi posao ili provjeri kasnije."
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Poštanski Broj"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr "Objavljeno"
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr "Pokreće se od Učenje"
@@ -4239,7 +4216,7 @@ msgstr "Preferirana Lokacija"
 msgid "Preview Image"
 msgstr "Pregled slike"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "Pregledaj Video"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Prethodna"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Određivanje Cijena"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr "Cijene i Certifikati"
@@ -4318,14 +4295,15 @@ msgstr "Član Programa"
 msgid "Program Members"
 msgstr "Članovi Programa"
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr "Programi"
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "Objavi na Stranici Učesnika"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Objavljeno"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "Objavljeni Kursevi"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Objavljeno dana"
@@ -4382,9 +4360,9 @@ msgstr "Kupljeni Certifikat"
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr "Detalj Pitanja"
 msgid "Question Name"
 msgstr "Naziv Pitanja"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr "Pitanje je uspješno dodano"
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr "Pitanje je uspješno ažurirano"
 
@@ -4430,7 +4408,7 @@ msgstr "Pitanje {0} od {1}"
 msgid "Questions"
 msgstr "Pitanja"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr "Pitanja su uspješno izbrisana"
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "Podnošenje Kviza"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr "Prijave za Kviz"
 
@@ -4467,7 +4445,7 @@ msgstr "Sažetak Kviza"
 msgid "Quiz Title"
 msgstr "Naziv Kviza"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr "Kviz je uspješno kreiran"
 
@@ -4475,7 +4453,7 @@ msgstr "Kviz je uspješno kreiran"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "Kviz nije dostupan gostima. Prijavi se da nastaviš."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr "Kviz je uspješno ažuriran"
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "Kviz će se pojaviti na dnu lekcije."
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr "Kvizovi"
@@ -4535,7 +4513,7 @@ msgstr "Referentna vrsta dokumenta"
 msgid "Regards"
 msgstr "Pozdrav"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr "Registrirajte se Sada"
 
@@ -4564,7 +4542,7 @@ msgstr "Odbijeno"
 msgid "Related Courses"
 msgstr "Povezani Kursevi"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Ukloni"
 
@@ -4633,6 +4611,10 @@ msgstr "Uloga"
 msgid "Role Preference"
 msgstr "Preferenca Uloge"
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr "Uloga je uspješno ažurirana"
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Uloge"
@@ -4642,19 +4624,19 @@ msgstr "Uloge"
 msgid "Route"
 msgstr "Ruta"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Red #{0} Datum ne može biti izvan trajanja grupe."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Red #{0} Vrijeme završetka ne može biti izvan trajanja grupe."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Red #{0} Vrijeme početka ne može biti kasnije ili isto vremenu završetka."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Red #{0} Vrijeme početka ne može biti izvan trajanja grupe."
 
@@ -4697,14 +4679,13 @@ msgstr "Subota"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Spremi"
 
@@ -4730,7 +4711,7 @@ msgstr "Obim"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr "Rezultat Od Mogućih"
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Traži"
 
@@ -4750,11 +4731,11 @@ msgstr "Traži"
 msgid "Search by Name"
 msgstr "Traži po Imenu"
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr "Traži po Nazivu"
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr "Traži po Nazivu"
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr "Traži Ikonu"
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "Broj Mjesta"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr "Preostalo Mjesto"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr "Broj sjedišta ne može biti negativan."
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr "Preostalih Mjesta"
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr "Odaberi Pitanje"
 
@@ -4824,7 +4808,7 @@ msgstr "Postavljanje Platnog Prolaza"
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Postavke"
@@ -4833,17 +4817,17 @@ msgstr "Postavke"
 msgid "Share on"
 msgstr "Dijeli"
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr "Kratki Opis"
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr "Kratki Uvod"
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr "Kratak opis Grupe"
 
@@ -4945,7 +4929,7 @@ msgstr "Naziv Vještine"
 msgid "Skills"
 msgstr "Vještine"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Preskoči"
 
@@ -4953,6 +4937,14 @@ msgstr "Preskoči"
 msgid "Slot Times are overlapping for some schedules."
 msgstr "Vremena termina se preklapaju za neke rasporede."
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr "Termin uspješno dodan"
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr "Termin uspješno izbrisan"
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr "Rasprodano"
 
@@ -5003,11 +4995,10 @@ msgstr "Start"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Start Datum"
 
@@ -5028,7 +5019,7 @@ msgstr "Počni Učiti"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "Počni Učiti"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Vrijeme Početka"
 
@@ -5062,7 +5052,7 @@ msgstr "Zemlja"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr "Studentske Recenzije"
 msgid "Students"
 msgstr "Studenti"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr "Studenti su uspješno izbrisani"
 
@@ -5147,6 +5137,10 @@ msgstr "Podgrupa"
 msgid "Subject"
 msgstr "Predmet"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr "Predmet je obavezan"
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr "Predaja"
@@ -5155,7 +5149,7 @@ msgstr "Predaja"
 msgid "Submission List"
 msgstr "List Predaje"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr "Tip Podnošenja"
 
@@ -5168,7 +5162,7 @@ msgstr "Predaja od"
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr "Predaja od"
 msgid "Submit"
 msgstr "Potvrdi"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr "Podnesi i Nastavi"
 
@@ -5189,30 +5183,6 @@ msgstr "Pošalji svoj životopis kako biste nastavili sa prijavom za ovu pozicij
 msgid "Submitted {0}"
 msgstr "Predano {0}"
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Uspjeh"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "Upravitelj Sistema"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Oznake"
@@ -5348,7 +5318,7 @@ msgstr "Hvala vam na povratnim informacijama!"
 msgid "Thanks and Regards"
 msgstr "Hvala i Pozdrav"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr "Grupa je popunjena. Kontaktiraj Administratora."
 
@@ -5376,27 +5346,11 @@ msgstr "Termin je već rezervirao drugi učesnik."
 msgid "The status of your application has changed."
 msgstr "Status vaše prijave je promijenjen."
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "Nema grupe koje odgovaraju kriterijumima. Pazite, nova iskustva učenja su uskoro na putu!"
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr "U ovom kursu nema poglavlja. Kreiraj i upravljaj poglavljima odavde."
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "Nema kurseva koji odgovaraju kriterijumima. Pazite, nova iskustva učenja su uskoro na putu!"
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr "Trenutno nema otvorenih poslova."
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "Trenutno nema dostupnih programa. Pazite, nova iskustva učenja su uskoro na putu!"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr "Nema slobodnih mjesta u ovoj grupi."
 
@@ -5408,6 +5362,10 @@ msgstr "U ovoj grupi nema studenata."
 msgid "There are no submissions for this assignment."
 msgstr "Ne postoje prijave za ovaj zadatak."
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr "Trenutno nema {0}. Pratite nas, nova iskustva učenja su uskoro!"
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "Na ovoj stranici nema {0}."
@@ -5443,7 +5401,7 @@ msgstr "Ovaj čas je završen"
 msgid "This course has:"
 msgstr "Ovaj kurs ima:"
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "Ovaj kurs je besplatan."
 
@@ -5529,14 +5487,14 @@ msgstr "Vremenski Šablon"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "Vremenska Zona"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr "Vremena:"
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr "Vremena:"
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Naziv"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr "Naziv je obavezan"
 
@@ -5602,7 +5559,7 @@ msgstr "Do"
 msgid "To Date"
 msgstr "Do Datuma"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr "Da biste se pridružili ovoj grupi, kontaktirajte administratora."
 
@@ -5655,9 +5612,9 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr "Tip"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr "Unesi svoj odgovor"
 
@@ -5689,6 +5646,10 @@ msgstr "URL"
 msgid "Unavailability"
 msgstr "Nedostupnost"
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr "Nedostupnost je uspješno ažurirana"
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr "Nedostupno Od Datuma ne može biti kasnije od Nedostupno Do Datuma"
@@ -5703,7 +5664,7 @@ msgstr "Pod Recenzijom"
 msgid "Unlisted"
 msgstr "Neizlistane"
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr "Neobjavljeno"
 
@@ -5725,8 +5686,8 @@ msgstr "Nestrukturirana Uloga"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "Ažuriraj"
 msgid "Update Password"
 msgstr "Ažuriraj Lozinku"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Učitaj"
 
@@ -5853,7 +5814,7 @@ msgstr "Prikaži Certifikat"
 msgid "Visibility"
 msgstr "Vidljivost"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr "Posjeti Grupu"
 
@@ -5861,7 +5822,7 @@ msgstr "Posjeti Grupu"
 msgid "Visit Website"
 msgstr "Posjeti Web Stranicu"
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr "Posjeti sljedeću vezu da vidite svoje "
 
@@ -5893,6 +5854,10 @@ msgstr "Primijetili smo da ste se počeli s upisom"
 msgid "Web Page"
 msgstr "Web Stranica"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr "Web stranica je dodana u bočnu traku"
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Srijeda"
 msgid "Welcome to {0}!"
 msgstr "Dobrodošli u {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr "Šta najbolje opisuje vašu ulogu?"
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "Šta znači uključi u pregled?"
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr "Koji je vaš slučaj upotrebe Frappe Učenja?"
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Kada se kurs pošalje na pregled, biće naveden ovdje."
@@ -5982,10 +5955,6 @@ msgstr "Niste član ove grupe. Provjerite naše nadolazeće grupe."
 msgid "You are not a mentor of the course {0}"
 msgstr "Niste mentor kursa {0}"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr "Niste upisani"
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr "Niste upisani na ovaj kurs. Prijavi se za pristup ovoj lekciji."
@@ -6064,11 +6033,11 @@ msgstr "Već ste pregledali ovaj kurs"
 msgid "You have applied"
 msgstr "Prijavili ste se"
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr "Upisani ste u ovu grupu"
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr "Upisani ste na ovaj kurs"
 
@@ -6080,19 +6049,11 @@ msgstr "Premašili ste maksimalan broj pokušaja ({0}) za ovaj kviz"
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr "Imate ocjenu {0} za kviz {1}"
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr "Još niste kreirali nijedan zadatak. Da kreiraš novi zadatak, klikni na dugme \"Novi\" iznad."
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr "Još niste kreirali nijedan kviz. Da kreiraš novi kviz, klikni na dugme \"Novi Kviz\" iznad."
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Odlučili ste da budete obaviješteni o ovom kursu. Primit ćete e-poštu kada kurs postane dostupan."
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr "Prvo se prijavite da biste se upisali na ovaj kurs"
 
@@ -6124,7 +6085,7 @@ msgstr "YouTube video će se pojaviti na vrhu lekcije."
 msgid "Your Account has been successfully created!"
 msgstr "Vaš račun je uspješno kreiran!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr "Vaša grupa {0} počinje sutra"
 
@@ -6178,11 +6139,11 @@ msgstr "aktivnosti"
 msgid "activity"
 msgstr "aktivnost"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr "podnositelj"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr "podnositelji"
 
@@ -6242,7 +6203,7 @@ msgstr "od"
 msgid "out of"
 msgstr "od"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr "pitanje_detalj"
 
@@ -6262,10 +6223,18 @@ msgstr "sedmice"
 msgid "you can"
 msgstr "možeš"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr "{0} Zadataka"
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr "{0} Otvoreni Poslovi"
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr "{0} Kvizova"
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr "{0} Postavke nisu pronađene"
diff --git a/lms/locale/de.po b/lms/locale/de.po
index 23623823..e6ba6f42 100644
--- a/lms/locale/de.po
+++ b/lms/locale/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr " Bitte bewerten und benoten Sie es."
 msgid "% completed"
 msgstr "% abgeschlossen"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr "Auszeichnungen"
 msgid "Active"
 msgstr "Aktiv"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Hinzufügen"
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr "Kurs hinzufügen"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Fügen Sie mindestens eine mögliche Antwort für diese Frage hinzu: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Admin"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Alle"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Alle Kurse"
 
@@ -293,7 +277,7 @@ msgstr "Selbstregistrierung zulassen"
 msgid "Allow accessing future dates"
 msgstr "Zugriff auf zukünftige Daten zulassen"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "Selbstregistrierung zulassen"
 
@@ -304,11 +288,10 @@ msgstr "Bereits registriert"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Betrag"
 
@@ -316,11 +299,10 @@ msgstr "Betrag"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Betrag (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,32 +323,36 @@ msgstr "Betrag inkl. MwSt."
 msgid "Announcement"
 msgstr "Ankündigung"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Antwort"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "Empfangene Anwendungen"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "Genehmigt"
 msgid "Apps"
 msgstr "Apps"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "Archiviert"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr "Möchten Sie sich wirklich bei Ihrem Frappe Cloud-Dashboard anmelden?"
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "Prüfung"
@@ -430,11 +416,11 @@ msgstr "Prüfungsname"
 msgid "Assessment Type"
 msgstr "Prüfungstyp"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr "Aufgabentitel"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Die Aufgabe für Lektion {0} von {1} existiert bereits."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Die Aufgabe wird unten in der Lektion angezeigt."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Zuordnungen"
 
@@ -525,6 +515,10 @@ msgstr "Automatische Zuweisung"
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Chargenbeschreibung"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Chargendetails"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Charge:"
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr "Anfangsdatum"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "Herzliche Grüße"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Rechnungsdetails"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategorie"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Kategoriename"
 
@@ -801,7 +787,7 @@ msgstr "Zertifikatslink"
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "Zertifizierungsname"
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr "Zertifizierte Teilnehmer"
 msgid "Change"
 msgstr "Ändern"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr "Kapitel"
 msgid "Chapter Reference"
 msgstr "Kapitelreferenz"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr "Prüfen"
 msgid "Check Discussion"
 msgstr "Diskussion prüfen"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "Mehr über die Zertifizierung erfahren Sie unter {0}."
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr "Auswahlmöglichkeiten"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Wählen Sie alle zutreffenden Antworten aus"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "Symbol auswählen"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Wählen Sie eine Antwort"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "Client-ID"
 msgid "Client Secret"
 msgstr "Client-Geheimnis"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Schließen"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Unternehmenswebseite"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Bestätigen"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Vertrag"
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr "Richtig"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "Kurskapitel"
 msgid "Course Completed"
 msgstr "Abgeschlossene Kurse"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "Kursersteller"
 msgid "Course Data"
 msgstr "Kursdaten"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "Kursbeschreibung"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "Kursbewerter"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "Kursbild"
 
@@ -1364,7 +1381,7 @@ msgstr "Kursliste"
 msgid "Course Name"
 msgstr "Kursname"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr "Kurs-Statistiken"
 msgid "Course Title"
 msgstr "Kurstitel"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Erstellen"
 
@@ -1456,6 +1477,11 @@ msgstr "Erstellen"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Neuen Eintrag erstellen"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "Einen Kurs erstellen"
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Erstellt"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Währung"
 
@@ -1573,7 +1594,7 @@ msgstr "Datum"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
@@ -1614,9 +1635,9 @@ msgstr "Standardwährung"
 msgid "Degree Type"
 msgstr "Abschlussart"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1624,27 +1645,27 @@ msgstr "Löschen"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1687,7 +1707,7 @@ msgstr "Schreibtisch"
 msgid "Details"
 msgstr "Details"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "Selbstregistrierung deaktivieren"
 
@@ -1768,7 +1788,7 @@ msgstr "E-Mail"
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "E-Mail"
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1822,7 +1842,7 @@ msgstr "E-Mail-Adresse"
 msgid "Email Sent"
 msgstr "E-Mail wurde versandt"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "E-Mail-Vorlage"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Enddatum"
 
@@ -1888,7 +1907,7 @@ msgstr "Enddatum (oder voraussichtlich)"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "Enddatum (oder voraussichtlich)"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Endzeit"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr "Eingeschriebene Studenten"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "Erfolgreich eingeschrieben"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Anzahl der Einschreibungen"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "Geben Sie die richtige Antwort ein"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Fehler"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "Beurteilung"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Ereignis"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr "Verfallsdatum"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "Erklärung"
@@ -2128,7 +2123,7 @@ msgstr "Mehr entdecken"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Fehler"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Vorgestellt"
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "Dateityp"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Vorname"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "Frei"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Vollständiger Name"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Vollzeit"
@@ -2355,6 +2350,10 @@ msgstr "Helfen Sie anderen, etwas Neues zu lernen, indem Sie einen Kurs erstelle
 msgid "Help us improve our course material."
 msgstr "Helfen Sie uns, unser Kursmaterial zu verbessern."
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr "Ich bin nicht verfügbar"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "ID"
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "Wenn Sie Fragen haben oder Hilfe benötigen, können Sie uns gerne konta
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr "Bild"
 msgid "Image search powered by"
 msgstr "Bildsuche powered by"
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "Bild: Beschädigter Datenstrom"
 
@@ -2492,7 +2490,7 @@ msgstr "Bild: Beschädigter Datenstrom"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "Ausgestellt am"
 msgid "Items in Sidebar"
 msgstr "Elemente in der Seitenleiste"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "Stellenbezeichnung"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "freie Stellen"
@@ -2742,7 +2740,7 @@ msgstr "freie Stellen"
 msgid "Join"
 msgstr "Beitreten"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr "Titel der Unterrichtseinheit"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Verknüpfungen"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Mehr laden"
 
@@ -3119,7 +3133,6 @@ msgstr "Lokal"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "Machen Sie eine Ankündigung"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr "Als gelesen markieren"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Mittel"
 
@@ -3236,7 +3248,7 @@ msgstr "Mittel"
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Mittel:"
@@ -3259,7 +3271,7 @@ msgstr "Mittel:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr "Meta Beschreibung"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Meta-Bild"
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "Mein Kalender"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Neu"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "Neuer Kurs"
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr "Keine bevorstehenden Bewertungen"
 msgid "No announcements"
 msgstr "Keine Ankündigungen"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "Keine Zertifikate"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr "Keine Kurse erstellt"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr "Keine Einführung"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Keine Live-Kurse geplant"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "Für dieses Datum sind keine Plätze verfügbar."
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Keine {0}"
 
@@ -3717,7 +3700,7 @@ msgstr "Benachrichtigungen"
 msgid "Notify me when available"
 msgstr "Benachrichtige mich, wenn verfügbar"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Es werden nur Dateien vom Typ {0} akzeptiert."
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "Option"
@@ -3814,15 +3797,15 @@ msgstr "Option 3"
 msgid "Option 4"
 msgstr "Option 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Optionen"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "Bestell-Nr."
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "Seiten"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr "Bezahlte Charge"
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Kostenpflichtiger Kurs"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Teilzeit"
@@ -3902,7 +3884,7 @@ msgstr "Teilweise abgeschlossen"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "Bestehensquote"
 msgid "Password"
 msgstr "Passwort"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "Ausstehend"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Prozentsatz"
@@ -4023,7 +4004,7 @@ msgstr "Prozentsatz"
 msgid "Percentage (e.g. 70%)"
 msgstr "Prozentsatz (z. B. 70 %)"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr "Bitte überprüfen Sie Ihren Posteingang. Wir haben Ihnen eine E-Mail mi
 msgid "Please click on the following button to set your new password"
 msgstr "Bitte klicken Sie auf die folgende Schaltfläche, um Ihr neues Passwort festzulegen"
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Bitte aktivieren Sie die Zoom-Einstellungen, um diese Funktion zu nutzen."
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr "Bitte geben Sie eine gültige URL ein."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr "Bitte geben Sie die URL zur Aufgabeneinreichung ein."
 msgid "Please enter your answer"
 msgstr "Bitte geben Sie Ihre Antwort ein"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr "Bitte loggen Sie sich ein, um mit der Zahlung fortzufahren."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Bitte bereiten Sie sich gut vor und erscheinen Sie pünktlich zu den Prüfungen."
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "Bitte wählen Sie ein Datum aus."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr "Mögliche Antwort 4"
 msgid "Post"
 msgstr "Absenden"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr "Vorschaubild"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "Videovorschau"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Vorhergehende"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Preisgestaltung"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "Auf der Teilnehmerseite veröffentlichen"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Veröffentlicht"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "Veröffentlichte Kurse"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Veröffentlicht am"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr "Name der Frage"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr "Frage {0} von {1}"
 msgid "Questions"
 msgstr "Fragen"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "Quiz-Einreichung"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr "Quiz-Zusammenfassung"
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "Das Quiz ist für Gastbenutzer nicht verfügbar. Bitte melden Sie sich an, um fortzufahren."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "Das Quiz wird am Ende der Lektion angezeigt."
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr "Referenz-Dokumententyp"
 msgid "Regards"
 msgstr "Grüße"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr "Abgelehnt"
 msgid "Related Courses"
 msgstr "Ähnliche Kurse"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -4633,6 +4611,10 @@ msgstr "Rolle"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Rollen"
@@ -4642,19 +4624,19 @@ msgstr "Rollen"
 msgid "Route"
 msgstr "Pfad"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr "Samstag"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Speichern"
 
@@ -4730,7 +4711,7 @@ msgstr "Geltungsbereich"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Suchen"
 
@@ -4750,11 +4731,11 @@ msgstr "Suchen"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Einstellungen"
@@ -4833,17 +4817,17 @@ msgstr "Einstellungen"
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr "Name der Fertigkeit"
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Überspringen"
 
@@ -4953,6 +4937,14 @@ msgstr "Überspringen"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr "Starten"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Startdatum"
 
@@ -5028,7 +5019,7 @@ msgstr "Mit dem Lernen beginnen"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "Mit dem Lernen beginnen"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Startzeit"
 
@@ -5062,7 +5052,7 @@ msgstr "Bundesland"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr "Schüler"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr "Untergruppe"
 msgid "Subject"
 msgstr "Betreff"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr "Einreichung"
@@ -5155,7 +5149,7 @@ msgstr "Einreichung"
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr "Buchen"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Erfolg"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "System-Manager"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Schlagworte"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Danke und Grüße"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr "Der Platz ist bereits von einem anderen Teilnehmer gebucht."
 msgid "The status of your application has changed."
 msgstr "Der Status Ihrer Bewerbung hat sich geändert."
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "Dieser Kurs ist kostenlos."
 
@@ -5529,14 +5487,14 @@ msgstr "Stundenplan-Vorlage"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Bezeichnung"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr "An"
 msgid "To Date"
 msgstr "Bis-Datum"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr "Um dieser Gruppe beizutreten, wenden Sie sich bitte an den Administrator."
 
@@ -5655,9 +5612,9 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr "Typ"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr "URL"
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr "Das Datum „Nicht verfügbar ab“ kann nicht größer sein als das Datum „Nicht verfügbar bis“."
@@ -5703,7 +5664,7 @@ msgstr "Wird überprüft"
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "Aktualisieren"
 msgid "Update Password"
 msgstr "Passwort ändern"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Webseite"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Mittwoch"
 msgid "Welcome to {0}!"
 msgstr "Willkommen auf {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr "Sie sind kein Mentor des Kurses {0}"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr "Sie haben diesen Kurs bereits bewertet"
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Sie haben sich für eine Benachrichtigung zu diesem Kurs entschieden. Sie erhalten eine E-Mail, sobald der Kurs verfügbar ist."
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr "Das YouTube-Video wird oben in der Lektion angezeigt."
 msgid "Your Account has been successfully created!"
 msgstr "Ihr Konto wurde erfolgreich erstellt!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "aktivitäten"
 msgid "activity"
 msgstr "aktivität"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "von"
 msgid "out of"
 msgstr "von"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr "Sie können"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/eo.po b/lms/locale/eo.po
index 269b7d93..6c747996 100644
--- a/lms/locale/eo.po
+++ b/lms/locale/eo.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr "crwdns149182:0crwdne149182:0"
 msgid "% completed"
 msgstr "crwdns151724:0crwdne151724:0"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr "crwdns154692:0crwdne154692:0"
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr "crwdns154694:0crwdne154694:0"
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr "crwdns154696:0crwdne154696:0"
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr "crwdns154698:0crwdne154698:0"
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr "crwdns149198:0crwdne149198:0"
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr "crwdns152597:0crwdne152597:0"
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "crwdns151462:0crwdne151462:0"
 
@@ -123,13 +107,17 @@ msgstr "crwdns149208:0crwdne149208:0"
 msgid "Active"
 msgstr "crwdns149210:0crwdne149210:0"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr "crwdns154794:0crwdne154794:0"
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "crwdns149212:0crwdne149212:0"
@@ -168,7 +156,7 @@ msgstr "crwdns151726:0crwdne151726:0"
 msgid "Add a course"
 msgstr "crwdns149226:0crwdne149226:0"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr "crwdns152004:0crwdne152004:0"
 
@@ -176,7 +164,7 @@ msgstr "crwdns152004:0crwdne152004:0"
 msgid "Add a lesson"
 msgstr "crwdns151728:0crwdne151728:0"
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr "crwdns149228:0crwdne149228:0"
@@ -193,10 +181,6 @@ msgstr "crwdns149232:0crwdne149232:0"
 msgid "Add an assignment to your lesson"
 msgstr "crwdns152104:0crwdne152104:0"
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr "crwdns149234:0crwdne149234:0"
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "crwdns149236:0{0}crwdne149236:0"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "crwdns149248:0crwdne149248:0"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "crwdns149250:0crwdne149250:0"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr "crwdns152262:0crwdne152262:0"
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "crwdns149252:0crwdne149252:0"
 
@@ -293,7 +277,7 @@ msgstr "crwdns149260:0crwdne149260:0"
 msgid "Allow accessing future dates"
 msgstr "crwdns149262:0crwdne149262:0"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "crwdns149264:0crwdne149264:0"
 
@@ -304,11 +288,10 @@ msgstr "crwdns149266:0crwdne149266:0"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "crwdns149268:0crwdne149268:0"
 
@@ -316,11 +299,10 @@ msgstr "crwdns149268:0crwdne149268:0"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "crwdns149270:0crwdne149270:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr "crwdns151730:0crwdne151730:0"
 
@@ -341,32 +323,36 @@ msgstr "crwdns149276:0crwdne149276:0"
 msgid "Announcement"
 msgstr "crwdns149278:0crwdne149278:0"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr "crwdns151584:0crwdne151584:0"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr "crwdns155068:0crwdne155068:0"
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "crwdns149280:0crwdne149280:0"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr "crwdns151464:0crwdne151464:0"
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr "crwdns151466:0crwdne151466:0"
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "crwdns149282:0crwdne149282:0"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr "crwdns155070:0crwdne155070:0"
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "crwdns149292:0crwdne149292:0"
 msgid "Apps"
 msgstr "crwdns149294:0crwdne149294:0"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "crwdns152268:0crwdne152268:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "crwdns152463:0crwdne152463:0"
 
@@ -414,7 +400,7 @@ msgstr "crwdns152465:0crwdne152465:0"
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "crwdns149300:0crwdne149300:0"
@@ -430,11 +416,11 @@ msgstr "crwdns149302:0crwdne149302:0"
 msgid "Assessment Type"
 msgstr "crwdns149304:0crwdne149304:0"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr "crwdns149306:0crwdne149306:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "crwdns149308:0{0}crwdne149308:0"
 
@@ -479,7 +465,7 @@ msgstr "crwdns154518:0crwdne154518:0"
 msgid "Assignment Title"
 msgstr "crwdns149320:0crwdne149320:0"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr "crwdns154596:0crwdne154596:0"
 
@@ -487,7 +473,11 @@ msgstr "crwdns154596:0crwdne154596:0"
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "crwdns149322:0{0}crwdnd149322:0{1}crwdne149322:0"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr "crwdns155072:0crwdne155072:0"
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr "crwdns154598:0crwdne154598:0"
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "crwdns149324:0crwdne149324:0"
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "crwdns152108:0crwdne152108:0"
 
@@ -525,6 +515,10 @@ msgstr "crwdns149332:0crwdne149332:0"
 msgid "Auto Recording"
 msgstr "crwdns149334:0crwdne149334:0"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr "crwdns155074:0crwdne155074:0"
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "crwdns149348:0crwdne149348:0"
 msgid "Batch Course"
 msgstr "crwdns149350:0crwdne149350:0"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "crwdns149352:0crwdne149352:0"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "crwdns149354:0crwdne149354:0"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "crwdns149356:0crwdne149356:0"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "crwdns149358:0crwdne149358:0"
 
@@ -646,10 +634,6 @@ msgstr "crwdns149368:0crwdne149368:0"
 msgid "Batch Title"
 msgstr "crwdns149372:0crwdne149372:0"
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr "crwdns149374:0crwdne149374:0"
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "crwdns149376:0crwdne149376:0"
@@ -662,6 +646,10 @@ msgstr "crwdns154786:0crwdne154786:0"
 msgid "Batch is sold out."
 msgstr "crwdns154325:0crwdne154325:0"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr "crwdns155076:0crwdne155076:0"
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "crwdns152469:0crwdne152469:0"
@@ -677,7 +665,7 @@ msgstr "crwdns149380:0crwdne149380:0"
 msgid "Begin Date"
 msgstr "crwdns149382:0crwdne149382:0"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "crwdns149384:0crwdne149384:0"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "crwdns149386:0crwdne149386:0"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "crwdns149408:0crwdne149408:0"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "crwdns152471:0crwdne152471:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr "crwdns152473:0crwdne152473:0"
 
@@ -766,18 +754,16 @@ msgstr "crwdns149414:0crwdne149414:0"
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "crwdns149416:0crwdne149416:0"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "crwdns149418:0crwdne149418:0"
 
@@ -801,7 +787,7 @@ msgstr "crwdns149424:0crwdne149424:0"
 msgid "Certificate of Completion"
 msgstr "crwdns152601:0crwdne152601:0"
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr "crwdns149426:0crwdne149426:0"
 
@@ -809,7 +795,7 @@ msgstr "crwdns149426:0crwdne149426:0"
 msgid "Certificates"
 msgstr "crwdns149428:0crwdne149428:0"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr "crwdns151924:0crwdne151924:0"
 
@@ -822,11 +808,11 @@ msgstr "crwdns151924:0crwdne151924:0"
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "crwdns149436:0crwdne149436:0"
 msgid "Certified"
 msgstr "crwdns152422:0crwdne152422:0"
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr "crwdns154600:0crwdne154600:0"
 
@@ -862,7 +849,7 @@ msgstr "crwdns149438:0crwdne149438:0"
 msgid "Change"
 msgstr "crwdns149440:0crwdne149440:0"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr "crwdns152110:0crwdne152110:0"
 
@@ -880,11 +867,15 @@ msgstr "crwdns149442:0crwdne149442:0"
 msgid "Chapter Reference"
 msgstr "crwdns149444:0crwdne149444:0"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr "crwdns151620:0crwdne151620:0"
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr "crwdns155078:0crwdne155078:0"
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr "crwdns151622:0crwdne151622:0"
 
@@ -901,6 +892,10 @@ msgstr "crwdns149448:0crwdne149448:0"
 msgid "Check Discussion"
 msgstr "crwdns149450:0crwdne149450:0"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr "crwdns154796:0crwdne154796:0"
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "crwdns149452:0{0}crwdne149452:0"
@@ -916,21 +911,25 @@ msgstr "crwdns149454:0crwdne149454:0"
 msgid "Choices"
 msgstr "crwdns149456:0crwdne149456:0"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "crwdns149458:0crwdne149458:0"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr "crwdns154798:0crwdne154798:0"
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "crwdns149460:0crwdne149460:0"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "crwdns149462:0crwdne149462:0"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "crwdns149470:0crwdne149470:0"
 msgid "Client Secret"
 msgstr "crwdns149472:0crwdne149472:0"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "crwdns155080:0crwdne155080:0"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "crwdns149514:0crwdne149514:0"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr "crwdns152426:0crwdne152426:0"
 msgid "Completed"
 msgstr "crwdns149520:0crwdne149520:0"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr "crwdns152082:0crwdne152082:0"
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "crwdns149522:0crwdne149522:0"
@@ -1164,6 +1169,10 @@ msgstr "crwdns149530:0crwdne149530:0"
 msgid "Conduct Evaluation"
 msgstr "crwdns154203:0crwdne154203:0"
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr "crwdns155082:0crwdne155082:0"
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "crwdns152479:0crwdne152479:0"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr "crwdns149540:0crwdne149540:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "crwdns149542:0crwdne149542:0"
@@ -1228,15 +1237,15 @@ msgstr "crwdns149548:0crwdne149548:0"
 msgid "Correct"
 msgstr "crwdns149550:0crwdne149550:0"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr "crwdns149552:0crwdne149552:0"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "crwdns149558:0crwdne149558:0"
 msgid "Course Completed"
 msgstr "crwdns149560:0crwdne149560:0"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr "crwdns154800:0crwdne154800:0"
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "crwdns149564:0crwdne149564:0"
 msgid "Course Data"
 msgstr "crwdns149566:0crwdne149566:0"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "crwdns149568:0crwdne149568:0"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr "crwdns154802:0crwdne154802:0"
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "crwdns149570:0crwdne149570:0"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "crwdns149572:0crwdne149572:0"
 
@@ -1364,7 +1381,7 @@ msgstr "crwdns149578:0crwdne149578:0"
 msgid "Course Name"
 msgstr "crwdns149580:0crwdne149580:0"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr "crwdns151624:0crwdne151624:0"
 
@@ -1396,23 +1413,27 @@ msgstr "crwdns149588:0crwdne149588:0"
 msgid "Course Title"
 msgstr "crwdns149590:0crwdne149590:0"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr "crwdns151734:0crwdne151734:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "crwdns149592:0crwdne149592:0"
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr "crwdns155084:0crwdne155084:0"
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr "crwdns151586:0crwdne151586:0"
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr "crwdns151736:0crwdne151736:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr "crwdns155086:0crwdne155086:0"
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "crwdns149596:0{0}crwdne149596:0"
@@ -1421,13 +1442,13 @@ msgstr "crwdns149596:0{0}crwdne149596:0"
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr "crwdns149606:0crwdne149606:0"
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "crwdns151468:0crwdne151468:0"
 
@@ -1456,6 +1477,11 @@ msgstr "crwdns151468:0crwdne151468:0"
 msgid "Create Certificate"
 msgstr "crwdns154205:0crwdne154205:0"
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "crwdns155088:0crwdne155088:0"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "crwdns149612:0crwdne149612:0"
@@ -1476,11 +1502,7 @@ msgstr "crwdns151738:0crwdne151738:0"
 msgid "Create a live class"
 msgstr "crwdns154447:0crwdne154447:0"
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr "crwdns149616:0crwdne149616:0"
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr "crwdns154604:0crwdne154604:0"
 
@@ -1496,7 +1518,7 @@ msgstr "crwdns154451:0crwdne154451:0"
 msgid "Create your first quiz"
 msgstr "crwdns154453:0crwdne154453:0"
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "crwdns152116:0crwdne152116:0"
 
@@ -1511,11 +1533,10 @@ msgstr "crwdns154457:0crwdne154457:0"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "crwdns149618:0crwdne149618:0"
 
@@ -1573,7 +1594,7 @@ msgstr "crwdns149632:0crwdne149632:0"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "crwdns149634:0crwdne149634:0"
@@ -1614,9 +1635,9 @@ msgstr "crwdns149642:0crwdne149642:0"
 msgid "Degree Type"
 msgstr "crwdns149644:0crwdne149644:0"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "crwdns149646:0crwdne149646:0"
 
@@ -1624,27 +1645,27 @@ msgstr "crwdns149646:0crwdne149646:0"
 msgid "Delete Chapter"
 msgstr "crwdns151626:0crwdne151626:0"
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr "crwdns151588:0crwdne151588:0"
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr "crwdns151628:0crwdne151628:0"
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr "crwdns151630:0crwdne151630:0"
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "crwdns151590:0crwdne151590:0"
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "crwdns151632:0crwdne151632:0"
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "crwdns151634:0crwdne151634:0"
 
@@ -1661,7 +1682,7 @@ msgstr "crwdns151634:0crwdne151634:0"
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr "crwdns151634:0crwdne151634:0"
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "crwdns149650:0crwdne149650:0"
 
@@ -1687,7 +1707,7 @@ msgstr "crwdns149652:0crwdne149652:0"
 msgid "Details"
 msgstr "crwdns149654:0crwdne149654:0"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "crwdns149656:0crwdne149656:0"
 
@@ -1768,7 +1788,7 @@ msgstr "crwdns149678:0crwdne149678:0"
 msgid "E-mail"
 msgstr "crwdns149680:0crwdne149680:0"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "crwdns149680:0crwdne149680:0"
 msgid "Edit"
 msgstr "crwdns149682:0crwdne149682:0"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr "crwdns154606:0crwdne154606:0"
 
@@ -1808,8 +1828,8 @@ msgstr "crwdns149692:0crwdne149692:0"
 msgid "Education Details"
 msgstr "crwdns149694:0crwdne149694:0"
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "crwdns149696:0crwdne149696:0"
 
@@ -1822,7 +1842,7 @@ msgstr "crwdns149698:0crwdne149698:0"
 msgid "Email Sent"
 msgstr "crwdns149700:0crwdne149700:0"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "crwdns152487:0crwdne152487:0"
 
@@ -1870,9 +1890,8 @@ msgstr "crwdns151926:0crwdne151926:0"
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "crwdns149716:0crwdne149716:0"
 
@@ -1888,7 +1907,7 @@ msgstr "crwdns149718:0crwdne149718:0"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "crwdns149718:0crwdne149718:0"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "crwdns149720:0crwdne149720:0"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr "crwdns149722:0crwdne149722:0"
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr "crwdns152272:0crwdne152272:0"
 
@@ -1915,10 +1933,6 @@ msgstr "crwdns152272:0crwdne152272:0"
 msgid "Enrolled Students"
 msgstr "crwdns149724:0crwdne149724:0"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "crwdns149726:0crwdne149726:0"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr "crwdns152430:0{0}crwdne152430:0"
@@ -1928,7 +1942,7 @@ msgstr "crwdns152430:0{0}crwdne152430:0"
 msgid "Enrollment Count"
 msgstr "crwdns149730:0crwdne149730:0"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr "crwdns149732:0crwdne149732:0"
 
@@ -1955,31 +1969,13 @@ msgstr "crwdns149740:0crwdne149740:0"
 msgid "Enter the correct answer"
 msgstr "crwdns149742:0crwdne149742:0"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "crwdns149744:0crwdne149744:0"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr "crwdns152489:0{0}crwdne152489:0"
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "crwdns149746:0crwdne149746:0"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr "crwdns149748:0crwdne149748:0"
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr "crwdns149750:0crwdne149750:0"
 
@@ -2001,11 +1996,11 @@ msgstr "crwdns149750:0crwdne149750:0"
 msgid "Evaluation Request"
 msgstr "crwdns149752:0crwdne149752:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "crwdns149754:0crwdne149754:0"
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr "crwdns149756:0crwdne149756:0"
 
@@ -2016,9 +2011,9 @@ msgstr "crwdns149756:0crwdne149756:0"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr "crwdns149760:0crwdne149760:0"
 msgid "Evaluator Schedule"
 msgstr "crwdns149762:0crwdne149762:0"
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr "crwdns149764:0crwdne149764:0"
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr "crwdns152603:0crwdne152603:0"
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr "crwdns155090:0crwdne155090:0"
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr "crwdns152603:0crwdne152603:0"
 msgid "Event"
 msgstr "crwdns149766:0crwdne149766:0"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr "crwdns151472:0crwdne151472:0"
 
@@ -2109,7 +2104,7 @@ msgstr "crwdns149780:0crwdne149780:0"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "crwdns149782:0crwdne149782:0"
@@ -2128,7 +2123,7 @@ msgstr "crwdns149786:0crwdne149786:0"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "crwdns149788:0crwdne149788:0"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "crwdns149790:0crwdne149790:0"
@@ -2166,7 +2161,7 @@ msgstr "crwdns149796:0crwdne149796:0"
 msgid "File Type"
 msgstr "crwdns149798:0crwdne149798:0"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "crwdns149800:0crwdne149800:0"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "crwdns149810:0crwdne149810:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "crwdns149812:0crwdne149812:0"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "crwdns149824:0crwdne149824:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "crwdns149826:0crwdne149826:0"
@@ -2355,6 +2350,10 @@ msgstr "crwdns149862:0crwdne149862:0"
 msgid "Help us improve our course material."
 msgstr "crwdns149864:0crwdne149864:0"
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr "crwdns154804:0crwdne154804:0"
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr "crwdns149892:0crwdne149892:0"
 msgid "I am unavailable"
 msgstr "crwdns149894:0crwdne149894:0"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "crwdns149896:0crwdne149896:0"
 
@@ -2444,7 +2443,7 @@ msgstr "crwdns149902:0crwdne149902:0"
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr "crwdns152436:0crwdne152436:0"
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "crwdns149904:0crwdne149904:0"
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr "crwdns149906:0crwdne149906:0"
 
@@ -2484,7 +2482,7 @@ msgstr "crwdns149910:0crwdne149910:0"
 msgid "Image search powered by"
 msgstr "crwdns149912:0crwdne149912:0"
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "crwdns149914:0crwdne149914:0"
 
@@ -2492,7 +2490,7 @@ msgstr "crwdns149914:0crwdne149914:0"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "crwdns149940:0crwdne149940:0"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "crwdns149972:0crwdne149972:0"
 msgid "Items in Sidebar"
 msgstr "crwdns149974:0crwdne149974:0"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr "crwdns151746:0crwdne151746:0"
 
@@ -2732,7 +2730,7 @@ msgstr "crwdns149992:0crwdne149992:0"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "crwdns149994:0crwdne149994:0"
@@ -2742,7 +2740,7 @@ msgstr "crwdns149994:0crwdne149994:0"
 msgid "Join"
 msgstr "crwdns149996:0crwdne149996:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr "crwdns152499:0crwdne152499:0"
 
@@ -3038,6 +3036,22 @@ msgstr "crwdns150082:0crwdne150082:0"
 msgid "Lesson Title"
 msgstr "crwdns150084:0crwdne150084:0"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr "crwdns155092:0crwdne155092:0"
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr "crwdns155094:0crwdne155094:0"
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr "crwdns155096:0crwdne155096:0"
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr "crwdns155098:0crwdne155098:0"
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "crwdns150102:0crwdne150102:0"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "crwdns150106:0crwdne150106:0"
 
@@ -3103,12 +3117,12 @@ msgstr "crwdns150108:0crwdne150108:0"
 msgid "LiveCode URL"
 msgstr "crwdns150110:0crwdne150110:0"
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "crwdns150112:0crwdne150112:0"
 
@@ -3119,7 +3133,6 @@ msgstr "crwdns150116:0crwdne150116:0"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "crwdns150128:0crwdne150128:0"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr "crwdns152605:0crwdne152605:0"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr "crwdns150132:0crwdne150132:0"
 
@@ -3195,10 +3208,10 @@ msgstr "crwdns150142:0crwdne150142:0"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr "crwdns150146:0{0}crwdne150146:0"
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr "crwdns150148:0crwdne150148:0"
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr "crwdns152462:0crwdne152462:0"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "crwdns150154:0crwdne150154:0"
 
@@ -3236,7 +3248,7 @@ msgstr "crwdns150154:0crwdne150154:0"
 msgid "Medium ID"
 msgstr "crwdns150156:0crwdne150156:0"
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "crwdns150158:0crwdne150158:0"
@@ -3259,7 +3271,7 @@ msgstr "crwdns150158:0crwdne150158:0"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "crwdns150170:0crwdne150170:0"
 msgid "Member Username"
 msgstr "crwdns152442:0crwdne152442:0"
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr "crwdns151754:0crwdne151754:0"
 
@@ -3408,9 +3420,9 @@ msgstr "crwdns154526:0crwdne154526:0"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "crwdns150190:0crwdne150190:0"
 
@@ -3444,6 +3456,7 @@ msgstr "crwdns151758:0crwdne151758:0"
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "crwdns150212:0crwdne150212:0"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "crwdns150214:0crwdne150214:0"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "crwdns150218:0crwdne150218:0"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "crwdns150220:0crwdne150220:0"
 
@@ -3512,7 +3528,7 @@ msgstr "crwdns150222:0crwdne150222:0"
 msgid "New Job Applicant"
 msgstr "crwdns150224:0crwdne150224:0"
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr "crwdns151760:0crwdne151760:0"
 
@@ -3528,7 +3544,7 @@ msgstr "crwdns151764:0crwdne151764:0"
 msgid "New Question"
 msgstr "crwdns150226:0crwdne150226:0"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr "crwdns150228:0crwdne150228:0"
@@ -3583,26 +3599,10 @@ msgstr "crwdns150248:0crwdne150248:0"
 msgid "No announcements"
 msgstr "crwdns150250:0crwdne150250:0"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr "crwdns152126:0crwdne152126:0"
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr "crwdns151478:0crwdne151478:0"
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "crwdns150252:0crwdne150252:0"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr "crwdns154610:0crwdne154610:0"
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr "crwdns154612:0crwdne154612:0"
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr "crwdns154471:0crwdne154471:0"
@@ -3611,10 +3611,6 @@ msgstr "crwdns154471:0crwdne154471:0"
 msgid "No courses created"
 msgstr "crwdns150254:0crwdne150254:0"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr "crwdns151480:0crwdne151480:0"
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr "crwdns151766:0crwdne151766:0"
@@ -3631,36 +3627,23 @@ msgstr "crwdns152282:0crwdne152282:0"
 msgid "No introduction"
 msgstr "crwdns150258:0crwdne150258:0"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr "crwdns154528:0crwdne154528:0"
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "crwdns150262:0crwdne150262:0"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr "crwdns151768:0crwdne151768:0"
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr "crwdns154530:0crwdne154530:0"
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr "crwdns151592:0crwdne151592:0"
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "crwdns150264:0crwdne150264:0"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr "crwdns155100:0crwdne155100:0"
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr "crwdns152128:0crwdne152128:0"
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "crwdns150268:0{0}crwdne150268:0"
 
@@ -3717,7 +3700,7 @@ msgstr "crwdns150292:0crwdne150292:0"
 msgid "Notify me when available"
 msgstr "crwdns150294:0crwdne150294:0"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr "crwdns151486:0crwdne151486:0"
 
@@ -3757,11 +3740,11 @@ msgstr "crwdns151770:0crwdne151770:0"
 msgid "Only files of type {0} will be accepted."
 msgstr "crwdns150308:0{0}crwdne150308:0"
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr "crwdns150310:0crwdne150310:0"
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr "crwdns151642:0crwdne151642:0"
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr "crwdns150318:0crwdne150318:0"
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "crwdns150322:0crwdne150322:0"
@@ -3814,15 +3797,15 @@ msgstr "crwdns150328:0crwdne150328:0"
 msgid "Option 4"
 msgstr "crwdns150330:0crwdne150330:0"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "crwdns154808:0crwdne154808:0"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "crwdns150332:0crwdne150332:0"
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr "crwdns150336:0crwdne150336:0"
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "crwdns150350:0crwdne150350:0"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr "crwdns150352:0crwdne150352:0"
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr "crwdns152607:0crwdne152607:0"
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr "crwdns152609:0crwdne152609:0"
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "crwdns150354:0crwdne150354:0"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr "crwdns150356:0crwdne150356:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "crwdns150358:0crwdne150358:0"
@@ -3902,7 +3884,7 @@ msgstr "crwdns150360:0crwdne150360:0"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "crwdns150364:0crwdne150364:0"
 msgid "Password"
 msgstr "crwdns150366:0crwdne150366:0"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr "crwdns151488:0crwdne151488:0"
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr "crwdns150388:0crwdne150388:0"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "crwdns150390:0crwdne150390:0"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "crwdns150392:0crwdne150392:0"
@@ -4023,7 +4004,7 @@ msgstr "crwdns150392:0crwdne150392:0"
 msgid "Percentage (e.g. 70%)"
 msgstr "crwdns150394:0crwdne150394:0"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr "crwdns152448:0crwdne152448:0"
 
@@ -4036,10 +4017,6 @@ msgstr "crwdns154706:0crwdne154706:0"
 msgid "Phone Number"
 msgstr "crwdns150396:0crwdne150396:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr "crwdns150398:0crwdne150398:0"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr "crwdns150400:0{0}crwdnd150400:0{1}crwdnd150400:0{2}crwdnd150400:0{3}crwdne150400:0"
@@ -4056,15 +4033,15 @@ msgstr "crwdns150404:0crwdne150404:0"
 msgid "Please click on the following button to set your new password"
 msgstr "crwdns150406:0crwdne150406:0"
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "crwdns151772:0crwdne151772:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "crwdns150408:0crwdne150408:0"
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr "crwdns151644:0crwdne151644:0"
 
@@ -4072,7 +4049,7 @@ msgstr "crwdns151644:0crwdne151644:0"
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr "crwdns150410:0{0}crwdne150410:0"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr "crwdns151774:0crwdne151774:0"
 
@@ -4081,7 +4058,7 @@ msgstr "crwdns151774:0crwdne151774:0"
 msgid "Please enter a valid URL."
 msgstr "crwdns150412:0crwdne150412:0"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr "crwdns151776:0crwdne151776:0"
 
@@ -4093,7 +4070,7 @@ msgstr "crwdns150414:0crwdne150414:0"
 msgid "Please enter your answer"
 msgstr "crwdns150416:0crwdne150416:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr "crwdns154614:0{0}crwdne154614:0"
 
@@ -4122,35 +4099,39 @@ msgstr "crwdns150428:0crwdne150428:0"
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "crwdns150430:0crwdne150430:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr "crwdns152615:0crwdne152615:0"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "crwdns151778:0crwdne151778:0"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr "crwdns151780:0crwdne151780:0"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr "crwdns151782:0crwdne151782:0"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr "crwdns151784:0crwdne151784:0"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr "crwdns151786:0crwdne151786:0"
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr "crwdns155102:0crwdne155102:0"
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr "crwdns150432:0{0}crwdne150432:0"
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr "crwdns151646:0crwdne151646:0"
 
@@ -4163,7 +4144,11 @@ msgstr "crwdns150434:0crwdne150434:0"
 msgid "Point of Score (e.g. 70)"
 msgstr "crwdns150436:0crwdne150436:0"
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr "crwdns154810:0crwdne154810:0"
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr "crwdns150438:0crwdne150438:0"
 
@@ -4192,18 +4177,10 @@ msgstr "crwdns150446:0crwdne150446:0"
 msgid "Post"
 msgstr "crwdns150448:0crwdne150448:0"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr "crwdns154708:0crwdne154708:0"
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "crwdns150450:0crwdne150450:0"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr "crwdns150452:0crwdne150452:0"
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr "crwdns154618:0crwdne154618:0"
@@ -4239,7 +4216,7 @@ msgstr "crwdns150462:0crwdne150462:0"
 msgid "Preview Image"
 msgstr "crwdns150464:0crwdne150464:0"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "crwdns150466:0crwdne150466:0"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "crwdns150468:0crwdne150468:0"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "crwdns150470:0crwdne150470:0"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr "crwdns152617:0crwdne152617:0"
@@ -4318,14 +4295,15 @@ msgstr "crwdns151792:0crwdne151792:0"
 msgid "Program Members"
 msgstr "crwdns151794:0crwdne151794:0"
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr "crwdns154532:0crwdne154532:0"
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "crwdns150494:0crwdne150494:0"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "crwdns150496:0crwdne150496:0"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "crwdns150498:0crwdne150498:0"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "crwdns150500:0crwdne150500:0"
@@ -4382,9 +4360,9 @@ msgstr "crwdns152619:0crwdne152619:0"
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr "crwdns150506:0crwdne150506:0"
 msgid "Question Name"
 msgstr "crwdns150508:0crwdne150508:0"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr "crwdns150510:0crwdne150510:0"
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr "crwdns150512:0crwdne150512:0"
 
@@ -4430,7 +4408,7 @@ msgstr "crwdns150516:0{0}crwdnd150516:0{1}crwdne150516:0"
 msgid "Questions"
 msgstr "crwdns150518:0crwdne150518:0"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr "crwdns150520:0crwdne150520:0"
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "crwdns150526:0crwdne150526:0"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr "crwdns150528:0crwdne150528:0"
 
@@ -4467,7 +4445,7 @@ msgstr "crwdns150530:0crwdne150530:0"
 msgid "Quiz Title"
 msgstr "crwdns150532:0crwdne150532:0"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr "crwdns150534:0crwdne150534:0"
 
@@ -4475,7 +4453,7 @@ msgstr "crwdns150534:0crwdne150534:0"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "crwdns150536:0crwdne150536:0"
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr "crwdns150538:0crwdne150538:0"
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "crwdns150540:0crwdne150540:0"
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr "crwdns150542:0crwdne150542:0"
@@ -4535,7 +4513,7 @@ msgstr "crwdns150556:0crwdne150556:0"
 msgid "Regards"
 msgstr "crwdns150558:0crwdne150558:0"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr "crwdns150560:0crwdne150560:0"
 
@@ -4564,7 +4542,7 @@ msgstr "crwdns150566:0crwdne150566:0"
 msgid "Related Courses"
 msgstr "crwdns150568:0crwdne150568:0"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "crwdns151490:0crwdne151490:0"
 
@@ -4633,6 +4611,10 @@ msgstr "crwdns150592:0crwdne150592:0"
 msgid "Role Preference"
 msgstr "crwdns150594:0crwdne150594:0"
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr "crwdns155104:0crwdne155104:0"
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "crwdns154473:0crwdne154473:0"
@@ -4642,19 +4624,19 @@ msgstr "crwdns154473:0crwdne154473:0"
 msgid "Route"
 msgstr "crwdns150596:0crwdne150596:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "crwdns150598:0#{0}crwdne150598:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "crwdns150600:0#{0}crwdne150600:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "crwdns150602:0#{0}crwdne150602:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "crwdns150604:0#{0}crwdne150604:0"
 
@@ -4697,14 +4679,13 @@ msgstr "crwdns150610:0crwdne150610:0"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "crwdns150612:0crwdne150612:0"
 
@@ -4730,7 +4711,7 @@ msgstr "crwdns150620:0crwdne150620:0"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr "crwdns150624:0crwdne150624:0"
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "crwdns150626:0crwdne150626:0"
 
@@ -4750,11 +4731,11 @@ msgstr "crwdns150626:0crwdne150626:0"
 msgid "Search by Name"
 msgstr "crwdns152286:0crwdne152286:0"
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr "crwdns152288:0crwdne152288:0"
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr "crwdns152132:0crwdne152132:0"
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr "crwdns150628:0crwdne150628:0"
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "crwdns150630:0crwdne150630:0"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr "crwdns150632:0crwdne150632:0"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr "crwdns155106:0crwdne155106:0"
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr "crwdns150634:0crwdne150634:0"
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr "crwdns150636:0crwdne150636:0"
 
@@ -4824,7 +4808,7 @@ msgstr "crwdns154477:0crwdne154477:0"
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "crwdns150648:0crwdne150648:0"
@@ -4833,17 +4817,17 @@ msgstr "crwdns150648:0crwdne150648:0"
 msgid "Share on"
 msgstr "crwdns150650:0crwdne150650:0"
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr "crwdns152513:0crwdne152513:0"
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr "crwdns150652:0crwdne150652:0"
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr "crwdns151492:0crwdne151492:0"
 
@@ -4945,7 +4929,7 @@ msgstr "crwdns150690:0crwdne150690:0"
 msgid "Skills"
 msgstr "crwdns150692:0crwdne150692:0"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "crwdns150696:0crwdne150696:0"
 
@@ -4953,6 +4937,14 @@ msgstr "crwdns150696:0crwdne150696:0"
 msgid "Slot Times are overlapping for some schedules."
 msgstr "crwdns150698:0crwdne150698:0"
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr "crwdns155108:0crwdne155108:0"
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr "crwdns155110:0crwdne155110:0"
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "crwdns150700:0crwdne150700:0"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr "crwdns150702:0crwdne150702:0"
 
@@ -5003,11 +4995,10 @@ msgstr "crwdns150712:0crwdne150712:0"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "crwdns150714:0crwdne150714:0"
 
@@ -5028,7 +5019,7 @@ msgstr "crwdns150716:0crwdne150716:0"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "crwdns150716:0crwdne150716:0"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "crwdns150718:0crwdne150718:0"
 
@@ -5062,7 +5052,7 @@ msgstr "crwdns150730:0crwdne150730:0"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr "crwdns150744:0crwdne150744:0"
 msgid "Students"
 msgstr "crwdns150748:0crwdne150748:0"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr "crwdns150750:0crwdne150750:0"
 
@@ -5147,6 +5137,10 @@ msgstr "crwdns150754:0crwdne150754:0"
 msgid "Subject"
 msgstr "crwdns150756:0crwdne150756:0"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr "crwdns155112:0crwdne155112:0"
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr "crwdns150758:0crwdne150758:0"
@@ -5155,7 +5149,7 @@ msgstr "crwdns150758:0crwdne150758:0"
 msgid "Submission List"
 msgstr "crwdns150760:0crwdne150760:0"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr "crwdns154620:0crwdne154620:0"
 
@@ -5168,7 +5162,7 @@ msgstr "crwdns152136:0crwdne152136:0"
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr "crwdns152136:0crwdne152136:0"
 msgid "Submit"
 msgstr "crwdns150762:0crwdne150762:0"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr "crwdns154710:0crwdne154710:0"
 
@@ -5189,30 +5183,6 @@ msgstr "crwdns150764:0crwdne150764:0"
 msgid "Submitted {0}"
 msgstr "crwdns150766:0{0}crwdne150766:0"
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "crwdns150768:0crwdne150768:0"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "crwdns150774:0crwdne150774:0"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "crwdns150776:0crwdne150776:0"
@@ -5348,7 +5318,7 @@ msgstr "crwdns152290:0crwdne152290:0"
 msgid "Thanks and Regards"
 msgstr "crwdns150794:0crwdne150794:0"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr "crwdns152138:0crwdne152138:0"
 
@@ -5376,27 +5346,11 @@ msgstr "crwdns150802:0crwdne150802:0"
 msgid "The status of your application has changed."
 msgstr "crwdns150804:0crwdne150804:0"
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "crwdns152292:0crwdne152292:0"
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr "crwdns150806:0crwdne150806:0"
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "crwdns154207:0crwdne154207:0"
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr "crwdns154712:0crwdne154712:0"
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "crwdns151798:0crwdne151798:0"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr "crwdns150808:0crwdne150808:0"
 
@@ -5408,6 +5362,10 @@ msgstr "crwdns150810:0crwdne150810:0"
 msgid "There are no submissions for this assignment."
 msgstr "crwdns152140:0crwdne152140:0"
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr "crwdns155114:0{0}crwdne155114:0"
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "crwdns150812:0{0}crwdne150812:0"
@@ -5443,7 +5401,7 @@ msgstr "crwdns152144:0crwdne152144:0"
 msgid "This course has:"
 msgstr "crwdns150820:0crwdne150820:0"
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "crwdns150822:0crwdne150822:0"
 
@@ -5529,14 +5487,14 @@ msgstr "crwdns150844:0crwdne150844:0"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "crwdns150846:0crwdne150846:0"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr "crwdns150848:0crwdne150848:0"
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr "crwdns150848:0crwdne150848:0"
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "crwdns150850:0crwdne150850:0"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr "crwdns151656:0crwdne151656:0"
 
@@ -5602,7 +5559,7 @@ msgstr "crwdns150852:0crwdne150852:0"
 msgid "To Date"
 msgstr "crwdns150854:0crwdne150854:0"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr "crwdns150858:0crwdne150858:0"
 
@@ -5655,9 +5612,9 @@ msgstr "crwdns150876:0crwdne150876:0"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "crwdns150876:0crwdne150876:0"
 msgid "Type"
 msgstr "crwdns150878:0crwdne150878:0"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr "crwdns150880:0crwdne150880:0"
 
@@ -5689,6 +5646,10 @@ msgstr "crwdns150884:0crwdne150884:0"
 msgid "Unavailability"
 msgstr "crwdns150886:0crwdne150886:0"
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr "crwdns155116:0crwdne155116:0"
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr "crwdns150888:0crwdne150888:0"
@@ -5703,7 +5664,7 @@ msgstr "crwdns150890:0crwdne150890:0"
 msgid "Unlisted"
 msgstr "crwdns150892:0crwdne150892:0"
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr "crwdns152296:0crwdne152296:0"
 
@@ -5725,8 +5686,8 @@ msgstr "crwdns150898:0crwdne150898:0"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "crwdns150906:0crwdne150906:0"
 msgid "Update Password"
 msgstr "crwdns150908:0crwdne150908:0"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "crwdns151498:0crwdne151498:0"
 
@@ -5853,7 +5814,7 @@ msgstr "crwdns150940:0crwdne150940:0"
 msgid "Visibility"
 msgstr "crwdns150942:0crwdne150942:0"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr "crwdns150944:0crwdne150944:0"
 
@@ -5861,7 +5822,7 @@ msgstr "crwdns150944:0crwdne150944:0"
 msgid "Visit Website"
 msgstr "crwdns154540:0crwdne154540:0"
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr "crwdns150946:0crwdne150946:0"
 
@@ -5893,6 +5854,10 @@ msgstr "crwdns152454:0crwdne152454:0"
 msgid "Web Page"
 msgstr "crwdns150952:0crwdne150952:0"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr "crwdns155118:0crwdne155118:0"
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "crwdns150954:0crwdne150954:0"
 msgid "Welcome to {0}!"
 msgstr "crwdns150956:0{0}crwdne150956:0"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr "crwdns155120:0crwdne155120:0"
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "crwdns151500:0crwdne151500:0"
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr "crwdns155122:0crwdne155122:0"
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "crwdns150958:0crwdne150958:0"
@@ -5982,10 +5955,6 @@ msgstr "crwdns150984:0crwdne150984:0"
 msgid "You are not a mentor of the course {0}"
 msgstr "crwdns150986:0{0}crwdne150986:0"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr "crwdns151658:0crwdne151658:0"
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr "crwdns151660:0crwdne151660:0"
@@ -6064,11 +6033,11 @@ msgstr "crwdns151012:0crwdne151012:0"
 msgid "You have applied"
 msgstr "crwdns154718:0crwdne154718:0"
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr "crwdns151014:0crwdne151014:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr "crwdns151016:0crwdne151016:0"
 
@@ -6080,19 +6049,11 @@ msgstr "crwdns152527:0{0}crwdne152527:0"
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr "crwdns151852:0{0}crwdnd151852:0{1}crwdne151852:0"
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr "crwdns152146:0crwdne152146:0"
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr "crwdns151594:0crwdne151594:0"
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "crwdns151018:0crwdne151018:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr "crwdns151022:0crwdne151022:0"
 
@@ -6124,7 +6085,7 @@ msgstr "crwdns151032:0crwdne151032:0"
 msgid "Your Account has been successfully created!"
 msgstr "crwdns151034:0crwdne151034:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr "crwdns154222:0{0}crwdne154222:0"
 
@@ -6178,11 +6139,11 @@ msgstr "crwdns152176:0crwdne152176:0"
 msgid "activity"
 msgstr "crwdns152178:0crwdne152178:0"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr "crwdns154722:0crwdne154722:0"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr "crwdns154724:0crwdne154724:0"
 
@@ -6242,7 +6203,7 @@ msgstr "crwdns151064:0crwdne151064:0"
 msgid "out of"
 msgstr "crwdns151066:0crwdne151066:0"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr "crwdns151070:0crwdne151070:0"
 
@@ -6262,10 +6223,18 @@ msgstr "crwdns152184:0crwdne152184:0"
 msgid "you can"
 msgstr "crwdns151076:0crwdne151076:0"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr "crwdns155124:0{0}crwdne155124:0"
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr "crwdns154726:0{0}crwdne154726:0"
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr "crwdns155126:0{0}crwdne155126:0"
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr "crwdns151078:0{0}crwdne151078:0"
diff --git a/lms/locale/es.po b/lms/locale/es.po
index 2660847b..dcfc51e3 100644
--- a/lms/locale/es.po
+++ b/lms/locale/es.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr " Por favor evalúelo y califíquelo."
 msgid "% completed"
 msgstr "% completado"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr "<span style=\"font-size: 18px;\"><b>Estadísticas</b></span>"
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "Una introducción de una línea al curso que aparece en la tarjeta del curso."
 
@@ -123,13 +107,17 @@ msgstr "Logros"
 msgid "Active"
 msgstr "Activo"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Agregar"
@@ -168,7 +156,7 @@ msgstr "Añadir un capítulo"
 msgid "Add a course"
 msgstr "Añadir un curso"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr "Añadir una lección"
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr "Añadir una nueva pregunta"
@@ -193,10 +181,6 @@ msgstr "Añadir un examen"
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr "Añadir una pregunta existente"
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Añadir al menos una respuesta posible para esta pregunta: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Admin"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Todos"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Todos los Cursos"
 
@@ -293,7 +277,7 @@ msgstr "Permitir la autoinscripción"
 msgid "Allow accessing future dates"
 msgstr "Permitir acceder a fechas futuras"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "Permitir autoinscripción"
 
@@ -304,11 +288,10 @@ msgstr "Ya está Registrado"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Importe"
 
@@ -316,11 +299,10 @@ msgstr "Importe"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Importe (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,32 +323,36 @@ msgstr "Importe con GST"
 msgid "Announcement"
 msgstr "Anuncio"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Respuesta"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr "Aparece en la tarjeta del curso en la lista de cursos."
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr "Aparece cuando la URL del grupo se comparte en cualquier plataforma en línea"
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "Solicitudes recibidas"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "Aprobado"
 msgid "Apps"
 msgstr "Apps"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "Archivado"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "Evaluación"
@@ -430,11 +416,11 @@ msgstr "Nombre de la Evaluación"
 msgid "Assessment Type"
 msgstr "Tipo de evaluación"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr "Examen añadido correctamente"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "La evaluación {0} ya se ha agregado a este lote."
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr "Título de la tarea"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Ya existe una asignación para la lección {0} por {1}."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "La tarea aparecerá al final de la lección."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Asignaciones"
 
@@ -525,6 +515,10 @@ msgstr "Autoasignar"
 msgid "Auto Recording"
 msgstr "Grabación Automática"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "Plantilla de confirmación de lote"
 msgid "Batch Course"
 msgstr "Curso por lotes"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "Lote creado"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Descripción de Lotes"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Detalles del lote"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "Detalles del lote en bruto"
 
@@ -646,10 +634,6 @@ msgstr "Fecha de inicio del lote:"
 msgid "Batch Title"
 msgstr "Título del grupo"
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr "Lote actualizado"
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "La fecha de finalización del grupo no puede ser anterior a la fecha de inicio del lote"
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Lote:"
@@ -677,7 +665,7 @@ msgstr "Lotes"
 msgid "Begin Date"
 msgstr "Fecha de comienzo"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "Atentamente,"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Detalles de facturación"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr "Ropa casual"
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Categoría"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Nombre Categoría"
 
@@ -801,7 +787,7 @@ msgstr "Enlace de certificado"
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr "Certificado guardado correctamente"
 
@@ -809,7 +795,7 @@ msgstr "Certificado guardado correctamente"
 msgid "Certificates"
 msgstr "Certificados"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "Nombre de la certificación"
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr "Participantes certificados"
 msgid "Change"
 msgstr "Cambio"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr "Capítulo"
 msgid "Chapter Reference"
 msgstr "Referencia del capítulo"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr "Marcar"
 msgid "Check Discussion"
 msgstr "Comprobar el debate"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "Visite {0} para saber más sobre la certificación."
@@ -916,21 +911,25 @@ msgstr "Comprobar cursos"
 msgid "Choices"
 msgstr "Opciones"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Elegir todas las respuestas que apliquen"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "Elegir icono"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Elige una respuesta"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "Id del cliente"
 msgid "Client Secret"
 msgstr "Secreto del cliente"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Cerrar"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Página Web de la empresa"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "Completado"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "Certificado de finalización"
@@ -1164,6 +1169,10 @@ msgstr "La condición debe ser un código Python válido."
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Confirmar"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr "Continuar aprendiendo"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Contrato"
@@ -1228,15 +1237,15 @@ msgstr "Organización corporativa"
 msgid "Correct"
 msgstr "Correcto"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr "Respuesta correcta"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "Capítulo del curso"
 msgid "Course Completed"
 msgstr "Curso Completado"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "Creador del curso"
 msgid "Course Data"
 msgstr "Datos del Curso"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "Descripción del curso"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "Evaluador del curso"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "Imagen del curso"
 
@@ -1364,7 +1381,7 @@ msgstr "Lista de Cursos"
 msgid "Course Name"
 msgstr "Nombre del Curso"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr "Estadísticas del curso"
 msgid "Course Title"
 msgstr "Título del curso"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "Curso ya agregado al lote."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "El curso {0} ya se ha agregado a este lote."
@@ -1421,13 +1442,13 @@ msgstr "El curso {0} ya se ha agregado a este lote."
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr "Imagen de portada"
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Crear"
 
@@ -1456,6 +1477,11 @@ msgstr "Crear"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Crear"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "Crear un curso"
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr "Crear una nueva pregunta"
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Creado"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Divisa / Moneda"
 
@@ -1573,7 +1594,7 @@ msgstr "Fecha"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "Fecha y hora"
@@ -1614,9 +1635,9 @@ msgstr "Divisa / modena predeterminada"
 msgid "Degree Type"
 msgstr "Tipo de Grado"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1624,27 +1645,27 @@ msgstr "Eliminar"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Descripción"
 
@@ -1687,7 +1707,7 @@ msgstr "Escritorio"
 msgid "Details"
 msgstr "Detalles"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "Deshabilitar la autoinscripción"
 
@@ -1768,7 +1788,7 @@ msgstr "Correo Electrónico"
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "Correo Electrónico"
 msgid "Edit"
 msgstr "Editar"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr "Detalle de la Educación"
 msgid "Education Details"
 msgstr "Detalles de la educación"
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -1822,7 +1842,7 @@ msgstr "Identificación de correo"
 msgid "Email Sent"
 msgstr "Correo Electrónico Enviado"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "Plantilla de Correo Electrónico"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Fecha Final"
 
@@ -1888,7 +1907,7 @@ msgstr "Fecha de finalización (o esperado)"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "Fecha de finalización (o esperado)"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Hora de finalización"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr "Inscribirse ahora"
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr "Estudiantes inscritos"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "Inscrito exitosamente"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Recuento de inscripciones"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr "Error al inscribirse"
 
@@ -1955,31 +1969,13 @@ msgstr "Ingrese un título y guarde el cuestionario para continuar."
 msgid "Enter the correct answer"
 msgstr "Ingrese la respuesta correcta"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Error"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "Evaluación"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr "Detalles de evaluación"
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr "Fecha de finalización de la evaluación"
 
@@ -2001,11 +1996,11 @@ msgstr "Fecha de finalización de la evaluación"
 msgid "Evaluation Request"
 msgstr "Solicitud de evaluación"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "La fecha de finalización de la evaluación no puede ser inferior a la fecha de finalización"
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr "La evaluación se guardó correctamente"
 
@@ -2016,9 +2011,9 @@ msgstr "La evaluación se guardó correctamente"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr "Nombre del evaluador"
 msgid "Evaluator Schedule"
 msgstr "Horario del evaluador"
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr "El evaluador no está disponible"
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Evento"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr "Ejemplo: IST (+5:30)"
 
@@ -2109,7 +2104,7 @@ msgstr "Fecha de caducidad"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "Explicación"
@@ -2128,7 +2123,7 @@ msgstr "Explorar más"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Falla"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Destacados"
@@ -2166,7 +2161,7 @@ msgstr "Campo de especialización/estudio"
 msgid "File Type"
 msgstr "Tipo de Archivo"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Primer Nombre"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "Gratis"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Freelance"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Nombre completo"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Tiempo completo"
@@ -2355,6 +2350,10 @@ msgstr "Ayude a otros a aprender algo nuevo creando un curso."
 msgid "Help us improve our course material."
 msgstr "Ayúdanos a mejorar el material de nuestro curso."
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr "Estoy buscando un trabajo"
 msgid "I am unavailable"
 msgstr "No estoy disponible"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "Identificador"
 
@@ -2444,7 +2443,7 @@ msgstr "Si no lo hace, el cuestionario se enviará automáticamente cuando final
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "Si tiene alguna pregunta o necesita ayuda, no dude en ponerse en contact
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr "Si establece una cantidad aquí, entonces no se aplicará el ajuste equivalente en USD."
 
@@ -2484,7 +2482,7 @@ msgstr "Imagen"
 msgid "Image search powered by"
 msgstr "Búsqueda de imágenes con tecnología"
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "Imagen: Flujo de datos corruptos"
 
@@ -2492,7 +2490,7 @@ msgstr "Imagen: Flujo de datos corruptos"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "Notas del instructor"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "Emitido el"
 msgid "Items in Sidebar"
 msgstr "Elementos en la barra lateral"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "Título del trabajo"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "Trabajos"
@@ -2742,7 +2740,7 @@ msgstr "Trabajos"
 msgid "Join"
 msgstr "Unirse"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr "Referencia de la lección"
 msgid "Lesson Title"
 msgstr "Título de la lección"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Enlaces"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "En vivo"
 
@@ -3103,12 +3117,12 @@ msgstr "Clase en vivo"
 msgid "LiveCode URL"
 msgstr "URL LiveCode"
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Carga más"
 
@@ -3119,7 +3133,6 @@ msgstr "Local"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "Publicar un anuncio"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr "Administrar grupo"
 
@@ -3195,10 +3208,10 @@ msgstr "Marcar como leído"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr "Las calificaciones para la pregunta número {0} no pueden ser mayores que las calificaciones asignadas para esa pregunta."
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr "Marcas fuera de"
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Medio"
 
@@ -3236,7 +3248,7 @@ msgstr "Medio"
 msgid "Medium ID"
 msgstr "ID de Medium"
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Medio:"
@@ -3259,7 +3271,7 @@ msgstr "Medio:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "Tipo de miembro"
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr "Metadescripción"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Meta imagen"
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "Mi calendario"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Nuevo"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "Nuevo lote"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "Nuevo curso"
 
@@ -3512,7 +3528,7 @@ msgstr "Nuevo trabajo"
 msgid "New Job Applicant"
 msgstr "Nuevo solicitante de trabajo"
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr "Nueva pregunta"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr "Nuevo cuestionario"
@@ -3583,26 +3599,10 @@ msgstr "No hay próximas evaluaciones"
 msgid "No announcements"
 msgstr "Sin anuncios"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr "No se encontraron grupos"
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "No hay certificados"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr "No hay cursos creados"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr "No se encontraron cursos"
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr "No hay introducción"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "No hay clases en vivo programadas"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "No hay cupos disponibles para esta fecha."
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "No {0}"
 
@@ -3717,7 +3700,7 @@ msgstr "Notificaciones"
 msgid "Notify me when available"
 msgstr "Avísame cuando esté disponible"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr "Número de plazas disponibles"
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Sólo se aceptarán archivos del tipo {0}."
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr "Sólo se permiten archivos de imagen."
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr "Apertura finalizada"
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "Opción"
@@ -3814,15 +3797,15 @@ msgstr "Opción 3"
 msgid "Option 4"
 msgstr "Opción 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Opciones"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "ID de pedido"
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr "Organización"
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "Páginas"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr "Lote pagó"
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Cursos Pagos"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr "Número NIF"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Tiempo parcial"
@@ -3902,7 +3884,7 @@ msgstr "Parcialmente completo"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "Porcentaje de aprobación"
 msgid "Password"
 msgstr "Contraseña"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr "Pegue el enlace de YouTube de un video corto que presenta el curso."
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr "La aplicación de pagos no está instalada"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "Pendiente"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Porcentaje"
@@ -4023,7 +4004,7 @@ msgstr "Porcentaje"
 msgid "Percentage (e.g. 70%)"
 msgstr "Porcentaje (por ejemplo, 70%)"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr "Por favor, inicie sesión"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr "Agregue <a href='{0}'>{1}</a> para <a href='{2}'>{3}</a> para enviar invitaciones de calendario para evaluaciones."
@@ -4056,15 +4033,15 @@ msgstr "Por favor, consultar su correo electrónico para la verificación"
 msgid "Please click on the following button to set your new password"
 msgstr "Haga clic en el siguiente botón para establecer su nueva contraseña"
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Habilite la configuración de Zoom para utilizar esta funcionalidad."
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr "Asegúrese de completar todas las preguntas en {0} minutos."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr "Introduce una URL válida."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr "Por favor, introduzca la URL para el envío de la tarea."
 msgid "Please enter your answer"
 msgstr "Por favor escriba su respuesta"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr "Por favor inicie sesión para continuar con el pago."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Por favor, prepárese bien y llegue a tiempo a las evaluaciones."
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr "Tome las medidas adecuadas en {0}"
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr "Por favor, suba el archivo de la tarea."
 msgid "Point of Score (e.g. 70)"
 msgstr "Punto de puntuación (por ejemplo, 70)"
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr "Posibilidad"
 
@@ -4192,18 +4177,10 @@ msgstr "Posible respuesta 4"
 msgid "Post"
 msgstr "Publicar"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Codigo postal"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr "Publicado el"
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr "Ubicación preferida"
 msgid "Preview Image"
 msgstr "Previsualizar imagen"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "Vista previa del video"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Anterior"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Precios"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "Publicar en la página del participante"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Publicado"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "Cursos Publicados"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Publicado el"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr "Detalle de la pregunta"
 msgid "Question Name"
 msgstr "Nombre de la Pregunta"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr "Pregunta añadida correctamente"
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr "Pregunta actualizada correctamente"
 
@@ -4430,7 +4408,7 @@ msgstr "Pregunta {0} de {1}"
 msgid "Questions"
 msgstr "Preguntas"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr "Preguntas eliminadas correctamente"
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "Envíos de cuestionarios"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr "Envíos de cuestionarios"
 
@@ -4467,7 +4445,7 @@ msgstr "Resumen del cuestionario"
 msgid "Quiz Title"
 msgstr "Título del cuestionario"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr "Cuestionario creado correctamente"
 
@@ -4475,7 +4453,7 @@ msgstr "Cuestionario creado correctamente"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "El cuestionario no está disponible para usuarios invitados. Por favor inicie sesión para continuar."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr "Cuestionario actualizado correctamente"
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "El cuestionario aparecerá al final de la lección."
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr "Cuestionarios"
@@ -4535,7 +4513,7 @@ msgstr "Tipo de Documento de Referencia"
 msgid "Regards"
 msgstr "Saludos"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr "Regístrate ahora"
 
@@ -4564,7 +4542,7 @@ msgstr "Rechazado"
 msgid "Related Courses"
 msgstr "Cursos relacionados"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -4633,6 +4611,10 @@ msgstr "Rol"
 msgid "Role Preference"
 msgstr "Preferencia de rol"
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Roles"
@@ -4642,19 +4624,19 @@ msgstr "Roles"
 msgid "Route"
 msgstr "Ruta"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Fila #{0} La fecha no puede estar fuera de la duración del lote."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Fila #{0} La hora de finalización no puede estar fuera de la duración del lote."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Fila #{0} La hora de inicio no puede ser mayor o igual que la hora final."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Fila #{0} La hora de inicio no puede estar fuera de la duración del lote."
 
@@ -4697,14 +4679,13 @@ msgstr "Sábado"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Guardar"
 
@@ -4730,7 +4711,7 @@ msgstr "Alcance"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr "Puntuación fuera de"
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Buscar"
 
@@ -4750,11 +4731,11 @@ msgstr "Buscar"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr "Buscar un icono"
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "Número de asientos"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr "Asiento restante"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr "Asiento restantea"
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr "Seleccione una pregunta"
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Configuración"
@@ -4833,17 +4817,17 @@ msgstr "Configuración"
 msgid "Share on"
 msgstr "Compartir en"
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr "Breve introducción"
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr "Breve descripción del grupo"
 
@@ -4945,7 +4929,7 @@ msgstr "nombre de la habilidad"
 msgid "Skills"
 msgstr "Habilidades"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Omitir"
 
@@ -4953,6 +4937,14 @@ msgstr "Omitir"
 msgid "Slot Times are overlapping for some schedules."
 msgstr "Los horarios de las franjas horarias se superponen."
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr "Agotado"
 
@@ -5003,11 +4995,10 @@ msgstr "Iniciar"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
@@ -5028,7 +5019,7 @@ msgstr "Comienza a aprender"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "Comienza a aprender"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Hora de inicio"
 
@@ -5062,7 +5052,7 @@ msgstr "Estado"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr "Reseñas de estudiantes"
 msgid "Students"
 msgstr "Estudiantes"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr "Estudiantes eliminados correctamente"
 
@@ -5147,6 +5137,10 @@ msgstr "Subgrupo"
 msgid "Subject"
 msgstr "Asunto"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr "Envío"
@@ -5155,7 +5149,7 @@ msgstr "Envío"
 msgid "Submission List"
 msgstr "Lista de entregas"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr "Validar"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr "Envíe su currículum para proceder con su solicitud para este puesto. U
 msgid "Submitted {0}"
 msgstr "Enviado {0}"
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Éxito"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "Administrador del sistema"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Etiquetas"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Gracias y saludos"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr "La plaza ya está reservada por otro participante."
 msgid "The status of your application has changed."
 msgstr "El estado de su solicitud ha cambiado."
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr "No hay capítulos en este curso. Crea y administra capítulos desde aquí."
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr "No hay asientos disponibles en este lote."
 
@@ -5408,6 +5362,10 @@ msgstr "No hay estudiantes en este lote."
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "No hay {0} en este sitio."
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr "Este curso tiene:"
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "Este curso es gratuito."
 
@@ -5529,14 +5487,14 @@ msgstr "Plantilla de horario"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "Zona Horaria"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr "Horarios:"
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr "Horarios:"
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Nombre"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr "A"
 msgid "To Date"
 msgstr "Hasta la fecha"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr "Para unirse a este lote, comuníquese con el Administrador."
 
@@ -5655,9 +5612,9 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr "Tipo"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr "Escribe tu respuesta"
 
@@ -5689,6 +5646,10 @@ msgstr "URL"
 msgid "Unavailability"
 msgstr "Indisponibilidad"
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr "No disponible Desde Fecha no puede ser mayor que No disponible Hasta Fecha"
@@ -5703,7 +5664,7 @@ msgstr "En Revisión"
 msgid "Unlisted"
 msgstr "No listado"
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr "Rol no estructurado"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "Actualizar"
 msgid "Update Password"
 msgstr "Actualizar contraseña"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Subir"
 
@@ -5853,7 +5814,7 @@ msgstr "Ver certificado"
 msgid "Visibility"
 msgstr "Visibilidad"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr "Visitar el Grupo"
 
@@ -5861,7 +5822,7 @@ msgstr "Visitar el Grupo"
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr "Visita el siguiente enlace para ver tu "
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Página Web"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Miércoles"
 msgid "Welcome to {0}!"
 msgstr "Bienvenido a {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "¿Qué significa incluir en la vista previa?"
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Cuando un curso se someta a revisión, aparecerá en esta lista."
@@ -5982,10 +5955,6 @@ msgstr "No eres miembro de este lote. Consulte nuestros próximos lotes."
 msgid "You are not a mentor of the course {0}"
 msgstr "No eres mentor del curso {0}"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr "Ya has revisado este curso"
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr "Te has inscrito en este grupo"
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr "Te has inscrito en este curso"
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Has optado por recibir notificaciones sobre este curso. Recibirás un correo electrónico cuando el curso esté disponible."
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr "Debes iniciar sesión primero para inscribirte en este curso."
 
@@ -6124,7 +6085,7 @@ msgstr "El vídeo de YouTube aparecerá en la parte superior de la lección."
 msgid "Your Account has been successfully created!"
 msgstr "¡Su cuenta ha sido creada satisfactoriamente!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "actividades"
 msgid "activity"
 msgstr "actividad"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "de"
 msgid "out of"
 msgstr "fuera de"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr "pregunta_detalle"
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr "puedes"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr "Configuraciones {0} no encontradas"
diff --git a/lms/locale/fa.po b/lms/locale/fa.po
index ebd10d25..a618b726 100644
--- a/lms/locale/fa.po
+++ b/lms/locale/fa.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr " لطفا آن را ارزیابی و نمره دهید."
 msgid "% completed"
 msgstr "% تکمیل شده"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr "دستاوردها"
 msgid "Active"
 msgstr "فعال"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "افزودن"
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr "افزودن دوره"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr "یک کلمه کلیدی اضافه کنید و سپس اینتر را فشار دهید"
 
@@ -176,7 +164,7 @@ msgstr "یک کلمه کلیدی اضافه کنید و سپس اینتر را 
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "حداقل یک پاسخ ممکن برای این سؤال اضافه کنید: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "ادمین"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "همه"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "همه دوره ها"
 
@@ -293,7 +277,7 @@ msgstr "اجازه ثبت نام خود"
 msgid "Allow accessing future dates"
 msgstr "اجازه دسترسی به تاریخ‌های آینده"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "اجازه ثبت نام خود"
 
@@ -304,11 +288,10 @@ msgstr "قبلا ثبت شده است"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "مبلغ"
 
@@ -316,11 +299,10 @@ msgstr "مبلغ"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "مبلغ (دلار آمریکا)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,32 +323,36 @@ msgstr "مبلغ با GST"
 msgid "Announcement"
 msgstr "اطلاعیه"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "پاسخ"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "درخواست های دریافت شده"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "تایید شده"
 msgid "Apps"
 msgstr "برنامه ها"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "بایگانی شد"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "ارزیابی"
@@ -430,11 +416,11 @@ msgstr "اسم ارزیابی"
 msgid "Assessment Type"
 msgstr "نوع ارزیابی"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "ارزیابی {0} قبلاً به این دسته اضافه شده است."
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr "عنوان تکلیف"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "تکلیف برای درس {0} توسط {1} از قبل وجود دارد."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "تکلیف زیر درس نشان داده می‌شود."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "تکالیف"
 
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr "دوره دسته ای"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "دسته ایجاد شد"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "توضیحات دسته"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "جزئیات دسته"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "جزئیات دسته خام"
 
@@ -646,10 +634,6 @@ msgstr "تاریخ شروع دسته:"
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "دسته:"
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "با احترام"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "جزئیات صورتحساب"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "لغو"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "دسته بندی"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "نام دسته"
 
@@ -801,7 +787,7 @@ msgstr "لینک گواهی"
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr "گواهی‌ها"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr "گواهی شده"
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr "تغییر دادن"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr "تغییرات با موفقیت ذخیره شد"
 
@@ -880,11 +867,15 @@ msgstr "فصل"
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr "فصل با موفقیت اضافه شد"
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr "فصل با موفقیت به روز شد"
 
@@ -901,6 +892,10 @@ msgstr "بررسی"
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr "گزینه‌ها"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "همه‌ی پاسخ‌هایی که صحیح هستند را انتخاب کردن کنید"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "یک تصویر انتخاب کن"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "یک پاسخ را انتخاب کنید"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "شناسه مشتری"
 msgid "Client Secret"
 msgstr "راز مشتری"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "بستن"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "وب سایت شرکت"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr "ثبت نام خود را تکمیل کنید - فرصت را از دس
 msgid "Completed"
 msgstr "تکمیل شده"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "تایید"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "قرارداد"
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr "درست"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "فصل دوره"
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "ارزیاب دوره"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "تصویر دوره"
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr "اسم دوره"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr "طرح کلی دوره"
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr "عنوان دوره"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "دوره قبلاً به دسته اضافه شده است."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr "دوره با موفقیت حذف شد"
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "دوره {0} قبلاً به این دسته اضافه شده است."
@@ -1421,13 +1442,13 @@ msgstr "دوره {0} قبلاً به این دسته اضافه شده است."
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "ایجاد کردن"
 
@@ -1456,6 +1477,11 @@ msgstr "ایجاد کردن"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "ایجاد جدید"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "ایجاد دوره"
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "ایجاد شده"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "واحد پول"
 
@@ -1573,7 +1594,7 @@ msgstr "تاریخ"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "تاریخ و زمان"
@@ -1614,9 +1635,9 @@ msgstr "ارز پیش‌فرض"
 msgid "Degree Type"
 msgstr "نوع مدرک"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "حذف"
 
@@ -1624,27 +1645,27 @@ msgstr "حذف"
 msgid "Delete Chapter"
 msgstr "حذف فصل"
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr "حذف دوره"
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr "این فصل حذف شود؟"
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr "این درس حذف شود؟"
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "با حذف این فصل، تمام دروس آن نیز حذف می‌شود و برای همیشه از دوره حذف می‌شود. این عمل قابل بازگشت نیست. آیا مطمئن هستید که می‌خواهید ادامه دهید؟"
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "حذف این درس آن را برای همیشه از دوره حذف می‌کند. این عمل قابل بازگشت نیست. آیا مطمئن هستید که می‌خواهید ادامه دهید؟"
 
@@ -1661,7 +1682,7 @@ msgstr "حذف این درس آن را برای همیشه از دوره حذف
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,13 +1694,12 @@ msgstr "حذف این درس آن را برای همیشه از دوره حذف
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "شرح"
 
 #: frontend/src/components/Apps.vue:51
 msgid "Desk"
-msgstr "میز کار"
+msgstr "پیشخوان"
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
 #: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:25
@@ -1687,7 +1707,7 @@ msgstr "میز کار"
 msgid "Details"
 msgstr "جزئیات"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "غیرفعال کردن ثبت نام خود"
 
@@ -1768,7 +1788,7 @@ msgstr "ایمیل"
 msgid "E-mail"
 msgstr "ایمیل"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "ایمیل"
 msgid "Edit"
 msgstr "ویرایش"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr "جزئیات آموزش"
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "ایمیل"
 
@@ -1822,7 +1842,7 @@ msgstr "آدرس ایمیل"
 msgid "Email Sent"
 msgstr "ایمیل ارسال شد"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "قالب ایمیل"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "تاریخ پایان"
 
@@ -1888,7 +1907,7 @@ msgstr "تاریخ پایان (یا مورد انتظار)"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "تاریخ پایان (یا مورد انتظار)"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "زمان پایان"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr "دانش آموزان ثبت نام شده"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "با موفقیت ثبت نام شد"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr "تایید ثبت نام برای {0}"
@@ -1928,7 +1942,7 @@ msgstr "تایید ثبت نام برای {0}"
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "پاسخ صحیح را وارد کنید"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "خطا"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "ارزیابی"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "رویداد"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr "مثال: IST (+5:30)"
 
@@ -2109,7 +2104,7 @@ msgstr "تاریخ انقضا"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "توضیح"
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "ویژه"
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "نوع فایل"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "نام کوچک"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "رایگان"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "نام و نام خانوادگی"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "تمام وقت"
@@ -2355,6 +2350,10 @@ msgstr "با ایجاد دوره آموزشی به دیگران کمک کنید
 msgid "Help us improve our course material."
 msgstr "به ما در بهبود مطالب درسی کمک کنید."
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr "من در دسترس نیستم"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "شناسه"
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr "اگر سوالی دارید یا نیاز به کمک دارید، با تیم پشتیبانی ما تماس بگیرید."
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "اگر سوالی دارید یا نیاز به کمک دارید، با
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr "تصویر"
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "یادداشت های مدرس"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "صادر شده در"
 msgid "Items in Sidebar"
 msgstr "موارد موجود در نوار کناری"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr "آیتم‌ها با موفقیت حذف شدند"
 
@@ -2732,7 +2730,7 @@ msgstr "عنوان شغلی"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "شغل ها"
@@ -2742,7 +2740,7 @@ msgstr "شغل ها"
 msgid "Join"
 msgstr "پیوستن"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr "پیوستن به تماس"
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr "عنوان درس"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "پیوندها"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "فعال"
 
@@ -3103,12 +3117,12 @@ msgstr "کلاس زنده"
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "بارگذاری بیشتر"
 
@@ -3119,7 +3133,6 @@ msgstr "محلی"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr "علامت‌گذاری به عنوان خوانده شد"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr "حداکثر تلاش‌ها"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "متوسط"
 
@@ -3236,7 +3248,7 @@ msgstr "متوسط"
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "متوسط:"
@@ -3259,7 +3271,7 @@ msgstr "متوسط:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "نوع عضو"
 msgid "Member Username"
 msgstr "نام کاربری عضو"
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr "توضیحات متا"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "تصویر متا"
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "تقویم من"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "جدید"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "دسته جدید"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "دوره جدید"
 
@@ -3512,7 +3528,7 @@ msgstr "شغل جدید"
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr "بدون ارزیابی های آتی"
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr "هیچ دوره ای اضافه نشده است"
@@ -3611,10 +3611,6 @@ msgstr "هیچ دوره ای اضافه نشده است"
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr "هیچ دوره ای پیدا نشد"
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr "ارسالی وجود ندارد"
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "نه {0}"
 
@@ -3717,7 +3700,7 @@ msgstr "اعلان‌ها"
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "فقط فایل هایی از نوع {0} پذیرفته می‌شوند."
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr "فقط فایل های zip مجاز هستند"
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "گزینه"
@@ -3814,15 +3797,15 @@ msgstr "گزینه 3"
 msgid "Option 4"
 msgstr "انتخاب کردن 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "گزینه‌ها"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "صفحات"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "پاره وقت"
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr "گذرواژه"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "انتظار"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "درصد"
@@ -4023,7 +4004,7 @@ msgstr "درصد"
 msgid "Percentage (e.g. 70%)"
 msgstr "درصد (به عنوان مثال 70%)"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr "درصد/وضعیت"
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "شماره تلفن"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr "لطفا ایمیل خود را برای تایید بررسی کنید"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr "لطفا برای مشاهده این درس در این دوره ثبت نام کنید"
 
@@ -4072,7 +4049,7 @@ msgstr "لطفا برای مشاهده این درس در این دوره ثبت
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr "لطفا یک عنوان وارد کنید."
 
@@ -4081,7 +4058,7 @@ msgstr "لطفا یک عنوان وارد کنید."
 msgid "Please enter a valid URL."
 msgstr "لطفاً یک URL معتبر وارد کنید."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "لطفا تاریخ را انتخاب کنید"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr "لطفا زمانی را انتخاب کنید."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr "لطفاً یک منطقه زمانی انتخاب کنید."
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr "لطفا فایل تکلیف را آپلود کنید."
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr "پاسخ ممکن ۴"
 msgid "Post"
 msgstr "پست"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "کد پستی"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr "پیش نمایش تصویر"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "قبلی"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "قیمت گذاری"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "منتشر شده"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "منتشر شده در"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr "سوال {0} از {1}"
 msgid "Questions"
 msgstr "سوالات"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "آزمون برای کاربران مهمان در دسترس نیست. لطفا برای ادامه وارد شوید."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "تکلیف زیر درس نشان داده می‌شود."
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr "نوع سند مرجع"
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr "رد شده"
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "حدف"
 
@@ -4633,6 +4611,10 @@ msgstr "نقش"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "نقش ها"
@@ -4642,19 +4624,19 @@ msgstr "نقش ها"
 msgid "Route"
 msgstr "مسیر"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr "شنبه"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "ذخیره"
 
@@ -4730,7 +4711,7 @@ msgstr "محدوده"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "جستجو کردن"
 
@@ -4750,11 +4731,11 @@ msgstr "جستجو کردن"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr "جستجو بر اساس عنوان"
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "تعداد صندلی ها"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr "راه‌اندازی درگاه پرداخت"
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "تنظیمات"
@@ -4833,17 +4817,17 @@ msgstr "تنظیمات"
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr "شرح کوتاه"
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr "نام مهارت"
 msgid "Skills"
 msgstr "مهارت ها"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "پرش کنید"
 
@@ -4953,6 +4937,14 @@ msgstr "پرش کنید"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "نامک"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr "شروع"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "تاریخ شروع"
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "زمان شروع"
 
@@ -5062,7 +5052,7 @@ msgstr "حالت"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr "دانش‌آموزان"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr "زیر گروه"
 msgid "Subject"
 msgstr "موضوع"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr "ارسال توسط"
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr "ارسال توسط"
 msgid "Submit"
 msgstr "ارسال"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "موفقیت"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "مدیر سیستم"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "تگ‌ها"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr "وضعیت درخواست شما تغییر کرده است."
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr "هیچ دانش‌آموزی در این گروه وجود ندارد."
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "هیچ {0} در این سایت وجود ندارد."
@@ -5443,7 +5401,7 @@ msgstr "این کلاس به پایان رسید"
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr "الگوی جدول زمانی"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "منطقه زمانی"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "عنوان"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr "عنوان الزامی است"
 
@@ -5602,7 +5559,7 @@ msgstr "به"
 msgid "To Date"
 msgstr "تا تاریخ"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr "توییتر"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "توییتر"
 msgid "Type"
 msgstr "نوع"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr "پاسخ خود را تایپ کنید"
 
@@ -5689,6 +5646,10 @@ msgstr "URL"
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr "تحت بررسی"
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr "منتشر نشده"
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "به روز رسانی"
 msgid "Update Password"
 msgstr "به‌روزرسانی گذرواژه"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "آپلود"
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr "دید"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr "ما متوجه شدیم که شما شروع به ثبت نام کرد
 msgid "Web Page"
 msgstr "صفحه وب"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "چهارشنبه"
 msgid "Welcome to {0}!"
 msgstr "به {0} خوش آمدید!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr "شما ثبت نام نکرده‌اید"
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr "شما در این دوره ثبت نام نکرده‌اید. لطفا برای دسترسی به این دوره ثبت نام کنید."
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "فعالیت ها"
 msgid "activity"
 msgstr "فعالیت"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr "متقاضی"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr "متقاضیان"
 
@@ -6242,7 +6203,7 @@ msgstr "از"
 msgid "out of"
 msgstr "از"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr "هفته ها"
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/fr.po b/lms/locale/fr.po
index 638d38da..cd7d1a95 100644
--- a/lms/locale/fr.po
+++ b/lms/locale/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr " Veuillez l'évaluer et le noter."
 msgid "% completed"
 msgstr "% complété"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr "Progrès"
 msgid "Active"
 msgstr "actif"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Ajouter"
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr "Ajouter un cours"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Ajoutez au moins une réponse possible à cette question : {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Administrateur"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Tout"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Tous les cours"
 
@@ -293,7 +277,7 @@ msgstr "Autoriser l'auto-inscription"
 msgid "Allow accessing future dates"
 msgstr "Autoriser l'accès aux dates futures"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "Autoriser l'auto-inscription"
 
@@ -304,11 +288,10 @@ msgstr "Déjà Inscrit"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr ""
 
@@ -316,11 +299,10 @@ msgstr ""
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Montant (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,32 +323,36 @@ msgstr "Montant avec taxe"
 msgid "Announcement"
 msgstr "Information"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Réponse"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "Applications reçues"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "Approuvé"
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "Archivé"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "Évaluation"
@@ -430,11 +416,11 @@ msgstr "Nom de l'évaluation"
 msgid "Assessment Type"
 msgstr "Type d'évaluation"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "L'évaluation {0} a déjà été ajoutée à ce lot."
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr "Titre du devoir"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Le devoir pour la leçon {0} de {1} existe déjà."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Le devoir apparaîtra au bas de la leçon."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Affectations"
 
@@ -525,6 +515,10 @@ msgstr "Affectation automatique"
 msgid "Auto Recording"
 msgstr "Enregistrement automatique"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "Modèle de confirmation de lot"
 msgid "Batch Course"
 msgstr "Cours par lots"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "Lot créé"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Description du Lot"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Détails du lot"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "Détails du lot brut"
 
@@ -646,10 +634,6 @@ msgstr "Date de début du lot :"
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr "Lot mis à jour"
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Lot:"
@@ -677,7 +665,7 @@ msgstr "Lots"
 msgid "Begin Date"
 msgstr "Date de début"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "Cordialement"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Détails de la Facturation"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Annuler"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Catégorie"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Nom de la Catégorie"
 
@@ -801,7 +787,7 @@ msgstr "Lien de certificat"
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr "Certificats"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "Nom de la certification"
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr "Participants certifiés"
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr "Chapitre"
 msgid "Chapter Reference"
 msgstr "Référence de chapitre"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr "Vérifier"
 msgid "Check Discussion"
 msgstr "Vérifiez la discussion"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "Consultez le {0} pour en savoir plus sur la certification."
@@ -916,21 +911,25 @@ msgstr "Cours de vérification"
 msgid "Choices"
 msgstr "Choix"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Choisissez toutes les réponses qui s'appliquent"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "Choisir une icône"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Choisissez une réponse"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "ID Client"
 msgid "Client Secret"
 msgstr "Secret Client"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Fermer"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Site Web de l'entreprise"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "Terminé"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Confirmer"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Contrat"
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr "Correct"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "Chapitre du cours"
 msgid "Course Completed"
 msgstr "Cours terminé"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "Créateur de cours"
 msgid "Course Data"
 msgstr "Données du cours"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "Description du cours"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "Évaluateur de cours"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "Image du cours"
 
@@ -1364,7 +1381,7 @@ msgstr "Liste de cours"
 msgid "Course Name"
 msgstr "Nom du cours"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr "Statistiques du cours"
 msgid "Course Title"
 msgstr "Titre du cours"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "Cours déjà ajouté au lot."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Le cours {0} a déjà été ajouté à ce lot."
@@ -1421,13 +1442,13 @@ msgstr "Le cours {0} a déjà été ajouté à ce lot."
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Créer"
 
@@ -1456,6 +1477,11 @@ msgstr "Créer"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Créer Nouveau(elle)"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "Créer un cours"
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Créé"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Devise"
 
@@ -1573,7 +1594,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "Date et heure"
@@ -1614,9 +1635,9 @@ msgstr "Devise par Défaut"
 msgid "Degree Type"
 msgstr "Type de diplôme"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1624,27 +1645,27 @@ msgstr "Supprimer"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1687,7 +1707,7 @@ msgstr "Bureau"
 msgid "Details"
 msgstr "Détails"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "Désactiver l'auto-inscription"
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr "modifier"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1822,7 +1842,7 @@ msgstr "Identifiant Email"
 msgid "Email Sent"
 msgstr "Email Envoyé"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "Modèle d&#39;email"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Date de Fin"
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Heure de Fin"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Erreur"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "Évaluation"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Événement"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr "Date d'expiration"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "Explication"
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "En vedette"
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "Type de fichier"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Prénom"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Nom Complet"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr "Image"
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "Titre de l'Emploi"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "Emplois"
@@ -2742,7 +2740,7 @@ msgstr "Emplois"
 msgid "Join"
 msgstr "Joindre"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Liens"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Charger plus"
 
@@ -3119,7 +3133,6 @@ msgstr "Locale"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Moyen"
 
@@ -3236,7 +3248,7 @@ msgstr "Moyen"
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Moyen:"
@@ -3259,7 +3271,7 @@ msgstr "Moyen:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr ""
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Nouveau"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr ""
 msgid "Notify me when available"
 msgstr "M'avertir si disponible"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3814,15 +3797,15 @@ msgstr ""
 msgid "Option 4"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Options"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr "Mot de Passe"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "En Attente"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Pourcentage"
@@ -4023,7 +4004,7 @@ msgstr "Pourcentage"
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr "Veuillez vérifier votre email pour validation"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Veuillez bien vous préparer et être à temps pour les évaluations."
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "Veuillez sélectionner une date."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr "Poster"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "code postal"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Précedent"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Tarification"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Publié"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Publié le"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr "Type du document de référence"
 msgid "Regards"
 msgstr "Cordialement"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr "Rejeté"
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -4633,6 +4611,10 @@ msgstr "Rôle"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Rôles"
@@ -4642,19 +4624,19 @@ msgstr "Rôles"
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr "Samedi"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -4730,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Rechercher"
 
@@ -4750,11 +4731,11 @@ msgstr "Rechercher"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Paramètres"
@@ -4833,17 +4817,17 @@ msgstr "Paramètres"
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr "Nom de la compétence"
 msgid "Skills"
 msgstr "Compétences"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Sauter"
 
@@ -4953,6 +4937,14 @@ msgstr "Sauter"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr "Démarrer"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Date de Début"
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Heure de Début"
 
@@ -5062,7 +5052,7 @@ msgstr "Etat"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr "Sujet"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr "Valider"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Succès"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "Responsable Système"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Balises"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Titre"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr "À"
 msgid "To Date"
 msgstr "Jusqu'au"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr "En cours de révision"
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "Mettre à Jour"
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Charger"
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Page Web"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Mercredi"
 msgid "Welcome to {0}!"
 msgstr "Bienvenue sur {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Vous avez choisi d'être notifié pour ce cours. Vous recevrez un courriel lorsque le cours sera disponible."
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "activités"
 msgid "activity"
 msgstr "historique"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr ""
 msgid "out of"
 msgstr "sur"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/hr.po b/lms/locale/hr.po
index 20fce7fd..27def893 100644
--- a/lms/locale/hr.po
+++ b/lms/locale/hr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr "Procjeni i Ocjeni"
 msgid "% completed"
 msgstr "% dovršeno"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr "<span style=\"font-size: 18px;\"><b>Statistika</b></span>"
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr "Tečaj ne može imati i plaćenu potvrdu i potvrdu o završetku."
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "Uvod u tečaj u jednom redu koji se pojavljuje na kartici tečaja"
 
@@ -123,13 +107,17 @@ msgstr "Dostignuća"
 msgid "Active"
 msgstr "Aktivan"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Dodaj"
@@ -168,7 +156,7 @@ msgstr "Dodaj Poglavlje"
 msgid "Add a course"
 msgstr "Dodaj Tečaj"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr "Dodaj ključnu riječ, a zatim pritisnite enter"
 
@@ -176,7 +164,7 @@ msgstr "Dodaj ključnu riječ, a zatim pritisnite enter"
 msgid "Add a lesson"
 msgstr "Dodaj Lekciju"
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr "Dodaj novo pitanje"
@@ -193,10 +181,6 @@ msgstr "Dodaj Procjenu"
 msgid "Add an assignment to your lesson"
 msgstr "Dodaj zadatak svojoj lekciji"
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr "Dodaj postojeće pitanje"
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Dodaj barem jedan mogući odgovor na ovo pitanje: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Administrator"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Sve"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr "Sve Grupe"
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Svi Tečajevi"
 
@@ -293,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -304,11 +288,10 @@ msgstr ""
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Iznos"
 
@@ -316,11 +299,10 @@ msgstr "Iznos"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Iznos (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr "Objava"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Odgovor"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr "Podnošenje Zadataka"
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Dodjele"
 
@@ -525,6 +515,10 @@ msgstr "Automatski Dodjeli"
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr ""
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Detalji Grupe"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "Detalji Grupe"
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr "Grupa je rasprodana."
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr ""
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr "Ležerna Odjeća"
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategorija"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Naziv Kategorije"
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr "Certificirani Sudionici"
 msgid "Change"
 msgstr "Promjeni"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr "Poglavlje"
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr ""
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Zatvori"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Potvrdi"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr ""
 
@@ -1456,6 +1477,11 @@ msgstr ""
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr ""
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr ""
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr ""
 
@@ -1573,7 +1594,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1614,9 +1635,9 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr ""
 
@@ -1624,27 +1645,27 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1822,7 +1842,7 @@ msgstr ""
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr ""
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr ""
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr ""
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr ""
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr ""
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr ""
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr ""
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2742,7 +2740,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr ""
 
@@ -3119,7 +3133,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr ""
 
@@ -3236,7 +3248,7 @@ msgstr ""
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
@@ -3259,7 +3271,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr ""
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr "Nema pronađenih poslova"
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr ""
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3814,15 +3797,15 @@ msgstr ""
 msgid "Option 4"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr ""
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -4023,7 +4004,7 @@ msgstr ""
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr "Programi"
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr ""
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr ""
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr ""
 
@@ -4633,6 +4611,10 @@ msgstr ""
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr ""
@@ -4642,19 +4624,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr ""
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -4730,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr ""
 
@@ -4750,11 +4731,11 @@ msgstr ""
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr ""
@@ -4833,17 +4817,17 @@ msgstr ""
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr ""
 
@@ -4953,6 +4937,14 @@ msgstr ""
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr ""
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr ""
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr ""
 
@@ -5062,7 +5052,7 @@ msgstr ""
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr ""
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr ""
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr ""
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr ""
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr "Posjeti Web Stranicu"
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr ""
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr "Što najbolje opisuje vašu ulogu?"
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr ""
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/hu.po b/lms/locale/hu.po
index 4ae87780..492ee801 100644
--- a/lms/locale/hu.po
+++ b/lms/locale/hu.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr ""
 msgid "% completed"
 msgstr "% befejezve"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr ""
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -293,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -304,11 +288,10 @@ msgstr "Már regisztrált"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr ""
 
@@ -316,11 +299,10 @@ msgstr ""
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "Archivált"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Feladatok"
 
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr ""
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr ""
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Köteg:"
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategória"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr ""
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr ""
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Cég honlapja"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Megerősítés"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr ""
 
@@ -1456,6 +1477,11 @@ msgstr ""
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Új létrehozása"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Alkotó"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr ""
 
@@ -1573,7 +1594,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1614,9 +1635,9 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr ""
 
@@ -1624,27 +1645,27 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr "Részletek"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "E-mail"
 
@@ -1822,7 +1842,7 @@ msgstr "Email azonosító"
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "E-mail sablon"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr ""
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Befejezés dátuma"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Esemény"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr ""
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Nem sikerül"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Kiemelt"
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "Fájl típusa"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Vezetéknév"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Szabadúszó"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Teljes név"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Teljes munkaidőben"
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "Beosztás"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2742,7 +2740,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Összekapcsolások"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Töltsön be többet"
 
@@ -3119,7 +3133,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr ""
 
@@ -3236,7 +3248,7 @@ msgstr ""
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Közepes:"
@@ -3259,7 +3271,7 @@ msgstr "Közepes:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr "Meta Leírás"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Meta kép"
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr "Értesítések"
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3814,15 +3797,15 @@ msgstr "3. lehetőség"
 msgid "Option 4"
 msgstr "4. lehetőség"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Választhatók"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Részmunkaidő"
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr "Jelszó"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -4023,7 +4004,7 @@ msgstr ""
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr "Kérjük, ellenőrizze e-mail a vizsgálathoz"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr "Hozzászólás"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Előző"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Közzétett"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr ""
 msgid "Regards"
 msgstr "Üdvözlettel"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr "Elutasítva"
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "eltávolítás"
 
@@ -4633,6 +4611,10 @@ msgstr "Beosztás"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Beosztások"
@@ -4642,19 +4624,19 @@ msgstr "Beosztások"
 msgid "Route"
 msgstr "Útvonal"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr "Szombat"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -4730,7 +4711,7 @@ msgstr "terület"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr ""
 
@@ -4750,11 +4731,11 @@ msgstr ""
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr ""
@@ -4833,17 +4817,17 @@ msgstr ""
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Ugrás"
 
@@ -4953,6 +4937,14 @@ msgstr "Ugrás"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr ""
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr ""
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Kezdés ideje"
 
@@ -5062,7 +5052,7 @@ msgstr ""
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr ""
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr ""
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Címkék"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Feltöltés"
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Weboldal"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Szerda"
 msgid "Welcome to {0}!"
 msgstr "Üdvözöljük itt {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "tevékenységek"
 msgid "activity"
 msgstr "tevékenység"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "nak,-nek"
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/main.pot b/lms/locale/main.pot
index 05b199ad..4f96db6d 100644
--- a/lms/locale/main.pot
+++ b/lms/locale/main.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe LMS VERSION\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-02 16:04+0000\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-16 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -25,22 +25,6 @@ msgstr ""
 msgid "% completed"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -85,7 +69,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -121,13 +105,17 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr ""
@@ -166,7 +154,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -174,7 +162,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -191,10 +179,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -247,15 +231,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -291,7 +275,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -302,11 +286,10 @@ msgstr ""
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr ""
 
@@ -314,11 +297,10 @@ msgstr ""
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -339,31 +321,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -397,11 +383,11 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -412,7 +398,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -428,11 +414,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -477,7 +463,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -485,7 +471,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -495,7 +485,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr ""
 
@@ -523,6 +513,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -577,10 +571,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -588,16 +578,14 @@ msgid "Batch Description"
 msgstr ""
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr ""
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -644,10 +632,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -660,6 +644,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr ""
@@ -675,7 +663,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -684,7 +672,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -733,11 +721,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -764,18 +752,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr ""
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr ""
 
@@ -799,7 +785,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -807,7 +793,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -820,11 +806,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -846,8 +832,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -860,7 +847,7 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -878,11 +865,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -899,6 +890,10 @@ msgstr ""
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -914,21 +909,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -961,6 +960,12 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1107,7 +1112,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1135,12 +1140,12 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1162,6 +1167,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
@@ -1199,7 +1208,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1226,15 +1235,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1314,6 +1323,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1331,16 +1344,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1362,7 +1379,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1394,23 +1411,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1419,13 +1440,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1446,7 +1467,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr ""
 
@@ -1454,6 +1475,11 @@ msgstr ""
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr ""
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1474,11 +1500,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1494,7 +1516,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr ""
 
@@ -1509,11 +1531,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr ""
 
@@ -1571,7 +1592,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1612,9 +1633,9 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr ""
 
@@ -1622,27 +1643,27 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1659,7 +1680,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1671,7 +1692,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1685,7 +1705,7 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1766,7 +1786,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1774,7 +1794,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1806,8 +1826,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1820,7 +1840,7 @@ msgstr ""
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr ""
 
@@ -1868,9 +1888,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr ""
 
@@ -1886,7 +1905,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1895,15 +1914,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1913,10 +1931,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1926,7 +1940,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1953,31 +1967,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1988,9 +1984,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -1999,11 +1994,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2014,9 +2009,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2044,14 +2039,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2059,7 +2054,7 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2107,7 +2102,7 @@ msgstr ""
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2126,7 +2121,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2134,7 +2129,7 @@ msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr ""
@@ -2164,7 +2159,7 @@ msgstr ""
 msgid "File Type"
 msgstr ""
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr ""
@@ -2189,7 +2184,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2233,7 +2228,7 @@ msgid "Full Name"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2353,6 +2348,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2411,7 +2410,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2442,7 +2441,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2452,7 +2451,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2482,7 +2480,7 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2490,7 +2488,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2571,7 +2569,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2680,7 +2678,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2730,7 +2728,7 @@ msgstr ""
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2740,7 +2738,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3036,6 +3034,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3086,7 +3100,7 @@ msgid "Links"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3101,12 +3115,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr ""
 
@@ -3117,7 +3131,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3160,7 +3173,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3193,10 +3206,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3208,7 +3221,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3223,9 +3236,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr ""
 
@@ -3234,7 +3246,7 @@ msgstr ""
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
@@ -3257,7 +3269,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3340,7 +3352,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3406,9 +3418,9 @@ msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr ""
 
@@ -3442,6 +3454,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3488,17 +3501,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3510,7 +3526,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3526,7 +3542,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3581,26 +3597,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3609,10 +3609,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3629,36 +3625,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3715,7 +3698,7 @@ msgstr ""
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3755,11 +3738,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3787,7 +3770,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3812,15 +3795,15 @@ msgstr ""
 msgid "Option 4"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr ""
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3859,14 +3842,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3876,7 +3858,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3886,7 +3868,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3900,7 +3882,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3919,13 +3901,12 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4001,7 +3982,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4011,7 +3992,7 @@ msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -4021,7 +4002,7 @@ msgstr ""
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4034,10 +4015,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4054,15 +4031,15 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4070,7 +4047,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4079,7 +4056,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4091,7 +4068,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4120,35 +4097,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4161,7 +4142,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4190,18 +4175,10 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4237,7 +4214,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4246,13 +4223,13 @@ msgid "Previous"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4316,14 +4293,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4349,20 +4327,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -4380,9 +4358,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4407,11 +4385,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4428,7 +4406,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4451,8 +4429,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4465,7 +4443,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4473,7 +4451,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4483,7 +4461,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4533,7 +4511,7 @@ msgstr ""
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4562,7 +4540,7 @@ msgstr ""
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr ""
 
@@ -4631,6 +4609,10 @@ msgstr ""
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr ""
@@ -4640,19 +4622,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4695,14 +4677,13 @@ msgstr ""
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -4728,7 +4709,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4740,7 +4721,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr ""
 
@@ -4748,11 +4729,11 @@ msgstr ""
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4761,23 +4742,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4822,7 +4806,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr ""
@@ -4831,17 +4815,17 @@ msgstr ""
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4943,7 +4927,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr ""
 
@@ -4951,6 +4935,14 @@ msgstr ""
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4961,7 +4953,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5001,11 +4993,10 @@ msgstr ""
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr ""
 
@@ -5026,7 +5017,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5035,7 +5026,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr ""
 
@@ -5060,7 +5050,7 @@ msgstr ""
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5123,7 +5113,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5145,6 +5135,10 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5153,7 +5147,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5166,7 +5160,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5174,7 +5168,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5187,30 +5181,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr ""
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5281,7 +5251,7 @@ msgid "System Manager"
 msgstr ""
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr ""
@@ -5346,7 +5316,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5374,27 +5344,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5406,6 +5360,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5441,7 +5399,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5527,14 +5485,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5557,12 +5515,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5581,11 +5539,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5600,7 +5557,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5653,9 +5610,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5665,7 +5622,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5687,6 +5644,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5701,7 +5662,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5723,8 +5684,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5749,7 +5710,7 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr ""
 
@@ -5851,7 +5812,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5859,7 +5820,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5891,6 +5852,10 @@ msgstr ""
 msgid "Web Page"
 msgstr ""
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5903,10 +5868,18 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5980,10 +5953,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6062,11 +6031,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6078,19 +6047,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6122,7 +6083,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6176,11 +6137,11 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6240,7 +6201,7 @@ msgstr ""
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6260,10 +6221,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/pl.po b/lms/locale/pl.po
index 57e06756..c1ba072d 100644
--- a/lms/locale/pl.po
+++ b/lms/locale/pl.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr ""
 msgid "% completed"
 msgstr "%  zakończono"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr ""
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -293,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -304,11 +288,10 @@ msgstr "Już zarejestrowano"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr ""
 
@@ -316,11 +299,10 @@ msgstr ""
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "W archiwum"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr "Czy na pewno chcesz zalogować się do panelu Frappe Cloud?"
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Przydziały"
 
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Opis partii"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Szczegóły partii"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Grupa:"
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategoria"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Nazwa kategorii"
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr "Czek"
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "ID klienta"
 msgid "Client Secret"
 msgstr "Tajny klucz klienta"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Potwierdź"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr ""
 
@@ -1456,6 +1477,11 @@ msgstr ""
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Utwórz nowy"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "utworzył(a)"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr ""
 
@@ -1573,7 +1594,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1614,9 +1635,9 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr ""
 
@@ -1624,27 +1645,27 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr "Szczegóły"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1822,7 +1842,7 @@ msgstr "ID e-mail"
 msgid "Email Sent"
 msgstr "E-mail wysłany"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "Szablon e-mail"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr ""
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Godzina zakończenia"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr "Data ważności"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Nie powiodło się."
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Opisany"
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "Typ pliku"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Imię"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Pełne imię i nazwisko"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr "Obraz"
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "Tytuł zadania"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2742,7 +2740,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Linki"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Załaduj więcej"
 
@@ -3119,7 +3133,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr ""
 
@@ -3236,7 +3248,7 @@ msgstr ""
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Średni:"
@@ -3259,7 +3271,7 @@ msgstr "Średni:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr "Opis meta"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Obraz meta"
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr "Powiadomienia"
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "Opcja"
@@ -3814,15 +3797,15 @@ msgstr "Opcja 3"
 msgid "Option 4"
 msgstr "Opcja 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Opcje"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr "Hasło"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Procent"
@@ -4023,7 +4004,7 @@ msgstr "Procent"
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr "Proszę sprawdzić pocztę do weryfikacji"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "Proszę wybrać datę."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr "Stanowisko"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Wstecz"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Opublikowany"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Opublikowany"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr ""
 msgid "Regards"
 msgstr "Pozdrowienia"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr "Odrzucono"
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Usunąć"
 
@@ -4633,6 +4611,10 @@ msgstr "Rola"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Role"
@@ -4642,19 +4624,19 @@ msgstr "Role"
 msgid "Route"
 msgstr "Trasa"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr "Sobota"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -4730,7 +4711,7 @@ msgstr "Zakres"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr ""
 
@@ -4750,11 +4731,11 @@ msgstr ""
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr ""
@@ -4833,17 +4817,17 @@ msgstr ""
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Pominąć"
 
@@ -4953,6 +4937,14 @@ msgstr "Pominąć"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr ""
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr ""
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Czas rozpoczęcia"
 
@@ -5062,7 +5052,7 @@ msgstr ""
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr ""
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr ""
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Tagi"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Prześlij"
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Strona"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Środa"
 msgid "Welcome to {0}!"
 msgstr "Zapraszamy do {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "aktywności"
 msgid "activity"
 msgstr "aktywność"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "z"
 msgid "out of"
 msgstr "spośród"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/pt.po b/lms/locale/pt.po
index e7487b79..e69d8a6f 100644
--- a/lms/locale/pt.po
+++ b/lms/locale/pt.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr ""
 msgid "% completed"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr ""
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -293,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -304,11 +288,10 @@ msgstr ""
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr ""
 
@@ -316,11 +299,10 @@ msgstr ""
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr ""
 
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr ""
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr ""
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr ""
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr ""
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr ""
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr ""
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr ""
 
@@ -1456,6 +1477,11 @@ msgstr ""
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr ""
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr ""
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr ""
 
@@ -1573,7 +1594,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1614,9 +1635,9 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr ""
 
@@ -1624,27 +1645,27 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1822,7 +1842,7 @@ msgstr ""
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr ""
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr ""
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr ""
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr ""
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr ""
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr ""
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr ""
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2742,7 +2740,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr ""
 
@@ -3119,7 +3133,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr ""
 
@@ -3236,7 +3248,7 @@ msgstr ""
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
@@ -3259,7 +3271,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr ""
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr ""
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3814,15 +3797,15 @@ msgstr ""
 msgid "Option 4"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr ""
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -4023,7 +4004,7 @@ msgstr ""
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr ""
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr ""
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr ""
 
@@ -4633,6 +4611,10 @@ msgstr ""
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr ""
@@ -4642,19 +4624,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr ""
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -4730,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr ""
 
@@ -4750,11 +4731,11 @@ msgstr ""
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr ""
@@ -4833,17 +4817,17 @@ msgstr ""
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr ""
 
@@ -4953,6 +4937,14 @@ msgstr ""
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr ""
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr ""
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr ""
 
@@ -5062,7 +5052,7 @@ msgstr ""
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr ""
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr ""
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr ""
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr ""
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr ""
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr ""
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/pt_BR.po b/lms/locale/pt_BR.po
index 1d0b99dc..b430452e 100644
--- a/lms/locale/pt_BR.po
+++ b/lms/locale/pt_BR.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr ""
 msgid "% completed"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr ""
 msgid "Active"
 msgstr "Ativo"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Adicionar"
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Todos"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -293,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -304,11 +288,10 @@ msgstr ""
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Montante"
 
@@ -316,11 +299,10 @@ msgstr "Montante"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr ""
 
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr ""
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr ""
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr ""
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr ""
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Nome da Categoria"
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr "Verifica"
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "ID do Cliente"
 msgid "Client Secret"
 msgstr "Segredo do cliente"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Fechar"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "Concluído"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Contrato"
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Criar"
 
@@ -1456,6 +1477,11 @@ msgstr "Criar"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr ""
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr ""
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Moeda"
 
@@ -1573,7 +1594,7 @@ msgstr "Data"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1614,9 +1635,9 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Excluir"
 
@@ -1624,27 +1645,27 @@ msgstr "Excluir"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Descrição"
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Editar"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1822,7 +1842,7 @@ msgstr ""
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr ""
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Data Final"
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Erro"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr ""
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr ""
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr ""
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr ""
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr "Imagem"
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr ""
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2742,7 +2740,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr ""
 
@@ -3119,7 +3133,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Médio"
 
@@ -3236,7 +3248,7 @@ msgstr "Médio"
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
@@ -3259,7 +3271,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr ""
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Novo"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr ""
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3814,15 +3797,15 @@ msgstr ""
 msgid "Option 4"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Opções"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "Pendente"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Percentagem"
@@ -4023,7 +4004,7 @@ msgstr "Percentagem"
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Número de telefone"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Precificação"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Publicado no"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr ""
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr ""
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr ""
 
@@ -4633,6 +4611,10 @@ msgstr ""
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr ""
@@ -4642,19 +4624,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr ""
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Salvar"
 
@@ -4730,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Pesquisar"
 
@@ -4750,11 +4731,11 @@ msgstr "Pesquisar"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Configurações"
@@ -4833,17 +4817,17 @@ msgstr "Configurações"
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr ""
 
@@ -4953,6 +4937,14 @@ msgstr ""
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr "Iniciar"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Data de Início"
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr ""
 
@@ -5062,7 +5052,7 @@ msgstr "Estado"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr "Assunto"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr "Enviar"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Sucesso"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "Administrador do Sistema"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr ""
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Título"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr "Para"
 msgid "To Date"
 msgstr "Até a Data"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr "Tipo"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "Atualizar"
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr ""
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr ""
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr ""
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/ru.po b/lms/locale/ru.po
index 3b7a9f03..7fc5a5ee 100644
--- a/lms/locale/ru.po
+++ b/lms/locale/ru.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr " Пожалуйста, оцените и поставьте оценку
 msgid "% completed"
 msgstr "% завершено"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr "Достижения"
 msgid "Active"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr ""
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr "Добавить курс"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Добавьте хотя бы один возможный ответ на этот вопрос: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Админ"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Все курсы"
 
@@ -293,7 +277,7 @@ msgstr "Разрешить самостоятельную регистрацию
 msgid "Allow accessing future dates"
 msgstr "Разрешить доступ к будущим датам"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "Разрешить самостоятельную регистрацию"
 
@@ -304,11 +288,10 @@ msgstr "Уже зарегистрирован"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr ""
 
@@ -316,11 +299,10 @@ msgstr ""
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Сумма"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr "Сумма с НДС"
 msgid "Announcement"
 msgstr "Объявление"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Отвечать"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr "Утвержден"
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "Оценка"
@@ -430,11 +416,11 @@ msgstr "Название оценки"
 msgid "Assessment Type"
 msgstr "Тип оценки"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Оценка {0} уже добавлена в этот пакет."
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr "Название задания"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Задание для урока {0} от {1} уже существует."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Задание появится в конце урока."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr ""
 
@@ -525,6 +515,10 @@ msgstr "Автоназначение"
 msgid "Auto Recording"
 msgstr "Авто. запись"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "Шаблон подтверждения группы"
 msgid "Batch Course"
 msgstr "Группа курса"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "Группа создана"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Описание группы"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Подробности группы"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "Подробности группы Необработанные"
 
@@ -646,10 +634,6 @@ msgstr "Дата начала группы:"
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr "Группа обновлена"
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Партия:"
@@ -677,7 +665,7 @@ msgstr "Группы"
 msgid "Begin Date"
 msgstr "Дата начала"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "С наилучшими пожеланиями"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Платёжные реквизиты"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Отмена"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Категория"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr ""
 
@@ -801,7 +787,7 @@ msgstr "Ссылка на сертификат"
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "Название сертификации"
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr "Сертифицированные участники"
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr "Глава"
 msgid "Chapter Reference"
 msgstr "Ссылка на главу"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr "Проверка"
 msgid "Check Discussion"
 msgstr "Проверить дискуссию"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "Посмотрите {0} чтобы узнать больше о сертификации."
@@ -916,21 +911,25 @@ msgstr "Оформить заказ на Курсы"
 msgid "Choices"
 msgstr "Варианты ответов"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Выберите все подходящие ответы"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "Выберите иконку"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Выберите один ответ"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "ID клиента"
 msgid "Client Secret"
 msgstr "Секретный ключ клиента"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Вебсайт Компании"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Подтвердить"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr "Правильный"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "Глава курса"
 msgid "Course Completed"
 msgstr "Курс завершен"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "Создание курса"
 msgid "Course Data"
 msgstr "Данные курса"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "Описание курса"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "Оценщик курса"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "Изображение курса"
 
@@ -1364,7 +1381,7 @@ msgstr "Список курсов"
 msgid "Course Name"
 msgstr "Название курса"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr "Статистика курса"
 msgid "Course Title"
 msgstr "Заголовок курса"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "Курс уже добавлен в группу."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Курс {0} уже добавлен в группу."
@@ -1421,13 +1442,13 @@ msgstr "Курс {0} уже добавлен в группу."
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr ""
 
@@ -1456,6 +1477,11 @@ msgstr ""
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr ""
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "Создать курс"
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr ""
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr ""
 
@@ -1573,7 +1594,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "Дата и время"
@@ -1614,9 +1635,9 @@ msgstr "Валюта по умолчания"
 msgid "Degree Type"
 msgstr "Тип степени"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr ""
 
@@ -1624,27 +1645,27 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr "Детали"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "Отключить самостоятельную регистрацию"
 
@@ -1768,7 +1788,7 @@ msgstr "E-Mail"
 msgid "E-mail"
 msgstr "E-mail"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "E-mail"
 msgid "Edit"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr "Детали обучения"
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1822,7 +1842,7 @@ msgstr ""
 msgid "Email Sent"
 msgstr "Email отправлен"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "Шаблон электронного письма"
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr ""
 
@@ -1888,7 +1907,7 @@ msgstr "Дата окончания (или ожидаемая)"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "Дата окончания (или ожидаемая)"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Время окончания"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr "Зачисленные студенты"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "Зачислен успешно"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Количество регистраций"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "Введите правильный ответ"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "Оценка"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr "Подробности оценки"
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr "Дата окончания оценки"
 
@@ -2001,11 +1996,11 @@ msgstr "Дата окончания оценки"
 msgid "Evaluation Request"
 msgstr "Запрос на оценку"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "Дата окончания оценки не может быть меньше даты окончания группы."
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr "График оценки"
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Событие"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr "Истекает"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "Объяснение"
@@ -2128,7 +2123,7 @@ msgstr "Узнать больше"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Ошибка"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Популярные"
@@ -2166,7 +2161,7 @@ msgstr "Область специальности/исследования"
 msgid "File Type"
 msgstr "Тип файла"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Имя"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Фриланс"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Полное имя"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Полная занятость"
@@ -2355,6 +2350,10 @@ msgstr "Помогите другим узнать что-то новое, со
 msgid "Help us improve our course material."
 msgstr "Помогите нам улучшить наш учебный материал."
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr "Я недоступен"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "Если у вас возникнут какие-либо вопросы
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr "Если вы укажете здесь сумму, то настройка эквивалента в долларах США применена не будет."
 
@@ -2484,7 +2482,7 @@ msgstr "Изображение"
 msgid "Image search powered by"
 msgstr "Поиск изображений с помощью"
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "Заметки инструктора"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "Дата выпуска:"
 msgid "Items in Sidebar"
 msgstr "Элементы боковой панели"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "Должность"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "Вакансии"
@@ -2742,7 +2740,7 @@ msgstr "Вакансии"
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr "Ссылка на урок"
 msgid "Lesson Title"
 msgstr "Название урока"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Ссылки"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Live"
 
@@ -3103,12 +3117,12 @@ msgstr "Онлайн-урок"
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr ""
 
@@ -3119,7 +3133,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "Разместить объявление"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr "Отметить как прочитанное"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr ""
 
@@ -3236,7 +3248,7 @@ msgstr ""
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Средний:"
@@ -3259,7 +3271,7 @@ msgstr "Средний:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "Тип участника"
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Мета изображение"
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "Мой календарь"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "Новая группа"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "Новый курс"
 
@@ -3512,7 +3528,7 @@ msgstr "Новая Вакансия"
 msgid "New Job Applicant"
 msgstr "Новый соискатель работы"
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr "Нет предстоящих оценок"
 msgid "No announcements"
 msgstr "Нет объявлений"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "Нет сертификатов"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr "Курсы не созданы"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr "Без введения"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Не запланированы онлайн-курсы"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "На эту дату свободных мест нет."
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Нет {0}"
 
@@ -3717,7 +3700,7 @@ msgstr "Уведомления"
 msgid "Notify me when available"
 msgstr "Сообщите мне, когда появится"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Принимаются только файлы типа {0} ."
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "Вариант"
@@ -3814,15 +3797,15 @@ msgstr "Вариант 3"
 msgid "Option 4"
 msgstr "Вариант 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Параметры"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "ID Заказа"
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "Страницы"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr "Платная группа"
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Платный курс"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Неполная занятость"
@@ -3902,7 +3884,7 @@ msgstr "Частично завершено"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "Процент сдачи экзамена"
 msgid "Password"
 msgstr "Пароль"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Проценты"
@@ -4023,7 +4004,7 @@ msgstr "Проценты"
 msgid "Percentage (e.g. 70%)"
 msgstr "Процент (например, 70%)"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr "Пожалуйста, добавьте <a href='{0}'>{1}</a> для <a href='{2}'>{3}</a> , чтобы отправить приглашения в календарь для оценки."
@@ -4056,15 +4033,15 @@ msgstr "Пожалуйста, проверьте свой email для подт
 msgid "Please click on the following button to set your new password"
 msgstr "Нажмите на следующую кнопку, чтобы установить новый пароль."
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Чтобы использовать эту функцию, включите настройки Zoom."
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr "Введите действительный URL-адрес."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr "Введите URL для отправки задания."
 msgid "Please enter your answer"
 msgstr "Пожалуйста, введите ваш ответ"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr "Пожалуйста, войдите в систему, чтобы пр
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Пожалуйста, хорошо подготовьтесь и приходите на оценку вовремя."
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "Пожалуйста, выберите дату."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr "Пожалуйста, примите соответствующие меры в {0}"
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr "Пожалуйста, загрузите файл задания."
 msgid "Point of Score (e.g. 70)"
 msgstr "Балл (например, 70)"
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr "Возможный ответ 4"
 msgid "Post"
 msgstr "Пост"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr "Просмотр изображения"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "Предварительный просмотр видео"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Предыдущие"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "Опубликовать на странице участника"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Опубликовано"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "Опубликованные курсы"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Опубликована"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr "Название вопроса"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr "Вопрос {0} из {1}"
 msgid "Questions"
 msgstr "Вопросы"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "Подача теста"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr "Краткое содержание теста"
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "Тест недоступен для гостевых пользователей. Пожалуйста, войдите, чтобы продолжить."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "Тест появится в конце урока."
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr ""
 msgid "Regards"
 msgstr "С уважением "
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr "Отклонено"
 msgid "Related Courses"
 msgstr "Похожие курсы"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr ""
 
@@ -4633,6 +4611,10 @@ msgstr "Роль"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr ""
@@ -4642,19 +4624,19 @@ msgstr ""
 msgid "Route"
 msgstr "Маршрут"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Строка #{0} Дата не может выходить за пределы длительности партии."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Строка #{0} Время окончания не может выходить за рамки длительности партии."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Строка #{0} Время начала не может быть больше или равно времени окончания."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Строка #{0} Время начала не может выходить за рамки длительности партии."
 
@@ -4697,14 +4679,13 @@ msgstr "Суббота"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -4730,7 +4711,7 @@ msgstr "Объем"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr "Оценка из"
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr ""
 
@@ -4750,11 +4731,11 @@ msgstr ""
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr "Поиск значка"
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "Количество мест"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr "Сиденье слева"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr "Осталось мест"
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr ""
@@ -4833,17 +4817,17 @@ msgstr ""
 msgid "Share on"
 msgstr "Поделиться"
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr "Краткое введение"
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr "Название навыка"
 msgid "Skills"
 msgstr "Навыки"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Пропустить"
 
@@ -4953,6 +4937,14 @@ msgstr "Пропустить"
 msgid "Slot Times are overlapping for some schedules."
 msgstr "В некоторых расписаниях интервалы времени пересекаются."
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "Метка"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr ""
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr ""
 
@@ -5028,7 +5019,7 @@ msgstr "Начать изучение"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "Начать изучение"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Время начала"
 
@@ -5062,7 +5052,7 @@ msgstr ""
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr "Студенты"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr "Подруппа"
 msgid "Subject"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr "Сданные"
@@ -5155,7 +5149,7 @@ msgstr "Сданные"
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr "Отправьте свое резюме, чтобы продолжит
 msgid "Submitted {0}"
 msgstr "Отправлено {0}"
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr ""
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr ""
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Теги"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Спасибо и с наилучшими пожеланиями"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr "Слот уже забронирован другим участнико
 msgid "The status of your application has changed."
 msgstr "Статус вашей заявки изменился."
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr "В этой группе нет свободных мест."
 
@@ -5408,6 +5362,10 @@ msgstr "В этой группе нет студентов."
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "На этом сайте нет {0} ."
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "Этот курс бесплатный."
 
@@ -5529,14 +5487,14 @@ msgstr "Шаблон расписания"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr "Сроки:"
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr "Сроки:"
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr "Чтобы присоединиться к этой группе, свяжитесь с администратором."
 
@@ -5655,9 +5612,9 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr "URL"
 msgid "Unavailability"
 msgstr "Недоступность"
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr "Недоступно с даты не может быть больше, чем Недоступно по дату"
@@ -5703,7 +5664,7 @@ msgstr "На рассмотрении"
 msgid "Unlisted"
 msgstr "Не публиковать"
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr ""
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr "Доступность"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr "Перейдите по следующей ссылке, чтобы просмотреть ваш "
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Веб-страница"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Среда"
 msgid "Welcome to {0}!"
 msgstr "Добро пожаловать в {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Когда курс будет отправлен на рассмотрение, он появится в этом списке."
@@ -5982,10 +5955,6 @@ msgstr "Вы не являетесь участником этой группы.
 msgid "You are not a mentor of the course {0}"
 msgstr "Вы не являетесь наставником курса {0}"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr "Вы уже просмотрели этот курс"
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Вы выбрали получение уведомлений об этом курсе. Вы получите электронное письмо, когда курс станет доступен."
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr "Видео YouTube появится в верхней части уро
 msgid "Your Account has been successfully created!"
 msgstr "Ваш аккаунт был успешно создан!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "действия"
 msgid "activity"
 msgstr "активность"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "из"
 msgid "out of"
 msgstr "из"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr "вы можете"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/sr_CS.po b/lms/locale/sr_CS.po
index c12d2b1e..3da3d411 100644
--- a/lms/locale/sr_CS.po
+++ b/lms/locale/sr_CS.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Serbian (Latin)\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr ""
 msgid "% completed"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,13 +71,13 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
 #: frontend/src/pages/ProfileAbout.vue:4
 msgid "About"
-msgstr ""
+msgstr "O"
 
 #: frontend/src/pages/Batch.vue:100
 msgid "About this batch"
@@ -123,13 +107,17 @@ msgstr ""
 msgid "Active"
 msgstr "Aktivan"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Dodaj"
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Sve"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -267,7 +251,7 @@ msgstr ""
 
 #: lms/templates/quiz/quiz.html:141
 msgid "All Submissions"
-msgstr ""
+msgstr "Svi podneti podaci"
 
 #: lms/lms/doctype/lms_quiz/lms_quiz.py:44
 msgid "All questions should have the same marks if the limit is set."
@@ -293,22 +277,21 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
 #: lms/lms/user.py:34
 msgid "Already Registered"
-msgstr ""
+msgstr "Već registrovan"
 
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Iznos"
 
@@ -316,11 +299,10 @@ msgstr "Iznos"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -397,13 +383,13 @@ msgstr ""
 
 #: frontend/src/components/Apps.vue:13
 msgid "Apps"
-msgstr ""
+msgstr "Aplikacije"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,9 +487,9 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
-msgstr ""
+msgstr "Dodeljeni zadaci"
 
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Opis šarže"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Detalji šarže"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr ""
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Detalji fakturisanja"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr ""
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -860,9 +847,9 @@ msgstr ""
 
 #: lms/templates/assignment.html:13
 msgid "Change"
-msgstr ""
+msgstr "Promena"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr ""
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
-msgstr ""
+msgstr "Izaberi ikonicu"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -942,7 +941,7 @@ msgstr ""
 
 #: frontend/src/components/Controls/Link.vue:49
 msgid "Clear"
-msgstr ""
+msgstr "Očisti"
 
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
@@ -963,6 +962,12 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Zatvori"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1029,7 +1034,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:142
 msgid "Collapse"
-msgstr ""
+msgstr "Sažmi"
 
 #. Label of the college (Data) field in DocType 'User'
 #: lms/fixtures/custom_field.json
@@ -1039,7 +1044,7 @@ msgstr ""
 #. Label of the color (Color) field in DocType 'LMS Timetable Legend'
 #: lms/lms/doctype/lms_timetable_legend/lms_timetable_legend.json
 msgid "Color"
-msgstr ""
+msgstr "Boja"
 
 #. Label of the comments (Small Text) field in DocType 'Exercise Latest
 #. Submission'
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "Završeno"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,9 +1169,13 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. Label of the confirmation_email_sent (Check) field in DocType 'LMS Batch
 #. Enrollment'
@@ -1194,14 +1203,14 @@ msgstr ""
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 msgid "Content"
-msgstr ""
+msgstr "Sadržaj"
 
 #: frontend/src/components/CourseCardOverlay.vue:30
 msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Ugovor"
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Kreiraj"
 
@@ -1456,6 +1477,11 @@ msgstr "Kreiraj"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Kreiraj novi"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,9 +1518,9 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
-msgstr ""
+msgstr "Kreirano"
 
 #: frontend/src/components/AppSidebar.vue:562
 msgid "Creating a batch"
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Valuta"
 
@@ -1531,7 +1552,7 @@ msgstr ""
 #. Label of the custom_component (Code) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 msgid "Custom HTML"
-msgstr ""
+msgstr "Prilagođeni HTML"
 
 #. Label of the custom_script (Code) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1573,7 +1594,7 @@ msgstr "Datum"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1590,7 +1611,7 @@ msgstr ""
 #: lms/lms/doctype/lms_batch_timetable/lms_batch_timetable.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #: lms/templates/emails/mentor_request_creation_email.html:2
 #: lms/templates/emails/mentor_request_status_update_email.html:2
@@ -1614,9 +1635,9 @@ msgstr "Podrazumevana valuta"
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1624,27 +1645,27 @@ msgstr "Obriši"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Opis"
 
@@ -1685,9 +1705,9 @@ msgstr ""
 #: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:25
 #: frontend/src/pages/QuizForm.vue:42
 msgid "Details"
-msgstr ""
+msgstr "Detalji"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1709,7 +1729,7 @@ msgstr "Onemogućeno"
 #: frontend/src/components/DiscussionReplies.vue:57
 #: lms/lms/widgets/NoPreviewModal.html:25 lms/templates/reviews.html:159
 msgid "Discard"
-msgstr ""
+msgstr "Odbaci"
 
 #. Label of the show_discussions (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/Batch.vue:85
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Izmeni"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1787,7 +1807,7 @@ msgstr ""
 
 #: frontend/src/pages/Profile.vue:72
 msgid "Edit Profile"
-msgstr ""
+msgstr "Uredi profil"
 
 #: frontend/src/pages/QuizForm.vue:182
 msgid "Edit the question"
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "Imejl"
 
@@ -1822,9 +1842,9 @@ msgstr ""
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
-msgstr ""
+msgstr "Imejl šablon"
 
 #. Label of the email_templates_tab (Tab Break) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -1834,7 +1854,7 @@ msgstr ""
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
-msgstr ""
+msgstr "Imejlovi"
 
 #. Option for the 'User Category' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json lms/templates/signup-form.html:25
@@ -1862,7 +1882,7 @@ msgstr ""
 #. Label of the enabled (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Enabled"
-msgstr ""
+msgstr "Omogućeno"
 
 #: frontend/src/components/Modals/BulkCertificates.vue:53
 msgid "Enabling this will publish the certificate on the certified participants page."
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Datum završetka"
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Greška"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,22 +2041,22 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Event"
-msgstr ""
+msgstr "Događaj"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2092,7 +2087,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:142
 msgid "Expand"
-msgstr ""
+msgstr "Proširi"
 
 #. Label of the expiration_date (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
@@ -2109,7 +2104,7 @@ msgstr "Datum isteka"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2128,18 +2123,18 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
-msgstr ""
+msgstr "Neuspeh"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
-msgstr ""
+msgstr "Istaknuto"
 
 #. Label of the feedback (Small Text) field in DocType 'LMS Batch Feedback'
 #: frontend/src/components/BatchFeedback.vue:29
@@ -2164,12 +2159,12 @@ msgstr ""
 #. Label of the file_type (Select) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "File Type"
-msgstr ""
+msgstr "Vrsta fajla"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
-msgstr ""
+msgstr "Ime"
 
 #. Option for the 'Time Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
@@ -2188,10 +2183,10 @@ msgstr ""
 
 #: lms/lms/widgets/CourseCard.html:114
 msgid "Free"
-msgstr ""
+msgstr "Besplatno"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2232,10 +2227,10 @@ msgstr "Datum početka"
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 #: lms/templates/signup-form.html:5
 msgid "Full Name"
-msgstr ""
+msgstr "Ime i prezime"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2246,7 +2241,7 @@ msgstr ""
 #: lms/lms/doctype/function/function.json
 #: lms/lms/doctype/preferred_function/preferred_function.json
 msgid "Function"
-msgstr ""
+msgstr "Funkcija"
 
 #: frontend/src/pages/Billing.vue:43
 msgid "GST Amount"
@@ -2264,7 +2259,7 @@ msgstr ""
 #. Label of the general_tab (Tab Break) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "General"
-msgstr ""
+msgstr "Opšte"
 
 #: frontend/src/components/Modals/BulkCertificates.vue:5
 #: frontend/src/pages/Batch.vue:12
@@ -2327,7 +2322,7 @@ msgstr ""
 
 #: lms/templates/signup-form.html:56
 msgid "Have an account? Login"
-msgstr ""
+msgstr "Imate nalog? Prijavite se"
 
 #. Label of the headline (Data) field in DocType 'User'
 #: frontend/src/components/Modals/EditProfile.vue:69
@@ -2337,7 +2332,7 @@ msgstr ""
 
 #: lms/lms/widgets/HelloWorld.html:13
 msgid "Hello"
-msgstr ""
+msgstr "Zdravo"
 
 #: frontend/src/components/AppSidebar.vue:128
 msgid "Help"
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "ID"
 
@@ -2421,7 +2420,7 @@ msgstr "ID"
 #: frontend/src/components/Modals/PageModal.vue:28
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 msgid "Icon"
-msgstr ""
+msgstr "Ikonica"
 
 #. Label of the user_category (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,15 +2482,15 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
-msgstr ""
+msgstr "Slika: Oštećen tok podataka"
 
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2502,7 +2500,7 @@ msgstr "U toku"
 #. Option for the 'Status' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Inactive"
-msgstr ""
+msgstr "Neaktivan"
 
 #. Label of the include_in_preview (Check) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
@@ -2526,7 +2524,7 @@ msgstr ""
 #. Label of the index_ (Int) field in DocType 'LMS Exercise'
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Index"
-msgstr ""
+msgstr "Indeks"
 
 #. Label of the index_label (Data) field in DocType 'LMS Exercise'
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,13 +2680,13 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
 #: lms/templates/signup-form.html:6
 msgid "Jane Doe"
-msgstr ""
+msgstr "Petar Petrović"
 
 #. Label of the job (Link) field in DocType 'LMS Job Application'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -2732,7 +2730,7 @@ msgstr ""
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2742,7 +2740,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -2990,11 +2988,11 @@ msgstr ""
 #. Label of the label (Data) field in DocType 'LMS Timetable Legend'
 #: lms/lms/doctype/lms_timetable_legend/lms_timetable_legend.json
 msgid "Label"
-msgstr ""
+msgstr "Oznaka"
 
 #: frontend/src/components/Modals/EditProfile.vue:64
 msgid "Last Name"
-msgstr ""
+msgstr "Prezime"
 
 #. Label of the latest_submission (Link) field in DocType 'Exercise Latest
 #. Submission'
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3085,10 +3099,10 @@ msgstr ""
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 msgid "Links"
-msgstr ""
+msgstr "Linkovi"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,14 +3117,14 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
-msgstr ""
+msgstr "Učitaj više"
 
 #. Option for the 'Auto Recording' (Select) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
@@ -3119,7 +3133,6 @@ msgstr "Lokalno"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3134,7 +3147,7 @@ msgstr ""
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:188
 #: frontend/src/pages/Lesson.vue:53
 msgid "Login"
-msgstr ""
+msgstr "Prijava"
 
 #: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3187,7 +3200,7 @@ msgstr ""
 
 #: frontend/src/pages/Notifications.vue:12
 msgid "Mark all as read"
-msgstr ""
+msgstr "Označi sve kao pročitano"
 
 #: frontend/src/pages/Notifications.vue:40
 msgid "Mark as read"
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Srednje"
 
@@ -3236,7 +3248,7 @@ msgstr "Srednje"
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
@@ -3259,7 +3271,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3404,15 +3416,15 @@ msgstr ""
 #. Label of the meta_description (Small Text) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Meta Description"
-msgstr ""
+msgstr "Meta opis"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
-msgstr ""
+msgstr "Meta slika"
 
 #. Label of the meta_keywords (Small Text) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -3422,7 +3434,7 @@ msgstr ""
 #. Label of the milestone (Check) field in DocType 'LMS Batch Timetable'
 #: lms/lms/doctype/lms_batch_timetable/lms_batch_timetable.json
 msgid "Milestone"
-msgstr ""
+msgstr "Ključna tačka"
 
 #: lms/lms/doctype/lms_question/lms_question.py:48
 msgid "Minimum two options are required for multiple choice questions."
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3474,7 +3487,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:39
 msgid "More"
-msgstr ""
+msgstr "Više"
 
 #. Label of the multiple (Check) field in DocType 'LMS Question'
 #: lms/lms/doctype/lms_question/lms_question.json
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Novi"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3548,7 +3564,7 @@ msgstr ""
 #: frontend/src/components/Discussions.vue:8
 #: frontend/src/components/Discussions.vue:63
 msgid "New {0}"
-msgstr ""
+msgstr "Novi {0}"
 
 #: frontend/src/components/Quiz.vue:213 frontend/src/pages/Lesson.vue:154
 msgid "Next"
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,38 +3627,25 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
-msgstr ""
+msgstr "Nema {0}"
 
 #: lms/templates/quiz/quiz.html:147
 msgid "No."
@@ -3702,7 +3685,7 @@ msgstr "Nije dozvoljeno"
 #: frontend/src/components/SettingDetails.vue:10
 #: frontend/src/pages/QuizSubmission.vue:9
 msgid "Not Saved"
-msgstr ""
+msgstr "Nije sačuvano"
 
 #: frontend/src/pages/Notifications.vue:54
 msgid "Nothing to see here."
@@ -3711,13 +3694,13 @@ msgstr ""
 #. Label of the notifications (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Notifications"
-msgstr ""
+msgstr "Obaveštenja"
 
 #: lms/lms/widgets/NoPreviewModal.html:30
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3797,32 +3780,32 @@ msgstr ""
 #. Label of the option_1 (Small Text) field in DocType 'LMS Question'
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Option 1"
-msgstr ""
+msgstr "Opcija 1"
 
 #. Label of the option_2 (Small Text) field in DocType 'LMS Question'
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Option 2"
-msgstr ""
+msgstr "Opcija 2"
 
 #. Label of the option_3 (Small Text) field in DocType 'LMS Question'
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Option 3"
-msgstr ""
+msgstr "Opcija 3"
 
 #. Label of the option_4 (Small Text) field in DocType 'LMS Question'
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Option 4"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Opcije"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3853,7 +3836,7 @@ msgstr ""
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #. Label of the pages (Table) field in DocType 'Cohort'
 #: lms/lms/doctype/cohort/cohort.json
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,11 +3884,11 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
-msgstr ""
+msgstr "Prošlo"
 
 #. Label of the passing_percentage (Int) field in DocType 'LMS Quiz'
 #. Label of the passing_percentage (Int) field in DocType 'LMS Quiz Submission'
@@ -3919,15 +3901,14 @@ msgstr ""
 #. Label of the password (Password) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Password"
-msgstr ""
+msgstr "Lozinka"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "Na čekanju"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -4023,7 +4004,7 @@ msgstr ""
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,35 +4017,31 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Broj telefona"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
 
 #: lms/lms/user.py:75
 msgid "Please ask your administrator to verify your sign-up"
-msgstr ""
+msgstr "Molimo Vas da zatražite od administratora da verifikuje Vašu registraciju"
 
 #: lms/lms/user.py:73
 msgid "Please check your email for verification"
-msgstr ""
+msgstr "Molimo Vas da proverite svoj imejl za verifikaciju"
 
 #: lms/templates/emails/community_course_membership.html:7
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4190,20 +4175,12 @@ msgstr ""
 #: frontend/src/components/DiscussionReplies.vue:54
 #: frontend/src/components/DiscussionReplies.vue:89
 msgid "Post"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
+msgstr "Objavi"
 
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Poštanski broj"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,22 +4216,22 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
 #: frontend/src/pages/Lesson.vue:119
 msgid "Previous"
-msgstr ""
+msgstr "Prethodni"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Cene"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4277,7 +4254,7 @@ msgstr ""
 #. Option for the 'Visibility' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Private"
-msgstr ""
+msgstr "Privatno"
 
 #. Description of the 'Hide my Private Information from others' (Check) field
 #. in DocType 'User'
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4340,7 +4318,7 @@ msgstr "Napredak (%)"
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Public"
-msgstr ""
+msgstr "Javni"
 
 #. Label of the published (Check) field in DocType 'LMS Certificate'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
-msgstr ""
+msgstr "Objavljeno"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr "Vrsta referentnog dokumenta"
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4546,7 +4524,7 @@ msgstr ""
 
 #: lms/lms/user.py:36
 msgid "Registered but disabled"
-msgstr ""
+msgstr "Registrovano, ali onemogućeno"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort Join Request'
 #. Option for the 'Status' (Select) field in DocType 'Invite Request'
@@ -4564,9 +4542,9 @@ msgstr ""
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
-msgstr ""
+msgstr "Ukloni"
 
 #: frontend/src/components/Modals/AnnouncementModal.vue:27
 msgid "Reply To"
@@ -4593,7 +4571,7 @@ msgstr ""
 #. Label of the result (Table) field in DocType 'LMS Quiz Submission'
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Result"
-msgstr ""
+msgstr "Rezultat"
 
 #. Label of the resume (Attach) field in DocType 'LMS Job Application'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -4626,35 +4604,39 @@ msgstr ""
 #: lms/lms/doctype/cohort_staff/cohort_staff.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Role"
-msgstr ""
+msgstr "Uloga"
 
 #. Label of the role (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
-msgstr ""
+msgstr "Uloge"
 
 #. Label of the route (Data) field in DocType 'LMS Sidebar Item'
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,21 +4679,20 @@ msgstr ""
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Sačuvaj"
 
 #. Label of the schedule (Table) field in DocType 'Course Evaluator'
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Schedule"
-msgstr ""
+msgstr "Raspored"
 
 #: frontend/src/components/Modals/EvaluationModal.vue:5
 #: frontend/src/components/UpcomingEvaluations.vue:14
@@ -4730,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Pretraga"
 
@@ -4750,11 +4731,11 @@ msgstr "Pretraga"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Podešavanja"
@@ -4833,17 +4817,17 @@ msgstr "Podešavanja"
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4903,11 +4887,11 @@ msgstr ""
 
 #: lms/lms/user.py:29
 msgid "Sign Up is disabled"
-msgstr ""
+msgstr "Registracija je onemogućena"
 
 #: lms/templates/signup-form.html:53
 msgid "Sign up"
-msgstr ""
+msgstr "Registruj se"
 
 #. Label of the signup_email (Data) field in DocType 'Invite Request'
 #: lms/lms/doctype/invite_request/invite_request.json
@@ -4945,14 +4929,22 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
-msgstr ""
+msgstr "Preskoči"
 
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:63
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr "Početak"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Datum početka"
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr ""
 
@@ -5062,7 +5052,7 @@ msgstr "Stanje"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr "Predmet"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr "Podnesi"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,36 +5183,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Uspeh"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Summary"
-msgstr ""
+msgstr "Rezime"
 
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
@@ -5283,10 +5253,10 @@ msgid "System Manager"
 msgstr "Sistem menadžer"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
-msgstr ""
+msgstr "Oznake"
 
 #: lms/templates/emails/community_course_membership.html:18
 #: lms/templates/emails/mentor_request_creation_email.html:8
@@ -5310,7 +5280,7 @@ msgstr "Šablon"
 
 #: lms/lms/user.py:40
 msgid "Temporarily Disabled"
-msgstr ""
+msgstr "Privremeno onemogućeno"
 
 #: lms/lms/utils.py:439
 msgid "Terms of Use"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5493,7 +5451,7 @@ msgstr ""
 #: frontend/src/components/Quiz.vue:45
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Time"
-msgstr ""
+msgstr "Vreme"
 
 #. Label of the time (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Naslov"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr "Za"
 msgid "To Date"
 msgstr "Datum završetka"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5612,7 +5569,7 @@ msgstr ""
 
 #: lms/lms/user.py:41
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
-msgstr ""
+msgstr "Previše korisnika se registrovalo u poslednje vreme, stoga je registracija privremeno onemogućena. Pokušajte ponovo za sat vremena"
 
 #: frontend/src/pages/Billing.vue:53
 msgid "Total"
@@ -5636,7 +5593,7 @@ msgstr ""
 
 #: frontend/src/components/Quiz.vue:259 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
-msgstr ""
+msgstr "Pokušajte ponovo"
 
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr "Vrsta"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5749,11 +5710,11 @@ msgstr "Ažuriraj"
 
 #: lms/templates/emails/community_course_membership.html:11
 msgid "Update Password"
-msgstr ""
+msgstr "Ažuriraj lozinku"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
-msgstr ""
+msgstr "Otpremi"
 
 #: frontend/src/components/Assignment.vue:81
 msgid "Upload File"
@@ -5808,12 +5769,12 @@ msgstr ""
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/invite_request/invite_request.json
 msgid "Username"
-msgstr ""
+msgstr "Korisničko ime"
 
 #. Label of a shortcut in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. Label of the answer (Small Text) field in DocType 'LMS Quiz Result'
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -5822,7 +5783,7 @@ msgstr ""
 
 #: lms/templates/signup-form.html:83
 msgid "Valid email and name required"
-msgstr ""
+msgstr "Neophodni su važeći imejl i naziv"
 
 #. Label of the value (Rating) field in DocType 'LMS Batch Feedback'
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5891,6 +5852,10 @@ msgstr ""
 #: frontend/src/components/Modals/PageModal.vue:23
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 msgid "Web Page"
+msgstr "Veb-stranica"
+
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
 msgstr ""
 
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
@@ -5905,10 +5870,18 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -5993,7 +5962,7 @@ msgstr ""
 #: lms/templates/emails/lms_course_interest.html:13
 #: lms/templates/emails/lms_invite_request_approved.html:11
 msgid "You can also copy-paste following link in your browser"
-msgstr ""
+msgstr "Takođe možete kopirati i nalepiti sledeći link u Vašem internet pretraživaču"
 
 #: lms/templates/quiz/quiz.html:18
 msgid "You can attempt this quiz only {0} {1}"
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6224,7 +6185,7 @@ msgstr ""
 
 #: lms/templates/signup-form.html:12
 msgid "jane@example.com"
-msgstr ""
+msgstr "jane@example.com"
 
 #: frontend/src/pages/Programs.vue:31
 msgid "member"
@@ -6236,13 +6197,13 @@ msgstr ""
 
 #: lms/templates/quiz/quiz.html:106
 msgid "of"
-msgstr ""
+msgstr "od"
 
 #: lms/templates/quiz/quiz.js:141
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
@@ -6350,5 +6319,5 @@ msgstr ""
 #. Count format of shortcut in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "{} Published"
-msgstr ""
+msgstr "{} objavljeno"
 
diff --git a/lms/locale/sv.po b/lms/locale/sv.po
index 310f3b32..7140a943 100644
--- a/lms/locale/sv.po
+++ b/lms/locale/sv.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr " Utvärdera och betygsätt."
 msgid "% completed"
 msgstr "% klar"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr "1. Vad beskriver bäst din roll?"
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr "2. Hur många elever planerar du att undervisa?"
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr "3. Vad är ditt huvudsakliga användningsfall för Frappe Learning?"
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr "4. Använder du för närvarande några Frappe produkter?"
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr "<span style=\"font-size: 18px;\"><b>Statistik</b></span>"
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr "Kurs kan inte ha både betalt certifikat och certifikat för genomförande."
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "En rad introduktion till kurs som finns på kurskortet"
 
@@ -123,13 +107,17 @@ msgstr "Prestationer"
 msgid "Active"
 msgstr "Aktiv"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr "Aktiva Medlemmar"
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Lägg till"
@@ -168,7 +156,7 @@ msgstr "Lägg till Kapitel"
 msgid "Add a course"
 msgstr "Lägg till kurs"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr "Lägg till nyckelord och tryck sedan på Enter"
 
@@ -176,7 +164,7 @@ msgstr "Lägg till nyckelord och tryck sedan på Enter"
 msgid "Add a lesson"
 msgstr "Lägg till Lektion"
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr "Lägg till ny fråga"
@@ -193,10 +181,6 @@ msgstr "Lägg till bedömning"
 msgid "Add an assignment to your lesson"
 msgstr "Lägg till uppgift till din lektion"
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr "Lägg till befintlig fråga"
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Lägg till minst ett möjligt svar för denna fråga: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Administratör"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Alla"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr "Alla Grupper"
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Alla Kurser"
 
@@ -293,7 +277,7 @@ msgstr "Tillåt självregistrering"
 msgid "Allow accessing future dates"
 msgstr "Tillåt åtkomst till framtida datum"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "Tillåt självregistrering"
 
@@ -304,11 +288,10 @@ msgstr "Redan Registrerad"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Belopp"
 
@@ -316,11 +299,10 @@ msgstr "Belopp"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Belopp (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr "Belopp och valuta erfordras för betalda grupper."
 
@@ -341,32 +323,36 @@ msgstr "Belopp med Moms"
 msgid "Announcement"
 msgstr "Meddelande"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr "Tillkännagivande är skickad"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr "Tillkännagivande erfordras"
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Svara"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr "Visas på kurskort i kurslista"
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr "Visas när grupp URL delas på valfri online plattform"
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "Ansökan Mottagen"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr "Visas när grupp URL delas på sociala medier"
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "Godkänd"
 msgid "Apps"
 msgstr "Appar"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "Arkiverad"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "Är du säker på att du vill avbryta denna utvärdering? Denna åtgärd kan inte ångras."
 
@@ -414,7 +400,7 @@ msgstr "Är du säker på att du vill logga in på din Översikt Panel i Frappe
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "Bedömning"
@@ -430,11 +416,11 @@ msgstr "Bedömning Namn"
 msgid "Assessment Type"
 msgstr "Bedömning Typ"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr "Bedömning tillagd"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Bedömning {0} har redan lagts till i denna grupp."
 
@@ -479,7 +465,7 @@ msgstr "Uppgift Inlämningar"
 msgid "Assignment Title"
 msgstr "Uppgift Benämning"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr "Uppgift skapad"
 
@@ -487,7 +473,11 @@ msgstr "Uppgift skapad"
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Uppgift för Lektion {0} av {1} finns redan."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr "Uppgift inlämnad"
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr "Uppgift uppdaterad"
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Uppgift kommer att visas längst ner i lektion."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Uppgifter"
 
@@ -525,6 +515,10 @@ msgstr "Automatiskt Tilldela"
 msgid "Auto Recording"
 msgstr "Automatisk Inspelning"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr "Tillgänglighet uppdaterad"
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "Grupp Bekräftelse Mall"
 msgid "Batch Course"
 msgstr "Grupp Kurs"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "Grupp Skapad"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Parti Beskrivning"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Parti Detaljer"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "Grupp Detaljer"
 
@@ -646,10 +634,6 @@ msgstr "Grupp Start Datum:"
 msgid "Batch Title"
 msgstr "Grupp Benämning"
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr "Grupp Uppdaterad"
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "Grupp slutdatum får inte vara före grupp startdatum"
@@ -662,6 +646,10 @@ msgstr "Grupp redan startad."
 msgid "Batch is sold out."
 msgstr "Gruppen är slutsåld."
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr "Gruppens starttid kan inte vara senare än eller lika med sluttid."
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Parti:"
@@ -677,7 +665,7 @@ msgstr "Grupper"
 msgid "Begin Date"
 msgstr "Start Datum"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "Vänliga hälsningar,"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Faktura Detaljer"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "Annullera"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr "Avbryt denna utvärdering?"
 
@@ -766,18 +754,16 @@ msgstr "Fritidskläder"
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategori"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Kategori Namn"
 
@@ -801,7 +787,7 @@ msgstr "Cerifikat Länk"
 msgid "Certificate of Completion"
 msgstr "Certifikat för Genomförande"
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr "Certifikat sparad"
 
@@ -809,7 +795,7 @@ msgstr "Certifikat sparad"
 msgid "Certificates"
 msgstr "Certifikat"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr "Certifikat genererade"
 
@@ -822,11 +808,11 @@ msgstr "Certifikat genererade"
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "Certifiering Namn"
 msgid "Certified"
 msgstr "Certifierad"
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr "Certifierade Medlemmar"
 
@@ -862,7 +849,7 @@ msgstr "Certifierade Deltagare"
 msgid "Change"
 msgstr "Ändra"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr "Ändringar sparade"
 
@@ -880,11 +867,15 @@ msgstr "Kapitel"
 msgid "Chapter Reference"
 msgstr "Kapitel Referens"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr "Kapitel tillagt"
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr "Kapitel raderad"
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr "Kapitel uppdaterad"
 
@@ -901,6 +892,10 @@ msgstr "Check"
 msgid "Check Discussion"
 msgstr "Kolla Diskussion"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr "Kontrollera Inlämningar"
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "Kolla in {0} för att få veta mer om certifiering."
@@ -916,21 +911,25 @@ msgstr "Kolla Kurser"
 msgid "Choices"
 msgstr "Alternativ"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Välj alla svar som gäller"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr "Välj befintlig fråga"
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "Välj Ikon"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Välj ett svar"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "Klient ID"
 msgid "Client Secret"
 msgstr "Klient Hemlighet"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Stäng"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Bolag Webbplats"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr "Slutför din Registrering - Missa inte!"
 msgid "Completed"
 msgstr "Klar"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr "Klart av Studenter"
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "Kompletterande Certifikat"
@@ -1164,6 +1169,10 @@ msgstr "Villkoret måste vara giltig python kod."
 msgid "Conduct Evaluation"
 msgstr "Genomför Utvärdering"
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr "Konfigurationer"
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Bekräfta"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr "Fortsätt lära dig"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Avtal"
@@ -1228,15 +1237,15 @@ msgstr "Organisation"
 msgid "Correct"
 msgstr "Korrekt"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr "Rätt Svar"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "Kurs Kapitel"
 msgid "Course Completed"
 msgstr "Klara Kurser"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr "Kursavslutningar"
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "Kurs Skapare"
 msgid "Course Data"
 msgstr "Kursdata"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "Kursbeskrivning"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr "Kursregistreringar"
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "Kurs Utvärderare"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "Kursbild"
 
@@ -1364,7 +1381,7 @@ msgstr "Kurslista"
 msgid "Course Name"
 msgstr "Kursnamn"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr "Kursöversikt"
 
@@ -1396,23 +1413,27 @@ msgstr "Kursstatistik"
 msgid "Course Title"
 msgstr "Kurs Benämning"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr "Kurs tillagd till program"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "Kurs har redan lagts till grupp."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr "Kurs skapad"
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr "Kurs är borttagen"
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr "Kurs flyttad"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr "Kurs uppdaterad"
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Kurs {0} har redan lagts till i denna omgång."
@@ -1421,13 +1442,13 @@ msgstr "Kurs {0} har redan lagts till i denna omgång."
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr "Omslagsbild"
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Skapa"
 
@@ -1456,6 +1477,11 @@ msgstr "Skapa"
 msgid "Create Certificate"
 msgstr "Skapa Certifikat"
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Skapa Ny"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "Skapa Kurs"
@@ -1476,11 +1502,7 @@ msgstr "Skapa Kurs"
 msgid "Create a live class"
 msgstr "Skapa live lektion"
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr "Skapa ny fråga"
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr "Skapa Uppgift"
 
@@ -1496,7 +1518,7 @@ msgstr "Skapa din första kurs"
 msgid "Create your first quiz"
 msgstr "Skapa din första frågesport"
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Skapad"
 
@@ -1511,11 +1533,10 @@ msgstr "Skapar kurs"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Valuta"
 
@@ -1573,7 +1594,7 @@ msgstr "Datum"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "Datum och Tid"
@@ -1614,9 +1635,9 @@ msgstr "Standard Valuta"
 msgid "Degree Type"
 msgstr "Examen Typ"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1624,27 +1645,27 @@ msgstr "Ta bort"
 msgid "Delete Chapter"
 msgstr "Ta bort Kapitel"
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr "Ta bort kurs"
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr "Ta bort detta kapitel?"
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr "Ta bort denna lektion?"
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "Om du tar bort kurs raderas också alla dess kapitel och lektioner. Är du säker på att du vill ta bort denna kurs?"
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "Borttagning av detta kapitel tar också bort alla dess lektioner och de tas bort permanent från kurs. Denna åtgärd kan inte ångras. Är du säker på att du vill fortsätta?"
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "Borttagning av denna lektion kommer att ta bort den permanent från kurs. Denna åtgärd kan inte ångras. Är du säker på att du vill fortsätta?"
 
@@ -1661,7 +1682,7 @@ msgstr "Borttagning av denna lektion kommer att ta bort den permanent från kurs
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr "Borttagning av denna lektion kommer att ta bort den permanent från kurs
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -1687,7 +1707,7 @@ msgstr "Skrivbord"
 msgid "Details"
 msgstr "Detaljer"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "Inaktivera självregistrering"
 
@@ -1768,7 +1788,7 @@ msgstr "E-post"
 msgid "E-mail"
 msgstr "E-post"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "E-post"
 msgid "Edit"
 msgstr "Redigera"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr "Redigera Uppgift"
 
@@ -1808,8 +1828,8 @@ msgstr "Utbildning Detalj"
 msgid "Education Details"
 msgstr "Utbildning Detaljer"
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "E-post"
 
@@ -1822,7 +1842,7 @@ msgstr "E-post"
 msgid "Email Sent"
 msgstr "E-post Skickad"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "E-post Mall"
 
@@ -1870,9 +1890,8 @@ msgstr "Om du aktiverar detta kommer certifikatet att publiceras på sidan för
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Slut Datum"
 
@@ -1888,7 +1907,7 @@ msgstr "Slutdatum (eller förväntat)"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "Slutdatum (eller förväntat)"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Slut Tid"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr "Registrera Nu"
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr "Inskriven"
 
@@ -1915,10 +1933,6 @@ msgstr "Inskriven"
 msgid "Enrolled Students"
 msgstr "Inskrivna Studenter"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "Inskriven"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr "Registreringsbekräftelse för {0}"
@@ -1928,7 +1942,7 @@ msgstr "Registreringsbekräftelse för {0}"
 msgid "Enrollment Count"
 msgstr "Antal Inskrivna"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr "Registrering Misslyckad"
 
@@ -1955,31 +1969,13 @@ msgstr "Ange benämning och spara frågesport för att fortsätta"
 msgid "Enter the correct answer"
 msgstr "Ange korrekt svar"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Fel"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr "Fel vid skapande av liveklass. Vänligen försök igen. {0}"
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "Utvärdering"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr "Utvärdering Detaljer"
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr "Utvärdering Slutdatum"
 
@@ -2001,11 +1996,11 @@ msgstr "Utvärdering Slutdatum"
 msgid "Evaluation Request"
 msgstr "Utvärdering Begäran"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "Utvärdering slutdatum får inte vara tidigare än grupp slutdatum."
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr "Utvärdering sparad"
 
@@ -2016,9 +2011,9 @@ msgstr "Utvärdering sparad"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr "Utvärderarens Namn"
 msgid "Evaluator Schedule"
 msgstr "Utvärderare Schema"
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr "Utvärderare är inte tillgänglig"
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr "Utvärderare erfordras för betalda certifikat."
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr "Utvärderare är inte tillgänglig"
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr "Utvärderare erfordras för betalda certifikat."
 msgid "Event"
 msgstr "Händelse"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr "Exempel: IST (+5:30)"
 
@@ -2109,7 +2104,7 @@ msgstr "Utgång Datum"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "Förklaring"
@@ -2128,7 +2123,7 @@ msgstr "Utforska mer"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Misslyckad "
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Utvald"
@@ -2166,7 +2161,7 @@ msgstr "Huvudämne/Studieinriktning"
 msgid "File Type"
 msgstr "Fil Typ"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Förnamn"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "Gratis"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Frilansare"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Fullständig Namn"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Heltid"
@@ -2355,6 +2350,10 @@ msgstr "Hjälp andra att lära sig något nytt genom att skapa kurs."
 msgid "Help us improve our course material."
 msgstr "Hjälp oss att förbättra vårt kursmaterial."
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr "Hjälp oss att förstå dina behov"
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr "Jag söker jobb"
 msgid "I am unavailable"
 msgstr "Jag är inte tillgänglig"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "ID"
 
@@ -2444,7 +2443,7 @@ msgstr "Om du inte gör det kommer frågesporten att skickas in automatiskt när
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr "Om du har några frågor eller behöver hjälp är du välkommen att kontakta vårt supportteam."
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "Om du har några frågor eller behöver hjälp är du välkommen att kon
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr "Om du anger belopp här kommer motsvarande USD inställning inte att tillämpas."
 
@@ -2484,7 +2482,7 @@ msgstr "Bild"
 msgid "Image search powered by"
 msgstr "Bildsökning drivs av"
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "Bild: Skadad Dataström"
 
@@ -2492,7 +2490,7 @@ msgstr "Bild: Skadad Dataström"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "Lärare Anteckningar"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "Utfärdad"
 msgid "Items in Sidebar"
 msgstr "Artiklar i Sidofält"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr "Artiklar borttagna"
 
@@ -2732,7 +2730,7 @@ msgstr "Jobb Benämning"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "Jobb"
@@ -2742,7 +2740,7 @@ msgstr "Jobb"
 msgid "Join"
 msgstr "Anslut"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr "Delta i Samtal"
 
@@ -3038,6 +3036,22 @@ msgstr "Lektion Referens"
 msgid "Lesson Title"
 msgstr "Lektion Benämning"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr "Lektion skapad"
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr "Lektion raderad"
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr "Lektion flyttad"
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr "Lektion uppdaterad"
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Länkar"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Live"
 
@@ -3103,12 +3117,12 @@ msgstr "Live Klass"
 msgid "LiveCode URL"
 msgstr "LiveCode URL"
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Ladda Mer"
 
@@ -3119,7 +3133,6 @@ msgstr "Lokal"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "Skapa Meddelande"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr "Ange rätt faktura adress eftersom det kommer att användas på din faktura."
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr "Hantera Grupp"
 
@@ -3195,10 +3208,10 @@ msgstr "Markera som läst"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr "Poängen för fråga nummer {0} får inte vara högre än de poäng som tilldelats för denna fråga."
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr "Poäng utav"
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr "Maximalt Antal Försök"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Medium"
 
@@ -3236,7 +3248,7 @@ msgstr "Medium"
 msgid "Medium ID"
 msgstr "Medium ID"
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Medium:"
@@ -3259,7 +3271,7 @@ msgstr "Medium:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "Medlem Typ"
 msgid "Member Username"
 msgstr "Medlem Användarnamn"
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr "Medlem tillagd till program"
 
@@ -3408,9 +3420,9 @@ msgstr "Meta Beskrivning"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Meta Bild"
 
@@ -3444,6 +3456,7 @@ msgstr "Minst två alternativ erfordras för flervalsfrågor."
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "Min kalender"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Ny"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "Ny Grupp"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "Ny Kurs"
 
@@ -3512,7 +3528,7 @@ msgstr "Nya Jobb"
 msgid "New Job Applicant"
 msgstr "Ny Jobb Sökande"
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr "Ny Program"
 
@@ -3528,7 +3544,7 @@ msgstr "Ny Program Medlem"
 msgid "New Question"
 msgstr "Ny Fråga"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr "Nytt Frågesport"
@@ -3583,26 +3599,10 @@ msgstr "Inga Kommande Utvärderingar"
 msgid "No announcements"
 msgstr "Inga tillkännagivanden"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr "Inga uppgifter hittades"
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr "Inga grupper hittades"
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "Inga certifikat"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr "Inga certifierade medlemmar"
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr "Inga certifierade medlemmar hittades. Kontrollera igen senare eller bli certifierad själv."
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr "Inga kurser tillagda"
@@ -3611,10 +3611,6 @@ msgstr "Inga kurser tillagda"
 msgid "No courses created"
 msgstr "Inga kurser skapade"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr "Inga kurser hittades"
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr "Inga kurser i detta program"
@@ -3631,36 +3627,23 @@ msgstr "Ingen återkoppling mottagen ännu."
 msgid "No introduction"
 msgstr "Ingen introduktion"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr "Inga jobb hittades"
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Inga live lektioner schemalagda"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr "Inga program hittades"
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr "Inga frågesport inlämningar hittades. Kontrollera igen senare."
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr "Inga frågesporter hittades"
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "Inga lediga tider för detta datum."
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr "Inga studenter i denna grupp"
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr "Inga inlämningar"
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Ingen {0}"
 
@@ -3717,7 +3700,7 @@ msgstr "Aviseringar"
 msgid "Notify me when available"
 msgstr "Meddela mig när den är tillgänglig"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr "Antal platser tillgängliga"
 
@@ -3757,11 +3740,11 @@ msgstr "Endast kurser för vilka självinlärning är inaktiverat kan läggas ti
 msgid "Only files of type {0} will be accepted."
 msgstr "Endast filer av typ {0} kommer att accepteras."
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr "Endast bildfiler är tillåtna."
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr "Endast zip filer är tillåtna"
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr "Öppen Avslutad"
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "Alternativ"
@@ -3814,15 +3797,15 @@ msgstr "Alternativ 3"
 msgid "Option 4"
 msgstr "Alternativ 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Alternativ "
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "Order ID"
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr "Organisation"
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "Sidor"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr "Betald Parti"
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr "Betalt Certifikat"
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr "Betald Certifikat efter Utvärdering"
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Betald Kurs"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr "Pan Nummer"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Deltid"
@@ -3902,7 +3884,7 @@ msgstr "Delvis Klar"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "Passerande Procent"
 msgid "Password"
 msgstr "Lösenord"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr "Klistra in youtube länk i kort video för kursintroduktion"
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr "Betalning App är inte installerad"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "Pågående"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Procentuell"
@@ -4023,7 +4004,7 @@ msgstr "Procentuell"
 msgid "Percentage (e.g. 70%)"
 msgstr "Procent (t.ex. 70%)"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr "Procentandel/Status"
 
@@ -4036,10 +4017,6 @@ msgstr "Persona Fångad"
 msgid "Phone Number"
 msgstr "Telefon Nummer"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr "Logga in"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr "Lägg till <a href='{0}'>{1}</a> för <a href='{2}'>{3}</a> för att skicka kalender inbjudningar för utvärderingar."
@@ -4056,15 +4033,15 @@ msgstr "Kontrollera din E-post för verifiering"
 msgid "Please click on the following button to set your new password"
 msgstr "Klicka på följande knapp för att ange ditt nya lösenord"
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "Slutför tidigare kurser i program för att anmäla dig till denna kurs."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Aktivera Zoom Inställningar för att använda denna funktion."
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr "Anmäl dig till denna kurs för att se denna lektion"
 
@@ -4072,7 +4049,7 @@ msgstr "Anmäl dig till denna kurs för att se denna lektion"
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr "Se till att besvara alla frågor på {0} minuter."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr "Ange benämning."
 
@@ -4081,7 +4058,7 @@ msgstr "Ange benämning."
 msgid "Please enter a valid URL."
 msgstr "Ange giltig URL."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr "Ange giltig tid i format HH:mm."
 
@@ -4093,7 +4070,7 @@ msgstr "Ange URL för uppgift inlämning."
 msgid "Please enter your answer"
 msgstr "Ange ditt svar"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr "Installera betalning app för att skapa betald grupp. Se dokumentation för mer information. {0}"
 
@@ -4122,35 +4099,39 @@ msgstr "Logga in för att fortsätta med betalning."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Förbered dig väl och kom i tid till utvärderingarna."
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr "Boka gärna utvärdering för att bli certifierad."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "Välj Datum"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr "Välj varaktighet."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr "Välj framtida datum och tid."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr "Välj tid."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr "Välj tidszon."
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr "Välj ett alternativ"
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr "Vidta lämpliga åtgärder {0}"
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr "Ladda upp SCORM App"
 
@@ -4163,7 +4144,11 @@ msgstr "Ladda upp tilldelning fil."
 msgid "Point of Score (e.g. 70)"
 msgstr "Poäng (t.ex. 70)"
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr "Möjligheter"
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr "Möjlighet"
 
@@ -4192,18 +4177,10 @@ msgstr "Möjligt svar 4"
 msgid "Post"
 msgstr "Post"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr "Lägg upp nytt jobb eller kom tillbaka senare."
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr "Postad"
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr "Drivs av Lärande"
@@ -4239,7 +4216,7 @@ msgstr "Föredragen Plats"
 msgid "Preview Image"
 msgstr "Förhandsgranska Bild"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "Förhandsgranska Video"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Föregående"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Prissättning"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr "Prissättning och Certifiering"
@@ -4318,14 +4295,15 @@ msgstr "Program Medlem"
 msgid "Program Members"
 msgstr "Program Medlemmar"
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr "Program"
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "Publicera på deltagarsidan"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Publicerad"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "Publicerade Kurser"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Publicerad"
@@ -4382,9 +4360,9 @@ msgstr "Förvärvad Certifikat"
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr "Fråga Detalj"
 msgid "Question Name"
 msgstr "Fråga Namn"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr "Fråga tillagd"
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr "Fråga uppdaterad"
 
@@ -4430,7 +4408,7 @@ msgstr "Fråga {0} av {1}"
 msgid "Questions"
 msgstr "Frågor"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr "Frågor är borttagna"
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "Frågesport Inlämning"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr "Frågesport Inlämningar"
 
@@ -4467,7 +4445,7 @@ msgstr "Frågesport Sammanfattning"
 msgid "Quiz Title"
 msgstr "Frågesport Benämning"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr "Frågesport skapad"
 
@@ -4475,7 +4453,7 @@ msgstr "Frågesport skapad"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "Frågesport är inte tillgänglig för gästanvändare. Logga in för att fortsätta."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr "Frågesport uppdaterad"
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "Frågesport kommer att visas längst ner i lektionen."
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr "Frågesporter"
@@ -4535,7 +4513,7 @@ msgstr "Referens Dokument Typ"
 msgid "Regards"
 msgstr "Hälsningar"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr "Registrera Nu"
 
@@ -4564,7 +4542,7 @@ msgstr "Avvisad"
 msgid "Related Courses"
 msgstr "Relaterade Kurser"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -4633,6 +4611,10 @@ msgstr "Roll"
 msgid "Role Preference"
 msgstr "Rollpreferens"
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr "Roll uppdaterad"
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Roller"
@@ -4642,19 +4624,19 @@ msgstr "Roller"
 msgid "Route"
 msgstr "Sökväg"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "Rad #{0} Datum kan inte vara utanför grupp varaktighet."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "Rad #{0} Sluttid kan inte vara utanför grupp varaktighet."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "Rad #{0} Starttid kan inte vara senare än eller lika med sluttid."
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "Rad #{0} Starttid kan inte vara utanför grupp varaktighet."
 
@@ -4697,14 +4679,13 @@ msgstr "Lördag"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Spara"
 
@@ -4730,7 +4711,7 @@ msgstr "Omfatning"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr "Resultat av"
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Sök"
 
@@ -4750,11 +4731,11 @@ msgstr "Sök"
 msgid "Search by Name"
 msgstr "Sök efter Namn"
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr "Sök efter Benämning"
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr "Sök efter benämning"
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr "Sök efter ikon"
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "Antal Platser"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr "Antal Plater Kvar"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr "Antal platser kan inte vara negativt."
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr "Antal Platser Kvar"
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr "Välj fråga"
 
@@ -4824,7 +4808,7 @@ msgstr "Konfigurerar Betalningsport"
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Inställningar"
@@ -4833,17 +4817,17 @@ msgstr "Inställningar"
 msgid "Share on"
 msgstr "Dela på"
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr "Kort Beskrivning"
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr "Kort Introduktion"
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr "Kort beskrivning av grupp"
 
@@ -4945,7 +4929,7 @@ msgstr "Färdighet Namn"
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Hoppa Över"
 
@@ -4953,6 +4937,14 @@ msgstr "Hoppa Över"
 msgid "Slot Times are overlapping for some schedules."
 msgstr "Tider överlappar för vissa schema."
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr "Tid tillagd"
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr "Tid raderad"
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr "Slutsåld"
 
@@ -5003,11 +4995,10 @@ msgstr "Start"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Start Datum"
 
@@ -5028,7 +5019,7 @@ msgstr "Börja lära dig"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "Börja lära dig"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Start Tid"
 
@@ -5057,12 +5047,12 @@ msgstr "Uppstart Organisation"
 
 #: frontend/src/pages/Billing.vue:83
 msgid "State"
-msgstr "Län"
+msgstr "Tillstånd"
 
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr "Student Recensioner"
 msgid "Students"
 msgstr "Studenter"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr "Studenter borttagna"
 
@@ -5147,6 +5137,10 @@ msgstr "Undergrupp"
 msgid "Subject"
 msgstr "Ämne"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr "Ämne erfordras"
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr "Inlämning"
@@ -5155,7 +5149,7 @@ msgstr "Inlämning"
 msgid "Submission List"
 msgstr "Inlämning Lista"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr "Inlämningstyp"
 
@@ -5168,7 +5162,7 @@ msgstr "Inlämning av"
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr "Inlämning av"
 msgid "Submit"
 msgstr "Godkänn"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr "Godkänn och Fortsätt"
 
@@ -5189,30 +5183,6 @@ msgstr "Lämna in ditt CV för att gå vidare med din ansökan till denna tjäns
 msgid "Submitted {0}"
 msgstr "Inskickad {0}"
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Klar"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "System Ansvarig"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Taggar"
@@ -5348,7 +5318,7 @@ msgstr "Tack för återkoppling!"
 msgid "Thanks and Regards"
 msgstr "Tack och Hälsningar"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr "Gruppen är full. Kontakta administratör."
 
@@ -5376,27 +5346,11 @@ msgstr "Tiden är redan bokad av en annan deltagare."
 msgid "The status of your application has changed."
 msgstr "Status för din ansökan har förändrats."
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "Det finns inga grupper som matchar kriterierna. Håll utkik, nya inlärningsupplevelser är snart på väg!"
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr "Det finns inga kapitel i denna kurs. Skapa och hantera kapitel härifrån."
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "Det finns inga kurser som stämmer med kriterierna. Håll utkik, nya inlärningsupplevelser är på väg snart!"
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr "Det finns inga lediga jobb för närvarande."
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "Det finns inga program tillgängliga för tillfället. Håll utkik, nya inlärningsupplevelser är på väg snart!"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr "Det finns inga platser tillgängliga i denna grupp."
 
@@ -5408,6 +5362,10 @@ msgstr "Det finns inga studenter i denna grupp."
 msgid "There are no submissions for this assignment."
 msgstr "Det finns inga inlämningar för denna uppgift."
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr "Det finns inga {0} för närvarande. Håll utkik, nya inlärningsupplevelser är på väg!"
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "Det finns ingen {0} på denna webbplats."
@@ -5443,7 +5401,7 @@ msgstr "Denna klass har avslutats"
 msgid "This course has:"
 msgstr "Denna kurs har:"
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "Denna kurs är gratis."
 
@@ -5529,14 +5487,14 @@ msgstr "Tidtabell Mall"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr "Tidpunkter:"
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr "Tidpunkter:"
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Benämning"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr "Benämning erfordras"
 
@@ -5602,7 +5559,7 @@ msgstr "Till"
 msgid "To Date"
 msgstr "Till Datum"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr "För att gå med i denna grupp, kontakta Administratör."
 
@@ -5655,9 +5612,9 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr "Typ"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr "Skriv ditt svar"
 
@@ -5689,6 +5646,10 @@ msgstr "URL"
 msgid "Unavailability"
 msgstr "Otillgänglighet"
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr "Otillgänglighet uppdaterad"
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr "Otillgänglig Från datum kan inte vara senare än Otillgänglig till datum"
@@ -5703,7 +5664,7 @@ msgstr "Under Recension"
 msgid "Unlisted"
 msgstr "Ej Listad"
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr "Opublicerad"
 
@@ -5725,8 +5686,8 @@ msgstr "Ostrukturerad Roll"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "Uppdatera"
 msgid "Update Password"
 msgstr "Uppdatera lösenord"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -5853,7 +5814,7 @@ msgstr "Visa Certifikat"
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr "Besök Omgång"
 
@@ -5861,7 +5822,7 @@ msgstr "Besök Omgång"
 msgid "Visit Website"
 msgstr "Besök Webbplats"
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr "Besök följande länk för att se din "
 
@@ -5893,6 +5854,10 @@ msgstr "Vi märkte att du började registrera dig i"
 msgid "Web Page"
 msgstr "Webbsida"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr "Webbsida tillagd i sidofält"
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Onsdag"
 msgid "Welcome to {0}!"
 msgstr "Välkommen till {0}!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr "Vad beskriver bäst din roll?"
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "Vad betyder inkludera i förhandsvisning?"
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr "Vad är ditt användningsfall för Frappe Learning?"
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "När kurs lämnas in för granskning kommer den att listas här."
@@ -5982,10 +5955,6 @@ msgstr "Du är inte i denna omgång. Kolla in våra kommande omgångar."
 msgid "You are not a mentor of the course {0}"
 msgstr "Du är inte mentor för kurs {0}"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr "Du är inte inskriven"
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr "Du är inte inskriven i denna kurs. Anmäl dig för att få tillgång till denna lektion."
@@ -6064,11 +6033,11 @@ msgstr "Du har redan granskat denna kurs"
 msgid "You have applied"
 msgstr "Du har ansökt"
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr "Du har blivit registrerad i denna grupp"
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr "Du har blivit registrerad på denna kurs"
 
@@ -6080,19 +6049,11 @@ msgstr "Du har överskridit det maximala antalet försök ({0}) för denna fråg
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr "Du har fått resultat av {0} för frågesport {1}"
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr "Du har inte skapat några uppgifter ännu. För att skapa ny uppgift, klicka på knapp \"Ny\" ovan."
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr "Du har inte skapat några frågesporter än. För att skapa ny frågesport, klicka på knapp \"Nytt Frågesport\" ovan."
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Du har valt att bli meddelad om denna kurs. Du kommer att få ett e-post meddelande när kursen blir tillgänglig."
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr "Du måste logga in först för att registrera dig till denna kurs"
 
@@ -6124,7 +6085,7 @@ msgstr "YouTube Video visas överst i lektion."
 msgid "Your Account has been successfully created!"
 msgstr "Ditt konto är skapad!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr "Din grupp {0} börjar imorgon"
 
@@ -6178,11 +6139,11 @@ msgstr "aktiviteter"
 msgid "activity"
 msgstr "aktivitet"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr "sökande"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr "sökande"
 
@@ -6242,7 +6203,7 @@ msgstr "av "
 msgid "out of"
 msgstr "av"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr "fråga_detalj"
 
@@ -6262,10 +6223,18 @@ msgstr "veckor"
 msgid "you can"
 msgstr "du kan"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr "{0} Uppgifter"
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr "{0} Lediga Jobb"
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr "{0} Frågesporter"
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr "{0} Inställningar hittades inte"
diff --git a/lms/locale/th.po b/lms/locale/th.po
index db79c27a..9d8f6c95 100644
--- a/lms/locale/th.po
+++ b/lms/locale/th.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Thai\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr ""
 msgid "% completed"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr ""
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr ""
@@ -193,10 +181,6 @@ msgstr ""
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr ""
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -293,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -304,11 +288,10 @@ msgstr ""
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr ""
 
@@ -316,11 +299,10 @@ msgstr ""
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -341,31 +323,35 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
 msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
@@ -399,11 +385,11 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -430,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr ""
 
@@ -525,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr ""
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr ""
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr ""
@@ -677,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr ""
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr ""
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr ""
 
@@ -801,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -880,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -901,6 +892,10 @@ msgstr ""
 msgid "Check Discussion"
 msgstr ""
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr ""
@@ -916,21 +911,25 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1228,15 +1237,15 @@ msgstr ""
 msgid "Correct"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr ""
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr ""
 msgid "Course Completed"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1364,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1421,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr ""
 
@@ -1456,6 +1477,11 @@ msgstr ""
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr ""
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1476,11 +1502,7 @@ msgstr ""
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr ""
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr ""
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr ""
 
@@ -1573,7 +1594,7 @@ msgstr ""
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1614,9 +1635,9 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr ""
 
@@ -1624,27 +1645,27 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1661,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr ""
 
@@ -1687,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1768,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -1822,7 +1842,7 @@ msgstr ""
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr ""
 
@@ -1870,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr ""
 
@@ -1888,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1915,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -2001,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr ""
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr ""
@@ -2128,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr ""
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr ""
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr ""
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2355,6 +2350,10 @@ msgstr ""
 msgid "Help us improve our course material."
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr ""
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -2492,7 +2490,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr ""
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -2742,7 +2740,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr ""
 
@@ -3119,7 +3133,6 @@ msgstr ""
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr ""
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr ""
 
@@ -3236,7 +3248,7 @@ msgstr ""
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
@@ -3259,7 +3271,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr ""
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3512,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3583,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr ""
 
@@ -3717,7 +3700,7 @@ msgstr ""
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr ""
@@ -3814,15 +3797,15 @@ msgstr ""
 msgid "Option 4"
 msgstr ""
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr ""
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3902,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr ""
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -4023,7 +4004,7 @@ msgstr ""
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr ""
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr ""
 
@@ -4192,18 +4177,10 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr ""
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr ""
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr ""
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr ""
 msgid "Question Name"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4430,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4535,7 +4513,7 @@ msgstr ""
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4564,7 +4542,7 @@ msgstr ""
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr ""
 
@@ -4633,6 +4611,10 @@ msgstr ""
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr ""
@@ -4642,19 +4624,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr ""
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
 
@@ -4730,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr ""
 
@@ -4750,11 +4731,11 @@ msgstr ""
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr ""
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr ""
@@ -4833,17 +4817,17 @@ msgstr ""
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr ""
 
@@ -4953,6 +4937,14 @@ msgstr ""
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5003,11 +4995,10 @@ msgstr ""
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr ""
 
@@ -5028,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr ""
 
@@ -5062,7 +5052,7 @@ msgstr ""
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5147,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr ""
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr ""
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr ""
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5408,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr ""
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5689,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr ""
 
@@ -5853,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr ""
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr ""
@@ -5982,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6064,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6124,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr ""
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""
diff --git a/lms/locale/tr.po b/lms/locale/tr.po
index 8de37dfa..e6c076b0 100644
--- a/lms/locale/tr.po
+++ b/lms/locale/tr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr " Lütfen değerlendirin ve not verin."
 msgid "% completed"
 msgstr "% tamamlandı"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr "<span style=\"font-size: 18px;\"><b>İstatistikler</b></span>"
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -123,13 +107,17 @@ msgstr "Başarılar"
 msgid "Active"
 msgstr "Aktif"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Ekle"
@@ -168,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr "Kurs Ekle"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -176,7 +164,7 @@ msgstr ""
 msgid "Add a lesson"
 msgstr "Bir ders ekle"
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr "Yeni Soru Ekle"
@@ -193,10 +181,6 @@ msgstr "Bir değerlendirme ekleyin"
 msgid "Add an assignment to your lesson"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr "Mevcut bir soruyu ekle"
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "Bu soru için en azından bir olası cevap ekleyin: {0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "Yönetici"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Tümü"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "Tüm Kurslar"
 
@@ -293,7 +277,7 @@ msgstr "Kendi Kendine Kayıt Olmaya İzin Ver"
 msgid "Allow accessing future dates"
 msgstr "Gelecekteki tarihlere erişime izin ver"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "Kendi Kendine Kayıt Olmaya İzin Ver"
 
@@ -304,11 +288,10 @@ msgstr "Zaten kayıltı"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Tutar"
 
@@ -316,11 +299,10 @@ msgstr "Tutar"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "Tutar (USD)"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr "Ödenen partiler için tutar ve para birimi gereklidir."
 
@@ -341,32 +323,36 @@ msgstr "GST ile Tutar"
 msgid "Announcement"
 msgstr "Duyuru"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "Cevap"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr "Parti URL’si herhangi bir çevrimiçi platformda paylaşıldığında görünür."
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "Alınan Başvurular"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "Onaylandı"
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "Arşivlendi"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -414,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "Değerlendirme"
@@ -430,11 +416,11 @@ msgstr "Değerlendirme Adı"
 msgid "Assessment Type"
 msgstr "Değerlendirme Türü"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "Değerlendirme {0} bu gruba zaten eklendi."
 
@@ -479,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr "Ödev Başlığı"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -487,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "{1} tarafından verilen {0} Dersi için ödev zaten mevcut."
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Ödev dersin alt kısmında görünecektir."
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Atamalar"
 
@@ -525,6 +515,10 @@ msgstr "Otomatik Atama"
 msgid "Auto Recording"
 msgstr "Otomatik Kayıt"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "Toplu Onay Şablonu"
 msgid "Batch Course"
 msgstr "Toplu Kurs"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "Toplu İş Oluşturuldu"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "Parti Açıklaması"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "Parti Detayları"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr ""
 
@@ -646,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "Parti:"
@@ -677,7 +665,7 @@ msgstr "Sınıflar"
 msgid "Begin Date"
 msgstr "Başlangıç Tarihi"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Fatura Detayları"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "CGPA/4"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "İptal"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -766,18 +754,16 @@ msgstr "Günlük Giyim"
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategori"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "Kategori Adı"
 
@@ -801,7 +787,7 @@ msgstr "Sertifika Bağlantısı"
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -809,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr "Sertifikalar"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -822,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "Sertifika Adı"
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
 
@@ -862,7 +849,7 @@ msgstr "Sertifikalı Katılımcılar"
 msgid "Change"
 msgstr "Değiştir"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr "Değişiklikler başarıyla kaydedildi"
 
@@ -880,11 +867,15 @@ msgstr "Bölüm"
 msgid "Chapter Reference"
 msgstr "Bölüm Referansı"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr "Bölüm başarıyla eklendi"
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr "Bölüm başarıyla güncellendi"
 
@@ -901,6 +892,10 @@ msgstr "Kontrol et"
 msgid "Check Discussion"
 msgstr "Tartışmayı Kontrol Edin"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "Sertifikasyon hakkında daha fazla bilgi edinmek için {0} adresine göz atın."
@@ -916,21 +911,25 @@ msgstr "Kursları Kontrol Et"
 msgid "Choices"
 msgstr "Seçimler"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Uygulanabilir tüm cevapları seçin"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "Bir simge seçimi"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Bir cevap seçin"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "Client ID"
 msgid "Client Secret"
 msgstr "Client Secret"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Kapat"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "Şirket Web Sitesi"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1164,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Onayla"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr "Öğrenmeye Devam Et"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Sözleşme"
@@ -1228,15 +1237,15 @@ msgstr "Kurumsal Organizasyon"
 msgid "Correct"
 msgstr "Doğru"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr "Doğru Cevap"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "Kurs Bölümü"
 msgid "Course Completed"
 msgstr "Kurslar Tamamlandı"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr ""
 msgid "Course Data"
 msgstr "Kurs Verileri"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "Kurs Açıklaması"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "Kurs Resmi"
 
@@ -1364,7 +1381,7 @@ msgstr "Kurs Listesi"
 msgid "Course Name"
 msgstr "Kurs Adı"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1396,23 +1413,27 @@ msgstr "Kurs İstatistikleri"
 msgid "Course Title"
 msgstr "Kurs Başlığı"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "Kurs zaten gruba eklendi."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr "Kurs başarıyla silindi"
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr "Kurs başarıyla taşındı"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "Kurs {0} bu gruba zaten eklenmiştir."
@@ -1421,13 +1442,13 @@ msgstr "Kurs {0} bu gruba zaten eklenmiştir."
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr "Kapak Resmi"
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Oluştur"
 
@@ -1456,6 +1477,11 @@ msgstr "Oluştur"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Yeni Oluştur"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "Kurs Oluştur"
@@ -1476,11 +1502,7 @@ msgstr "Bir Kurs Oluştur"
 msgid "Create a live class"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr "Yeni bir soru oluştur"
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr ""
 
@@ -1496,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Oluşturdu"
 
@@ -1511,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Para Birimi"
 
@@ -1573,7 +1594,7 @@ msgstr "Tarih"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "Tarih ve Saat"
@@ -1614,9 +1635,9 @@ msgstr "Varsayılan Para Birimi"
 msgid "Degree Type"
 msgstr "Derece Türü"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Sil"
 
@@ -1624,27 +1645,27 @@ msgstr "Sil"
 msgid "Delete Chapter"
 msgstr "Bölümü Sil"
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr "Kursu Sil"
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr "Bu bölümü silmek istiyor musunuz?"
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr "Bu dersi silmek istiyor musunuz?"
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "Kursu silmek, tüm bölümlerini ve derslerini de silecektir. Bu kursu silmek istediğinizden emin misiniz?"
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "Bu bölümü silmek, tüm derslerini de silecek ve onu kurstan kalıcı olarak kaldıracaktır. Bu eylem geri alınamaz. Devam etmek istediğinizden emin misiniz?"
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "Bu dersi silmek onu kurstan kalıcı olarak kaldıracaktır. Bu eylem geri alınamaz. Devam etmek istediğinizden emin misiniz?"
 
@@ -1661,7 +1682,7 @@ msgstr "Bu dersi silmek onu kurstan kalıcı olarak kaldıracaktır. Bu eylem ge
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr "Bu dersi silmek onu kurstan kalıcı olarak kaldıracaktır. Bu eylem ge
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Açıklama"
 
@@ -1687,7 +1707,7 @@ msgstr "Masa"
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "Kendi Kendine Kayıt Olmayı Devre Dışı Bırak"
 
@@ -1768,7 +1788,7 @@ msgstr "E-posta"
 msgid "E-mail"
 msgstr "E-Posta"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "E-Posta"
 msgid "Edit"
 msgstr "Düzenle"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr ""
 
@@ -1808,8 +1828,8 @@ msgstr "Eğitim Detayı"
 msgid "Education Details"
 msgstr "Eğitim Geçmişi"
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "E-posta"
 
@@ -1822,7 +1842,7 @@ msgstr "E-Posta ID"
 msgid "Email Sent"
 msgstr "E-posta Gönderildi"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "E-Posta Şablonu"
 
@@ -1870,9 +1890,8 @@ msgstr "Bunu etkinleştirmek, sertifikanın sertifikalı katılımcılar sayfas
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Bitiş Tarihi"
 
@@ -1888,7 +1907,7 @@ msgstr "Bitiş Tarihi (veya beklenen)"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "Bitiş Tarihi (veya beklenen)"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "Bitiş Zamanı"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr "Hemen Kaydol"
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr "Kayıtlı"
 
@@ -1915,10 +1933,6 @@ msgstr "Kayıtlı"
 msgid "Enrolled Students"
 msgstr "Kayıtlı Öğrenci"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "Başarıyla kaydoldu"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1928,7 +1942,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Kayıt Sayısı"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr "Kayıt Başarısız"
 
@@ -1955,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "Doğru cevabı girin"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Hata"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "Değerlendirme"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr "Değerlendirme Detayları"
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr "Değerlendirme Bitiş Tarihi"
 
@@ -2001,11 +1996,11 @@ msgstr "Değerlendirme Bitiş Tarihi"
 msgid "Evaluation Request"
 msgstr "Değerlendirme Talebi"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2016,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr "Değerlendirici Programı"
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Etkinlik"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2109,7 +2104,7 @@ msgstr "Son Kullanım Tarihi"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "Açıklamalar"
@@ -2128,7 +2123,7 @@ msgstr "Daha Fazlasını Keşfedin"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "Başarısız"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Öne Çıkan"
@@ -2166,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "Dosya Türü"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Adı"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "Serbest"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Serbest çalışan"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "Tam Adı"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Tam Zamanlı"
@@ -2355,6 +2350,10 @@ msgstr "Bir kurs oluşturarak başkalarının yeni bir şeyler öğrenmesine yar
 msgid "Help us improve our course material."
 msgstr "Ders materyalimizi geliştirmemize yardımcı olun."
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr "Bir iş arıyorum"
 msgid "I am unavailable"
 msgstr "Müsait değilim"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "ID"
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "Herhangi bir sorunuz veya yardıma ihtiyacınız varsa bizimle iletişim
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr "Burada bir tutar belirlerseniz, USD karşılığı uygulanmayacaktır."
 
@@ -2484,7 +2482,7 @@ msgstr "Resim"
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "Resim: Bozuk Veri Akışı"
 
@@ -2492,7 +2490,7 @@ msgstr "Resim: Bozuk Veri Akışı"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "Eğitmen Notları"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "Yayınlanma Tarihi"
 msgid "Items in Sidebar"
 msgstr "Kenar Çubuğundaki Öğeler"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr "İş İlanı Başlığı"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "İşler"
@@ -2742,7 +2740,7 @@ msgstr "İşler"
 msgid "Join"
 msgstr "Katıl"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr ""
 
@@ -3038,6 +3036,22 @@ msgstr "Ders Referansı"
 msgid "Lesson Title"
 msgstr "Ders Başlığı"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Bağlantılar"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Canlı"
 
@@ -3103,12 +3117,12 @@ msgstr "Canlı Sınıf"
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Daha Fazla Yükle"
 
@@ -3119,7 +3133,6 @@ msgstr "Yerel"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "Bir Duyuru Yapın"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3195,10 +3208,10 @@ msgstr "Okundu olarak İşaretle"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Orta"
 
@@ -3236,7 +3248,7 @@ msgstr "Orta"
 msgid "Medium ID"
 msgstr "Medium"
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Orta:"
@@ -3259,7 +3271,7 @@ msgstr "Orta:"
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "Üye Türü"
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3408,9 +3420,9 @@ msgstr "Meta Açıklaması"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr ""
 
@@ -3444,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "Takvimim"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Yeni"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "Yeni Parti"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "Yeni Kurs"
 
@@ -3512,7 +3528,7 @@ msgstr "Yeni İş"
 msgid "New Job Applicant"
 msgstr "Yeni İş Başvurusu"
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3528,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr "Yeni Soru"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr "Yeni Test"
@@ -3583,26 +3599,10 @@ msgstr "Yaklaşan Değerlendirme Yok"
 msgid "No announcements"
 msgstr "Hiçbir duyuru yok"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr "Toplu kurs bulunamadı"
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "Sertifika yok"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3611,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr "Hiçbir kurs oluşturulmadı"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr "Hiçbir kurs bulunamadı"
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3631,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr "Tanıtım yok"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Planlanmış canlı ders yok"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr "Hiçbir program bulunamadı"
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr "Hiçbir sınav bulunamadı"
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "Bu tarih için boş yer bulunmamaktadır."
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr "Başvuru yok"
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "{0} Yok"
 
@@ -3717,7 +3700,7 @@ msgstr "Bildirimler"
 msgid "Notify me when available"
 msgstr "Kullanılabilir olduğundan bana bildir"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3757,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Sadece {0} türündeki dosyalar kabul edilecektir."
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr "Sadece resim dosyasına izin verilir."
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr ""
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "Seçenek"
@@ -3814,15 +3797,15 @@ msgstr "Seçenek 3"
 msgid "Option 4"
 msgstr "Seçenek 4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "Şeçenekler"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "Sipariş No"
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr ""
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "Sayfalar"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "Ücretli Kurs"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Yarı Zamanlı"
@@ -3902,7 +3884,7 @@ msgstr "Kısmen Tamamlandı"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "Başarı Yüzdesi"
 msgid "Password"
 msgstr "Şifre"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr "Ödeme uygulaması yüklü değil"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "Bekliyor"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "Yüzde"
@@ -4023,7 +4004,7 @@ msgstr "Yüzde"
 msgid "Percentage (e.g. 70%)"
 msgstr "Yüzde (örn. %70)"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr "Lütfen Giriş Yapın"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4056,15 +4033,15 @@ msgstr "Doğrulama için lütfen e-postanızı kontrol edin"
 msgid "Please click on the following button to set your new password"
 msgstr "Yeni şifrenizi belirlemek için lütfen aşağıdaki linke tıklayınız"
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "Bu özelliği kullanmak için lütfen Zoom Ayarlarını etkinleştirin."
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4072,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr "Lütfen tüm soruları {0} dakika içinde yanıtladığınızdan emin olun."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4081,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr "Lütfen geçerli bir URL girin."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4093,7 +4070,7 @@ msgstr "Lütfen ödev gönderimi için URL'yi girin."
 msgid "Please enter your answer"
 msgstr "Lütfen cevabınızı girin"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4122,35 +4099,39 @@ msgstr "Ödeme işlemine devam etmek için lütfen giriş yapın."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Lütfen iyi hazırlanın ve değerlendirmelere zamanında katılın."
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "Lütfen bir tarih seçin."
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4163,7 +4144,11 @@ msgstr "Lütfen ödev dosyasını yükleyin."
 msgid "Point of Score (e.g. 70)"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr "Olasılık"
 
@@ -4192,18 +4177,10 @@ msgstr "Olası Cevap 4"
 msgid "Post"
 msgstr "Gönder"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Posta Kodu"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr "Yayınlama Tarihi"
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr ""
@@ -4239,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr "Resim Önizleme"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "Video Önzileme"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "Önceki"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Fiyatlandırma"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4318,14 +4295,15 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "Katılımcı Sayfasında Yayınla"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Yayınlandı"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "Yayınlamış Kurslar"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "Yayınlanma Zamanı"
@@ -4382,9 +4360,9 @@ msgstr ""
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr "Soru Detayı"
 msgid "Question Name"
 msgstr "Soru Adı"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr "Soru başarıyla eklendi"
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr "Soru başarıyla güncellendi"
 
@@ -4430,7 +4408,7 @@ msgstr "Soru {0} / {1}"
 msgid "Questions"
 msgstr "Sorular"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr "Sorular başarıyla silindi"
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "Sınav Gönderimi"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4467,7 +4445,7 @@ msgstr "Sınav Özeti"
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4475,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr "Sınav başarıyla güncellendi"
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr "Sınavlar"
@@ -4535,7 +4513,7 @@ msgstr "Referans Belge Türü"
 msgid "Regards"
 msgstr "Saygılarımla"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr "Şimdi Kaydol"
 
@@ -4564,7 +4542,7 @@ msgstr "Reddedildi"
 msgid "Related Courses"
 msgstr "İlgili Kurslar"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -4633,6 +4611,10 @@ msgstr "Rol"
 msgid "Role Preference"
 msgstr "Rol Tercihi"
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Roller"
@@ -4642,19 +4624,19 @@ msgstr "Roller"
 msgid "Route"
 msgstr "Rota"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4697,14 +4679,13 @@ msgstr "Cumartesi"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Kaydet"
 
@@ -4730,7 +4711,7 @@ msgstr "Kapsam"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Arama"
 
@@ -4750,11 +4731,11 @@ msgstr "Arama"
 msgid "Search by Name"
 msgstr "İsme Göre Ara"
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr "Başlığa Göre Ara"
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr "Başlığa göre ara"
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr "Bir simge arayın"
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "Koltuk Sayısı"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr "Kalan Koltuk"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr "Kalan Koltuk Sayısı"
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr "Bir soru seçin"
 
@@ -4824,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Ayarlar"
@@ -4833,17 +4817,17 @@ msgstr "Ayarlar"
 msgid "Share on"
 msgstr "Paylaş"
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr "Kısa Tanıtım"
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4945,7 +4929,7 @@ msgstr "Yetkinlik İsmi"
 msgid "Skills"
 msgstr "Yetkinlikler"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "Geç"
 
@@ -4953,6 +4937,14 @@ msgstr "Geç"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "Kısaltma"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr "Tükendi"
 
@@ -5003,11 +4995,10 @@ msgstr "Başlangıç"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Başlangıç Tarihi"
 
@@ -5028,7 +5019,7 @@ msgstr "Öğrenmeye Başlayın"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "Öğrenmeye Başlayın"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "Başlangıç Zamanı"
 
@@ -5062,7 +5052,7 @@ msgstr "Durum"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr "Öğrenci İncelemeleri"
 msgid "Students"
 msgstr "Öğrenciler"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr "Öğrenciler başarıyla silindi"
 
@@ -5147,6 +5137,10 @@ msgstr "Alt Grup"
 msgid "Subject"
 msgstr "Konu"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5155,7 +5149,7 @@ msgstr ""
 msgid "Submission List"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr ""
 
@@ -5168,7 +5162,7 @@ msgstr ""
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr ""
 msgid "Submit"
 msgstr "Gönder"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr "Kaydedildi {0}"
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Başarılı"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "Sistem Yöneticisi"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Etiketler"
@@ -5348,7 +5318,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr "Teşekkürler ve Saygılar"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr ""
 
@@ -5376,27 +5346,11 @@ msgstr "Bu slot başka bir katılımcı tarafından rezerve edilmiş."
 msgid "The status of your application has changed."
 msgstr "Başvurunuzun durumu değişti."
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "Şu anda mevcut toplu ders bulunmamaktadır. Gözünüzü dört açın, yeni öğrenme deneyimleri yakında yolda!"
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr "Bu kursta bölüm bulunmamaktadır. Bölümleri buradan oluşturun ve yönetin."
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr "Bu grupta boş yer bulunmamaktadır."
 
@@ -5408,6 +5362,10 @@ msgstr "Bu grupta hiç öğrenci bulunmamaktadır."
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "Bu sitede {0} yok."
@@ -5443,7 +5401,7 @@ msgstr ""
 msgid "This course has:"
 msgstr "Bu kursta:"
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "Bu kurs ücretsizdir."
 
@@ -5529,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "Zaman Dilimi"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Başlık"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5602,7 +5559,7 @@ msgstr "Alıcı"
 msgid "To Date"
 msgstr "Bitiş Tarihi"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -5655,9 +5612,9 @@ msgstr "X"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "X"
 msgid "Type"
 msgstr "Türü"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr "Cevabınızı yazın"
 
@@ -5689,6 +5646,10 @@ msgstr "URL"
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5703,7 +5664,7 @@ msgstr "İnceleniyor"
 msgid "Unlisted"
 msgstr "Listelenmemiş"
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5725,8 +5686,8 @@ msgstr "Ayarlanmamış Rol"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "Güncelle"
 msgid "Update Password"
 msgstr "Şifreyi Güncelle"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Yükle"
 
@@ -5853,7 +5814,7 @@ msgstr "Sertifikayı Görüntüle"
 msgid "Visibility"
 msgstr "Görünürlülük"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5861,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr "Görüntülemek için aşağıdaki bağlantıyı ziyaret edin "
 
@@ -5893,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Web Sayfası"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "Çarşamba"
 msgid "Welcome to {0}!"
 msgstr "{0} Uygulamasına Hoş Geldiniz!"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "Önizlemede dahil etmek ne anlama geliyor?"
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "Bir kurs incelenmek üzere gönderildiğinde burada listelenecektir."
@@ -5982,10 +5955,6 @@ msgstr "Bu sınıfın üyesi değilsiniz. Lütfen yaklaşan sınıflara göz at
 msgid "You are not a mentor of the course {0}"
 msgstr "Kursun mentoru değilsiniz {0}"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr "Kayıtlı değilsiniz"
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr "Bu derse kayıtlı değilsiniz. Bu derse erişmek için lütfen kaydolun."
@@ -6064,11 +6033,11 @@ msgstr "Bu kursa zaten yorum eklediniz"
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr "Bu gruba kayıt oldunuz"
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr "Bu kursa zaten kayıtlısınız"
 
@@ -6080,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr "Henüz hiçbir sınav oluşturmadınız. Yeni bir sınav oluşturmak için yukarıdaki \"Yeni Sınav\" düğmesine tıklayın."
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "Bu kurs için bildirim almayı seçtiniz. Kurs kullanılabilir olduğunda bir e-posta alacaksınız."
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr "Bu kursa kaydolmak için önce giriş yapmanız gerekiyor"
 
@@ -6124,7 +6085,7 @@ msgstr "YouTube Videosu dersin en üstünde görünecektir."
 msgid "Your Account has been successfully created!"
 msgstr "Hesabınız başarıyla oluşturuldu!"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6178,11 +6139,11 @@ msgstr "aktiviteler"
 msgid "activity"
 msgstr "aktivite"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "/"
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6262,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr "yapabilirsin"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr "{0} Ayarları bulunamadı"
diff --git a/lms/locale/zh.po b/lms/locale/zh.po
index 1d5651c3..d8baaccb 100644
--- a/lms/locale/zh.po
+++ b/lms/locale/zh.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-02 16:04+0000\n"
-"PO-Revision-Date: 2025-05-06 12:54\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -27,22 +27,6 @@ msgstr "请进行评估并评分。"
 msgid "% completed"
 msgstr "完成百分比"
 
-#: frontend/src/pages/PersonaForm.vue:17
-msgid "1. What best describes your role?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:29
-msgid "2. How many students are you planning to teach?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:42
-msgid "3. What is your main use case for Frappe Learning?"
-msgstr ""
-
-#: frontend/src/pages/PersonaForm.vue:55
-msgid "4. Are you currently using any Frappe products?"
-msgstr ""
-
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
@@ -87,7 +71,7 @@ msgstr "<span style=\"font-size: 18px;\"><b>统计数据</b></span>"
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr "课程不可同时设置付费证书与结业证书。"
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr "课程卡片显示的课程简介（单行）"
 
@@ -123,13 +107,17 @@ msgstr "成就"
 msgid "Active"
 msgstr "激活"
 
+#: frontend/src/pages/Statistics.vue:16
+msgid "Active Members"
+msgstr ""
+
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "添加"
@@ -168,7 +156,7 @@ msgstr "添加章节"
 msgid "Add a course"
 msgstr "创建课程"
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr "输入关键词后按回车键添加"
 
@@ -176,7 +164,7 @@ msgstr "输入关键词后按回车键添加"
 msgid "Add a lesson"
 msgstr "添加课时"
 
-#: frontend/src/components/Modals/Question.vue:147
+#: frontend/src/components/Modals/Question.vue:163
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
 msgstr "新增试题"
@@ -193,10 +181,6 @@ msgstr "添加考核"
 msgid "Add an assignment to your lesson"
 msgstr "为本课时添加作业"
 
-#: frontend/src/components/Modals/Question.vue:18
-msgid "Add an existing question"
-msgstr "添加现有试题"
-
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
 msgstr "请为该问题添加至少一个备选答案：{0}"
@@ -249,15 +233,15 @@ msgid "Admin"
 msgstr "管理员"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "全部"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr "所有批次"
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr "所有课程"
 
@@ -293,7 +277,7 @@ msgstr "允许自助注册"
 msgid "Allow accessing future dates"
 msgstr "允许访问未来日期"
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr "允许自助注册"
 
@@ -304,11 +288,10 @@ msgstr "已注册"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "金额"
 
@@ -316,11 +299,10 @@ msgstr "金额"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr "金额（美元）"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr "付费批次必须填写金额与币种。"
 
@@ -341,32 +323,36 @@ msgstr "含商品及服务税金额"
 msgid "Announcement"
 msgstr "公告"
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr "公告发送成功"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr "答案"
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr "显示在课程列表的课程卡片上"
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr "在分享批次链接至网络平台时显示"
 
-#: frontend/src/pages/JobDetail.vue:137
-msgid "Applications Received"
-msgstr "收到的申请"
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
@@ -399,11 +385,11 @@ msgstr "已批准"
 msgid "Apps"
 msgstr "应用"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr "已归档"
 
-#: frontend/src/components/UpcomingEvaluations.vue:170
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "确认取消本次评估？此操作不可撤销。"
 
@@ -414,7 +400,7 @@ msgstr "确定要登录Frappe Cloud控制面板？"
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr "考核"
@@ -430,11 +416,11 @@ msgstr "考核名称"
 msgid "Assessment Type"
 msgstr "考核类型"
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr "考核添加成功"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr "考核{0}已添加至本批次。"
 
@@ -479,7 +465,7 @@ msgstr "作业提交记录"
 msgid "Assignment Title"
 msgstr "作业标题"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:112
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr "作业创建成功"
 
@@ -487,7 +473,11 @@ msgstr "作业创建成功"
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "学员{1}的课时{0}作业已存在。"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:129
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr "作业更新成功"
 
@@ -497,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr "作业将显示在课时末尾。"
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "作业"
 
@@ -525,6 +515,10 @@ msgstr "自动分配"
 msgid "Auto Recording"
 msgstr "自动录制"
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -579,10 +573,6 @@ msgstr "批次确认模板"
 msgid "Batch Course"
 msgstr "批次课程"
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr "批次已创建"
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -590,16 +580,14 @@ msgid "Batch Description"
 msgstr "批次说明"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:349
-#: lms/templates/emails/batch_confirmation.html:24
+#: lms/templates/emails/batch_confirmation.html:26
 msgid "Batch Details"
 msgstr "批次详情"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
 msgstr "批次原始数据"
 
@@ -646,10 +634,6 @@ msgstr "批次开始日期："
 msgid "Batch Title"
 msgstr "批次标题"
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr "批次已更新"
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr "批次结束日期不可早于开始日期"
@@ -662,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr "该批次已满额。"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr "批次："
@@ -677,7 +665,7 @@ msgstr "批次"
 msgid "Begin Date"
 msgstr "起始日期"
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -686,7 +674,7 @@ msgstr "此致敬礼"
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "账单明细"
@@ -735,11 +723,11 @@ msgid "CGPA/4"
 msgstr "累计平均绩点/4分制"
 
 #: frontend/src/components/UpcomingEvaluations.vue:60
-#: frontend/src/components/UpcomingEvaluations.vue:175
+#: frontend/src/components/UpcomingEvaluations.vue:174
 msgid "Cancel"
 msgstr "取消"
 
-#: frontend/src/components/UpcomingEvaluations.vue:169
+#: frontend/src/components/UpcomingEvaluations.vue:168
 msgid "Cancel this evaluation?"
 msgstr "取消本次评估？"
 
@@ -766,18 +754,16 @@ msgstr "便装"
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
-#: frontend/src/pages/JobDetail.vue:112
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "类别"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr "类别名称"
 
@@ -801,7 +787,7 @@ msgstr "证书链接"
 msgid "Certificate of Completion"
 msgstr "结业证书"
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr "证书保存成功"
 
@@ -809,7 +795,7 @@ msgstr "证书保存成功"
 msgid "Certificates"
 msgstr "证书"
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr "证书生成成功"
 
@@ -822,11 +808,11 @@ msgstr "证书生成成功"
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -848,8 +834,9 @@ msgstr "认证名称"
 msgid "Certified"
 msgstr "已认证"
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
+#: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr "认证成员"
 
@@ -862,7 +849,7 @@ msgstr "认证参与者"
 msgid "Change"
 msgstr "变更"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr "变更保存成功"
 
@@ -880,11 +867,15 @@ msgstr "章节"
 msgid "Chapter Reference"
 msgstr "章节引用"
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr "章节添加成功"
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr "章节更新成功"
 
@@ -901,6 +892,10 @@ msgstr "检查"
 msgid "Check Discussion"
 msgstr "查看讨论"
 
+#: frontend/src/components/Modals/AssignmentForm.vue:55
+msgid "Check Submissions"
+msgstr ""
+
 #: lms/templates/certificates_section.html:24
 msgid "Check out the {0} to know more about certification."
 msgstr "查看{0}了解更多认证信息。"
@@ -916,21 +911,25 @@ msgstr "选课中心"
 msgid "Choices"
 msgstr "选项"
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "选择所有适用答案"
 
+#: frontend/src/components/Modals/Question.vue:19
+msgid "Choose an existing question"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:27
 msgid "Choose an icon"
 msgstr "选择图标"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "选择唯一答案"
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -963,6 +962,12 @@ msgstr "客户端ID"
 msgid "Client Secret"
 msgstr "客户端密钥"
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "关闭"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1109,7 +1114,7 @@ msgid "Company Website"
 msgstr "公司网站"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1137,12 +1142,12 @@ msgstr "完成注册——切勿错过！"
 msgid "Completed"
 msgstr "已完成"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr "学员完成情况"
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr "结业证书"
@@ -1164,6 +1169,10 @@ msgstr "条件必须为有效的Python代码"
 msgid "Conduct Evaluation"
 msgstr "执行评估"
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "确认"
@@ -1201,7 +1210,7 @@ msgid "Continue Learning"
 msgstr "继续学习"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "合同"
@@ -1228,15 +1237,15 @@ msgstr "企业机构"
 msgid "Correct"
 msgstr "正确"
 
-#: frontend/src/components/Modals/Question.vue:73
+#: frontend/src/components/Modals/Question.vue:76
 msgid "Correct Answer"
 msgstr "正确答案"
 
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1316,6 +1325,10 @@ msgstr "课程章节"
 msgid "Course Completed"
 msgstr "课程完成"
 
+#: frontend/src/pages/Statistics.vue:31
+msgid "Course Completions"
+msgstr ""
+
 #. Name of a role
 #: frontend/src/pages/ProfileRoles.vue:26
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -1333,16 +1346,20 @@ msgstr "课程创建者"
 msgid "Course Data"
 msgstr "课程数据"
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr "课程描述"
 
+#: frontend/src/pages/Statistics.vue:22
+msgid "Course Enrollments"
+msgstr ""
+
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
 msgstr "课程评估人"
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr "课程图片"
 
@@ -1364,7 +1381,7 @@ msgstr "课程列表"
 msgid "Course Name"
 msgstr "课程名称"
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr "课程大纲"
 
@@ -1396,23 +1413,27 @@ msgstr "课程统计"
 msgid "Course Title"
 msgstr "课程标题"
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr "课程已添加至项目"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
-msgstr "该课程已添加至批次"
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
+msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr "课程删除成功"
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr "课程移动成功"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr "课程{0}已添加至本批次"
@@ -1421,13 +1442,13 @@ msgstr "课程{0}已添加至本批次"
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1448,7 +1469,7 @@ msgid "Cover Image"
 msgstr "封面图片"
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "创建"
 
@@ -1456,6 +1477,11 @@ msgstr "创建"
 msgid "Create Certificate"
 msgstr "创建证书"
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "新建"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr "创建课程"
@@ -1476,11 +1502,7 @@ msgstr "创建课程"
 msgid "Create a live class"
 msgstr "创建直播课程"
 
-#: frontend/src/components/Modals/Question.vue:31
-msgid "Create a new question"
-msgstr "新建试题"
-
-#: frontend/src/components/Modals/AssignmentForm.vue:7
+#: frontend/src/components/Modals/AssignmentForm.vue:13
 msgid "Create an Assignment"
 msgstr "创建作业"
 
@@ -1496,7 +1518,7 @@ msgstr "创建首门课程"
 msgid "Create your first quiz"
 msgstr "创建首项测验"
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "已创建"
 
@@ -1511,11 +1533,10 @@ msgstr "正在创建课程"
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "币种"
 
@@ -1573,7 +1594,7 @@ msgstr "日期"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr "日期与时间"
@@ -1614,9 +1635,9 @@ msgstr "默认币种"
 msgid "Degree Type"
 msgstr "学位类型"
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "删除"
 
@@ -1624,27 +1645,27 @@ msgstr "删除"
 msgid "Delete Chapter"
 msgstr "删除章节"
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr "删除课程"
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr "确认删除此章节？"
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr "确认删除此课时？"
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr "删除本课程将同时删除其所有章节和课时。此操作不可逆。确认继续吗？"
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "删除本章节将同时删除其所有课时并永久移除。此操作不可撤销。确认继续吗？"
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr "删除本课时将永久移除。此操作不可撤销。确认继续吗？"
 
@@ -1661,7 +1682,7 @@ msgstr "删除本课时将永久移除。此操作不可撤销。确认继续吗
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1673,7 +1694,6 @@ msgstr "删除本课时将永久移除。此操作不可撤销。确认继续吗
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "描述"
 
@@ -1687,7 +1707,7 @@ msgstr "工作台"
 msgid "Details"
 msgstr "详情"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr "禁用自助注册"
 
@@ -1768,7 +1788,7 @@ msgstr "电子邮件"
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1776,7 +1796,7 @@ msgstr "电子邮件"
 msgid "Edit"
 msgstr "编辑"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:8
+#: frontend/src/components/Modals/AssignmentForm.vue:14
 msgid "Edit Assignment"
 msgstr "编辑作业"
 
@@ -1808,8 +1828,8 @@ msgstr "教育详情"
 msgid "Education Details"
 msgstr "教育背景详情"
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "电子邮件"
 
@@ -1822,7 +1842,7 @@ msgstr "邮箱账号"
 msgid "Email Sent"
 msgstr "邮件已发送"
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "邮件模板"
 
@@ -1870,9 +1890,8 @@ msgstr "启用后证书将发布至认证参与者页面"
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "结束日期"
 
@@ -1888,7 +1907,7 @@ msgstr "结束日期（或预期）"
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1897,15 +1916,14 @@ msgstr "结束日期（或预期）"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr "结束时间"
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr "立即报名"
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr "已注册"
 
@@ -1915,10 +1933,6 @@ msgstr "已注册"
 msgid "Enrolled Students"
 msgstr "注册学员"
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr "注册成功"
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr "{0}的注册确认"
@@ -1928,7 +1942,7 @@ msgstr "{0}的注册确认"
 msgid "Enrollment Count"
 msgstr "注册人数"
 
-#: lms/lms/utils.py:1910
+#: lms/lms/utils.py:1913
 msgid "Enrollment Failed"
 msgstr "注册失败"
 
@@ -1955,31 +1969,13 @@ msgstr "输入标题并保存测验以继续"
 msgid "Enter the correct answer"
 msgstr "输入正确答案"
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:252
-#: frontend/src/components/Modals/Question.vue:275
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "错误"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr "创建直播课程失败，请重试。错误：{0}"
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr "评估"
 
@@ -1990,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr "评估详情"
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr "评估结束日期"
 
@@ -2001,11 +1996,11 @@ msgstr "评估结束日期"
 msgid "Evaluation Request"
 msgstr "评估请求"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr "评估结束日期不得早于批次结束日期"
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr "评估保存成功"
 
@@ -2016,9 +2011,9 @@ msgstr "评估保存成功"
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2046,14 +2041,14 @@ msgstr "评估人姓名"
 msgid "Evaluator Schedule"
 msgstr "评估人日程"
 
-#: frontend/src/components/Modals/EvaluationModal.vue:151
-msgid "Evaluator is Unavailable"
-msgstr "评估人不可用"
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr "付费证书需指定评估人"
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2061,7 +2056,7 @@ msgstr "付费证书需指定评估人"
 msgid "Event"
 msgstr "事件"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr "示例：IST（+5:30）"
 
@@ -2109,7 +2104,7 @@ msgstr "到期日"
 #. Label of the explanation_1 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_3 (Small Text) field in DocType 'LMS Question'
 #. Label of the explanation_4 (Small Text) field in DocType 'LMS Question'
-#: frontend/src/components/Modals/Question.vue:69
+#: frontend/src/components/Modals/Question.vue:72
 #: lms/lms/doctype/lms_question/lms_question.json
 msgid "Explanation"
 msgstr "解析"
@@ -2128,7 +2123,7 @@ msgstr "查看更多"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2136,7 +2131,7 @@ msgstr "未通过"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "精选"
@@ -2166,7 +2161,7 @@ msgstr "专业/研究领域"
 msgid "File Type"
 msgstr "文件类型"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "名字"
@@ -2191,7 +2186,7 @@ msgid "Free"
 msgstr "免费"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "自由职业"
@@ -2235,7 +2230,7 @@ msgid "Full Name"
 msgstr "全名"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "全职"
@@ -2355,6 +2350,10 @@ msgstr "通过创建课程帮助他人学习新知"
 msgid "Help us improve our course material."
 msgstr "帮助我们改进课程材料"
 
+#: frontend/src/pages/PersonaForm.vue:16
+msgid "Help us understand your needs"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:1
 #: lms/templates/emails/certificate_request_notification.html:1
 msgid "Hey {0}"
@@ -2413,7 +2412,7 @@ msgstr "我正在求职"
 msgid "I am unavailable"
 msgstr "我暂不可用"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "ID"
 
@@ -2444,7 +2443,7 @@ msgstr "若未完成，计时结束后测验将自动提交"
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr "如有疑问或需协助，请联系支持团队"
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: lms/templates/emails/batch_start_reminder.html:27
 #: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
@@ -2454,7 +2453,6 @@ msgstr "如需帮助，请随时联系我们"
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr "此处设置金额后将不再应用美元等值换算"
 
@@ -2484,7 +2482,7 @@ msgstr "图片"
 msgid "Image search powered by"
 msgstr "图片搜索由{0}提供"
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "图片：数据流损坏"
 
@@ -2492,7 +2490,7 @@ msgstr "图片：数据流损坏"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr "讲师备注"
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr "签发于"
 msgid "Items in Sidebar"
 msgstr "侧边栏项目"
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr "项目移除成功"
 
@@ -2732,7 +2730,7 @@ msgstr "职位名称"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr "职位"
@@ -2742,7 +2740,7 @@ msgstr "职位"
 msgid "Join"
 msgstr "加入"
 
-#: frontend/src/components/UpcomingEvaluations.vue:94
+#: frontend/src/components/UpcomingEvaluations.vue:93
 msgid "Join Call"
 msgstr "加入通话"
 
@@ -3038,6 +3036,22 @@ msgstr "课时引用"
 msgid "Lesson Title"
 msgstr "课时标题"
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "链接"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "直播"
 
@@ -3103,12 +3117,12 @@ msgstr "直播课程"
 msgid "LiveCode URL"
 msgstr "实时编码链接"
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "加载更多"
 
@@ -3119,7 +3133,6 @@ msgstr "本地"
 
 #. Label of the location (Data) field in DocType 'Education Detail'
 #. Label of the location (Data) field in DocType 'Work Experience'
-#: frontend/src/pages/JobDetail.vue:101
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "Location"
@@ -3162,7 +3175,7 @@ msgstr "发布公告"
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr "请确保输入正确的开票名称，该名称将用于发票"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr "管理批次"
 
@@ -3195,10 +3208,10 @@ msgstr "标记为已读"
 
 #. Label of the marks (Int) field in DocType 'LMS Quiz Question'
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/components/Modals/Question.vue:50
-#: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Modals/Question.vue:40
+#: frontend/src/components/Modals/Question.vue:103
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3210,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr "第{0}题的得分不得超过该题总分"
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr "总分"
@@ -3225,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr "最大尝试次数"
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "媒介"
 
@@ -3236,7 +3248,7 @@ msgstr "媒介"
 msgid "Medium ID"
 msgstr "媒介ID"
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "媒介："
@@ -3259,7 +3271,7 @@ msgstr "媒介："
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3342,7 +3354,7 @@ msgstr "成员类型"
 msgid "Member Username"
 msgstr "成员用户名"
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr "成员已添加至项目"
 
@@ -3408,9 +3420,9 @@ msgstr "元描述"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "元图片"
 
@@ -3444,6 +3456,7 @@ msgstr "多选题至少需要两个选项"
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3490,17 +3503,20 @@ msgid "My calendar"
 msgstr "我的日历"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "新建"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr "新建批次"
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr "新建课程"
 
@@ -3512,7 +3528,7 @@ msgstr "新建职位"
 msgid "New Job Applicant"
 msgstr "新职位申请人"
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr "新建项目"
 
@@ -3528,7 +3544,7 @@ msgstr "新项目成员"
 msgid "New Question"
 msgstr "新建试题"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr "新建测验"
@@ -3583,26 +3599,10 @@ msgstr "暂无待评估项"
 msgid "No announcements"
 msgstr "暂无公告"
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr "未找到作业"
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr "未找到批次"
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr "无证书"
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr "无认证成员"
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr "未找到认证成员，请稍后再试或自行申请认证。"
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr "未添加任何课程"
@@ -3611,10 +3611,6 @@ msgstr "未添加任何课程"
 msgid "No courses created"
 msgstr "未创建课程"
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr "未找到课程"
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr "本项目暂无课程"
@@ -3631,36 +3627,23 @@ msgstr "尚未收到反馈"
 msgid "No introduction"
 msgstr "无简介"
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr "未找到招聘职位"
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "未安排直播课程"
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr "未找到项目"
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr "当前无测验提交记录，请稍后再查。"
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr "未找到测验"
-
-#: frontend/src/components/Modals/EvaluationModal.vue:61
+#: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr "该日期无可用时段"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr "无提交记录"
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "无{0}"
 
@@ -3717,7 +3700,7 @@ msgstr "通知"
 msgid "Notify me when available"
 msgstr "可用时通知我"
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr "可用席位数量"
 
@@ -3757,11 +3740,11 @@ msgstr "仅允许添加已禁用自主学习的课程至项目"
 msgid "Only files of type {0} will be accepted."
 msgstr "仅接受{0}类型文件"
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:524
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr "仅允许图片文件"
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr "仅允许zip文件"
 
@@ -3789,7 +3772,7 @@ msgid "Open Ended"
 msgstr "开放型问题"
 
 #. Label of the option (Data) field in DocType 'LMS Option'
-#: frontend/src/components/Modals/Question.vue:64
+#: frontend/src/components/Modals/Question.vue:67
 #: lms/lms/doctype/lms_option/lms_option.json
 msgid "Option"
 msgstr "选项"
@@ -3814,15 +3797,15 @@ msgstr "选项3"
 msgid "Option 4"
 msgstr "选项4"
 
+#: frontend/src/components/Modals/Question.vue:56
+msgid "Options"
+msgstr "选项"
+
 #. Label of the order_id (Data) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Order ID"
 msgstr "订单ID"
 
-#: frontend/src/pages/JobDetail.vue:90
-msgid "Organisation"
-msgstr "组织"
-
 #. Label of the organization (Data) field in DocType 'Certification'
 #: lms/lms/doctype/certification/certification.json
 msgid "Organization"
@@ -3861,14 +3844,13 @@ msgid "Pages"
 msgstr "页面"
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr "付费批次"
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr "付费证书"
@@ -3878,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr "评估后付费证书"
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr "付费课程"
@@ -3888,7 +3870,7 @@ msgid "Pan Number"
 msgstr "PAN号码"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "兼职"
@@ -3902,7 +3884,7 @@ msgstr "部分完成"
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3921,13 +3903,12 @@ msgstr "通过百分比"
 msgid "Password"
 msgstr "密码"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr "粘贴课程简介的YouTube短视频链接"
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4003,7 +3984,7 @@ msgstr "未安装支付应用"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4013,7 +3994,7 @@ msgstr "待处理"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr "百分比"
@@ -4023,7 +4004,7 @@ msgstr "百分比"
 msgid "Percentage (e.g. 70%)"
 msgstr "百分比（如70%）"
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr "百分比/状态"
 
@@ -4036,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "电话号码"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr "请登录"
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr "请为<a href='{2}'>{3}</a>添加<a href='{0}'>{1}</a>以发送评估日历邀请"
@@ -4056,15 +4033,15 @@ msgstr "请查看邮箱进行验证"
 msgid "Please click on the following button to set your new password"
 msgstr "点击下方按钮设置新密码"
 
-#: lms/lms/utils.py:2044 lms/lms/utils.py:2048
+#: lms/lms/utils.py:2047 lms/lms/utils.py:2051
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "请先完成项目前置课程以报名本课程"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr "请启用Zoom设置以使用此功能"
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr "请报名本课程以查看此课时"
 
@@ -4072,7 +4049,7 @@ msgstr "请报名本课程以查看此课时"
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr "请确保在{0}分钟内完成所有试题"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr "请输入标题"
 
@@ -4081,7 +4058,7 @@ msgstr "请输入标题"
 msgid "Please enter a valid URL."
 msgstr "请输入有效URL"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr "请输入HH:mm格式的有效时间"
 
@@ -4093,7 +4070,7 @@ msgstr "请输入作业提交URL"
 msgid "Please enter your answer"
 msgstr "请输入答案"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr "请安装支付应用以创建付费班级，详情请参阅文档{0}"
 
@@ -4122,35 +4099,39 @@ msgstr "请登录以继续支付"
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "请充分准备并准时参加评估"
 
-#: frontend/src/components/UpcomingEvaluations.vue:102
+#: frontend/src/components/UpcomingEvaluations.vue:101
 msgid "Please schedule an evaluation to get certified."
 msgstr "请安排评估以获取认证"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr "请选择日期"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr "请选择时长"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr "请选择未来的日期和时间"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr "请选择时间"
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr "请选择时区"
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr "请在{0}采取适当操作"
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr "请上传SCORM包"
 
@@ -4163,7 +4144,11 @@ msgstr "请上传作业文件"
 msgid "Point of Score (e.g. 70)"
 msgstr "分数点（如70分）"
 
-#: frontend/src/components/Modals/Question.vue:85
+#: frontend/src/components/Modals/Question.vue:62
+msgid "Possibilities"
+msgstr ""
+
+#: frontend/src/components/Modals/Question.vue:88
 msgid "Possibility"
 msgstr "可能性"
 
@@ -4192,18 +4177,10 @@ msgstr "备选答案4"
 msgid "Post"
 msgstr "发布"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "邮政编码"
 
-#: frontend/src/pages/JobDetail.vue:123
-msgid "Posted on"
-msgstr "发布于"
-
 #: frontend/src/components/AppSidebar.vue:122
 msgid "Powered by Learning"
 msgstr "技术支持：学习平台"
@@ -4239,7 +4216,7 @@ msgstr "首选地点"
 msgid "Preview Image"
 msgstr "预览图片"
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr "预览视频"
 
@@ -4248,13 +4225,13 @@ msgid "Previous"
 msgstr "上一项"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "定价"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr "定价与认证"
@@ -4318,14 +4295,15 @@ msgstr "项目成员"
 msgid "Program Members"
 msgstr "项目成员"
 
-#: frontend/src/pages/Programs.vue:226 lms/www/lms.py:295
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
+#: lms/www/lms.py:295
 msgid "Programs"
 msgstr "课程项目"
 
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,20 +4329,20 @@ msgstr "发布至参与者页面"
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "已发布"
 
+#: frontend/src/pages/Statistics.vue:10
 #: lms/lms/web_template/lms_statistics/lms_statistics.html:14
 #: lms/templates/statistics.html:4
 msgid "Published Courses"
 msgstr "已发布课程"
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr "发布于"
@@ -4382,9 +4360,9 @@ msgstr "已购证书"
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Assignment.vue:20
-#: frontend/src/components/Modals/AssignmentForm.vue:35
-#: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/components/Modals/AssignmentForm.vue:32
+#: frontend/src/components/Modals/Question.vue:27
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4409,11 +4387,11 @@ msgstr "问题详情"
 msgid "Question Name"
 msgstr "问题名称"
 
-#: frontend/src/components/Modals/Question.vue:270
+#: frontend/src/components/Modals/Question.vue:281
 msgid "Question added successfully"
 msgstr "问题添加成功"
 
-#: frontend/src/components/Modals/Question.vue:322
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr "问题更新成功"
 
@@ -4430,7 +4408,7 @@ msgstr "第{0}/{1}题"
 msgid "Questions"
 msgstr "问题"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr "问题删除成功"
 
@@ -4453,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr "测验提交"
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr "测验提交记录"
 
@@ -4467,7 +4445,7 @@ msgstr "测验摘要"
 msgid "Quiz Title"
 msgstr "测验标题"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr "测验创建成功"
 
@@ -4475,7 +4453,7 @@ msgstr "测验创建成功"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "访客无法访问测验，请登录继续"
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr "测验更新成功"
 
@@ -4485,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr "测验将显示在课时末尾"
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr "测验"
@@ -4535,7 +4513,7 @@ msgstr "参考文档类型"
 msgid "Regards"
 msgstr "此致"
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr "立即注册"
 
@@ -4564,7 +4542,7 @@ msgstr "已拒绝"
 msgid "Related Courses"
 msgstr "相关课程"
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "移除"
 
@@ -4633,6 +4611,10 @@ msgstr "角色"
 msgid "Role Preference"
 msgstr "角色偏好"
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "角色"
@@ -4642,19 +4624,19 @@ msgstr "角色"
 msgid "Route"
 msgstr "路由"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr "第{0}行日期不可超出批次周期"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr "第{0}行结束时间不可超出批次周期"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr "第{0}行开始时间不可大于等于结束时间"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr "第{0}行开始时间不可超出批次周期"
 
@@ -4697,14 +4679,13 @@ msgstr "星期六"
 #: frontend/src/components/AssessmentPlugin.vue:34
 #: frontend/src/components/Assignment.vue:46
 #: frontend/src/components/Controls/CodeEditor.vue:25
-#: frontend/src/components/Modals/AssignmentForm.vue:12
+#: frontend/src/components/Modals/AssignmentForm.vue:59
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
 #: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "保存"
 
@@ -4730,7 +4711,7 @@ msgstr "范围"
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4742,7 +4723,7 @@ msgid "Score Out Of"
 msgstr "总分值"
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "搜索"
 
@@ -4750,11 +4731,11 @@ msgstr "搜索"
 msgid "Search by Name"
 msgstr "按名称搜索"
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr "按标题搜索"
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr "按标题搜索"
 
@@ -4763,23 +4744,26 @@ msgid "Search for an icon"
 msgstr "搜索图标"
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr "席位总数"
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr "剩余席位"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr "剩余席位"
 
-#: frontend/src/components/Modals/Question.vue:94
+#: frontend/src/components/Modals/Question.vue:98
 msgid "Select a question"
 msgstr "选择试题"
 
@@ -4824,7 +4808,7 @@ msgstr "设置支付网关"
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "设置"
@@ -4833,17 +4817,17 @@ msgstr "设置"
 msgid "Share on"
 msgstr "分享至"
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr "简短描述"
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr "简介"
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr "批次简介"
 
@@ -4945,7 +4929,7 @@ msgstr "技能名称"
 msgid "Skills"
 msgstr "技能"
 
-#: frontend/src/pages/PersonaForm.vue:75 lms/templates/onboarding_header.html:6
+#: frontend/src/pages/PersonaForm.vue:51 lms/templates/onboarding_header.html:6
 msgid "Skip"
 msgstr "跳过"
 
@@ -4953,6 +4937,14 @@ msgstr "跳过"
 msgid "Slot Times are overlapping for some schedules."
 msgstr "部分日程时段存在重叠"
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4963,7 +4955,7 @@ msgid "Slug"
 msgstr "URL别名"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr "已售罄"
 
@@ -5003,11 +4995,10 @@ msgstr "开始"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "开始日期"
 
@@ -5028,7 +5019,7 @@ msgstr "开始学习"
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5037,7 +5028,6 @@ msgstr "开始学习"
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr "开始时间"
 
@@ -5062,7 +5052,7 @@ msgstr "状态"
 #. Label of the tab_4_tab (Tab Break) field in DocType 'LMS Course'
 #. Label of the statistics (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchStudents.vue:5
-#: frontend/src/pages/Statistics.vue:214
+#: frontend/src/pages/Statistics.vue:225
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:204
 msgid "Statistics"
@@ -5125,7 +5115,7 @@ msgstr "学员评价"
 msgid "Students"
 msgstr "学员"
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr "学员删除成功"
 
@@ -5147,6 +5137,10 @@ msgstr "子组"
 msgid "Subject"
 msgstr "主题"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr "提交"
@@ -5155,7 +5149,7 @@ msgstr "提交"
 msgid "Submission List"
 msgstr "提交列表"
 
-#: frontend/src/components/Modals/AssignmentForm.vue:30
+#: frontend/src/components/Modals/AssignmentForm.vue:27
 msgid "Submission Type"
 msgstr "提交类型"
 
@@ -5168,7 +5162,7 @@ msgstr "提交人"
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
-#: frontend/src/components/Modals/Question.vue:344
+#: frontend/src/components/Modals/Question.vue:109
 #: frontend/src/components/Quiz.vue:218 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
@@ -5176,7 +5170,7 @@ msgstr "提交人"
 msgid "Submit"
 msgstr "提交"
 
-#: frontend/src/pages/PersonaForm.vue:67
+#: frontend/src/pages/PersonaForm.vue:43
 msgid "Submit and Continue"
 msgstr ""
 
@@ -5189,30 +5183,6 @@ msgstr "请提交简历以继续申请此职位。提交后，简历将分享给
 msgid "Submitted {0}"
 msgstr "已提交{0}"
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:111
-#: frontend/src/components/Modals/AssignmentForm.vue:128
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:270
-#: frontend/src/components/Modals/Question.vue:321
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "成功"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5283,7 +5253,7 @@ msgid "System Manager"
 msgstr "系统管理员"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "标签"
@@ -5348,7 +5318,7 @@ msgstr "感谢您提供反馈！"
 msgid "Thanks and Regards"
 msgstr "此致敬礼"
 
-#: lms/lms/utils.py:1942
+#: lms/lms/utils.py:1945
 msgid "The batch is full. Please contact the Administrator."
 msgstr "该批次已满。请联系管理员"
 
@@ -5376,27 +5346,11 @@ msgstr "该时段已被其他参与者预定"
 msgid "The status of your application has changed."
 msgstr "您的申请状态已变更"
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "暂无符合条件的批次，请持续关注，新学习项目即将上线！"
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr "本课程暂无章节，请在此创建和管理章节"
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "暂无符合条件的课程，请持续关注，新学习项目即将上线！"
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr "当前暂无可用项目，请持续关注，新学习项目即将上线！"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr "本批次无可用席位"
 
@@ -5408,6 +5362,10 @@ msgstr "本批次暂无学员"
 msgid "There are no submissions for this assignment."
 msgstr "本作业暂无提交记录"
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "本站暂无{0}"
@@ -5443,7 +5401,7 @@ msgstr "本课程已结束"
 msgid "This course has:"
 msgstr "本课程包含："
 
-#: lms/lms/utils.py:1785
+#: lms/lms/utils.py:1788
 msgid "This course is free."
 msgstr "本课程免费"
 
@@ -5529,14 +5487,14 @@ msgstr "课表模板"
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr "时区"
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5559,12 +5517,12 @@ msgstr "时间安排："
 #. Label of the title (Data) field in DocType 'LMS Sidebar Item'
 #. Label of the title (Data) field in DocType 'LMS Timetable Template'
 #. Label of the title (Data) field in DocType 'Work Experience'
-#: frontend/src/components/Modals/AssignmentForm.vue:23
+#: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5583,11 +5541,10 @@ msgstr "时间安排："
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "标题"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr "标题为必填项"
 
@@ -5602,7 +5559,7 @@ msgstr "至"
 msgid "To Date"
 msgstr "截止日期"
 
-#: lms/lms/utils.py:1796
+#: lms/lms/utils.py:1799
 msgid "To join this batch, please contact the Administrator."
 msgstr "加入本批次请联系管理员"
 
@@ -5655,9 +5612,9 @@ msgstr "推特"
 #. Label of the type (Select) field in DocType 'LMS Question'
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
-#: frontend/src/components/Modals/Question.vue:54
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/components/Modals/Question.vue:44
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5667,7 +5624,7 @@ msgstr "推特"
 msgid "Type"
 msgstr "类型"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr "输入答案"
 
@@ -5689,6 +5646,10 @@ msgstr "链接"
 msgid "Unavailability"
 msgstr "不可用状态"
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr "不可用开始日期不可晚于结束日期"
@@ -5703,7 +5664,7 @@ msgstr "审核中"
 msgid "Unlisted"
 msgstr "未列出"
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr "未发布"
 
@@ -5725,8 +5686,8 @@ msgstr "非结构化角色"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5751,7 +5712,7 @@ msgstr "更新"
 msgid "Update Password"
 msgstr "更新密码"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "上传"
 
@@ -5853,7 +5814,7 @@ msgstr "查看证书"
 msgid "Visibility"
 msgstr "可见性"
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr "访问批次"
 
@@ -5861,7 +5822,7 @@ msgstr "访问批次"
 msgid "Visit Website"
 msgstr "访问网站"
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr "访问以下链接查看您的"
 
@@ -5893,6 +5854,10 @@ msgstr "我们注意到您已开始注册"
 msgid "Web Page"
 msgstr "网页"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5905,10 +5870,18 @@ msgstr "星期三"
 msgid "Welcome to {0}!"
 msgstr "欢迎使用{0}！"
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "「包含在预览中」的含义是什么？"
 
+#: frontend/src/pages/PersonaForm.vue:21
+msgid "What is your use case for Frappe Learning?"
+msgstr ""
+
 #: lms/templates/courses_under_review.html:15
 msgid "When a course gets submitted for review, it will be listed here."
 msgstr "提交审核的课程将在此列出"
@@ -5982,10 +5955,6 @@ msgstr "您不属于本批次成员，请查看即将开课批次"
 msgid "You are not a mentor of the course {0}"
 msgstr "您不是课程{0}的导师"
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr "未注册"
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr "请注册本课程以访问此课时"
@@ -6064,11 +6033,11 @@ msgstr "您已评价过本课程"
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr "您已加入本批次"
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr "您已注册本课程"
 
@@ -6080,19 +6049,11 @@ msgstr "您已超过本测验最大尝试次数（{0}次）"
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr "您在测验{1}中获得了{0}分"
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr "当前尚未创建任何任务。点击上方\"新建\"按钮创建新任务。"
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr "您还没有创建任何测验。要创建一个新测验，请点击上面的“新测验”按钮。"
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr "您已订阅本课程通知，课程开放时将收到邮件提醒"
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr "请先登录以注册本课程"
 
@@ -6124,7 +6085,7 @@ msgstr "YouTube视频将显示在课时顶部"
 msgid "Your Account has been successfully created!"
 msgstr "账户创建成功！"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr "您的批次{0}将于明日开始"
 
@@ -6178,11 +6139,11 @@ msgstr "活动"
 msgid "activity"
 msgstr "活动"
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6242,7 +6203,7 @@ msgstr "/"
 msgid "out of"
 msgstr "超出"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr "问题详情"
 
@@ -6262,10 +6223,18 @@ msgstr "周"
 msgid "you can"
 msgstr "您可以"
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr "未找到{0}设置"
diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js
deleted file mode 100644
index 43306240..00000000
--- a/lms/public/js/common_functions.js
+++ /dev/null
@@ -1,450 +0,0 @@
-frappe.ready(() => {
-	setup_file_size();
-	pin_header();
-
-	$(".enroll-in-course").click((e) => {
-		enroll_in_course(e);
-	});
-
-	$(".notify-me").click((e) => {
-		notify_user(e);
-	});
-
-	$(".nav-link").click((e) => {
-		change_hash(e);
-	});
-
-	if (window.location.hash) {
-		open_tab();
-	}
-
-	if (window.location.pathname == "/statistics") {
-		generate_graph("New Signups", "#new-signups");
-		generate_graph("Course Enrollments", "#course-enrollments");
-		generate_graph("Lesson Completion", "#lesson-completion");
-		generate_course_completion_graph();
-	}
-
-	expand_the_active_chapter();
-
-	$(".chapter-title")
-		.unbind()
-		.click((e) => {
-			rotate_chapter_icon(e);
-		});
-
-	$(".no-preview").click((e) => {
-		show_no_preview_dialog(e);
-	});
-
-	$("#create-batch").click((e) => {
-		open_batch_dialog(e);
-	});
-
-	$("#course-filter").change((e) => {
-		filter_courses(e);
-	});
-});
-
-const pin_header = () => {
-	const el = document.querySelector(".sticky");
-	if (el) {
-		const observer = new IntersectionObserver(
-			([e]) =>
-				e.target.classList.toggle("is-pinned", e.intersectionRatio < 1),
-			{ threshold: [1] }
-		);
-		observer.observe(el);
-	}
-};
-
-const setup_file_size = () => {
-	frappe.provide("frappe.form.formatters");
-	frappe.form.formatters.FileSize = file_size;
-};
-
-const file_size = (value) => {
-	if (value > 1048576) {
-		value = flt(flt(value) / 1048576, 1) + "M";
-	} else if (value > 1024) {
-		value = flt(flt(value) / 1024, 1) + "K";
-	}
-	return value;
-};
-
-const enroll_in_course = (e) => {
-	e.preventDefault();
-	let course = $(e.currentTarget).attr("data-course");
-	if (frappe.session.user == "Guest") {
-		window.location.href = `/login?redirect-to=/courses/${course}`;
-		return;
-	}
-
-	let batch = $(e.currentTarget).attr("data-batch");
-	batch = batch ? decodeURIComponent(batch) : "";
-	frappe.call({
-		method: "lms.lms.doctype.lms_enrollment.lms_enrollment.create_membership",
-		args: {
-			batch: batch ? batch : "",
-			course: course,
-		},
-		callback: (data) => {
-			if (data.message == "OK") {
-				$(".no-preview-modal").modal("hide");
-				frappe.show_alert(
-					{
-						message: __("Enrolled successfully"),
-						indicator: "green",
-					},
-					3
-				);
-				setTimeout(function () {
-					window.location.href = `/courses/${course}/learn/1.1`;
-				}, 1000);
-			}
-		},
-	});
-};
-
-const notify_user = (e) => {
-	e.preventDefault();
-	var course = decodeURIComponent($("#outline-heading").attr("data-course"));
-	if (frappe.session.user == "Guest") {
-		window.location.href = `/login?redirect-to=/courses/${course}`;
-		return;
-	}
-
-	frappe.call({
-		method: "lms.lms.doctype.lms_course_interest.lms_course_interest.capture_interest",
-		args: {
-			course: course,
-		},
-		callback: (data) => {
-			$(".no-preview-modal").modal("hide");
-			frappe.show_alert(
-				{
-					message: __(
-						"You have opted to be notified for this course. You will receive an email when the course becomes available."
-					),
-					indicator: "green",
-				},
-				3
-			);
-			setTimeout(() => {
-				window.location.reload();
-			}, 3000);
-		},
-	});
-};
-
-const generate_graph = (chart_name, element, type = "line") => {
-	let date = frappe.datetime;
-
-	frappe.call({
-		method: "lms.lms.utils.get_chart_data",
-		args: {
-			chart_name: chart_name,
-			timespan: "Select Date Range",
-			timegrain: "Daily",
-			from_date: date.add_days(date.get_today(), -30),
-			to_date: date.add_days(date.get_today(), +1),
-		},
-		callback: (data) => {
-			render_chart(data.message, chart_name, element, type);
-		},
-	});
-};
-
-const render_chart = (data, chart_name, element, type) => {
-	const chart = new frappe.Chart(element, {
-		title: chart_name,
-		data: data,
-		type: type,
-		height: 250,
-		colors: ["#4563f1"],
-		axisOptions: {
-			xIsSeries: 1,
-		},
-		lineOptions: {
-			regionFill: 1,
-		},
-	});
-};
-
-const generate_course_completion_graph = () => {
-	frappe.call({
-		method: "lms.lms.utils.get_course_completion_data",
-		callback: (data) => {
-			render_chart(
-				data.message,
-				"Course Completion",
-				"#course-completion",
-				"pie"
-			);
-		},
-	});
-};
-
-const change_hash = (e) => {
-	window.location.hash = $(e.currentTarget).attr("href");
-};
-
-const open_tab = () => {
-	$(`a[href="${window.location.hash}"]`).click();
-};
-
-const expand_the_first_chapter = () => {
-	let elements = $(".course-home-outline .collapse");
-	elements.each((i, element) => {
-		if (i < 1) {
-			show_section(element);
-			return false;
-		}
-	});
-};
-
-const expand_the_active_chapter = () => {
-	let selector = $(".course-home-headings.title");
-
-	if (selector.length && $(".course-details-page").length) {
-		expand_for_course_details(selector);
-	} else if ($(".active-lesson").length) {
-		/* For course home page */
-		selector = $(".active-lesson");
-		show_section(selector.parent().parent());
-	} else {
-		/* If no active chapter then exapand the first chapter */
-		expand_the_first_chapter();
-	}
-};
-
-const expand_for_course_details = (selector) => {
-	$(".lesson-info").removeClass("active-lesson");
-	$(".lesson-info").each((i, elem) => {
-		if ($(elem).data("lesson") == selector.data("lesson")) {
-			$(elem).addClass("active-lesson");
-			show_section($(elem).parent().parent());
-		}
-	});
-};
-
-const show_section = (element) => {
-	$(element).addClass("show");
-	$(element)
-		.siblings(".chapter-title")
-		.children(".chapter-icon")
-		.css("transform", "rotate(90deg)");
-	$(element).siblings(".chapter-title").attr("aria-expanded", true);
-};
-
-const rotate_chapter_icon = (e) => {
-	let icon = $(e.currentTarget).children(".chapter-icon");
-	if (icon.css("transform") == "none") {
-		icon.css("transform", "rotate(90deg)");
-	} else {
-		icon.css("transform", "none");
-	}
-};
-
-const show_no_preview_dialog = (e) => {
-	$("#no-preview-modal").modal("show");
-};
-
-const open_batch_dialog = () => {
-	this.batch_dialog = new frappe.ui.Dialog({
-		title: __("New Batch"),
-		fields: [
-			{
-				fieldtype: "Data",
-				label: __("Title"),
-				fieldname: "title",
-				reqd: 1,
-				default: batch_info && batch_info.title,
-			},
-			{
-				fieldtype: "Check",
-				label: __("Published"),
-				fieldname: "published",
-				default: batch_info && batch_info.published,
-			},
-			{
-				fieldtype: "Section Break",
-			},
-			{
-				fieldtype: "Date",
-				label: __("Start Date"),
-				fieldname: "start_date",
-				reqd: 1,
-				default: batch_info && batch_info.start_date,
-			},
-			{
-				fieldtype: "Date",
-				label: __("End Date"),
-				fieldname: "end_date",
-				reqd: 1,
-				default: batch_info && batch_info.end_date,
-			},
-			{
-				fieldtype: "Column Break",
-			},
-			{
-				fieldtype: "Time",
-				label: __("Start Time"),
-				fieldname: "start_time",
-				default: batch_info && batch_info.start_time,
-				reqd: 1,
-			},
-			{
-				fieldtype: "Time",
-				label: __("End Time"),
-				fieldname: "end_time",
-				default: batch_info && batch_info.end_time,
-				reqd: 1,
-			},
-			{
-				fieldtype: "Section Break",
-			},
-			{
-				fieldtype: "Select",
-				label: __("Medium"),
-				fieldname: "medium",
-				options: ["Online", "Offline"],
-				default: (batch_info && batch_info.medium) || "Online",
-			},
-			{
-				fieldtype: "Link",
-				label: __("Category"),
-				fieldname: "category",
-				options: "LMS Category",
-				only_select: 1,
-				default: batch_info && batch_info.category,
-			},
-			{
-				fieldtype: "Column Break",
-			},
-			{
-				fieldtype: "Int",
-				label: __("Seat Count"),
-				fieldname: "seat_count",
-				default: batch_info && batch_info.seat_count,
-			},
-			{
-				fieldtype: "Date",
-				label: __("Evaluation End Date"),
-				fieldname: "evaluation_end_date",
-				default: batch_info && batch_info.evaluation_end_date,
-			},
-			{
-				fieldtype: "Section Break",
-			},
-			{
-				fieldtype: "Small Text",
-				label: __("Description"),
-				fieldname: "description",
-				default: batch_info && batch_info.description,
-				reqd: 1,
-			},
-			{
-				fieldtype: "Text Editor",
-				label: __("Batch Details"),
-				fieldname: "batch_details",
-				default: batch_info && batch_info.batch_details,
-				reqd: 1,
-			},
-			{
-				fieldtype: "HTML Editor",
-				label: __("Batch Details Raw"),
-				fieldname: "batch_details_raw",
-				default: batch_info && batch_info.batch_details_raw,
-			},
-			{
-				fieldtype: "Attach Image",
-				label: __("Meta Image"),
-				fieldname: "meta_image",
-				default: batch_info && batch_info.meta_image,
-			},
-			{
-				fieldtype: "Section Break",
-				label: __("Pricing"),
-				fieldname: "pricing",
-			},
-			{
-				fieldtype: "Check",
-				label: __("Paid Batch"),
-				fieldname: "paid_batch",
-				default: batch_info && batch_info.paid_batch,
-			},
-			{
-				fieldtype: "Currency",
-				label: __("Amount"),
-				fieldname: "amount",
-				default: batch_info && batch_info.amount,
-				mandatory_depends_on: "paid_batch",
-				depends_on: "paid_batch",
-			},
-			{
-				fieldtype: "Link",
-				label: __("Currency"),
-				fieldname: "currency",
-				options: "Currency",
-				default: batch_info && batch_info.currency,
-				mandatory_depends_on: "paid_batch",
-				depends_on: "paid_batch",
-				only_select: 1,
-			},
-			{
-				fieldtype: "Currency",
-				label: __("Amount (USD)"),
-				fieldname: "amount_usd",
-				depends_on: "paid_batch",
-				description: __(
-					"If you set an amount here, then the USD equivalent setting will not get applied."
-				),
-			},
-		],
-		primary_action_label: __("Save"),
-		primary_action: (values) => {
-			save_batch(values);
-		},
-	});
-	this.batch_dialog.show();
-};
-
-const save_batch = (values) => {
-	let args = {};
-	if (batch_info) {
-		args = Object.assign(batch_info, values);
-	} else {
-		args = values;
-	}
-	frappe.call({
-		method: "lms.lms.doctype.lms_batch.lms_batch.create_batch",
-		args: args,
-		callback: (r) => {
-			if (r.message) {
-				frappe.show_alert({
-					message: batch_info
-						? __("Batch Updated")
-						: __("Batch Created"),
-					indicator: "green",
-				});
-				this.batch_dialog.hide();
-				window.location.href = `/batches/details/${r.message.name}`;
-			}
-		},
-	});
-};
-
-const filter_courses = (e) => {
-	const course_lists = $(".course-cards-parent");
-	const filter = $(e.currentTarget).val();
-	course_lists.each((i, list) => {
-		const course_cards = $(list).children(".course-card");
-		course_cards.sort((a, b) => {
-			var value1 = $(a).data(filter);
-			var value2 = $(b).data(filter);
-			return value1 > value2 ? -1 : value1 < value2 ? 1 : 0;
-		});
-		$(list).append(course_cards);
-	});
-};
diff --git a/lms/public/js/profile.js b/lms/public/js/profile.js
deleted file mode 100644
index 681fea94..00000000
--- a/lms/public/js/profile.js
+++ /dev/null
@@ -1,14 +0,0 @@
-frappe.ready(() => {
-	hide_profile_and_dashboard_for_guest_users();
-});
-
-const hide_profile_and_dashboard_for_guest_users = () => {
-	if (frappe.session.user == "Guest") {
-		let links = $(".nav-link").filter(
-			(i, elem) =>
-				$(elem).text().trim() === "My Profile" ||
-				$(elem).text().trim() === "Dashboard"
-		);
-		links.length && links.each((i, elem) => $(elem).addClass("hide"));
-	}
-};
diff --git a/lms/public/js/website.bundle.js b/lms/public/js/website.bundle.js
deleted file mode 100644
index 1e86a794..00000000
--- a/lms/public/js/website.bundle.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import "./profile.js";
-import "./common_functions.js";
-import "../../../../frappe/frappe/public/js/frappe/ui/chart.js";
-import "../../../../frappe/frappe/public/js/frappe/ui/keyboard.js";
-import "../../../../frappe/frappe/public/js/frappe/event_emitter.js";
diff --git a/lms/templates/emails/batch_confirmation.html b/lms/templates/emails/batch_confirmation.html
index 4856ce39..d4cc26df 100644
--- a/lms/templates/emails/batch_confirmation.html
+++ b/lms/templates/emails/batch_confirmation.html
@@ -11,9 +11,11 @@
     <b>{{ _("Batch Start Date:") }}</b> {{ frappe.utils.format_date(start_date, "medium") }}
 </p>
 
+{% if medium %}
 <p>
     <b>{{ _("Medium:") }}</b> {{ medium }}
 </p>
+{% endif %}
 
 <p>
     <b>{{ _("Timings:") }}</b> {{ frappe.utils.format_time(start_time, "hh:mm a") }}
diff --git a/lms/templates/lms_base.html b/lms/templates/lms_base.html
deleted file mode 100644
index 311053d0..00000000
--- a/lms/templates/lms_base.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "templates/base.html" %}
-
-{% block content %}
-	{% include "public/icons/symbol-defs.svg" %}
-	{% include "lms/templates/onboarding_header.html" %}
-	{% block page_content %}
-		Hello, world!
-	{% endblock %}
-{% endblock %}
-
-{%- block script -%}
-	{{ super() }}
-	{% if frappe.get_system_settings("enable_telemetry") %}
-	{% set telemetry_boot_info = get_telemetry_boot_info() %}
-	<script>
-		const telemetry_boot_info = {{ get_telemetry_boot_info() }}
-		if (telemetry_boot_info && Object.keys(telemetry_boot_info).length)
-			Object.assign(frappe.boot, telemetry_boot_info)
-	</script>
-	{% endif %}
-	<script>
-		frappe.router = {
-			slug(name) {
-				return name.toLowerCase().replace(/ /g, "-");
-			},
-		};
-		frappe.utils.make_event_emitter(frappe.router)
-	</script>
-	{{ include_script("telemetry.bundle.js") }}
-
-{%- endblock -%}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 67ba076b..515b2448 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -129,9 +129,9 @@
     "@lezer/highlight" "^1.0.0"
 
 "@codemirror/view@^6.0.0", "@codemirror/view@^6.22.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.35.0":
-  version "6.36.7"
-  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.36.7.tgz#f3711d3fea457a3eec1c09a76b8a132f98df17b1"
-  integrity sha512-kCWGW/chWGPgZqfZ36Um9Iz0X2IVpmCjg1P/qY6B6a2ecXtWRRAigmpJ6YgUQ5lTWXMyyVdfmpzhLZmsZQMbtg==
+  version "6.36.8"
+  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.36.8.tgz#d72e59d2b2d99bb5f177178f63e11cef6e605b94"
+  integrity sha512-yoRo4f+FdnD01fFt4XpfpMCcCAo9QvZOtbrXExn4SqzH32YC6LgzqxfLZw/r6Ge65xyY03mK/UfUqrVw1gFiFg==
   dependencies:
     "@codemirror/state" "^6.5.0"
     style-mod "^4.1.0"
@@ -496,17 +496,17 @@
     mlly "^1.7.4"
 
 "@inquirer/confirm@^5.0.0":
-  version "5.1.9"
-  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-5.1.9.tgz#c858b6a3decb458241ec36ca9a9117477338076a"
-  integrity sha512-NgQCnHqFTjF7Ys2fsqK2WtnA8X1kHyInyG+nMIuHowVTIgIuS10T4AznI/PvbqSpJqjCUqNBlKGh1v3bwLFL4w==
+  version "5.1.10"
+  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-5.1.10.tgz#de3732cb7ae9333bd3e354afee6a6ef8cf28d951"
+  integrity sha512-FxbQ9giWxUWKUk2O5XZ6PduVnH2CZ/fmMKMBkH71MHJvWr7WL5AHKevhzF1L5uYWB2P548o1RzVxrNd3dpmk6g==
   dependencies:
-    "@inquirer/core" "^10.1.10"
+    "@inquirer/core" "^10.1.11"
     "@inquirer/type" "^3.0.6"
 
-"@inquirer/core@^10.1.10":
-  version "10.1.10"
-  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-10.1.10.tgz#222a374e3768536a1eb0adf7516c436d5f4a291d"
-  integrity sha512-roDaKeY1PYY0aCqhRmXihrHjoSW2A00pV3Ke5fTpMCkzcGF64R8e0lw3dK+eLEHwS4vB5RnW1wuQmvzoRul8Mw==
+"@inquirer/core@^10.1.11":
+  version "10.1.11"
+  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-10.1.11.tgz#4022032b5b6b35970e1c3fcfc522bc250ef8810d"
+  integrity sha512-BXwI/MCqdtAhzNQlBEFE7CEflhPkl/BqvAuV/aK6lW3DClIfYVDWPP/kXuXHtBWC7/EEbNqd/1BGq2BGBBnuxw==
   dependencies:
     "@inquirer/figures" "^1.0.11"
     "@inquirer/type" "^3.0.6"
@@ -1170,9 +1170,9 @@
   integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==
 
 "@types/node@*":
-  version "22.15.16"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.16.tgz#685cf0338ad9f5b14860f50a6ac2c3ebd58582cd"
-  integrity sha512-3pr+KjwpVujqWqOKT8mNR+rd09FqhBLwg+5L/4t0cNYBzm/yEiYGCxWttjaPBsLtAo+WFNoXzGJfolM1JuRXoA==
+  version "22.15.17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.17.tgz#355ccec95f705b664e4332bb64a7f07db30b7055"
+  integrity sha512-wIX2aSZL5FE+MR0JlvF87BNVrtFWf6AE6rxSE9X7OwnVvoyCQjpzSRJ+M87se/4QCkCiebQAqrJ0y6fwIyi7nw==
   dependencies:
     undici-types "~6.21.0"
 
@@ -1224,9 +1224,9 @@
   integrity sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==
 
 "@vitejs/plugin-vue@^5.0.3":
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.2.3.tgz#71a8fc82d4d2e425af304c35bf389506f674d89b"
-  integrity sha512-IYSLEQj4LgZZuoVpdSUCw3dIynTWQgPlaRP6iAvMle4My0HdYwr5g5wQAfwOeHQBmYwEkqF70nRpSilr6PoUDg==
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz#9e8a512eb174bfc2a333ba959bbf9de428d89ad8"
+  integrity sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==
 
 "@vitest/expect@2.1.9":
   version "2.1.9"
@@ -1756,9 +1756,9 @@ camelcase-css@^2.0.1:
   integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
 
 caniuse-lite@^1.0.30001702, caniuse-lite@^1.0.30001716:
-  version "1.0.30001717"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001717.tgz#5d9fec5ce09796a1893013825510678928aca129"
-  integrity sha512-auPpttCq6BDEG8ZAuHJIplGw6GODhjw+/11e7IjpnYCxZcW/ONgPs0KVBJ0d1bY3e2+7PRe5RCLyP+PfwVgkYw==
+  version "1.0.30001718"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz#dae13a9c80d517c30c6197515a96131c194d8f82"
+  integrity sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -2061,7 +2061,7 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+cross-spawn@^7.0.0, cross-spawn@^7.0.6:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
   integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -2322,9 +2322,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.5.149:
-  version "1.5.151"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.151.tgz#5edd6c17e1b2f14b4662c41b9379f96cc8c2bb7c"
-  integrity sha512-Rl6uugut2l9sLojjS4H4SAr3A4IgACMLgpuEMPYCVcKydzfyPrn5absNRju38IhQOf/NwjJY8OGWjlteqYeBCA==
+  version "1.5.152"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.152.tgz#bcdd39567e291b930ec26b930031137a05593695"
+  integrity sha512-xBOfg/EBaIlVsHipHl2VdTPJRSvErNUaqW8ejTq5OlOlIYx1wOllCHsAvAIrr55jD1IYEfdR86miUEt8H5IeJg==
 
 emoji-regex@^10.3.0:
   version "10.4.0"
@@ -2541,21 +2541,6 @@ execa@4.1.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execa@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
-  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^8.0.1"
-    human-signals "^5.0.0"
-    is-stream "^3.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^5.1.0"
-    onetime "^6.0.0"
-    signal-exit "^4.1.0"
-    strip-final-newline "^3.0.0"
-
 executable@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@@ -2677,9 +2662,9 @@ finalhandler@1.1.2:
     unpipe "~1.0.0"
 
 flexsearch@*:
-  version "0.8.161"
-  resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.8.161.tgz#fe964fe1841a99b580ba19f853603d1747fb3bc8"
-  integrity sha512-3dlwyJpl7PN4vRTp0pV8FkCULPzeuK6JzZYE3KhLiv5vbhUPGUqiOWgBbjlpCC4Rl1aW7B0lJeOS0Cr8G0N12g==
+  version "0.8.164"
+  resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.8.164.tgz#2d1277249d6dec8eb745358fa64543ddbddc9e05"
+  integrity sha512-tauQG+NlwSWW6uL3BIJdHNEXYiei2xTR3H/mrjNadAOwvXgiLbLvLzQWSJvD31Yn0+1lAxG2NVRndywGnDZZiA==
 
 flexsearch@0.7.21:
   version "0.7.21"
@@ -2835,11 +2820,6 @@ get-stream@^5.0.0, get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
-  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
-
 getos@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
@@ -3045,11 +3025,6 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-human-signals@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
-  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
-
 iconv-lite@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
@@ -3058,9 +3033,9 @@ iconv-lite@0.6.3:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
 idb-keyval@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-6.2.1.tgz#94516d625346d16f56f3b33855da11bfded2db33"
-  integrity sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-6.2.2.tgz#b0171b5f73944854a3291a5cdba8e12768c4854a"
+  integrity sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg==
 
 ieee754@^1.1.13:
   version "1.2.1"
@@ -3173,11 +3148,6 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-is-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
-  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -3349,20 +3319,20 @@ linkifyjs@^4.2.0:
   integrity sha512-DRSlB9DKVW04c4SUdGvKK5FR6be45lTU9M76JnngqPeeGDqPwYc0zdUErtsNVMtxPXgUWV4HbXbnC4sNyBxkYg==
 
 lint-staged@>=10:
-  version "15.5.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.5.2.tgz#beff028fd0681f7db26ffbb67050a21ed4d059a3"
-  integrity sha512-YUSOLq9VeRNAo/CTaVmhGDKG+LBtA8KF1X4K5+ykMSwWST1vDxJRB2kv2COgLb1fvpCo+A/y9A0G0znNVmdx4w==
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.0.0.tgz#31826709bde6a62542431da3055f038e386a20db"
+  integrity sha512-sUCprePs6/rbx4vKC60Hez6X10HPkpDJaGcy3D1NdwR7g1RcNkWL8q9mJMreOqmHBTs+1sNFp+wOiX9fr+hoOQ==
   dependencies:
     chalk "^5.4.1"
     commander "^13.1.0"
     debug "^4.4.0"
-    execa "^8.0.1"
     lilconfig "^3.1.3"
-    listr2 "^8.2.5"
+    listr2 "^8.3.3"
     micromatch "^4.0.8"
+    nano-spawn "^1.0.0"
     pidtree "^0.6.0"
     string-argv "^0.3.2"
-    yaml "^2.7.0"
+    yaml "^2.7.1"
 
 listr2@^3.8.3:
   version "3.14.0"
@@ -3378,7 +3348,7 @@ listr2@^3.8.3:
     through "^2.3.8"
     wrap-ansi "^7.0.0"
 
-listr2@^8.2.5:
+listr2@^8.3.3:
   version "8.3.3"
   resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.3.3.tgz#815fc8f738260ff220981bf9e866b3e11e8121bf"
   integrity sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ==
@@ -3597,11 +3567,6 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-fn@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
-  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
-
 mimic-function@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
@@ -3665,9 +3630,9 @@ ms@^2.1.1, ms@^2.1.3:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 msw@^2.7.0:
-  version "2.7.6"
-  resolved "https://registry.yarnpkg.com/msw/-/msw-2.7.6.tgz#1471ce4311f4c173f287dced31dee211b6958deb"
-  integrity sha512-P+rwn43ktxN8ghcl8q+hSAUlEi0PbJpDhGmDkw4zeUnRj3hBCVynWD+dTu38yLYKCE9ZF1OYcvpy7CTBRcqkZA==
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/msw/-/msw-2.8.2.tgz#a35545275403da472f4ed2152cd3c77000db544c"
+  integrity sha512-ugu8RBgUj6//RD0utqDDPdS+QIs36BKYkDAM6u59hcMVtFM4PM0vW4l3G1R+1uCWP2EWFUG8reT/gPXVEtx7/w==
   dependencies:
     "@bundled-es-modules/cookie" "^2.0.1"
     "@bundled-es-modules/statuses" "^1.0.1"
@@ -3702,6 +3667,11 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+nano-spawn@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-1.0.1.tgz#c8e4c1e133e567e3efba44041dcfb12113d861b6"
+  integrity sha512-BfcvzBlUTxSDWfT+oH7vd6CbUV+rThLLHCIym/QO6GGLBsyVXleZs00fto2i2jzC/wPiBYk5jyOmpXWg4YopiA==
+
 nanoid@^3.3.8:
   version "3.3.11"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
@@ -3742,13 +3712,6 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npm-run-path@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
-  integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
-  dependencies:
-    path-key "^4.0.0"
-
 nwsapi@^2.2.2:
   version "2.2.20"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.20.tgz#22e53253c61e7b0e7e93cef42c891154bcca11ef"
@@ -3795,13 +3758,6 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-onetime@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
-  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
-  dependencies:
-    mimic-fn "^4.0.0"
-
 onetime@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60"
@@ -3902,11 +3858,6 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-key@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
-  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
-
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -4540,9 +4491,9 @@ section-matter@^1.0.0:
     kind-of "^6.0.0"
 
 semver@^7.5.3:
-  version "7.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
-  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
 
 sentence-case@^3.0.4:
   version "3.0.4"
@@ -4877,11 +4828,6 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-final-newline@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
-  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
-
 style-mod@^4.0.0, style-mod@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67"
@@ -5223,9 +5169,9 @@ unplugin-vue-components@^28.4.1:
     unplugin-utils "^0.2.4"
 
 unplugin@^2.2.0, unplugin@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-2.3.2.tgz#36c93a1662b70c97a2e2fc45c0e78fa09f7a4984"
-  integrity sha512-3n7YA46rROb3zSj8fFxtxC/PqoyvYQ0llwz9wtUPUutr9ig09C8gGo5CWCwHrUzlqC1LLR43kxp5vEIyH1ac1w==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-2.3.3.tgz#f83507e4484008e400f3d831a628eaede22c954f"
+  integrity sha512-DN4DgiS13HFrAapoRmmoa9B35QzmQVRH2k58HelO28htXVNEEFZ8CGlZL0aRHXOXtz9McwY6lqaZjcc15uWMow==
   dependencies:
     acorn "^8.14.1"
     picomatch "^4.0.2"
@@ -5563,7 +5509,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
 
-yaml@^2.3.4, yaml@^2.7.0:
+yaml@^2.3.4, yaml@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.7.1.tgz#44a247d1b88523855679ac7fa7cda6ed7e135cf6"
   integrity sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==