diff --git a/assets/js/msls-quick-create.js b/assets/js/msls-quick-create.js
index c6763a2e5..311ab2826 100644
--- a/assets/js/msls-quick-create.js
+++ b/assets/js/msls-quick-create.js
@@ -1 +1 @@
-jQuery(document).ready(function($){$(document).on("click",".msls-quick-create",function(){var $button=$(this);if($button.hasClass("msls-loading")){return}$button.addClass("msls-loading");$button.find(".dashicons").removeClass("dashicons-plus").addClass("dashicons-update");wp.apiFetch({path:"/msls/v1/create-translation",method:"POST",data:{source_post_id:parseInt($button.data("source-post-id"),10),source_blog_id:parseInt($button.data("source-blog-id"),10),target_blog_id:parseInt($button.data("target-blog-id"),10)}}).then(function(response){var isMetabox=$button.closest("#msls").length>0;var $link=$("<a>").attr("href",response.edit_url).attr("title",$button.attr("title").replace(/Create/,"Edit")).html($button.html());if(isMetabox){$link.addClass("msls-edit-link").attr("target","_blank")}var successIcon=isMetabox?"dashicons-external":"dashicons-edit";$link.find(".dashicons").removeClass("dashicons-update dashicons-plus").addClass(successIcon);$button.replaceWith($link);var $container=$link.closest("li");if(!$container.length){return}var $hiddenInput=$container.find('input[type="hidden"][name^="msls_input_"]');if($hiddenInput.length){$hiddenInput.val(response.post_id)}var $titleInput=$container.find("input.msls_title");if($titleInput.length){$titleInput.val(response.post_title||"")}var $select=$container.find('select[name^="msls_input_"]');if($select.length){$select.append($("<option>").val(response.post_id).text(response.post_title||"").prop("selected",true))}}).catch(function(){$button.removeClass("msls-loading");$button.find(".dashicons").removeClass("dashicons-update").addClass("dashicons-plus")})})});
+jQuery(document).ready(function($){$(document).on("click",".msls-quick-create",function(){var $button=$(this);if($button.hasClass("msls-loading")){return}$button.addClass("msls-loading");$button.find(".dashicons").removeClass("dashicons-plus").addClass("dashicons-update");wp.apiFetch({path:"/msls/v1/create-translation",method:"POST",data:{source_post_id:parseInt($button.data("source-post-id"),10),source_blog_id:parseInt($button.data("source-blog-id"),10),target_blog_id:parseInt($button.data("target-blog-id"),10)}}).then(function(response){var isMetabox=$button.closest("#msls").length>0;var editTitle=$button.data("edit-title")||$button.attr("title");var $link=$("<a>").attr("href",response.edit_url).attr("title",editTitle).html($button.html());if(isMetabox){$link.addClass("msls-edit-link").attr("target","_blank")}var successIcon=isMetabox?"dashicons-external":"dashicons-edit";$link.find(".dashicons").removeClass("dashicons-update dashicons-plus").addClass(successIcon);$button.replaceWith($link);var $container=$link.closest("li");if(!$container.length){return}var $hiddenInput=$container.find('input[type="hidden"][name^="msls_input_"]');if($hiddenInput.length){$hiddenInput.val(response.post_id)}var $titleInput=$container.find("input.msls_title");if($titleInput.length){$titleInput.val(response.post_title||"")}var $select=$container.find('select[name^="msls_input_"]');if($select.length){$select.append($("<option>").val(response.post_id).text(response.post_title||"").prop("selected",true))}}).catch(function(){$button.removeClass("msls-loading");$button.find(".dashicons").removeClass("dashicons-update").addClass("dashicons-plus")})})});
diff --git a/includes/Admin/Icon.php b/includes/Admin/Icon.php
index 4aedd3727..4211b03a2 100644
--- a/includes/Admin/Icon.php
+++ b/includes/Admin/Icon.php
@@ -162,16 +162,19 @@ protected function get_quick_create_a(): string {
 		$target_blog_id = get_current_blog_id();
 
 		/* translators: %s: blog name */
-		$format = __( 'Create a new translation in the %s-blog', 'multisite-language-switcher' );
-		$title  = sprintf( $format, $this->language );
+		$title = sprintf( __( 'Create a new translation in the %s-blog', 'multisite-language-switcher' ), $this->language );
+
+		/* translators: %s: blog name */
+		$edit_title = sprintf( __( 'Edit the translation in the %s-blog', 'multisite-language-switcher' ), $this->language );
 
 		return sprintf(
-			'<button type="button" class="msls-quick-create" title="%1$s" aria-label="%1$s" data-target-blog-id="%2$d" data-source-post-id="%3$d" data-source-blog-id="%4$d">%5$s</button>&nbsp;',
+			'<button type="button" class="msls-quick-create" title="%1$s" aria-label="%1$s" data-target-blog-id="%2$d" data-source-post-id="%3$d" data-source-blog-id="%4$d" data-edit-title="%6$s">%5$s</button>&nbsp;',
 			esc_attr( $title ),
 			$target_blog_id,
 			$this->id,
 			$source_blog_id,
-			$this->get_icon()
+			$this->get_icon(),
+			esc_attr( $edit_title )
 		);
 	}
 
