From 1ea5b5cd478b259c1d3d69d8434971458e15192d Mon Sep 17 00:00:00 2001
From: Mayuko Moriyama <mayuko.jpn@gmail.com>
Date: Wed, 5 Oct 2016 18:41:10 +0900
Subject: [PATCH 1/5] Word order is not changable in translation string.

---
 inc/admin/class-spacious-admin.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/inc/admin/class-spacious-admin.php b/inc/admin/class-spacious-admin.php
index 02f5ccb7..c9a8f3e8 100644
--- a/inc/admin/class-spacious-admin.php
+++ b/inc/admin/class-spacious-admin.php
@@ -33,7 +33,12 @@ public function __construct() {
 	public function admin_menu() {
 		$theme = wp_get_theme( get_template() );
 
-		$page = add_theme_page( esc_html__( 'About', 'spacious' ) . ' ' . $theme->display( 'Name' ), esc_html__( 'About', 'spacious' ) . ' ' . $theme->display( 'Name' ), 'activate_plugins', 'spacious-welcome', array( $this, 'welcome_screen' ) );
+		$page = add_theme_page(
+			sprintf( esc_html__('About %s', 'spacious'), $theme->display( 'Name' ) ),
+			sprintf( esc_html__('About %s', 'spacious'), $theme->display( 'Name' ) ),
+			'activate_plugins',
+			'spacious-welcome',
+			array( $this, 'welcome_screen' ) );
 		add_action( 'admin_print_styles-' . $page, array( $this, 'enqueue_styles' ) );
 	}
 
@@ -113,9 +118,13 @@ private function intro() {
 		?>
 		<div class="spacious-theme-info">
 			<h1>
-				<?php esc_html_e('About', 'spacious'); ?>
-				<?php echo $theme->display( 'Name' ); ?>
-				<?php printf( '%s', $major_version ); ?>
+				<?php /* translators: %s is theme name. */
+							printf(
+								esc_html__('About %s', 'spacious'),
+									$theme->display( 'Name' )
+									.' '
+									. sprintf( '%s', $major_version )
+							); ?>
 			</h1>
 
 			<div class="welcome-description-wrap">

From ca6149c1a0bd88cac45e432e1756a9106fbb18af Mon Sep 17 00:00:00 2001
From: Mayuko Moriyama <mayuko.jpn@gmail.com>
Date: Wed, 5 Oct 2016 18:50:57 +0900
Subject: [PATCH 2/5] "Translate" is also need change word order.

---
 inc/admin/class-spacious-admin.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/inc/admin/class-spacious-admin.php b/inc/admin/class-spacious-admin.php
index c9a8f3e8..f81e5563 100644
--- a/inc/admin/class-spacious-admin.php
+++ b/inc/admin/class-spacious-admin.php
@@ -223,16 +223,20 @@ public function about_screen() {
 					<div class="col">
 						<h3>
 							<?php
-							esc_html_e( 'Translate', 'spacious' );
-							echo ' ' . $theme->display( 'Name' );
+							printf(
+								esc_html__('Translate %s', 'spacious'),
+								$theme->display( 'Name' )
+							)
 							?>
 						</h3>
 						<p><?php esc_html_e( 'Click below to translate this theme into your own language.', 'spacious' ) ?></p>
 						<p>
 							<a href="<?php echo esc_url( 'http://translate.wordpress.org/projects/wp-themes/spacious' ); ?>" class="button button-secondary">
 								<?php
-								esc_html_e( 'Translate', 'spacious' );
-								echo ' ' . $theme->display( 'Name' );
+								printf(
+									esc_html__('Translate %s', 'spacious'),
+									$theme->display( 'Name' )
+								)
 								?>
 							</a>
 						</p>

From ddd58d5f65071cec952ab6d43e435c8e076a4239 Mon Sep 17 00:00:00 2001
From: Mayuko Moriyama <mayuko.jpn@gmail.com>
Date: Wed, 5 Oct 2016 18:58:01 +0900
Subject: [PATCH 3/5] Add comment.

---
 inc/admin/class-spacious-admin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/admin/class-spacious-admin.php b/inc/admin/class-spacious-admin.php
index f81e5563..9bfdd089 100644
--- a/inc/admin/class-spacious-admin.php
+++ b/inc/admin/class-spacious-admin.php
@@ -224,6 +224,7 @@ public function about_screen() {
 						<h3>
 							<?php
 							printf(
+							 /* translators: %s is theme name. */
 								esc_html__('Translate %s', 'spacious'),
 								$theme->display( 'Name' )
 							)

From 03b155821481b09a07a7d8d25bf76c467c0b180b Mon Sep 17 00:00:00 2001
From: Mayuko Moriyama <mayuko.jpn@gmail.com>
Date: Wed, 5 Oct 2016 19:18:09 +0900
Subject: [PATCH 4/5] Add comments.

---
 inc/admin/class-spacious-admin.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/inc/admin/class-spacious-admin.php b/inc/admin/class-spacious-admin.php
index 9bfdd089..ee1f97c3 100644
--- a/inc/admin/class-spacious-admin.php
+++ b/inc/admin/class-spacious-admin.php
@@ -34,7 +34,9 @@ public function admin_menu() {
 		$theme = wp_get_theme( get_template() );
 
 		$page = add_theme_page(
+			/* translators: %s is theme name. */
 			sprintf( esc_html__('About %s', 'spacious'), $theme->display( 'Name' ) ),
+			/* translators: %s is theme name. */
 			sprintf( esc_html__('About %s', 'spacious'), $theme->display( 'Name' ) ),
 			'activate_plugins',
 			'spacious-welcome',
@@ -118,8 +120,8 @@ private function intro() {
 		?>
 		<div class="spacious-theme-info">
 			<h1>
-				<?php /* translators: %s is theme name. */
-							printf(
+				<?php
+							printf( /* translators: %s is theme name. */
 								esc_html__('About %s', 'spacious'),
 									$theme->display( 'Name' )
 									.' '
@@ -235,6 +237,7 @@ public function about_screen() {
 							<a href="<?php echo esc_url( 'http://translate.wordpress.org/projects/wp-themes/spacious' ); ?>" class="button button-secondary">
 								<?php
 								printf(
+									/* translators: %s is theme name. */
 									esc_html__('Translate %s', 'spacious'),
 									$theme->display( 'Name' )
 								)

From 8f4260cfc9669561169fe3c74f906f58136cfb05 Mon Sep 17 00:00:00 2001
From: Mayuko Moriyama <mayuko.jpn@gmail.com>
Date: Wed, 5 Oct 2016 19:30:57 +0900
Subject: [PATCH 5/5] Fix translation string.

---
 inc/admin/class-spacious-admin.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/inc/admin/class-spacious-admin.php b/inc/admin/class-spacious-admin.php
index ee1f97c3..64ce413e 100644
--- a/inc/admin/class-spacious-admin.php
+++ b/inc/admin/class-spacious-admin.php
@@ -121,11 +121,10 @@ private function intro() {
 		<div class="spacious-theme-info">
 			<h1>
 				<?php
-							printf( /* translators: %s is theme name. */
-								esc_html__('About %s', 'spacious'),
-									$theme->display( 'Name' )
-									.' '
-									. sprintf( '%s', $major_version )
+							printf( /* translators: %1$s is theme name. / %2$s is major version number of theme. */
+								esc_html__('About %1$s %2$s', 'spacious'),
+									$theme->display( 'Name' ),
+									sprintf( '%s', $major_version )
 							); ?>
 			</h1>