diff --git a/includes/class-options-page.php b/includes/class-options-page.php
index 824b7c5..95afe11 100644
--- a/includes/class-options-page.php
+++ b/includes/class-options-page.php
@@ -124,14 +124,14 @@ public function add_setting_section() {
 //		);
 		add_settings_section(
 				self::SETTING_SECTION_ID_GENERAL,
-				'General Settings', // Title
+				__( 'Toolbar hight Settings', 'the-2nd-toolbar' ), // Title
 				'',
 //				array( $this, 'print_section_info' ), // Callback
 				self::PAGE_SLUG // Page
 		);
 		add_settings_section(
 				self::SETTING_SECTION_ID_WAIN,
-				'Where Am I Now Settings', // Title
+				__( 'Where Am I Now Settings', 'the-2nd-toolbar' ), // Title
 				'',
 //				array( $this, 'print_section_info_wain' ), // Callback
 				self::PAGE_SLUG // Page
@@ -158,7 +158,6 @@ public function add_settings_field() {
 //				array( $this, 'title_callback' ),
 //				self::SETTING_SECTION_ID
 //		);
-
 //		$parts->add_settings_field_template(
 //				'show_only_logged_in',
 //				'Show only for logged in user',
@@ -168,7 +167,7 @@ public function add_settings_field() {
 
 		$parts->add_settings_field_template(
 				'height',
-				'Height',
+				__( 'Toolbar Height', 'the-2nd-toolbar' ),
 				[ $this, 'height_options_callback' ],
 				self::SETTING_SECTION_ID_GENERAL
 		);
@@ -182,7 +181,7 @@ public function add_settings_field() {
 
 		$parts->add_settings_field_template(
 				'where_am_i_now_setting_id',
-				__( 'Where Am I Now Setting', 'the-2nd-toolbar' ),
+				__( 'Toolbar position', 'the-2nd-toolbar' ),
 				[ $this, 'where_am_i_now_setting_callback' ],
 				self::SETTING_SECTION_ID_WAIN, // Section
 		);
@@ -272,17 +271,20 @@ public function height_options_callback() {
 				'height32px',
 				'32',
 				$what_height[ '32' ],
-				'32px (same as the default toolbar)' );
+				__( '32px (same as the default toolbar)', 'the-2nd-toolbar' )
+		);
 		$height_48_form = $this->get_height_radio_button_form(
 				'height48px',
 				'48',
 				$what_height[ '48' ],
-				'48px (1.5 times as high as the default toolbar)' );
+				__( '48px (1.5 times as high as the default toolbar)', 'the-2nd-toolbar' )
+		);
 		$height_64_form = $this->get_height_radio_button_form(
 				'height64px',
 				'64',
 				$what_height[ '64' ],
-				'64px (2 times as high as the default toolbar)' );
+				__( '64px (2 times as high as the default toolbar)', 'the-2nd-toolbar' )
+		);
 
 		$fieldset_html = sprintf(
 				$fieldset_html_form,
@@ -305,7 +307,7 @@ public function get_what_height_checked() {
 		} else {
 			$num = 32;
 		}
-        
+
 		$keys = [ '32', '48', '64', 'unknown' ];
 		$height = array_fill_keys( $keys, '' );
 
@@ -483,11 +485,11 @@ public function get_id_num( $site_env_type ) {
 	}
 
 	public function get_what_site_button_form( $site_env_type, $what_site ) {
-        
-        if (is_null($what_site)) {
-            echo 'Choose one of them:';
-            $what_site = ['none'];
-        }
+
+		if ( is_null( $what_site ) ) {
+			echo 'Choose one of them:';
+			$what_site = [ 'none' ];
+		}
 
 		$what_site_key = array_search( 'checked', $what_site );
 
@@ -503,13 +505,16 @@ public function get_what_site_button_form( $site_env_type, $what_site ) {
 
 		$parts = new Class_Options_Parts();
 
+		$server_type_str_format = __( 'The %s server.', 'the-2nd-toolbar' );
+		$server_type_str = sprintf( $server_type_str_format, $site_env_type );
+
 		$form_output = sprintf(
 				$parts->get_radio_button_form_template(),
 				'the_2nd_toolbar-' . ( string ) $id_num,
 				$input_name,
 				$site_env_type . '-site',
 				$is_checked,
-				'The ' . $site_env_type . ' server.',
+				$server_type_str,
 		);
 
 		return $form_output;
diff --git a/languages/the-2nd-toolbar-ja.mo b/languages/the-2nd-toolbar-ja.mo
index ff717ca..00c7f60 100644
Binary files a/languages/the-2nd-toolbar-ja.mo and b/languages/the-2nd-toolbar-ja.mo differ
diff --git a/languages/the-2nd-toolbar-ja.po b/languages/the-2nd-toolbar-ja.po
index ca1ac80..479e71a 100644
--- a/languages/the-2nd-toolbar-ja.po
+++ b/languages/the-2nd-toolbar-ja.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The 2nd toolbar\n"
-"POT-Creation-Date: 2019-08-27 23:17+0900\n"
-"PO-Revision-Date: 2019-08-27 23:18+0900\n"
+"POT-Creation-Date: 2020-02-22 13:53+0900\n"
+"PO-Revision-Date: 2020-02-22 13:53+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 2.3\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
@@ -22,64 +22,105 @@ msgstr ""
 "X-Poedit-SearchPathExcluded-0: *.min.js\n"
 "X-Poedit-SearchPathExcluded-1: node_modules\n"
 
-#: inc/class-output-notice-msg.php:53
+#: includes/class-options-page.php:66
+msgid "The 2nd Toolbar"
+msgstr "2 番目のツールバー"
+
+#: includes/class-options-page.php:83
+msgid "The 2nd Toolbar Settings"
+msgstr "2番目のツールバー設定"
+
+#: includes/class-options-page.php:127
+msgid "Toolbar hight Settings"
+msgstr "ツールバーの高さ設定"
+
+#: includes/class-options-page.php:134
+msgid "Where Am I Now Settings"
+msgstr "Where Am I Now 設定"
+
+#: includes/class-options-page.php:170
+msgid "Toolbar Height"
+msgstr "ツールバーの高さ"
+
+#: includes/class-options-page.php:184
+msgid "Toolbar position"
+msgstr "ツールバーの位置"
+
+#: includes/class-options-page.php:204
+msgid "Where Am I Now"
+msgstr "Where Am I Now"
+
+#: includes/class-options-page.php:274
+msgid "32px (same as the default toolbar)"
+msgstr "32px (デフォルトのツールバーと同じ)"
+
+#: includes/class-options-page.php:280
+msgid "48px (1.5 times as high as the default toolbar)"
+msgstr "48px (デフォルトのツールバーの1.5倍)"
+
+#: includes/class-options-page.php:286
+msgid "64px (2 times as high as the default toolbar)"
+msgstr "64px (デフォルトのツールバーの2倍)"
+
+#: includes/class-options-page.php:291
+msgid "Height of the toolbar."
+msgstr "ツールバーの高さ。"
+
+#: includes/class-options-page.php:295
+msgid "Choose how high the toolbar is."
+msgstr "ツールバーの高さを選択します。"
+
+#: includes/class-options-page.php:365
+msgid "Position Setting"
+msgstr "位置設定"
+
+#: includes/class-options-page.php:370
+msgid "Choose what position the toolbar appear."
+msgstr "ツールバーの表示位置を選択します。"
+
+#: includes/class-options-page.php:508
+#, php-format
+msgid "The %s server."
+msgstr "%sサーバー"
+
+#: includes/class-options-page.php:538
+msgid "Where Am I Now Setting"
+msgstr "Where Am I Now 設定"
+
+#: includes/class-options-page.php:543
+msgid "Choose what server your WordPress running on."
+msgstr "WordPress が実行されているサーバーを選択してください。"
+
+#: includes/class-output-the-2nd-toolbar.php:120
 #, php-format
 msgid "This site is on %s."
 msgstr "このサイトは%sで動いています。"
 
-#: inc/class-output-notice-msg.php:55
+#: includes/class-output-the-2nd-toolbar.php:122
 #, php-format
 msgid "%s server"
 msgstr "%sサーバー"
 
-#: inc/class-output-notice-msg.php:75
+#: includes/class-output-the-2nd-toolbar.php:136
 msgid "the production"
 msgstr "本番"
 
-#: inc/class-output-notice-msg.php:76
+#: includes/class-output-the-2nd-toolbar.php:138
 msgid "the staging"
 msgstr "ステージング"
 
-#: inc/class-output-notice-msg.php:77
+#: includes/class-output-the-2nd-toolbar.php:140
 msgid "the development"
 msgstr "開発"
 
-#: inc/class-output-notice-msg.php:78
+#: includes/class-output-the-2nd-toolbar.php:142
 msgid "the local"
 msgstr "ローカル"
 
-#: inc/class-output-notice-msg.php:79
+#: includes/class-output-the-2nd-toolbar.php:144
 msgid "an unknown"
 msgstr "不明な"
 
-#: inc/class-settings.php:26
-msgid "The 2nd Toolbar setting"
-msgstr "2番目のツールバー設定"
-
-#: inc/class-settings.php:77
-msgid "The production server"
-msgstr "本番サーバー"
-
-#: inc/class-settings.php:86
-msgid "The staging server"
-msgstr "ステージングサーバー"
-
-#: inc/class-settings.php:95
-msgid "The development server"
-msgstr "開発サーバー"
-
-#: inc/class-settings.php:104
-msgid "The local server"
-msgstr "ローカルサーバー"
-
-#: inc/class-settings.php:129
-msgid "Where Am I Now Setting"
-msgstr "Where Am I Now 設定"
-
-#: inc/class-settings.php:134
-msgid "Choose what server your WordPress running on."
-msgstr "WordPress が実行されているサーバーを選択してください。"
-
 #. Plugin Name of the plugin/theme
 msgid "The 2nd toolbar"
 msgstr "2 番目のツールバー"
@@ -103,6 +144,18 @@ msgstr "上滝太祐"
 msgid "https://tekapo.com/"
 msgstr "https://tekapo.com/"
 
+#~ msgid "The production server"
+#~ msgstr "本番サーバー"
+
+#~ msgid "The staging server"
+#~ msgstr "ステージングサーバー"
+
+#~ msgid "The development server"
+#~ msgstr "開発サーバー"
+
+#~ msgid "The local server"
+#~ msgstr "ローカルサーバー"
+
 #~ msgid ""
 #~ "A WordPress plugin that shows what environment (a production site, a "
 #~ "staging site or so on) you are browsing now."