diff --git a/includes/Cli/Cli.php b/includes/Cli/Cli.php
index 144f3bdd7..12da3d920 100644
--- a/includes/Cli/Cli.php
+++ b/includes/Cli/Cli.php
@@ -37,9 +37,22 @@ public function blog( $args ): void {
 		$blog           = msls_blog( $locale );
 
 		if ( is_null( $blog ) ) {
-			\WP_CLI::error( sprintf( 'No blog with locale %1$s found!', esc_attr( $locale ) ) );
+			\WP_CLI::error(
+				sprintf(
+					/* translators: %s: locale code, e.g. de_DE. */
+					esc_html__( 'No blog with locale %1$s found!', 'multisite-language-switcher' ),
+					esc_attr( $locale )
+				)
+			);
 		} else {
-			\WP_CLI::success( sprintf( 'Blog ID %1$d has locale %2$s!', $blog->userblog_id, esc_attr( $locale ) ) );
+			\WP_CLI::success(
+				sprintf(
+					/* translators: 1: blog ID, 2: locale code, e.g. de_DE. */
+					esc_html__( 'Blog ID %1$d has locale %2$s!', 'multisite-language-switcher' ),
+					$blog->userblog_id,
+					esc_attr( $locale )
+				)
+			);
 		}
 	}
 }
diff --git a/includes/Component/Component.php b/includes/Component/Component.php
index 6b07da5cd..b6db291fe 100644
--- a/includes/Component/Component.php
+++ b/includes/Component/Component.php
@@ -20,6 +20,7 @@ abstract class Component {
 			'data-target-blog-id' => true,
 			'data-source-post-id' => true,
 			'data-source-blog-id' => true,
+			'data-edit-title'     => true,
 		),
 		'form'   => array(
 			'action' => true,
diff --git a/src/msls-quick-create.js b/src/msls-quick-create.js
index b2a2debeb..8192ef48a 100644
--- a/src/msls-quick-create.js
+++ b/src/msls-quick-create.js
@@ -26,9 +26,10 @@ jQuery( document ).ready(
 				).then(
 					function ( response ) {
 						var isMetabox = $button.closest( '#msls' ).length > 0;
+						var editTitle = $button.data( 'edit-title' ) || $button.attr( 'title' );
 						var $link = $( '<a>' )
 							.attr( 'href', response.edit_url )
-							.attr( 'title', $button.attr( 'title' ).replace( /Create/, 'Edit' ) )
+							.attr( 'title', editTitle )
 							.html( $button.html() );
 
 						if ( isMetabox ) {