Merge branch 'release/1.1.0' of https://github.com/godaddy/wp-godaddy…

…-email-marketing into release/1.1.0

godaddy-email-marketing.php

@@ -193,11 +193,11 @@ public function enqueue() {
 
 		// Help strings.
 		wp_localize_script( 'gem-main', 'GEM', array(
-			'thankyou' => _x( 'Thank you for signing up!', 'ajax response', 'godaddy-email-marketing' ),
-			'thankyou_suppressed' => _x( 'Thank you for signing up! Please check your email to confirm your subscription.', 'ajax response', 'godaddy-email-marketing' ),
-			'oops' => _x( 'Oops! There was a problem. Please try again.', 'ajax response', 'godaddy-email-marketing' ),
-			'email' => _x( 'Please enter a valid email address.', 'ajax response', 'godaddy-email-marketing' ),
-			'required' => _x( '%s is a required field.', 'ajax response', 'godaddy-email-marketing' ),
+			'thankyou' => __( 'Thank you for signing up!', 'godaddy-email-marketing' ),
+			'thankyou_suppressed' => __( 'Thank you for signing up! Please check your email to confirm your subscription.', 'godaddy-email-marketing' ),
+			'oops' => __( 'Oops! There was a problem. Please try again.', 'godaddy-email-marketing' ),
+			'email' => __( 'Please enter a valid email address.', 'godaddy-email-marketing' ),
+			'required' => _x( '%s is a required field.', 'Name of required field', 'godaddy-email-marketing' ),
 		) );
 	}
 

includes/settings.php

