From e3d32b5d1d58602f43322637ba1b47364003e80d Mon Sep 17 00:00:00 2001
From: sarthaknagoshe2002 <sarthaknagoshe2002@gmail.com>
Date: Sat, 30 Nov 2024 00:35:04 +0530
Subject: [PATCH 1/3] Refactor Lock modal dialog for improved clarity and
 simplicity

---
 packages/block-editor/src/components/block-lock/modal.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-lock/modal.js b/packages/block-editor/src/components/block-lock/modal.js
index 3be23f6adde146..084d13d97ad4a0 100644
--- a/packages/block-editor/src/components/block-lock/modal.js
+++ b/packages/block-editor/src/components/block-lock/modal.js
@@ -100,7 +100,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
 				<fieldset className="block-editor-block-lock-modal__options">
 					<legend>
 						{ __(
-							'Choose specific attributes to restrict or lock all available options.'
+							'Choose "Lock all" to disable all actions, or select specific features to lock.'
 						) }
 					</legend>
 					{ /*
@@ -137,7 +137,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
 									<li className="block-editor-block-lock-modal__checklist-item">
 										<CheckboxControl
 											__nextHasNoMarginBottom
-											label={ __( 'Restrict editing' ) }
+											label={ __( 'Lock editing' ) }
 											checked={ !! lock.edit }
 											onChange={ ( edit ) =>
 												setLock( ( prevLock ) => ( {
@@ -159,7 +159,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
 								<li className="block-editor-block-lock-modal__checklist-item">
 									<CheckboxControl
 										__nextHasNoMarginBottom
-										label={ __( 'Disable movement' ) }
+										label={ __( 'Lock movement' ) }
 										checked={ lock.move }
 										onChange={ ( move ) =>
 											setLock( ( prevLock ) => ( {
@@ -178,7 +178,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
 								<li className="block-editor-block-lock-modal__checklist-item">
 									<CheckboxControl
 										__nextHasNoMarginBottom
-										label={ __( 'Prevent removal' ) }
+										label={ __( 'Lock removal' ) }
 										checked={ lock.remove }
 										onChange={ ( remove ) =>
 											setLock( ( prevLock ) => ( {

From e72bede902329710d13b7116c0226da971524a77 Mon Sep 17 00:00:00 2001
From: sarthaknagoshe2002 <sarthaknagoshe2002@gmail.com>
Date: Mon, 2 Dec 2024 18:52:24 +0530
Subject: [PATCH 2/3] Fix: modify the e2e test cases

---
 test/e2e/specs/editor/blocks/columns.spec.js         | 2 +-
 test/e2e/specs/editor/various/block-locking.spec.js  | 4 ++--
 test/e2e/specs/editor/various/block-switcher.spec.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/e2e/specs/editor/blocks/columns.spec.js b/test/e2e/specs/editor/blocks/columns.spec.js
index eea6e321aacb11..29262aef810d21 100644
--- a/test/e2e/specs/editor/blocks/columns.spec.js
+++ b/test/e2e/specs/editor/blocks/columns.spec.js
@@ -63,7 +63,7 @@ test.describe( 'Columns', () => {
 		);
 		await editor.clickBlockToolbarButton( 'Options' );
 		await page.click( 'role=menuitem[name="Lock"i]' );
-		await page.locator( 'role=checkbox[name="Prevent removal"i]' ).check();
+		await page.locator( 'role=checkbox[name="Lock removal"i]' ).check();
 		await page.click( 'role=button[name="Apply"i]' );
 
 		// Select columns block
diff --git a/test/e2e/specs/editor/various/block-locking.spec.js b/test/e2e/specs/editor/various/block-locking.spec.js
index eafb468902ef92..a8895d282fb956 100644
--- a/test/e2e/specs/editor/various/block-locking.spec.js
+++ b/test/e2e/specs/editor/various/block-locking.spec.js
@@ -16,7 +16,7 @@ test.describe( 'Block Locking', () => {
 
 		await editor.clickBlockOptionsMenuItem( 'Lock' );
 
-		await page.click( 'role=checkbox[name="Prevent removal"]' );
+		await page.click( 'role=checkbox[name="Lock removal"]' );
 		await page.click( 'role=button[name="Apply"]' );
 
 		await expect(
@@ -35,7 +35,7 @@ test.describe( 'Block Locking', () => {
 
 		await editor.clickBlockOptionsMenuItem( 'Lock' );
 
-		await page.click( 'role=checkbox[name="Disable movement"]' );
+		await page.click( 'role=checkbox[name="Lock movement"]' );
 		await page.click( 'role=button[name="Apply"]' );
 
 		// Hide options.
diff --git a/test/e2e/specs/editor/various/block-switcher.spec.js b/test/e2e/specs/editor/various/block-switcher.spec.js
index 41b0b1ee49c88c..cb95c4d395c664 100644
--- a/test/e2e/specs/editor/various/block-switcher.spec.js
+++ b/test/e2e/specs/editor/various/block-switcher.spec.js
@@ -107,7 +107,7 @@ test.describe( 'Block Switcher', () => {
 		await expect( button ).toBeEnabled();
 
 		await editor.clickBlockOptionsMenuItem( 'Lock' );
-		await page.click( 'role=checkbox[name="Prevent removal"]' );
+		await page.click( 'role=checkbox[name="Lock removal"]' );
 		await page.click( 'role=button[name="Apply"]' );
 
 		// Verify the block switcher isn't enabled.

From 1ef036c97ba33b7750bff9d62a79ebdf07c4e1f0 Mon Sep 17 00:00:00 2001
From: sarthaknagoshe2002 <sarthaknagoshe2002@gmail.com>
Date: Thu, 5 Dec 2024 19:51:45 +0530
Subject: [PATCH 3/3] Fix: shorten the text & make it feel more specific

---
 packages/block-editor/src/components/block-lock/modal.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/block-lock/modal.js b/packages/block-editor/src/components/block-lock/modal.js
index 084d13d97ad4a0..df267e97165e36 100644
--- a/packages/block-editor/src/components/block-lock/modal.js
+++ b/packages/block-editor/src/components/block-lock/modal.js
@@ -99,9 +99,7 @@ export default function BlockLockModal( { clientId, onClose } ) {
 			>
 				<fieldset className="block-editor-block-lock-modal__options">
 					<legend>
-						{ __(
-							'Choose "Lock all" to disable all actions, or select specific features to lock.'
-						) }
+						{ __( 'Select the features you want to lock' ) }
 					</legend>
 					{ /*
 					 * Disable reason: The `list` ARIA role is redundant but