Fixed concatenated strings and added context where needed.

_inc/client/at-a-glance/akismet.jsx

@@ -98,7 +98,7 @@ const DashAkismet = React.createClass( {
 					module="akismet"
 					className="jp-dash-item__is-inactive"
 					status="is-warning"
-					statusText={ __( 'Invalid Key' ) }
+					statusText={ __( 'Invalid key' ) }
 					pro={ true }
 					siteAdminUrl={ this.props.siteAdminUrl }
 				>

_inc/client/at-a-glance/connections.jsx

@@ -120,7 +120,22 @@ export const DashConnections = React.createClass( {
 							<div className="jp-connection-settings__info">
 								<img alt="gravatar" width="64" height="64" className="jp-connection-settings__gravatar" src={ this.props.userWpComAvatar } />
 								<div className="jp-connection-settings__text">
-									{ __( 'Connected as ' ) }<span className="jp-connection-settings__username">{ this.props.userWpComLogin }</span>
+									{
+										__(
+											'Connected as {{span}}%(username)s{{/span}}',
+											{
+												args: {
+													username: this.props.userWpComLogin,
+												},
+												components: {
+													span: <span
+														className="jp-connection-settings__username"
+														/>
+												},
+												comment: '%(username) is the WordPress user login name.'
+											}
+										)
+									}
 									<div className="jp-connection-settings__email">{ this.props.userWpComEmail }</div>
 								</div>
 							</div>
@@ -155,14 +170,20 @@ export const DashConnections = React.createClass( {
 				<div className="jp-at-a-glance__item-grid">
 					<div className="jp-at-a-glance__left">
 						<div className="jp-dash-item__interior">
-							<DashItem className="jp-connection-type" label={ __( 'Site Connection' ) }>
+							<DashItem
+								className="jp-connection-type"
+								label={ __( 'Site connection', { context: 'Dashboard widget header' } ) }
+							>
 								{ this.siteConnection() }
 							</DashItem>
 						</div>
 					</div>
 					<div className="jp-at-a-glance__right">
 						<div className="jp-dash-item__interior">
-							<DashItem className="jp-connection-type" label={ __( 'Account Connection' ) }>
+							<DashItem
+								className="jp-connection-type"
+								label={ __( 'Account connection', { context: 'Dashboard widget header' } ) }
+							>
 								{ this.userConnection() }
 							</DashItem>
 						</div>

_inc/client/components/connect-button/index.jsx

@@ -75,7 +75,7 @@ export const ConnectButton = React.createClass( {
 							className="jp-connection-settings__cancel"
 							onClick={ this.handleCloseModal }>
 							{
-								__( 'Cancel' )
+								__( 'Cancel', { context: 'A caption for a button to cancel disconnection.' } )
 							}
 						</Button>
 						<Button
@@ -84,7 +84,7 @@ export const ConnectButton = React.createClass( {
 							className="jp-connection-settings__disconnect"
 							onClick={ this.disconnectSite }>
 							{
-								__( 'Disconnect' )
+								__( 'Disconnect', { context: 'A caption for a button to disconnect.' } )
 							}
 						</Button>
 					</div>

_inc/client/components/dash-item/index.jsx

@@ -78,7 +78,7 @@ export const DashItem = React.createClass( {
 								status={ this.props.status }
 								isCompact={ true }
 							>
-								{ __( 'Updates Needed' ) }
+								{ __( 'Updates needed', { context: 'Short warning message' } ) }
 							</SimpleNotice>
 						</a>
 					);
@@ -95,7 +95,7 @@ export const DashItem = React.createClass( {
 					compact={ true }
 					href="#/plans"
 				>
-					{ __( 'Paid' ) }
+					{ __( 'Paid', { context: 'Short label appearing near a paid feature configuration block.' } ) }
 				</Button>
 			;
 

_inc/client/components/module-settings/index.jsx

@@ -77,7 +77,7 @@ export let RelatedPostsSettings = React.createClass( {
 			<div className="jp-related-posts-preview">
 				{
 					show_headline ?
-						<div className="jp-related-posts-preview__title">{ __( 'Related' ) }</div> :
+						<div className="jp-related-posts-preview__title">{ __( 'Related', { context: 'A header for a block of related posts.' } ) }</div> :
 						''
 				}
 				{
@@ -118,7 +118,7 @@ export let RelatedPostsSettings = React.createClass( {
 						name={ 'show_thumbnails' }
 						label={ __( 'Use a large and visually striking layout' ) }
 						{ ...this.props } />
-					<div className="jp-related-posts-settings__preview-label">{ __( 'Preview' ) }</div>
+					<div className="jp-related-posts-settings__preview-label">{ __( 'Preview', { context: 'Noun, a header for a preview block in a configuration screen.' } ) }</div>
 					<Card>
 						{ this.renderPreviews() }
 					</Card>

_inc/client/components/navigation-settings/index.jsx

@@ -97,7 +97,7 @@ export const NavigationSettings = React.createClass( {
 									? 'https://wordpress.com/sharing/' + this.props.siteRawUrl
 									: this.props.siteAdminUrl + 'options-general.php?page=sharing'
 									}>
-								{ __( 'Sharing' ) }
+								{ __( 'Sharing', { context: 'Navigation item.' } ) }
 								{
 									true === this.props.siteConnectionStatus && (
 										<Gridicon icon="external" size={ 13 } />

_inc/client/pro-status/index.jsx

@@ -67,7 +67,7 @@ const ProStatus = React.createClass( {
 						status='is-error'
 						isCompact={ true }
 					>
-						{ __( 'Threats found!' ) }
+						{ __( 'Threats found!', { context: 'Short warning message about new threats found.' } ) }
 					</SimpleNotice>
 				);
 			}
@@ -82,7 +82,7 @@ const ProStatus = React.createClass( {
 								status='is-warning'
 								isCompact={ true }
 							>
-								{ __( 'Invalid Key' ) }
+								{ __( 'Invalid key', { context: 'Short warning message about an invalid key being used for Akismet.' } ) }
 							</SimpleNotice>
 						</a>
 					);
@@ -100,7 +100,7 @@ const ProStatus = React.createClass( {
 						primary={ true }
 						href={ 'https://jetpack.com/redirect/?source=upgrade-seo&site=' + this.props.siteRawUrl + '&feature=advanced-seo' }
 					>
-						{ __( 'Upgrade' ) }
+						{ __( 'Upgrade', { context: 'Caption for a button to purchase a paid feature.' } ) }
 					</Button>
 				);
 			}
@@ -116,7 +116,7 @@ const ProStatus = React.createClass( {
 						primary={ true }
 						href={ 'https://jetpack.com/redirect/?source=upgrade-ads&site=' + this.props.siteRawUrl + '&feature=jetpack-ads' }
 					>
-						{ __( 'Upgrade' ) }
+						{ __( 'Upgrade', { context: 'Caption for a button to purchase a paid feature.' } ) }
 					</Button>
 				);
 			}
@@ -132,7 +132,7 @@ const ProStatus = React.createClass( {
 						primary={ true }
 						href={ 'https://jetpack.com/redirect/?source=upgrade-google-analytics&site=' + this.props.siteRawUrl + '&feature=google-analytics' }
 					>
-						{ __( 'Upgrade' ) }
+						{ __( 'Upgrade', { context: 'Caption for a button to purchase a paid feature.' } ) }
 					</Button>
 				);
 			}
@@ -142,7 +142,7 @@ const ProStatus = React.createClass( {
 				if ( 'jetpack_free' !== sitePlan.product_slug ) {
 					btnVals = {
 						href: `https://wordpress.com/plugins/setup/${ this.props.siteRawUrl }?only=${ feature }`,
-						text: __( 'Set up' )
+						text: __( 'Set up', { context: 'Caption for a button to set up a feature.' } )
 					}
 
 					if ( 'scan' === feature && ! hasBusiness && ! hasPremium ) {
@@ -152,14 +152,14 @@ const ProStatus = React.createClass( {
 								primary={ true }
 								href={ 'https://jetpack.com/redirect/?source=upgrade&site=' + this.props.siteRawUrl }
 							>
-								{ __( 'Upgrade' ) }
+								{ __( 'Upgrade', { context: 'Caption for a button to purchase a paid feature.' } ) }
 							</Button>
 						);
 					}
 				} else {
 					btnVals = {
 						href: 'https://jetpack.com/redirect/?source=upgrade&site=' + this.props.siteRawUrl,
-						text: __( 'Upgrade' )
+						text: __( 'Upgrade', { context: 'Caption for a button to purchase a paid feature.' } )
 					}
 				}
 

_inc/client/traffic/related-posts.jsx

@@ -102,7 +102,9 @@ export const RelatedPosts = moduleSettingsForm(
 									}
 								} )
 							}
-							<FormLabel className="jp-form-label-wide">{ __( 'Preview' ) }</FormLabel>
+							<FormLabel className="jp-form-label-wide">
+								{ __( 'Preview', { context: 'A header for a preview area in the configuration screen.' } ) }
+							</FormLabel>
 							<Card className="jp-related-posts-preview">
 								{
 									this.state.show_headline && (