@@ -506,7 +506,7 @@ public function display_settings_page() {
 				</h1>
 
 				<?php if ( empty( $forms->signups ) ) : ?>
-				
+
 					<div class="gem-identity updated notice">
 						<p><?php echo esc_html_x( 'Enjoy the GoDaddy Email Marketing Experience.', 'gem header note', 'godaddy-email-marketing' ); ?></p>
 
@@ -517,7 +517,7 @@ public function display_settings_page() {
 								<?php echo esc_html_x( 'You don\'t have any forms yet.', 'header note', 'godaddy-email-marketing' ); ?>
 								<?php $this->signups_button(); ?>
 							<?php else : ?>
-								<?php echo sprintf( esc_html_x( 'New to GoDaddy? Create an account to get started today. %1$s', 'header note', 'godaddy-email-marketing' ), sprintf( '<a target="_blank" href="%s" class="button">%s</a>', 'https://sso.godaddy.com/account/create?path=/wordpress_plugin&app=gem&realm=idp&ssoreturnpath=/%3Fpath%3D%2Fwordpress_plugin%26app%3Dgem%26realm%3Didp', esc_html_x( 'Sign Up Now', 'header button', 'godaddy-email-marketing' ) ) ); ?>
+								<?php echo sprintf( esc_html_x( 'New to GoDaddy? Create an account to get started today. %s', 'Sign up button', 'godaddy-email-marketing' ), sprintf( '<a target="_blank" href="%s" class="button">%s</a>', 'https://sso.godaddy.com/account/create?path=/wordpress_plugin&app=gem&realm=idp&ssoreturnpath=/%3Fpath%3D%2Fwordpress_plugin%26app%3Dgem%26realm%3Didp', esc_html_x( 'Sign Up Now', 'header button', 'godaddy-email-marketing' ) ) ); ?>
 							<?php endif; ?>
 						</p>
 					</div>
@@ -531,7 +531,7 @@ public function display_settings_page() {
 					<?php endif; ?>
 					<a href="#settings" class="nav-tab <?php echo esc_attr( 'settings' === $tab || empty( $tab ) ? 'nav-tab-active' : '' ); ?>"><?php esc_html_e( 'Settings', 'godaddy-email-marketing' ); ?></a>
 				</h2>
-				
+
 				<div id="setting-errors"></div>
 
 				<?php if ( ! empty( $forms->signups ) ) : ?>
@@ -744,7 +744,7 @@ public static function debugging() {
 	public static function description() {
 		printf(
 			'<p>%s</p>',
-			sprintf( esc_html_x( 'For this plugin to work, it needs to access your GoDaddy Email Marketing account. %1$s to get your username and API key. Copy and paste them below; then click "Save Settings." If you don\'t have a GoDaddy Email Marketing account, %2$s.', 'account details', 'godaddy-email-marketing' ), sprintf( '<a target="_blank" href="%s">%s</a>', 'https://sso.godaddy.com/?realm=idp&app=gem&path=/wordpress_plugin', esc_html_x( 'Sign in here', 'account details link', 'godaddy-email-marketing' ) ), sprintf( '<a target="_blank" href="%s">%s</a>', 'https://sso.godaddy.com/account/create?path=/wordpress_plugin&app=gem&realm=idp&ssoreturnpath=/%3Fpath%3D%2Fwordpress_plugin%26app%3Dgem%26realm%3Didp', esc_html_x( 'sign up here', 'account details link', 'godaddy-email-marketing' ) ) )
+			sprintf( esc_html_x( 'For this plugin to work, it needs to access your GoDaddy Email Marketing account. %1$s to get your username and API key. Copy and paste them below; then click "Save Settings." If you don\'t have a GoDaddy Email Marketing account, %2$s.', '1. Sign-in link, 2. Sign-up link', 'godaddy-email-marketing' ), sprintf( '<a target="_blank" href="%s">%s</a>', 'https://sso.godaddy.com/?realm=idp&app=gem&path=/wordpress_plugin', esc_html_x( 'Sign in here', 'account details link', 'godaddy-email-marketing' ) ), sprintf( '<a target="_blank" href="%s">%s</a>', 'https://sso.godaddy.com/account/create?path=/wordpress_plugin&app=gem&realm=idp&ssoreturnpath=/%3Fpath%3D%2Fwordpress_plugin%26app%3Dgem%26realm%3Didp', esc_html_x( 'sign up here', 'account details link', 'godaddy-email-marketing' ) ) )
 		);
 	}
 

languages/godaddy-email-marketing-da_DK.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: godaddy-email-marketing-sign-up-forms 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-06 18:54-0500\n"
+"POT-Creation-Date: 2016-06-08 16:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,31 +18,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: godaddy-email-marketing.php:196
-msgctxt "ajax response"
+#, fuzzy
 msgid "Thank you for signing up!"
 msgstr "Tak for din tilmelding!"
 
 #: godaddy-email-marketing.php:197
-msgctxt "ajax response"
+#, fuzzy
 msgid ""
 "Thank you for signing up! Please check your email to confirm your "
 "subscription."
 msgstr ""
 "Tak for din tilmelding! Kontrollr din e-mail for at bekrfte dit abonnement."
 
 #: godaddy-email-marketing.php:198
-msgctxt "ajax response"
+#, fuzzy
 msgid "Oops! There was a problem. Please try again."
 msgstr "Hov! Det opstod et problem. Prv igen."
 
 #: godaddy-email-marketing.php:199
-msgctxt "ajax response"
 msgid "Please enter a valid email address."
 msgstr ""
 
 #: godaddy-email-marketing.php:200
 #, php-format
-msgctxt "ajax response"
+msgctxt "Name of required field"
 msgid "%s is a required field."
 msgstr ""
 
@@ -338,8 +337,8 @@ msgstr ""
 
 #: includes/settings.php:520
 #, php-format
-msgctxt "header note"
-msgid "New to GoDaddy? Create an account to get started today. %1$s"
+msgctxt "Sign up button"
+msgid "New to GoDaddy? Create an account to get started today. %s"
 msgstr ""
 
 #: includes/settings.php:520
@@ -414,7 +413,7 @@ msgstr ""
 
 #: includes/settings.php:747
 #, php-format
-msgctxt "account details"
+msgctxt "1. Sign-in link, 2. Sign-up link"
 msgid ""
 "For this plugin to work, it needs to access your GoDaddy Email Marketing "
 "account. %1$s to get your username and API key. Copy and paste them below; "

languages/godaddy-email-marketing-de_DE.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: godaddy-email-marketing-sign-up-forms 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-06 18:54-0500\n"
+"POT-Creation-Date: 2016-06-08 16:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: godaddy-email-marketing.php:196
-msgctxt "ajax response"
+#, fuzzy
 msgid "Thank you for signing up!"
 msgstr "Vielen Dank fr Ihre Anmeldung."
 
 #: godaddy-email-marketing.php:197
-msgctxt "ajax response"
+#, fuzzy
 msgid ""
 "Thank you for signing up! Please check your email to confirm your "
 "subscription."
@@ -32,18 +32,17 @@ msgstr ""
 "Abonnement zu besttigen."
 
 #: godaddy-email-marketing.php:198
-msgctxt "ajax response"
+#, fuzzy
 msgid "Oops! There was a problem. Please try again."
 msgstr "Ups! Es ist ein Problem aufgetreten. Bitte versuchen Sie es erneut."
 
 #: godaddy-email-marketing.php:199
-msgctxt "ajax response"
 msgid "Please enter a valid email address."
 msgstr ""
 
 #: godaddy-email-marketing.php:200
 #, php-format
-msgctxt "ajax response"
+msgctxt "Name of required field"
 msgid "%s is a required field."
 msgstr ""
 
@@ -341,8 +340,8 @@ msgstr ""
 
 #: includes/settings.php:520
 #, php-format
-msgctxt "header note"
-msgid "New to GoDaddy? Create an account to get started today. %1$s"
+msgctxt "Sign up button"
+msgid "New to GoDaddy? Create an account to get started today. %s"
 msgstr ""
 
 #: includes/settings.php:520
@@ -417,7 +416,7 @@ msgstr ""
 
 #: includes/settings.php:747
 #, php-format
-msgctxt "account details"
+msgctxt "1. Sign-in link, 2. Sign-up link"
 msgid ""
 "For this plugin to work, it needs to access your GoDaddy Email Marketing "
 "account. %1$s to get your username and API key. Copy and paste them below; "

languages/godaddy-email-marketing-el.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: godaddy-email-marketing-sign-up-forms 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-06 18:54-0500\n"
+"POT-Creation-Date: 2016-06-08 16:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,30 +18,29 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: godaddy-email-marketing.php:196
-msgctxt "ajax response"
+#, fuzzy
 msgid "Thank you for signing up!"
 msgstr "    !"
 
 #: godaddy-email-marketing.php:197
-msgctxt "ajax response"
+#, fuzzy
 msgid ""
 "Thank you for signing up! Please check your email to confirm your "
 "subscription."
 msgstr "    !   email       ."
 
 #: godaddy-email-marketing.php:198
-msgctxt "ajax response"
+#, fuzzy
 msgid "Oops! There was a problem. Please try again."
 msgstr "!  .  ."
 
 #: godaddy-email-marketing.php:199
-msgctxt "ajax response"
 msgid "Please enter a valid email address."
 msgstr ""
 
 #: godaddy-email-marketing.php:200
 #, php-format
-msgctxt "ajax response"
+msgctxt "Name of required field"
 msgid "%s is a required field."
 msgstr ""
 
@@ -326,8 +325,8 @@ msgstr ""
 
 #: includes/settings.php:520
 #, php-format
-msgctxt "header note"
-msgid "New to GoDaddy? Create an account to get started today. %1$s"
+msgctxt "Sign up button"
+msgid "New to GoDaddy? Create an account to get started today. %s"
 msgstr ""
 
 #: includes/settings.php:520
@@ -402,7 +401,7 @@ msgstr ""
 
 #: includes/settings.php:747
 #, php-format
-msgctxt "account details"
+msgctxt "1. Sign-in link, 2. Sign-up link"
 msgid ""
 "For this plugin to work, it needs to access your GoDaddy Email Marketing "
 "account. %1$s to get your username and API key. Copy and paste them below; "

languages/godaddy-email-marketing-es_ES.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: godaddy-email-marketing-sign-up-forms 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-06 18:54-0500\n"
+"POT-Creation-Date: 2016-06-08 16:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: godaddy-email-marketing.php:196
-msgctxt "ajax response"
+#, fuzzy
 msgid "Thank you for signing up!"
 msgstr "Gracias por registrarte!"
 
 #: godaddy-email-marketing.php:197
-msgctxt "ajax response"
+#, fuzzy
 msgid ""
 "Thank you for signing up! Please check your email to confirm your "
 "subscription."
@@ -32,18 +32,17 @@ msgstr ""
 "suscripcin."
 
 #: godaddy-email-marketing.php:198
-msgctxt "ajax response"
+#, fuzzy
 msgid "Oops! There was a problem. Please try again."
 msgstr "Uy! Hubo un problema. Intntalo de nuevo."
 
 #: godaddy-email-marketing.php:199
-msgctxt "ajax response"
 msgid "Please enter a valid email address."
 msgstr ""
 
 #: godaddy-email-marketing.php:200
 #, php-format
-msgctxt "ajax response"
+msgctxt "Name of required field"
 msgid "%s is a required field."
 msgstr ""
 
@@ -342,8 +341,8 @@ msgstr ""
 
 #: includes/settings.php:520
 #, php-format
-msgctxt "header note"
-msgid "New to GoDaddy? Create an account to get started today. %1$s"
+msgctxt "Sign up button"
+msgid "New to GoDaddy? Create an account to get started today. %s"
 msgstr ""
 
 #: includes/settings.php:520
@@ -418,7 +417,7 @@ msgstr ""
 
 #: includes/settings.php:747
 #, php-format
-msgctxt "account details"
+msgctxt "1. Sign-in link, 2. Sign-up link"
 msgid ""
 "For this plugin to work, it needs to access your GoDaddy Email Marketing "
 "account. %1$s to get your username and API key. Copy and paste them below; "

languages/godaddy-email-marketing-es_MX.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: godaddy-email-marketing-sign-up-forms 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-06 18:54-0500\n"
+"POT-Creation-Date: 2016-06-08 16:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: godaddy-email-marketing.php:196
-msgctxt "ajax response"
+#, fuzzy
 msgid "Thank you for signing up!"
 msgstr "Gracias por registrarte!"
 
 #: godaddy-email-marketing.php:197
-msgctxt "ajax response"
+#, fuzzy
 msgid ""
 "Thank you for signing up! Please check your email to confirm your "
 "subscription."
@@ -32,18 +32,17 @@ msgstr ""
 "suscripcin."
 
 #: godaddy-email-marketing.php:198
-msgctxt "ajax response"
+#, fuzzy
 msgid "Oops! There was a problem. Please try again."
 msgstr "Uy! Hubo un problema. Intntalo de nuevo."
 
 #: godaddy-email-marketing.php:199
-msgctxt "ajax response"
 msgid "Please enter a valid email address."
 msgstr ""
 
 #: godaddy-email-marketing.php:200
 #, php-format
-msgctxt "ajax response"
+msgctxt "Name of required field"
 msgid "%s is a required field."
 msgstr ""
 
@@ -342,8 +341,8 @@ msgstr ""
 
 #: includes/settings.php:520
 #, php-format
-msgctxt "header note"
-msgid "New to GoDaddy? Create an account to get started today. %1$s"
+msgctxt "Sign up button"
+msgid "New to GoDaddy? Create an account to get started today. %s"
 msgstr ""
 
 #: includes/settings.php:520
@@ -418,7 +417,7 @@ msgstr ""
 
 #: includes/settings.php:747
 #, php-format
-msgctxt "account details"
+msgctxt "1. Sign-in link, 2. Sign-up link"
 msgid ""
 "For this plugin to work, it needs to access your GoDaddy Email Marketing "
 "account. %1$s to get your username and API key. Copy and paste them below; "