Paid Memberships Pro - Version 2.1.4

Version Description

2019-10-31
BUG FIX: Better exception handling in the Stripe gateway class for PHP 7+.
BUG FIX: Fixing some JS issues at checkout, e.g. related to the "validateCreditCard method is not available" error.
BUG FIX: Better messaging if the Stripe Billing Limits Add On is already installed.
BUG FIX: Fixed cases where PMPro would email users about credit cards expiring when they had used an offsite gateway like PayPal Express.
BUG FIX: Fixed issue where some user information was missing from the pmpro_orders_user_row_actions filter.
BUG FIX: Fixed issues where the level confirmation text was not available in some cases.
BUG FIX/ENHANCEMENT: Updates to the French language translation.

Release Info

Developer	strangerstudios
Plugin	Paid Memberships Pro
Version	2.1.4
Comparing to
See all releases

Code changes from version 2.1.3 to 2.1.4

Files changed (16) hide show

CHANGELOG.txt +9 -0
adminpages/functions.php +1 -2
adminpages/membershiplevels.php +12 -2
adminpages/orders.php +1 -0
classes/gateways/class.pmprogateway_stripe.php +97 -33
includes/adminpages.php +18 -3
includes/functions.php +24 -22
js/pmpro-checkout.js +21 -19
languages/paid-memberships-pro-fr_FR.mo +0 -0
languages/paid-memberships-pro-fr_FR.po +10 -4
languages/paid-memberships-pro.mo +0 -0
languages/paid-memberships-pro.po +1110 -680
languages/paid-memberships-pro.pot +1110 -680
paid-memberships-pro.php +2 -2
readme.txt +10 -1
scheduled/crons.php +3 -1

CHANGELOG.txt CHANGED Viewed

@@ -1,5 +1,14 @@
             == Changelog ==
             = 2.1.3 - 2019-10-14 =
             * BUG FIX: Updating Stripe subscriptions from the edit user page will no longer cause an extra charge.
             * BUG FIX: Correctly localizing the expiration date on the frontend account page.


1	== Changelog ==
2
3	+ = 2.1.4 - 2019-10-31
4	+ * BUG FIX: Better exception handling in the Stripe gateway class for PHP 7+.
5	+ * BUG FIX: Fixing some JS issues at checkout, e.g. related to the "validateCreditCard method is not available" error.
6	+ * BUG FIX: Better messaging if the Stripe Billing Limits Add On is already installed.
7	+ * BUG FIX: Fixed cases where PMPro would email users about credit cards expiring when they had used an offsite gateway like PayPal Express.
8	+ * BUG FIX: Fixed issue where some user information was missing from the pmpro_orders_user_row_actions filter.
9	+ * BUG FIX: Fixed issues where the level confirmation text was not available in some cases.
10	+ * BUG FIX/ENHANCEMENT: Updates to the French language translation.
11	+
12	= 2.1.3 - 2019-10-14 =
13	* BUG FIX: Updating Stripe subscriptions from the edit user page will no longer cause an extra charge.
14	* BUG FIX: Correctly localizing the expiration date on the frontend account page.

adminpages/functions.php CHANGED Viewed

	@@ -52,8 +52,7 @@ function pmpro_checkLevelForStripeCompatibility($level = NULL)
52	$level = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->pmpro_membership_levels WHERE id = %d LIMIT 1" , $level ) );
53
54	//check this level
55	- if($level->billing_limit > 0)
56	- {
57	return false;
58	}
59	}


52	$level = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->pmpro_membership_levels WHERE id = %d LIMIT 1" , $level ) );
53
54	//check this level
55	+ if ( ( $level->billing_limit > 0 ) && ! function_exists( 'pmprosbl_plugin_row_meta' ) ) {

56	return false;
57	}
58	}

adminpages/membershiplevels.php CHANGED Viewed

@@ -464,8 +464,18 @@
             						<input name="billing_limit" type="text" size="20" value="<?php echo $level->billing_limit?>" />
             						<p class="description">
             							<?php _e('The <strong>total</strong> number of recurring billing cycles for this level, including the trial period (if applicable) but not including the initial payment. Set to zero if membership is indefinite.', 'paid-memberships-pro' );?>
-            -
            							<?php if($gateway == "stripe") { ?>
-            -
            								<strong <?php if(!empty($pmpro_stripe_error)) { ?>class="pmpro_red"<?php } ?>><?php _e('Stripe integration currently does not support billing limits. You can still set an expiration date below.', 'paid-memberships-pro' );?></strong>
             							<?php } ?>
             						</p>
             					</td>


464	<input name="billing_limit" type="text" size="20" value="<?php echo $level->billing_limit?>" />
465	<p class="description">
466	<?php _e('The <strong>total</strong> number of recurring billing cycles for this level, including the trial period (if applicable) but not including the initial payment. Set to zero if membership is indefinite.', 'paid-memberships-pro' );?>
467	+ <?php if ( ( $gateway == "stripe" ) && ! function_exists( 'pmprosbl_plugin_row_meta' ) ) { ?>
468	+ <br /><strong <?php if(!empty($pmpro_stripe_error)) { ?>class="pmpro_red"<?php } ?>><?php _e('Stripe integration currently does not support billing limits. You can still set an expiration date below.', 'paid-memberships-pro' );?></strong>
469	+ <?php if ( ! function_exists( 'pmprosd_pmpro_membership_level_after_other_settings' ) ) {
470	+ $allowed_sbl_html = array (
471	+ 'a' => array (
472	+ 'href' => array(),
473	+ 'target' => array(),
474	+ 'title' => array(),
475	+ ),
476	+ );
477	+ echo '<br />' . sprintf( wp_kses( __( 'Optional: Allow billing limits with Stripe using the <a href="%s" title="Paid Memberships Pro - Stripe Billing Limits Add On" target="_blank">Stripe Billing Limits Add On</a>.', 'paid-memberships-pro' ), $allowed_sbl_html ), 'https://www.paidmembershipspro.com/add-ons/pmpro-stripe-billing-limits/?utm_source=plugin&utm_medium=pmpro-membershiplevels&utm_campaign=add-ons&utm_content=stripe-billing-limits' ) . '</em></td></tr>';
478	+ } ?>
479	<?php } ?>
480	</p>
481	</td>

adminpages/orders.php CHANGED Viewed

	@@ -1320,6 +1320,7 @@ selected="selected"<?php } ?>><?php echo date_i18n( 'M', strtotime( $i . '/1/' .
1320	$order = new MemberOrder();
1321	$order->nogateway = true;
1322	$order->getMemberOrderByID( $order_id );

1323	?>
1324	<tr
1325	<?php


1320	$order = new MemberOrder();
1321	$order->nogateway = true;
1322	$order->getMemberOrderByID( $order_id );
1323	+ $order->getUser();
1324	?>
1325	<tr
1326	<?php

classes/gateways/class.pmprogateway_stripe.php CHANGED Viewed

	@@ -1120,7 +1120,6 @@ class PMProGateway_stripe extends PMProGateway {
1120	$order->code = $order->getRandomCode();
1121	}
1122
1123	-
1124	//what amount to charge?
1125	$amount = $order->InitialPayment;
1126
	@@ -1129,7 +1128,6 @@ class PMProGateway_stripe extends PMProGateway {
1129	$tax = $order->getTax( true );
1130	$amount = pmpro_round_price( (float) $order->subtotal + (float) $tax );
1131
1132	-
1133	//create a customer
1134	$result = $this->getCustomer( $order );
1135
	@@ -1138,7 +1136,6 @@ class PMProGateway_stripe extends PMProGateway {
1138	return false;
1139	}
1140
1141	-
1142	//charge
1143	try {
1144	$response = Stripe_Charge::create( array(
	@@ -1148,7 +1145,14 @@ class PMProGateway_stripe extends PMProGateway {
1148	"description" => apply_filters( 'pmpro_stripe_order_description', "Order #" . $order->code . ", " . trim( $order->FirstName . " " . $order->LastName ) . " (" . $order->Email . ")", $order )
1149	)
1150	);
1151	- } catch ( ~~Exception~~ $e ) {







1152	//$order->status = "error";
1153	$order->errorcode = true;
1154	$order->error = "Error: " . $e->getMessage();
	@@ -1247,8 +1251,12 @@ class PMProGateway_stripe extends PMProGateway {
1247	//charge, look it up
1248	try {
1249	$charge = Stripe_Charge::retrieve( $payment_transaction_id );
1250	- } catch ( \~~Exception~~ $~~exception~~ ) {
1251	- $order->error = sprintf( __( 'Error: %s', 'paid-memberships-pro' ), $~~exception~~->getMessage() );




1252
1253	return false;
1254	}
	@@ -1260,8 +1268,12 @@ class PMProGateway_stripe extends PMProGateway {
1260	//invoice look it up
1261	try {
1262	$invoice = Stripe_Invoice::retrieve( $payment_transaction_id );
1263	- } catch ( \~~Exception~~ $~~exception~~ ) {
1264	- $order->error = sprintf( __( 'Error: %s', 'paid-memberships-pro' ), $~~exception~~->getMessage() );




1265
1266	return false;
1267	}
	@@ -1340,8 +1352,9 @@ class PMProGateway_stripe extends PMProGateway {
1340	}
1341
1342	return $this->customer;
1343	-
1344	- } ~~catch~~ ( ~~Exception $e ) {~~

1345	//assume no customer found
1346	}
1347	}
	@@ -1357,6 +1370,16 @@ class PMProGateway_stripe extends PMProGateway {
1357	$order->error = __( "Error creating customer record with Stripe:", 'paid-memberships-pro' ) . " " . $e->getMessage();
1358	$order->shorterror = $order->error;
1359










1360	return false;
1361	}
1362
	@@ -1412,7 +1435,12 @@ class PMProGateway_stripe extends PMProGateway {
1412	if ( ! empty( $order->subscription_transaction_id ) && strpos( $order->subscription_transaction_id, "sub_" ) !== false ) {
1413	try {
1414	$sub = $this->customer->subscriptions->retrieve( $order->subscription_transaction_id );
1415	- } catch ( ~~Exception~~ $e ) {





1416	$order->error = __( "Error getting subscription with Stripe:", 'paid-memberships-pro' ) . $e->getMessage();
1417	$order->shorterror = $order->error;
1418
	@@ -1563,7 +1591,12 @@ class PMProGateway_stripe extends PMProGateway {
1563	);
1564
1565	$plan = Stripe_Plan::create( apply_filters( 'pmpro_stripe_create_plan_array', $plan ) );
1566	- } catch ( ~~Exception~~ $e ) {





1567	$order->error = __( "Error creating plan with Stripe:", 'paid-memberships-pro' ) . $e->getMessage();
1568	$order->shorterror = $order->error;
1569
	@@ -1585,7 +1618,21 @@ class PMProGateway_stripe extends PMProGateway {
1585	try {
1586	$subscription = array( "plan" => $order->code );
1587	$result = $this->customer->subscriptions->create( apply_filters( 'pmpro_stripe_create_subscription_array', $subscription ) );
1588	- } catch ( ~~Exception~~ $e ) {














1589	//try to delete the plan
1590	$plan->delete();
1591
	@@ -1915,7 +1962,9 @@ class PMProGateway_stripe extends PMProGateway {
1915	$r = $subscription->cancel();
1916
1917	return true;
1918	- } catch ( ~~Exception~~ $e ) {


1919	return false;
1920	}
1921	}
	@@ -1997,7 +2046,9 @@ class PMProGateway_stripe extends PMProGateway {
1997	//get the charge
1998	try {
1999	$charge = Stripe_Charge::retrieve( $transaction_id );
2000	- } catch ( ~~Exception~~ $e ) {


2001	$charge = false;
2002	}
2003
	@@ -2014,8 +2065,13 @@ class PMProGateway_stripe extends PMProGateway {
2014	//attempt refund
2015	try {
2016	$refund = $charge->refund();
2017	- } catch ( ~~Exception~~ $e ) {
2018	- ~~//$~~order->~~status~~ = ~~"error"~~;





2019	$order->errorcode = true;
2020	$order->error = __( "Error: ", 'paid-memberships-pro' ) . $e->getMessage();
2021	$order->shorterror = $order->error;
	@@ -2062,10 +2118,10 @@ class PMProGateway_stripe extends PMProGateway {
2062	} catch ( Stripe\Error\Base $e ) {
2063	$order->error = $e->getMessage();
2064	return false;
2065	- } catch ( Throwable $e ) {
2066	$order->error = $e->getMessage();
2067	return false;
2068	- } catch ( Exception $e ) {
2069	$order->error = $e->getMessage();
2070	return false;
2071	}
	@@ -2099,10 +2155,10 @@ class PMProGateway_stripe extends PMProGateway {
2099	} catch ( Stripe\Error\Base $e ) {
2100	$order->error = $e->getMessage();
2101	return false;
2102	- } catch ( Throwable $e ) {
2103	$order->error = $e->getMessage();
2104	return false;
2105	- } catch ( Exception $e ) {
2106	$order->error = $e->getMessage();
2107	return false;
2108	}
	@@ -2153,10 +2209,10 @@ class PMProGateway_stripe extends PMProGateway {
2153	} catch ( Stripe\Error\Base $e ) {
2154	$order->error = $e->getMessage();
2155	return false;
2156	- } catch ( Throwable $e ) {
2157	$order->error = $e->getMessage();
2158	return false;
2159	- } catch ( Exception $e ) {
2160	$order->error = $e->getMessage();
2161	return false;
2162	}
	@@ -2205,10 +2261,10 @@ class PMProGateway_stripe extends PMProGateway {
2205	} catch ( Stripe\Error\Base $e ) {
2206	$order->error = $e->getMessage();
2207	return false;
2208	- } catch ( Throwable $e ) {
2209	$order->error = $e->getMessage();
2210	return false;
2211	- } catch ( Exception $e ) {
2212	$order->error = $e->getMessage();
2213	return false;
2214	}
	@@ -2346,7 +2402,11 @@ class PMProGateway_stripe extends PMProGateway {
2346	$order->error = $e->getMessage();
2347
2348	return false;
2349	- } catch ( ~~Exception~~ $e ) {




2350	$order->error = $e->getMessage();
2351
2352	return false;
	@@ -2374,10 +2434,10 @@ class PMProGateway_stripe extends PMProGateway {
2374	} catch ( Stripe\Error\Base $e ) {
2375	$order->error = $e->getMessage();
2376	return false;
2377	- } catch ( Throwable $e ) {
2378	$order->error = $e->getMessage();
2379	return false;
2380	- } catch ( Exception $e ) {
2381	$order->error = $e->getMessage();
2382	return false;
2383	}
	@@ -2393,7 +2453,11 @@ class PMProGateway_stripe extends PMProGateway {
2393	$order->error = $e->getMessage();
2394
2395	return false;
2396	- } catch ( ~~Exception~~ $e ) {




2397	$order->error = $e->getMessage();
2398
2399	return false;
	@@ -2410,10 +2474,10 @@ class PMProGateway_stripe extends PMProGateway {
2410	} catch ( Stripe\Error\Base $e ) {
2411	$order->error = $e->getMessage();
2412	return false;
2413	- } catch ( Throwable $e ) {
2414	$order->error = $e->getMessage();
2415	return false;
2416	- } catch ( Exception $e ) {
2417	$order->error = $e->getMessage();
2418	return false;
2419	}
	@@ -2472,10 +2536,10 @@ class PMProGateway_stripe extends PMProGateway {
2472	} catch ( Stripe\Error\Base $e ) {
2473	$order->error = $e->getMessage();
2474	return false;
2475	- } catch ( Throwable $e ) {
2476	$order->error = $e->getMessage();
2477	return false;
2478	- } catch ( Exception $e ) {
2479	$order->error = $e->getMessage();
2480	return false;
2481	}


1120	$order->code = $order->getRandomCode();
1121	}
1122

1123	//what amount to charge?
1124	$amount = $order->InitialPayment;
1125

1128	$tax = $order->getTax( true );
1129	$amount = pmpro_round_price( (float) $order->subtotal + (float) $tax );
1130

1131	//create a customer
1132	$result = $this->getCustomer( $order );
1133

1136	return false;
1137	}
1138

1139	//charge
1140	try {
1141	$response = Stripe_Charge::create( array(

1145	"description" => apply_filters( 'pmpro_stripe_order_description', "Order #" . $order->code . ", " . trim( $order->FirstName . " " . $order->LastName ) . " (" . $order->Email . ")", $order )
1146	)
1147	);
1148	+ } catch ( \Throwable $e ) {
1149	+ //$order->status = "error";
1150	+ $order->errorcode = true;
1151	+ $order->error = "Error: " . $e->getMessage();
1152	+ $order->shorterror = $order->error;
1153	+
1154	+ return false;
1155	+ } catch ( \Exception $e ) {
1156	//$order->status = "error";
1157	$order->errorcode = true;
1158	$order->error = "Error: " . $e->getMessage();

1251	//charge, look it up
1252	try {
1253	$charge = Stripe_Charge::retrieve( $payment_transaction_id );
1254	+ } catch ( \Throwable $e ) {
1255	+ $order->error = sprintf( __( 'Error: %s', 'paid-memberships-pro' ), $e->getMessage() );
1256	+
1257	+ return false;
1258	+ } catch ( \Exception $e ) {
1259	+ $order->error = sprintf( __( 'Error: %s', 'paid-memberships-pro' ), $e->getMessage() );
1260
1261	return false;
1262	}

1268	//invoice look it up
1269	try {
1270	$invoice = Stripe_Invoice::retrieve( $payment_transaction_id );
1271	+ } catch ( \Throwable $e ) {
1272	+ $order->error = sprintf( __( 'Error: %s', 'paid-memberships-pro' ), $e->getMessage() );
1273	+
1274	+ return false;
1275	+ } catch ( \Exception $e ) {
1276	+ $order->error = sprintf( __( 'Error: %s', 'paid-memberships-pro' ), $e->getMessage() );
1277
1278	return false;
1279	}

1352	}
1353
1354	return $this->customer;
1355	+ } catch ( \Throwable $e ) {
1356	+ //assume no customer found
1357	+ } catch ( \Exception $e ) {
1358	//assume no customer found
1359	}
1360	}

1370	$order->error = __( "Error creating customer record with Stripe:", 'paid-memberships-pro' ) . " " . $e->getMessage();
1371	$order->shorterror = $order->error;
1372
1373	+ return false;
1374	+ } catch ( \Throwable $e ) {
1375	+ $order->error = __( "Error creating customer record with Stripe:", 'paid-memberships-pro' ) . " " . $e->getMessage();
1376	+ $order->shorterror = $order->error;
1377	+
1378	+ return false;
1379	+ } catch ( \Exception $e ) {
1380	+ $order->error = __( "Error creating customer record with Stripe:", 'paid-memberships-pro' ) . " " . $e->getMessage();
1381	+ $order->shorterror = $order->error;
1382	+
1383	return false;
1384	}
1385

1435	if ( ! empty( $order->subscription_transaction_id ) && strpos( $order->subscription_transaction_id, "sub_" ) !== false ) {
1436	try {
1437	$sub = $this->customer->subscriptions->retrieve( $order->subscription_transaction_id );
1438	+ } catch ( \Throwable $e ) {
1439	+ $order->error = __( "Error getting subscription with Stripe:", 'paid-memberships-pro' ) . $e->getMessage();
1440	+ $order->shorterror = $order->error;
1441	+
1442	+ return false;
1443	+ } catch ( \Exception $e ) {
1444	$order->error = __( "Error getting subscription with Stripe:", 'paid-memberships-pro' ) . $e->getMessage();
1445	$order->shorterror = $order->error;
1446

1591	);
1592
1593	$plan = Stripe_Plan::create( apply_filters( 'pmpro_stripe_create_plan_array', $plan ) );
1594	+ } catch ( \Throwable $e ) {
1595	+ $order->error = __( "Error creating plan with Stripe:", 'paid-memberships-pro' ) . $e->getMessage();
1596	+ $order->shorterror = $order->error;
1597	+
1598	+ return false;
1599	+ } catch ( \Exception $e ) {
1600	$order->error = __( "Error creating plan with Stripe:", 'paid-memberships-pro' ) . $e->getMessage();
1601	$order->shorterror = $order->error;
1602

1618	try {
1619	$subscription = array( "plan" => $order->code );
1620	$result = $this->customer->subscriptions->create( apply_filters( 'pmpro_stripe_create_subscription_array', $subscription ) );
1621	+ } catch ( \Throwable $e ) {
1622	+ //try to delete the plan
1623	+ $plan->delete();
1624	+
1625	+ //give the user any old updates back
1626	+ if ( ! empty( $user_id ) ) {
1627	+ update_user_meta( $user_id, "pmpro_stripe_updates", $old_user_updates );
1628	+ }
1629	+
1630	+ //return error
1631	+ $order->error = __( "Error subscribing customer to plan with Stripe:", 'paid-memberships-pro' ) . $e->getMessage();
1632	+ $order->shorterror = $order->error;
1633	+
1634	+ return false;
1635	+ } catch ( \Exception $e ) {
1636	//try to delete the plan
1637	$plan->delete();
1638

1962	$r = $subscription->cancel();
1963
1964	return true;
1965	+ } catch ( \Throwable $e ) {
1966	+ return false;
1967	+ } catch ( \Exception $e ) {
1968	return false;
1969	}
1970	}

2046	//get the charge
2047	try {
2048	$charge = Stripe_Charge::retrieve( $transaction_id );
2049	+ } catch ( \Throwable $e ) {
2050	+ $charge = false;
2051	+ } catch ( \Exception $e ) {
2052	$charge = false;
2053	}
2054

2065	//attempt refund
2066	try {
2067	$refund = $charge->refund();
2068	+ } catch ( \Throwable $e ) {
2069	+ $order->errorcode = true;
2070	+ $order->error = __( "Error: ", 'paid-memberships-pro' ) . $e->getMessage();
2071	+ $order->shorterror = $order->error;
2072	+
2073	+ return false;
2074	+ } catch ( \Exception $e ) {
2075	$order->errorcode = true;
2076	$order->error = __( "Error: ", 'paid-memberships-pro' ) . $e->getMessage();
2077	$order->shorterror = $order->error;

2118	} catch ( Stripe\Error\Base $e ) {
2119	$order->error = $e->getMessage();
2120	return false;
2121	+ } catch ( \Throwable $e ) {
2122	$order->error = $e->getMessage();
2123	return false;
2124	+ } catch ( \Exception $e ) {
2125	$order->error = $e->getMessage();
2126	return false;
2127	}

2155	} catch ( Stripe\Error\Base $e ) {
2156	$order->error = $e->getMessage();
2157	return false;
2158	+ } catch ( \Throwable $e ) {
2159	$order->error = $e->getMessage();
2160	return false;
2161	+ } catch ( \Exception $e ) {
2162	$order->error = $e->getMessage();
2163	return false;
2164	}

2209	} catch ( Stripe\Error\Base $e ) {
2210	$order->error = $e->getMessage();
2211	return false;
2212	+ } catch ( \Throwable $e ) {
2213	$order->error = $e->getMessage();
2214	return false;
2215	+ } catch ( \Exception $e ) {
2216	$order->error = $e->getMessage();
2217	return false;
2218	}

2261	} catch ( Stripe\Error\Base $e ) {
2262	$order->error = $e->getMessage();
2263	return false;
2264	+ } catch ( \Throwable $e ) {
2265	$order->error = $e->getMessage();
2266	return false;
2267	+ } catch ( \Exception $e ) {
2268	$order->error = $e->getMessage();
2269	return false;
2270	}

2402	$order->error = $e->getMessage();
2403
2404	return false;
2405	+ } catch ( \Throwable $e ) {
2406	+ $order->error = $e->getMessage();
2407	+
2408	+ return false;
2409	+ } catch ( \Exception $e ) {
2410	$order->error = $e->getMessage();
2411
2412	return false;

2434	} catch ( Stripe\Error\Base $e ) {
2435	$order->error = $e->getMessage();
2436	return false;
2437	+ } catch ( \Throwable $e ) {
2438	$order->error = $e->getMessage();
2439	return false;
2440	+ } catch ( \Exception $e ) {
2441	$order->error = $e->getMessage();
2442	return false;
2443	}

2453	$order->error = $e->getMessage();
2454
2455	return false;
2456	+ } catch ( \Throwable $e ) {
2457	+ $order->error = $e->getMessage();
2458	+
2459	+ return false;
2460	+ } catch ( \Exception $e ) {
2461	$order->error = $e->getMessage();
2462
2463	return false;

2474	} catch ( Stripe\Error\Base $e ) {
2475	$order->error = $e->getMessage();
2476	return false;
2477	+ } catch ( \Throwable $e ) {
2478	$order->error = $e->getMessage();
2479	return false;
2480	+ } catch ( \Exception $e ) {
2481	$order->error = $e->getMessage();
2482	return false;
2483	}

2536	} catch ( Stripe\Error\Base $e ) {
2537	$order->error = $e->getMessage();
2538	return false;
2539	+ } catch ( \Throwable $e ) {
2540	$order->error = $e->getMessage();
2541	return false;
2542	+ } catch ( \Exception $e ) {
2543	$order->error = $e->getMessage();
2544	return false;
2545	}

includes/adminpages.php CHANGED Viewed

	@@ -53,8 +53,16 @@ function pmpro_add_pages() {
53	add_submenu_page( 'pmpro-dashboard', __( 'Reports', 'paid-memberships-pro' ), __( 'Reports', 'paid-memberships-pro' ), 'pmpro_reports', 'pmpro-reports', 'pmpro_reports' );
54	add_submenu_page( 'pmpro-dashboard', __( 'Settings', 'paid-memberships-pro' ), __( 'Settings', 'paid-memberships-pro' ), 'pmpro_membershiplevels', 'pmpro-membershiplevels', 'pmpro_membershiplevels' );
55	add_submenu_page( 'pmpro-dashboard', __( 'Add Ons', 'paid-memberships-pro' ), __( 'Add Ons', 'paid-memberships-pro' ), 'pmpro_addons', 'pmpro-addons', 'pmpro_addons' );
56	- add_submenu_page( 'pmpro-dashboard', __( 'License', 'paid-memberships-pro' ), __( '<span style="color:#7FFF00">License</span>', 'paid-memberships-pro' ), 'manage_options', 'pmpro-license', 'pmpro_license_settings_page' );
57	-








58	// Settings tabs
59	add_submenu_page( 'admin.php', __( 'Discount Codes', 'paid-memberships-pro' ), __( 'Discount Codes', 'paid-memberships-pro' ), 'pmpro_discountcodes', 'pmpro-discountcodes', 'pmpro_discountcodes' );
60	add_submenu_page( 'admin.php', __( 'Page Settings', 'paid-memberships-pro' ), __( 'Page Settings', 'paid-memberships-pro' ), 'pmpro_pagesettings', 'pmpro-pagesettings', 'pmpro_pagesettings' );
	@@ -198,11 +206,18 @@ function pmpro_admin_bar_menu() {
198
199	// Add menu item for License.
200	if ( current_user_can( 'manage_options' ) ) {







201	$wp_admin_bar->add_menu(
202	array(
203	'id' => 'pmpro-license',
204	'parent' => 'paid-memberships-pro',
205	- 'title' => __( 'License', 'paid-memberships-pro' ),
206	'href' => get_admin_url( NULL, '/admin.php?page=pmpro-license' )
207	)
208	);


53	add_submenu_page( 'pmpro-dashboard', __( 'Reports', 'paid-memberships-pro' ), __( 'Reports', 'paid-memberships-pro' ), 'pmpro_reports', 'pmpro-reports', 'pmpro_reports' );
54	add_submenu_page( 'pmpro-dashboard', __( 'Settings', 'paid-memberships-pro' ), __( 'Settings', 'paid-memberships-pro' ), 'pmpro_membershiplevels', 'pmpro-membershiplevels', 'pmpro_membershiplevels' );
55	add_submenu_page( 'pmpro-dashboard', __( 'Add Ons', 'paid-memberships-pro' ), __( 'Add Ons', 'paid-memberships-pro' ), 'pmpro_addons', 'pmpro-addons', 'pmpro_addons' );
56	+
57	+ // Check License Key for Correct Link Color
58	+ $key = get_option( 'pmpro_license_key', '' );
59	+ if ( pmpro_license_isValid( $key, NULL, true ) ) {
60	+ $span_color = '#33FF00';
61	+ } else {
62	+ $span_color = '#FF3333';
63	+ }
64	+ add_submenu_page( 'pmpro-dashboard', __( 'License', 'paid-memberships-pro' ), __( '<span style="color: ' . $span_color . '">License</span>', 'paid-memberships-pro' ), 'manage_options', 'pmpro-license', 'pmpro_license_settings_page' );
65	+
66	// Settings tabs
67	add_submenu_page( 'admin.php', __( 'Discount Codes', 'paid-memberships-pro' ), __( 'Discount Codes', 'paid-memberships-pro' ), 'pmpro_discountcodes', 'pmpro-discountcodes', 'pmpro_discountcodes' );
68	add_submenu_page( 'admin.php', __( 'Page Settings', 'paid-memberships-pro' ), __( 'Page Settings', 'paid-memberships-pro' ), 'pmpro_pagesettings', 'pmpro-pagesettings', 'pmpro_pagesettings' );

206
207	// Add menu item for License.
208	if ( current_user_can( 'manage_options' ) ) {
209	+ // Check License Key for Correct Link Color
210	+ $key = get_option( 'pmpro_license_key', '' );
211	+ if ( pmpro_license_isValid( $key, NULL, true ) ) {
212	+ $span_color = '#33FF00';
213	+ } else {
214	+ $span_color = '#FF3333';
215	+ }
216	$wp_admin_bar->add_menu(
217	array(
218	'id' => 'pmpro-license',
219	'parent' => 'paid-memberships-pro',
220	+ 'title' => __( '<span style="color: ' . $span_color . '; line-height: 26px;">License</span>', 'paid-memberships-pro' ),
221	'href' => get_admin_url( NULL, '/admin.php?page=pmpro-license' )
222	)
223	);

includes/functions.php CHANGED Viewed

@@ -1754,28 +1754,29 @@ function pmpro_getMembershipLevelForUser( $user_id = null, $force = false ) {
             		global $wpdb;
             		$all_membership_levels[ $user_id ] = $wpdb->get_row(
             			"SELECT
-            -
            															l.id AS ID,
-            -
            															l.id as id,
-            -
            															mu.id as subscription_id,
-            -
            															l.name AS name,
-            -
            															l.description,
-            -
            															l.expiration_number,
-            -
            															l.expiration_period,
-            -
            															l.allow_signups,
-            -
            															mu.initial_payment,
-            -
            															mu.billing_amount,
-            -
            															mu.cycle_number,
-            -
            															mu.cycle_period,
-            -
            															mu.billing_limit,
-            -
            															mu.trial_amount,
-            -
            															mu.trial_limit,
-            -
            															mu.code_id as code_id,
-            -
            															UNIX_TIMESTAMP(startdate) as startdate,
-            -
            															UNIX_TIMESTAMP(enddate) as enddate
-            -
            														FROM {$wpdb->pmpro_membership_levels} AS l
-            -
            														JOIN {$wpdb->pmpro_memberships_users} AS mu ON (l.id = mu.membership_id)
-            -
            														WHERE mu.user_id = $user_id AND mu.status = 'active'
-            -
            														LIMIT 1"
             		);
             		// if null, change to false to avoid user meta conflicts
@@ -1855,6 +1856,7 @@ function pmpro_getMembershipLevelsForUser( $user_id = null, $include_inactive =
             				mu.id as subscription_id,
             				l.name,
             				l.description,
             				l.expiration_number,
             				l.expiration_period,
             				mu.initial_payment,


1754	global $wpdb;
1755	$all_membership_levels[ $user_id ] = $wpdb->get_row(
1756	"SELECT
1757	+ l.id AS ID,
1758	+ l.id as id,
1759	+ mu.id as subscription_id,
1760	+ l.name AS name,
1761	+ l.description,
1762	+ l.confirmation,
1763	+ l.expiration_number,
1764	+ l.expiration_period,
1765	+ l.allow_signups,
1766	+ mu.initial_payment,
1767	+ mu.billing_amount,
1768	+ mu.cycle_number,
1769	+ mu.cycle_period,
1770	+ mu.billing_limit,
1771	+ mu.trial_amount,
1772	+ mu.trial_limit,
1773	+ mu.code_id as code_id,
1774	+ UNIX_TIMESTAMP(startdate) as startdate,
1775	+ UNIX_TIMESTAMP(enddate) as enddate
1776	+ FROM {$wpdb->pmpro_membership_levels} AS l
1777	+ JOIN {$wpdb->pmpro_memberships_users} AS mu ON (l.id = mu.membership_id)
1778	+ WHERE mu.user_id = $user_id AND mu.status = 'active'
1779	+ LIMIT 1"
1780	);
1781
1782	// if null, change to false to avoid user meta conflicts

1856	mu.id as subscription_id,
1857	l.name,
1858	l.description,
1859	+ l.confirmation,
1860	l.expiration_number,
1861	l.expiration_period,
1862	mu.initial_payment,

js/pmpro-checkout.js CHANGED Viewed

@@ -107,25 +107,27 @@ jQuery(document).ready(function(){
+                }
             	// Validate credit card number and determine card type.
-            -
            	jQuery('#AccountNumber').validateCreditCard(function(result) {
-            -
            		var cardtypenames = {
-            -
            			"amex"                      : "American Express",
-            -
            			"diners_club_carte_blanche" : "Diners Club Carte Blanche",
-            -
            			"diners_club_international" : "Diners Club International",
-            -
            			"discover"                  : "Discover",
-            -
            			"jcb"                       : "JCB",
-            -
            			"laser"                     : "Laser",
-            -
            			"maestro"                   : "Maestro",
-            -
            			"mastercard"                : "Mastercard",
-            -
            			"visa"                      : "Visa",
-            -
            			"visa_electron"             : "Visa Electron"
-            -
            		};
-            -
-            -
            		if(result.card_type)
-            -
            			jQuery('#CardType').val(cardtypenames[result.card_type.name]);
-            -
            		else
-            -
            			jQuery('#CardType').val('Unknown Card Type');
-            -
            	});
             	// Find ALL <form> tags on your page
             	jQuery('form').submit(function(){


107	}
108
109	// Validate credit card number and determine card type.
110	+ if ( typeof jQuery('#AccountNumber').validateCreditCard == 'function' ) {
111	+ jQuery('#AccountNumber').validateCreditCard(function(result) {
112	+ var cardtypenames = {
113	+ "amex" : "American Express",
114	+ "diners_club_carte_blanche" : "Diners Club Carte Blanche",
115	+ "diners_club_international" : "Diners Club International",
116	+ "discover" : "Discover",
117	+ "jcb" : "JCB",
118	+ "laser" : "Laser",
119	+ "maestro" : "Maestro",
120	+ "mastercard" : "Mastercard",
121	+ "visa" : "Visa",
122	+ "visa_electron" : "Visa Electron"
123	+ };
124	+
125	+ if(result.card_type)
126	+ jQuery('#CardType').val(cardtypenames[result.card_type.name]);
127	+ else
128	+ jQuery('#CardType').val('Unknown Card Type');
129	+ });
130	+ }
131
132	// Find ALL <form> tags on your page
133	jQuery('form').submit(function(){

languages/paid-memberships-pro-fr_FR.mo CHANGED Viewed

Binary file

languages/paid-memberships-pro-fr_FR.po CHANGED Viewed

	@@ -2496,13 +2496,19 @@ msgstr "Après votre paiement initial, vos premiers %d paiements coûtera %s."
2496
2497	#: includes/functions.php:297
2498	#, php-format
2499	- msgid "Customers in %s will be charged %s%% tax."
2500	- msgstr "Les clients de %s seront taxés à %s%%."
2501
2502	#: includes/functions.php:311
2503	#, php-format
2504	- msgid "Membership expires after %d %s."
2505	- msgstr "L'adhésion expire après %d %s."






2506
2507	#: includes/functions.php:576
2508	msgid "User ID not found."


2496
2497	#: includes/functions.php:297
2498	#, php-format
2499	+ msgid "Customers in %1$s will be charged %2$s%% tax."
2500	+ msgstr "Les clients de %1$s seront taxés à %2$s%%."
2501
2502	#: includes/functions.php:311
2503	#, php-format
2504	+ msgid "Membership expires after %1$d %2$s."
2505	+ msgstr "L'adhésion expire après %1$d %2$s."
2506	+
2507	+ #: includes/functions.php:543 includes/functions.php:524
2508	+ #: includes/functions.php:543
2509	+ #, php-format
2510	+ msgid "%1$s membership expires after %2$d %3$s"
2511	+ msgstr "L'adhésion %1$s expire après %2$d %3$s."
2512
2513	#: includes/functions.php:576
2514	msgid "User ID not found."

languages/paid-memberships-pro.mo CHANGED Viewed

Binary file

languages/paid-memberships-pro.po CHANGED Viewed

	@@ -6,7 +6,7 @@ msgid ""
6	msgstr ""
7	"Project-Id-Version: paid-memberships-pro\n"
8	"Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
9	- "POT-Creation-Date: 2019-10-14 11:55-0400\n"
10	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11	"Last-Translator: \n"
12	"Language-Team: Stranger Studios <info@paidmembershipspro.com>\n"
	@@ -23,29 +23,31 @@ msgstr ""
23	#: adminpages/paymentsettings.php:5 adminpages/updates.php:5
24	#: adminpages/addons.php:5 adminpages/addons.php:21
25	#: adminpages/advancedsettings.php:5 adminpages/discountcodes.php:5
26	- #: adminpages/emailsettings.php:5 adminpages/~~membershiplevels~~.php:5
27	- #: adminpages/~~memberslist-csv~~.php:5 adminpages/memberslist.php:5
28	- #: adminpages/~~orders-csv~~.php:4 adminpages/orders-csv.php:5
29	- #: adminpages/orders-~~print~~.php:12 adminpages/orders.php:4
30	- #: adminpages/orders.php:5 adminpages/~~pagesettings~~.php:4
31	- #: adminpages/pagesettings.php:5 adminpages/~~paymentsettings~~.php:5
32	- #: adminpages/~~updates~~.php:5 ~~includes~~/~~license~~.php:36

33	msgid "You do not have permissions to perform this action."
34	msgstr ""
35
36	#: adminpages/addons.php:81 adminpages/admin_header.php:216
37	- #: includes/adminpages.php:55 includes/adminpages.php:~~193~~
38	#: adminpages/addons.php:64 adminpages/addons.php:67 adminpages/addons.php:80
39	#: adminpages/addons.php:81 adminpages/admin_header.php:133
40	#: adminpages/admin_header.php:154 adminpages/admin_header.php:170
41	#: adminpages/admin_header.php:179 adminpages/admin_header.php:191
42	#: adminpages/admin_header.php:204 adminpages/admin_header.php:208
43	- #: adminpages/admin_header.php:209 ~~includes~~/~~adminpages~~.php:14
44	- #: includes/adminpages.php:52 includes/adminpages.php:53
45	- #: includes/adminpages.php:55 includes/adminpages.php:69
46	- #: includes/adminpages.php:~~135~~ includes/adminpages.php:~~142~~
47	- #: includes/adminpages.php:~~146~~ includes/adminpages.php:~~151~~
48	- #: includes/adminpages.php:~~192~~ includes/adminpages.php:~~193~~

49	msgid "Add Ons"
50	msgstr ""
51
	@@ -65,8 +67,8 @@ msgstr ""
65	#: adminpages/orders.php:605 adminpages/orders.php:712
66	#: adminpages/orders.php:741 adminpages/orders.php:850
67	#: adminpages/orders.php:881 adminpages/orders.php:892
68	- #: adminpages/orders.php:983 adminpages/orders.php:~~994~~
69	- #: adminpages/orders.php:1039
70	msgid "All"
71	msgstr ""
72
	@@ -174,11 +176,12 @@ msgid "Activate %s"
174	msgstr ""
175
176	#: adminpages/addons.php:231 adminpages/discountcodes.php:773
177	- #: adminpages/membershiplevels.php:~~779~~ adminpages/orders.php:~~1343~~
178	#: adminpages/addons.php:213 adminpages/addons.php:216
179	#: adminpages/addons.php:229 adminpages/addons.php:231
180	#: adminpages/discountcodes.php:771 adminpages/discountcodes.php:773
181	- #: adminpages/membershiplevels.php:762 adminpages/membershiplevels.php:~~784~~

182	#: adminpages/orders.php:1358
183	msgid "Delete"
184	msgstr ""
	@@ -215,15 +218,16 @@ msgid "WordPress.org"
215	msgstr ""
216
217	#: adminpages/addons.php:249 adminpages/orders.php:895
218	- #: adminpages/orders.php:~~1429~~ adminpages/orders.php:~~1439~~
219	#: includes/profile.php:191 shortcodes/pmpro_account.php:158
220	#: adminpages/addons.php:231 adminpages/addons.php:234
221	#: adminpages/addons.php:247 adminpages/addons.php:249
222	- #: adminpages/orders.php:855 adminpages/orders.php:~~900~~
223	- #: adminpages/orders.php:~~910~~ adminpages/orders.php:~~1340~~
224	- #: adminpages/orders.php:~~1350~~ adminpages/orders.php:~~1429~~
225	- #: adminpages/orders.php:~~1439~~ adminpages/orders.php:~~1462~~
226	- #: adminpages/orders.php:~~1472~~ ~~includes~~/~~profile~~.php:~~186~~

227	#: shortcodes/pmpro_account.php:145 shortcodes/pmpro_account.php:146
228	#: shortcodes/pmpro_account.php:148 shortcodes/pmpro_account.php:158
229	msgid "N/A"
	@@ -395,14 +399,14 @@ msgstr ""
395	msgid "Get Support"
396	msgstr ""
397
398	- #: adminpages/admin_header.php:160
399	#, php-format
400	msgid ""
401	"<a class=\"pmpro_license_tag pmpro_license_tag-valid\" href=\"%s\">Valid "
402	"License</a>"
403	msgstr ""
404
405	- #: adminpages/admin_header.php:162
406	#, php-format
407	msgid ""
408	"<a class=\"pmpro_license_tag pmpro_license_tag-invalid\" href=\"%s\">No "
	@@ -410,28 +414,31 @@ msgid ""
410	msgstr ""
411
412	#: adminpages/admin_header.php:196 includes/adminpages.php:50
413	- #: includes/adminpages.php:~~133~~ adminpages/admin_header.php:188
414	- #: adminpages/admin_header.php:189 ~~includes~~/~~adminpages~~.php:50
415	- #: includes/adminpages.php:~~132~~ includes/adminpages.php:~~133~~

416	msgid "Dashboard"
417	msgstr ""
418
419	#: adminpages/admin_header.php:200 includes/adminpages.php:51
420	- #: includes/adminpages.php:~~145~~ adminpages/admin_header.php:192
421	- #: adminpages/admin_header.php:193 ~~includes~~/~~adminpages~~.php:51
422	- #: includes/adminpages.php:~~144~~ includes/adminpages.php:~~145~~

423	msgid "Members"
424	msgstr ""
425
426	#: adminpages/admin_header.php:204 adminpages/discountcodes.php:777
427	#: adminpages/orders.php:944 includes/adminpages.php:52
428	- #: includes/adminpages.php:~~157~~ adminpages/admin_header.php:196
429	- #: adminpages/admin_header.php:197 adminpages/~~discountcodes~~.php:~~775~~
430	- #: adminpages/discountcodes.php:~~777~~ adminpages/~~orders~~.php:~~520~~
431	- #: adminpages/orders.php:~~570~~ adminpages/orders.php:~~677~~
432	- #: adminpages/orders.php:~~706~~ adminpages/orders.php:~~810~~
433	- #: adminpages/orders.php:~~841~~ adminpages/orders.php:~~852~~
434	- #: adminpages/orders.php:~~939~~ adminpages/orders.php:~~949~~

435	#: adminpages/orders.php:994 includes/adminpages.php:17
436	#: includes/adminpages.php:52 includes/adminpages.php:55
437	#: includes/adminpages.php:56 includes/adminpages.php:84
	@@ -442,53 +449,56 @@ msgid "Orders"
442	msgstr ""
443
444	#: adminpages/admin_header.php:208 includes/adminpages.php:53
445	- #: includes/adminpages.php:~~169~~ adminpages/admin_header.php:200
446	- #: adminpages/admin_header.php:201 ~~includes~~/~~adminpages~~.php:16
447	- #: includes/adminpages.php:53 includes/adminpages.php:54
448	- #: includes/adminpages.php:55 includes/adminpages.php:79
449	- #: includes/adminpages.php:~~149~~ includes/adminpages.php:~~156~~
450	- #: includes/adminpages.php:~~160~~ includes/adminpages.php:~~165~~
451	- #: includes/adminpages.php:~~168~~ includes/adminpages.php:~~169~~

452	msgid "Reports"
453	msgstr ""
454
455	#: adminpages/admin_header.php:212 includes/adminpages.php:54
456	- #: includes/adminpages.php:~~181~~ adminpages/admin_header.php:204
457	- #: adminpages/admin_header.php:205 ~~includes~~/~~adminpages~~.php:54
458	- #: includes/adminpages.php:~~180~~ includes/adminpages.php:~~181~~

459	msgid "Settings"
460	msgstr ""
461
462	- #: adminpages/admin_header.php:220 includes/adminpages.php:56
463	- #: ~~includes~~/~~adminpages~~.php:~~205~~ adminpages/admin_header.php:~~213~~
464	#: includes/adminpages.php:56 includes/adminpages.php:205
465	msgid "License"
466	msgstr ""
467
468	#: adminpages/admin_header.php:227 adminpages/discountcodes.php:751
469	#: adminpages/admin_header.php:215 adminpages/admin_header.php:220
470	- #: adminpages/~~discountcodes~~.php:~~552~~ adminpages/discountcodes.php:~~562~~
471	- #: adminpages/discountcodes.php:~~590~~ adminpages/discountcodes.php:~~591~~
472	- #: adminpages/discountcodes.php:~~592~~ adminpages/discountcodes.php:~~597~~
473	- #: adminpages/discountcodes.php:~~670~~ adminpages/discountcodes.php:~~724~~
474	- #: adminpages/discountcodes.php:751
475	msgid "Levels"
476	msgstr ""
477
478	- #: adminpages/admin_header.php:227 adminpages/membershiplevels.php:~~745~~
479	#: adminpages/pagesettings.php:85 includes/metaboxes.php:130
480	#: adminpages/admin_header.php:128 adminpages/admin_header.php:149
481	#: adminpages/admin_header.php:150 adminpages/admin_header.php:159
482	#: adminpages/admin_header.php:171 adminpages/admin_header.php:184
483	#: adminpages/admin_header.php:215 adminpages/admin_header.php:220
484	- #: adminpages/~~membershiplevels~~.php:~~490~~ adminpages/membershiplevels.php:~~496~~
485	- #: adminpages/membershiplevels.php:~~498~~ adminpages/membershiplevels.php:~~525~~
486	- #: adminpages/membershiplevels.php:~~526~~ adminpages/membershiplevels.php:~~569~~
487	- #: adminpages/membershiplevels.php:~~607~~ adminpages/membershiplevels.php:~~609~~
488	- #: adminpages/membershiplevels.php:~~618~~ adminpages/membershiplevels.php:~~619~~
489	- #: adminpages/membershiplevels.php:~~631~~ adminpages/membershiplevels.php:~~641~~
490	- #: adminpages/membershiplevels.php:~~700~~ adminpages/membershiplevels.php:~~702~~
491	- #: adminpages/membershiplevels.php:~~728~~ adminpages/membershiplevels.php:~~750~~

492	#: adminpages/pagesettings.php:69 adminpages/pagesettings.php:70
493	#: adminpages/pagesettings.php:71 adminpages/pagesettings.php:85
494	#: includes/adminpages.php:44 includes/adminpages.php:64
	@@ -501,24 +511,25 @@ msgstr ""
501	msgid "Membership Levels"
502	msgstr ""
503
504	- #: adminpages/admin_header.php:231 includes/adminpages.php:59
505	#: adminpages/admin_header.php:219 adminpages/admin_header.php:224
506	- #: ~~includes~~/~~adminpages~~.php:18 includes/adminpages.php:56
507	- #: includes/adminpages.php:57 includes/adminpages.php:58
508	- #: includes/adminpages.php:59 includes/adminpages.php:89
509	- #: includes/adminpages.php:~~163~~ includes/adminpages.php:~~170~~
510	- #: includes/adminpages.php:~~174~~ includes/adminpages.php:~~179~~

511	msgid "Discount Codes"
512	msgstr ""
513
514	#: adminpages/admin_header.php:235 adminpages/pagesettings.php:108
515	- #: includes/adminpages.php:60 adminpages/admin_header.php:223
516	- #: adminpages/admin_header.php:228 adminpages/~~pagesettings~~.php:~~108~~
517	- #: ~~includes~~/~~adminpages~~.php:10 includes/adminpages.php:48
518	- #: includes/adminpages.php:49 includes/adminpages.php:59
519	- #: includes/adminpages.php:60 includes/adminpages.php:~~107~~
520	- #: includes/adminpages.php:~~114~~ includes/adminpages.php:~~118~~
521	- #: includes/adminpages.php:123
522	msgid "Page Settings"
523	msgstr ""
524
	@@ -526,9 +537,9 @@ msgstr ""
526	#: adminpages/admin_header.php:150 adminpages/admin_header.php:154
527	#: adminpages/admin_header.php:163 adminpages/admin_header.php:175
528	#: adminpages/admin_header.php:188 adminpages/admin_header.php:223
529	- #: adminpages/admin_header.php:228 adminpages/~~pagesettings~~.php:92
530	- #: adminpages/pagesettings.php:93 adminpages/pagesettings.php:~~108~~
531	- #: adminpages/pagesettings.php:120
532	msgid "Pages"
533	msgstr ""
534
	@@ -536,41 +547,42 @@ msgstr ""
536	#: adminpages/admin_header.php:151 adminpages/admin_header.php:158
537	#: adminpages/admin_header.php:167 adminpages/admin_header.php:179
538	#: adminpages/admin_header.php:192 adminpages/admin_header.php:227
539	- #: adminpages/admin_header.php:232
540	msgid "Payment Gateway & SSL"
541	msgstr ""
542
543	#: adminpages/admin_header.php:239 adminpages/admin_header.php:227
544	- #: adminpages/admin_header.php:232
545	msgid "Payment Gateway & SSL Settings"
546	msgstr ""
547
548	#: adminpages/admin_header.php:243 adminpages/memberslist.php:172
549	- #: adminpages/orders.php:372 adminpages/orders.php:~~1350~~
550	#: shortcodes/pmpro_account.php:111 adminpages/admin_header.php:131
551	#: adminpages/admin_header.php:152 adminpages/admin_header.php:162
552	#: adminpages/admin_header.php:171 adminpages/admin_header.php:183
553	#: adminpages/admin_header.php:196 adminpages/admin_header.php:231
554	- #: adminpages/admin_header.php:236 adminpages/~~memberslist~~.php:~~115~~
555	- #: adminpages/memberslist.php:~~148~~ adminpages/memberslist.php:~~158~~
556	- #: adminpages/memberslist.php:~~168~~ adminpages/~~orders~~.php:~~372~~
557	- #: adminpages/~~orders~~.php:~~1365~~ ~~pages~~/~~account~~.php:~~52 pages/account.php:56~~
558	- #: ~~pages~~/~~account~~.php:77 ~~shortcodes~~/~~pmpro_account~~.php:~~106~~

559	#: shortcodes/pmpro_account.php:108 shortcodes/pmpro_account.php:109
560	#: shortcodes/pmpro_account.php:111
561	msgid "Email"
562	msgstr ""
563
564	#: adminpages/admin_header.php:243 adminpages/emailsettings.php:83
565	- #: includes/adminpages.php:62 adminpages/admin_header.php:231
566	- #: adminpages/admin_header.php:236 adminpages/~~emailsettings~~.php:60
567	- #: adminpages/emailsettings.php:69 adminpages/emailsettings.php:79
568	- #: adminpages/emailsettings.php:83 ~~includes~~/~~adminpages~~.php:12
569	- #: includes/adminpages.php:50 includes/adminpages.php:51
570	- #: includes/adminpages.php:59 includes/adminpages.php:61
571	- #: includes/adminpages.php:62 includes/adminpages.php:~~121~~
572	- #: includes/adminpages.php:~~128~~ includes/adminpages.php:~~132~~
573	- #: includes/adminpages.php:137
574	msgid "Email Settings"
575	msgstr ""
576
	@@ -578,21 +590,21 @@ msgstr ""
578	#: adminpages/admin_header.php:153 adminpages/admin_header.php:166
579	#: adminpages/admin_header.php:175 adminpages/admin_header.php:187
580	#: adminpages/admin_header.php:200 adminpages/admin_header.php:235
581	- #: adminpages/admin_header.php:240
582	msgid "Advanced"
583	msgstr ""
584
585	#: adminpages/admin_header.php:247 adminpages/advancedsettings.php:109
586	- #: includes/adminpages.php:63 adminpages/admin_header.php:235
587	- #: adminpages/admin_header.php:240 adminpages/~~advancedsettings~~.php:79
588	- #: adminpages/advancedsettings.php:86 adminpages/advancedsettings.php:88
589	- #: adminpages/advancedsettings.php:91 adminpages/advancedsettings.php:~~107~~
590	- #: adminpages/advancedsettings.php:~~109~~ ~~includes~~/~~adminpages~~.php:13
591	- #: includes/adminpages.php:51 includes/adminpages.php:52
592	- #: includes/adminpages.php:62 includes/adminpages.php:63
593	- #: includes/adminpages.php:64 includes/adminpages.php:~~128~~
594	- #: includes/adminpages.php:~~135~~ includes/adminpages.php:~~139~~
595	- #: includes/adminpages.php:144
596	msgid "Advanced Settings"
597	msgstr ""
598
	@@ -683,32 +695,33 @@ msgstr ""
683	msgid "This message replaces the post content in RSS feeds."
684	msgstr ""
685
686	- #: adminpages/advancedsettings.php:143 adminpages/membershiplevels.php:~~589~~
687	- #: adminpages/~~membershiplevels~~.php:~~457~~ adminpages/membershiplevels.php:~~463~~
688	- #: adminpages/membershiplevels.php:~~465~~ adminpages/membershiplevels.php:~~492~~
689	- #: adminpages/membershiplevels.php:~~493~~ adminpages/membershiplevels.php:~~495~~
690	- #: adminpages/membershiplevels.php:~~496~~ adminpages/membershiplevels.php:~~517~~
691	- #: adminpages/membershiplevels.php:~~527~~ adminpages/membershiplevels.php:~~570~~
692	- #: adminpages/membershiplevels.php:~~572~~ adminpages/membershiplevels.php:~~594~~

693	msgid "Content Settings"
694	msgstr ""
695
696	#: adminpages/advancedsettings.php:148 adminpages/advancedsettings.php:122
697	#: adminpages/advancedsettings.php:125 adminpages/advancedsettings.php:141
698	- #: adminpages/advancedsettings.php:143
699	msgid "Filter searches and archives?"
700	msgstr ""
701
702	#: adminpages/advancedsettings.php:152 adminpages/advancedsettings.php:126
703	#: adminpages/advancedsettings.php:129 adminpages/advancedsettings.php:145
704	- #: adminpages/advancedsettings.php:147
705	msgid ""
706	"No - Non-members will see restricted posts/pages in searches and archives."
707	msgstr ""
708
709	#: adminpages/advancedsettings.php:153 adminpages/advancedsettings.php:127
710	#: adminpages/advancedsettings.php:130 adminpages/advancedsettings.php:146
711	- #: adminpages/advancedsettings.php:148
712	msgid ""
713	"Yes - Only members will see restricted posts/pages in searches and archives."
714	msgstr ""
	@@ -716,62 +729,65 @@ msgstr ""
716	#: adminpages/advancedsettings.php:159 adminpages/advancedsettings.php:113
717	#: adminpages/advancedsettings.php:120 adminpages/advancedsettings.php:133
718	#: adminpages/advancedsettings.php:136 adminpages/advancedsettings.php:152
719	- #: adminpages/advancedsettings.php:154
720	msgid "Show Excerpts to Non-Members?"
721	msgstr ""
722
723	#: adminpages/advancedsettings.php:163 adminpages/advancedsettings.php:117
724	#: adminpages/advancedsettings.php:124 adminpages/advancedsettings.php:137
725	#: adminpages/advancedsettings.php:140 adminpages/advancedsettings.php:156
726	- #: adminpages/advancedsettings.php:158
727	msgid "No - Hide excerpts."
728	msgstr ""
729
730	#: adminpages/advancedsettings.php:164 adminpages/advancedsettings.php:118
731	#: adminpages/advancedsettings.php:125 adminpages/advancedsettings.php:138
732	#: adminpages/advancedsettings.php:141 adminpages/advancedsettings.php:157
733	- #: adminpages/advancedsettings.php:159
734	msgid "Yes - Show excerpts."
735	msgstr ""
736
737	- #: adminpages/advancedsettings.php:171
738	msgid "reCAPTCHA Settings"
739	msgstr ""
740
741	- #: adminpages/advancedsettings.php:176 adminpages/advancedsettings.php:~~195~~
742	- #: adminpages/advancedsettings.php:~~202~~ adminpages/advancedsettings.php:~~215~~
743	- #: adminpages/advancedsettings.php:~~218~~ adminpages/advancedsettings.php:~~234~~
744	- #: adminpages/advancedsettings.php:236
745	msgid "Use reCAPTCHA?"
746	msgstr ""
747
748	#: adminpages/advancedsettings.php:180 adminpages/advancedsettings.php:225
749	- #: adminpages/advancedsettings.php:282 adminpages/membershiplevels.php:~~796~~
750	#: adminpages/paymentsettings.php:256
751	#: classes/gateways/class.pmprogateway_stripe.php:320 includes/profile.php:125
752	#: adminpages/advancedsettings.php:128 adminpages/advancedsettings.php:135
753	#: adminpages/advancedsettings.php:148 adminpages/advancedsettings.php:151
754	#: adminpages/advancedsettings.php:167 adminpages/advancedsettings.php:169
755	- #: adminpages/advancedsettings.php:~~187~~ adminpages/advancedsettings.php:~~194~~
756	- #: adminpages/advancedsettings.php:~~199~~ adminpages/advancedsettings.php:~~206~~
757	- #: adminpages/advancedsettings.php:~~207~~ adminpages/advancedsettings.php:~~210~~
758	- #: adminpages/advancedsettings.php:~~219~~ adminpages/advancedsettings.php:~~222~~

759	#: adminpages/advancedsettings.php:226 adminpages/advancedsettings.php:228
760	#: adminpages/advancedsettings.php:238 adminpages/advancedsettings.php:240
761	- #: adminpages/~~membershiplevels~~.php:~~563~~ adminpages/membershiplevels.php:~~569~~
762	- #: adminpages/membershiplevels.php:~~571~~ adminpages/membershiplevels.php:~~578~~
763	- #: adminpages/membershiplevels.php:~~598~~ adminpages/membershiplevels.php:~~658~~
764	- #: adminpages/membershiplevels.php:~~660~~ adminpages/membershiplevels.php:~~662~~
765	- #: adminpages/membershiplevels.php:~~667~~ adminpages/membershiplevels.php:~~668~~
766	- #: adminpages/membershiplevels.php:~~672~~ adminpages/membershiplevels.php:~~684~~
767	- #: adminpages/membershiplevels.php:~~694~~ adminpages/membershiplevels.php:~~744~~
768	- #: adminpages/membershiplevels.php:~~746~~ adminpages/membershiplevels.php:~~779~~

769	#: adminpages/membershiplevels.php:801 adminpages/paymentsettings.php:210
770	#: adminpages/paymentsettings.php:219 adminpages/paymentsettings.php:236
771	- #: adminpages/paymentsettings.php:253 adminpages/paymentsettings.php:~~414~~
772	- #: adminpages/paymentsettings.php:~~429~~ adminpages/paymentsettings.php:~~434~~
773	- #: adminpages/paymentsettings.php:~~436~~ adminpages/paymentsettings.php:~~454~~
774	- #: adminpages/paymentsettings.php:~~459~~ adminpages/paymentsettings.php:~~461~~

775	#: classes/gateways/class.pmprogateway_stripe.php:173
776	#: classes/gateways/class.pmprogateway_stripe.php:174
777	#: classes/gateways/class.pmprogateway_stripe.php:184
	@@ -787,152 +803,159 @@ msgstr ""
787	#: classes/gateways/class.pmprogateway_stripe.php:291
788	#: classes/gateways/class.pmprogateway_stripe.php:297
789	#: classes/gateways/class.pmprogateway_stripe.php:298

790	#: classes/gateways/class.pmprogateway_stripe.php:321 includes/profile.php:101
791	#: includes/profile.php:105 includes/profile.php:110 includes/profile.php:117
792	#: includes/profile.php:121 includes/profile.php:123 includes/profile.php:125
793	msgid "No"
794	msgstr ""
795
796	- #: adminpages/advancedsettings.php:181 adminpages/advancedsettings.php:~~200~~
797	- #: adminpages/advancedsettings.php:~~207~~ adminpages/advancedsettings.php:~~220~~
798	- #: adminpages/advancedsettings.php:~~223~~ adminpages/advancedsettings.php:~~239~~
799	- #: adminpages/advancedsettings.php:241
800	msgid "Yes - Free memberships only."
801	msgstr ""
802
803	- #: adminpages/advancedsettings.php:182 adminpages/advancedsettings.php:~~201~~
804	- #: adminpages/advancedsettings.php:~~208~~ adminpages/advancedsettings.php:~~221~~
805	- #: adminpages/advancedsettings.php:~~224~~ adminpages/advancedsettings.php:~~240~~
806	- #: adminpages/advancedsettings.php:242
807	msgid "Yes - All memberships."
808	msgstr ""
809
810	- #: adminpages/advancedsettings.php:184 adminpages/advancedsettings.php:~~203~~
811	- #: adminpages/advancedsettings.php:~~210~~ adminpages/advancedsettings.php:~~223~~
812	- #: adminpages/advancedsettings.php:~~226~~ adminpages/advancedsettings.php:~~242~~
813	- #: adminpages/advancedsettings.php:244
814	msgid "A free reCAPTCHA key is required."
815	msgstr ""
816
817	- #: adminpages/advancedsettings.php:184 adminpages/advancedsettings.php:~~203~~
818	- #: adminpages/advancedsettings.php:~~210~~ adminpages/advancedsettings.php:~~223~~
819	- #: adminpages/advancedsettings.php:~~226~~ adminpages/advancedsettings.php:~~242~~
820	- #: adminpages/advancedsettings.php:244
821	msgid "Click here to signup for reCAPTCHA"
822	msgstr ""
823
824	- #: adminpages/advancedsettings.php:192 adminpages/advancedsettings.php:~~250~~

825	msgid "reCAPTCHA Version"
826	msgstr ""
827
828	- #: adminpages/advancedsettings.php:195 adminpages/advancedsettings.php:~~252~~

829	msgid " v2 - Checkbox"
830	msgstr ""
831
832	- #: adminpages/advancedsettings.php:196 adminpages/advancedsettings.php:~~253~~

833	msgid "v3 - Invisible"
834	msgstr ""
835
836	- #: adminpages/advancedsettings.php:198 adminpages/advancedsettings.php:~~255~~

837	msgid "Changing your version will require new API keys."
838	msgstr ""
839
840	- #: adminpages/advancedsettings.php:202 adminpages/advancedsettings.php:~~248~~
841	- #: adminpages/advancedsettings.php:257
842	msgid "reCAPTCHA Site Key"
843	msgstr ""
844
845	- #: adminpages/advancedsettings.php:208 adminpages/advancedsettings.php:~~251~~
846	- #: adminpages/advancedsettings.php:260
847	msgid "reCAPTCHA Secret Key"
848	msgstr ""
849
850	- #: adminpages/advancedsettings.php:216 adminpages/membershiplevels.php:~~524~~
851	- #: adminpages/~~membershiplevels~~.php:~~422~~ adminpages/membershiplevels.php:~~428~~
852	- #: adminpages/membershiplevels.php:~~430~~ adminpages/membershiplevels.php:~~457~~
853	- #: adminpages/membershiplevels.php:~~458~~ adminpages/membershiplevels.php:~~460~~
854	- #: adminpages/membershiplevels.php:~~461~~ adminpages/membershiplevels.php:~~482~~
855	- #: adminpages/membershiplevels.php:~~492~~ adminpages/membershiplevels.php:~~516~~
856	- #: adminpages/membershiplevels.php:~~518~~ adminpages/membershiplevels.php:~~529~~

857	msgid "Other Settings"
858	msgstr ""
859
860	#: adminpages/advancedsettings.php:221 adminpages/advancedsettings.php:144
861	#: adminpages/advancedsettings.php:147 adminpages/advancedsettings.php:163
862	- #: adminpages/advancedsettings.php:165
863	msgid "Hide Ads From Members?"
864	msgstr ""
865
866	#: adminpages/advancedsettings.php:226 adminpages/advancedsettings.php:129
867	#: adminpages/advancedsettings.php:136 adminpages/advancedsettings.php:149
868	#: adminpages/advancedsettings.php:152 adminpages/advancedsettings.php:168
869	- #: adminpages/advancedsettings.php:170
870	msgid "Hide Ads From All Members"
871	msgstr ""
872
873	#: adminpages/advancedsettings.php:227 adminpages/advancedsettings.php:130
874	#: adminpages/advancedsettings.php:137 adminpages/advancedsettings.php:150
875	#: adminpages/advancedsettings.php:153 adminpages/advancedsettings.php:169
876	- #: adminpages/advancedsettings.php:171
877	msgid "Hide Ads From Certain Members"
878	msgstr ""
879
880	#: adminpages/advancedsettings.php:234 adminpages/advancedsettings.php:137
881	#: adminpages/advancedsettings.php:144 adminpages/advancedsettings.php:157
882	#: adminpages/advancedsettings.php:160 adminpages/advancedsettings.php:176
883	- #: adminpages/advancedsettings.php:178
884	msgid "Ads from the following plugins will be automatically turned off"
885	msgstr ""
886
887	#: adminpages/advancedsettings.php:235 adminpages/advancedsettings.php:138
888	#: adminpages/advancedsettings.php:145 adminpages/advancedsettings.php:158
889	#: adminpages/advancedsettings.php:161 adminpages/advancedsettings.php:177
890	- #: adminpages/advancedsettings.php:179
891	msgid "To hide ads in your template code, use code like the following"
892	msgstr ""
893
894	#: adminpages/advancedsettings.php:244 adminpages/advancedsettings.php:149
895	#: adminpages/advancedsettings.php:156 adminpages/advancedsettings.php:169
896	#: adminpages/advancedsettings.php:172 adminpages/advancedsettings.php:188
897	- #: adminpages/advancedsettings.php:190
898	msgid "Choose Levels to Hide Ads From"
899	msgstr ""
900
901	#: adminpages/advancedsettings.php:278 adminpages/advancedsettings.php:183
902	#: adminpages/advancedsettings.php:190 adminpages/advancedsettings.php:203
903	#: adminpages/advancedsettings.php:206 adminpages/advancedsettings.php:222
904	- #: adminpages/advancedsettings.php:224
905	msgid "Redirect all traffic from registration page to /susbcription/?"
906	msgstr ""
907
908	#: adminpages/advancedsettings.php:278 adminpages/advancedsettings.php:183
909	#: adminpages/advancedsettings.php:190 adminpages/advancedsettings.php:203
910	#: adminpages/advancedsettings.php:206 adminpages/advancedsettings.php:222
911	- #: adminpages/advancedsettings.php:224
912	msgid "multisite only"
913	msgstr ""
914
915	- #: adminpages/advancedsettings.php:283 adminpages/membershiplevels.php:~~796~~
916	#: adminpages/paymentsettings.php:257
917	#: classes/gateways/class.pmprogateway_stripe.php:322 includes/profile.php:126
918	#: adminpages/advancedsettings.php:188 adminpages/advancedsettings.php:195
919	#: adminpages/advancedsettings.php:208 adminpages/advancedsettings.php:211
920	#: adminpages/advancedsettings.php:227 adminpages/advancedsettings.php:229
921	- #: adminpages/~~membershiplevels~~.php:~~563~~ adminpages/membershiplevels.php:~~569~~
922	- #: adminpages/membershiplevels.php:~~571~~ adminpages/membershiplevels.php:~~578~~
923	- #: adminpages/membershiplevels.php:~~598~~ adminpages/membershiplevels.php:~~658~~
924	- #: adminpages/membershiplevels.php:~~660~~ adminpages/membershiplevels.php:~~662~~
925	- #: adminpages/membershiplevels.php:~~667~~ adminpages/membershiplevels.php:~~668~~
926	- #: adminpages/membershiplevels.php:~~672~~ adminpages/membershiplevels.php:~~684~~
927	- #: adminpages/membershiplevels.php:~~694~~ adminpages/membershiplevels.php:~~744~~
928	- #: adminpages/membershiplevels.php:~~746~~ adminpages/membershiplevels.php:~~779~~

929	#: adminpages/membershiplevels.php:801 adminpages/paymentsettings.php:211
930	#: adminpages/paymentsettings.php:220 adminpages/paymentsettings.php:237
931	- #: adminpages/paymentsettings.php:254 adminpages/paymentsettings.php:~~415~~
932	- #: adminpages/paymentsettings.php:~~424~~ adminpages/paymentsettings.php:~~430~~
933	- #: adminpages/paymentsettings.php:~~435~~ adminpages/paymentsettings.php:~~437~~
934	- #: adminpages/paymentsettings.php:~~455~~ adminpages/paymentsettings.php:~~460~~
935	- #: adminpages/paymentsettings.php:462
936	#: classes/gateways/class.pmprogateway_stripe.php:174
937	#: classes/gateways/class.pmprogateway_stripe.php:175
938	#: classes/gateways/class.pmprogateway_stripe.php:185
	@@ -948,6 +971,7 @@ msgstr ""
948	#: classes/gateways/class.pmprogateway_stripe.php:292
949	#: classes/gateways/class.pmprogateway_stripe.php:298
950	#: classes/gateways/class.pmprogateway_stripe.php:299

951	#: classes/gateways/class.pmprogateway_stripe.php:323 includes/profile.php:102
952	#: includes/profile.php:106 includes/profile.php:111 includes/profile.php:118
953	#: includes/profile.php:122 includes/profile.php:124 includes/profile.php:126
	@@ -957,14 +981,14 @@ msgstr ""
957	#: adminpages/advancedsettings.php:290 adminpages/advancedsettings.php:218
958	#: adminpages/advancedsettings.php:225 adminpages/advancedsettings.php:238
959	#: adminpages/advancedsettings.php:241 adminpages/advancedsettings.php:257
960	- #: adminpages/advancedsettings.php:266
961	msgid "Require Terms of Service on signups?"
962	msgstr ""
963
964	#: adminpages/advancedsettings.php:297 adminpages/advancedsettings.php:225
965	#: adminpages/advancedsettings.php:232 adminpages/advancedsettings.php:245
966	#: adminpages/advancedsettings.php:248 adminpages/advancedsettings.php:264
967	- #: adminpages/advancedsettings.php:273
968	msgid ""
969	"If yes, create a WordPress page containing your TOS agreement and assign it "
970	"using the dropdown above."
	@@ -974,15 +998,17 @@ msgstr ""
974	#: adminpages/paymentsettings.php:287 adminpages/advancedsettings.php:284
975	#: adminpages/advancedsettings.php:355 adminpages/advancedsettings.php:359
976	#: adminpages/advancedsettings.php:368 adminpages/advancedsettings.php:375
977	- #: adminpages/advancedsettings.php:384 adminpages/~~pagesettings~~.php:~~209~~
978	- #: adminpages/pagesettings.php:~~223~~ adminpages/pagesettings.php:~~251~~
979	- #: adminpages/pagesettings.php:~~254~~ adminpages/pagesettings.php:~~294~~
980	- #: adminpages/pagesettings.php:~~295~~ adminpages/pagesettings.php:~~310~~
981	- #: adminpages/pagesettings.php:~~315~~ adminpages/pagesettings.php:~~338~~

982	#: adminpages/paymentsettings.php:238 adminpages/paymentsettings.php:250
983	#: adminpages/paymentsettings.php:267 adminpages/paymentsettings.php:284
984	- #: adminpages/paymentsettings.php:~~485~~ adminpages/paymentsettings.php:~~526~~
985	- #: adminpages/paymentsettings.php:~~532~~ adminpages/paymentsettings.php:~~534~~

986	msgid "Save Settings"
987	msgstr ""
988
	@@ -1054,6 +1080,7 @@ msgstr ""
1054
1055	#: adminpages/dashboard.php:177 adminpages/license.php:51
1056	#: adminpages/dashboard.php:177 adminpages/dashboard.php:185

1057	#, php-format
1058	msgid ""
1059	"<strong>Thank you!</strong> A valid <strong>%s</strong> license key has been "
	@@ -1074,7 +1101,8 @@ msgstr ""
1074	#: shortcodes/pmpro_account.php:110 adminpages/dashboard.php:215
1075	#: adminpages/dashboard.php:223 adminpages/memberslist.php:112
1076	#: adminpages/memberslist.php:145 adminpages/memberslist.php:155
1077	- #: adminpages/memberslist.php:165 ~~pages~~/~~account~~.php:~~51 pages/account.php:55~~

1078	#: pages/account.php:76 pages/checkout.php:118 pages/checkout.php:167
1079	#: pages/checkout.php:168 pages/checkout.php:171 pages/checkout.php:173
1080	#: pages/checkout.php:175 pages/checkout.php:180 pages/checkout.php:182
	@@ -1094,6 +1122,7 @@ msgstr ""
1094	#: adminpages/reports/login.php:165 adminpages/reports/login.php:181
1095	#: classes/gateways/class.pmprogateway_authorizenet.php:187
1096	#: classes/gateways/class.pmprogateway_authorizenet.php:303

1097	msgid "Membership"
1098	msgstr ""
1099
	@@ -1101,9 +1130,10 @@ msgstr ""
1101	#: adminpages/reports/login.php:182 adminpages/dashboard.php:217
1102	#: adminpages/dashboard.php:225 adminpages/memberslist.php:120
1103	#: adminpages/memberslist.php:153 adminpages/memberslist.php:163
1104	- #: adminpages/memberslist.php:173 adminpages/~~reports/login~~.php:~~144~~
1105	- #: adminpages/reports/login.php:~~146~~ adminpages/reports/login.php:~~162~~
1106	- #: adminpages/reports/login.php:~~166~~ adminpages/reports/login.php:~~182~~

1107	msgid "Joined"
1108	msgstr ""
1109
	@@ -1117,12 +1147,12 @@ msgstr ""
1117	#: adminpages/discountcodes.php:722 adminpages/discountcodes.php:749
1118	#: adminpages/memberslist.php:121 adminpages/memberslist.php:159
1119	#: adminpages/memberslist.php:169 adminpages/memberslist.php:179
1120	- #: adminpages/memberslist.php:183 adminpages/~~reports/login~~.php:~~145~~
1121	- #: adminpages/reports/login.php:~~147~~ adminpages/reports/login.php:~~163~~
1122	- #: adminpages/reports/login.php:~~167~~ adminpages/reports/login.php:~~183~~
1123	- #: ~~includes~~/~~profile.php:98 includes~~/~~profile~~.php:~~102~~ includes/profile.php:~~107~~
1124	- #: includes/profile.php:~~114~~ includes/profile.php:~~118~~ includes/profile.php:~~120~~
1125	- #: includes/profile.php:122
1126	msgid "Expires"
1127	msgstr ""
1128
	@@ -1132,9 +1162,9 @@ msgstr ""
1132	#: adminpages/memberslist.php:223 adminpages/memberslist.php:251
1133	#: adminpages/memberslist.php:261 adminpages/memberslist.php:262
1134	#: adminpages/memberslist.php:266 adminpages/memberslist.php:268
1135	- #: adminpages/~~reports/login~~.php:~~210~~ adminpages/reports/login.php:~~212~~
1136	- #: adminpages/reports/login.php:~~228~~ adminpages/reports/login.php:~~232~~
1137	- #: adminpages/reports/login.php:261
1138	msgid "No members found."
1139	msgstr ""
1140
	@@ -1159,8 +1189,8 @@ msgstr ""
1159	#: adminpages/orders.php:911 adminpages/orders.php:938
1160	#: adminpages/orders.php:967 adminpages/orders.php:1104
1161	#: adminpages/orders.php:1135 adminpages/orders.php:1141
1162	- #: adminpages/orders.php:1232 adminpages/orders.php:~~1308~~
1163	- #: adminpages/orders.php:1353
1164	msgid "Code"
1165	msgstr ""
1166
	@@ -1178,6 +1208,7 @@ msgstr ""
1178	#: adminpages/reports/login.php:159 adminpages/reports/login.php:163
1179	#: adminpages/reports/login.php:179
1180	#: classes/gateways/class.pmprogateway_payflowpro.php:116

1181	msgid "User"
1182	msgstr ""
1183
	@@ -1186,6 +1217,7 @@ msgstr ""
1186	#: pages/cancel.php:60 pages/invoice.php:103 pages/levels.php:35
1187	#: shortcodes/pmpro_account.php:44 shortcodes/pmpro_account.php:128
1188	#: adminpages/dashboard.php:284 adminpages/dashboard.php:292

1189	#: includes/privacy.php:241 pages/account.php:12 pages/account.php:18
1190	#: pages/account.php:92 pages/billing.php:16 pages/billing.php:25
1191	#: pages/billing.php:27 pages/billing.php:28 pages/billing.php:30
	@@ -1209,11 +1241,12 @@ msgstr ""
1209	#: adminpages/orders.php:471 adminpages/orders.php:504
1210	#: adminpages/orders.php:535 adminpages/orders.php:546
1211	#: adminpages/orders.php:582 adminpages/orders.php:602
1212	- #: adminpages/orders.php:~~627~~ adminpages/orders.php:~~637~~
1213	- #: adminpages/orders.php:~~905~~ adminpages/orders.php:~~915~~
1214	- #: adminpages/orders.php:~~942~~ adminpages/orders.php:~~971~~
1215	- #: adminpages/orders.php:~~1108~~ adminpages/orders.php:~~1139~~
1216	- #: adminpages/orders.php:~~1145~~ adminpages/orders.php:~~1236~~

1217	#: adminpages/orders.php:1312 adminpages/orders.php:1357
1218	#: adminpages/templates/orders-email.php:64
1219	#: adminpages/templates/orders-print.php:93 includes/privacy.php:285
	@@ -1230,12 +1263,13 @@ msgstr ""
1230	#: adminpages/orders.php:495 adminpages/orders.php:524
1231	#: adminpages/orders.php:579 adminpages/orders.php:606
1232	#: adminpages/orders.php:610 adminpages/orders.php:621
1233	- #: adminpages/orders.php:667 adminpages/orders.php:~~712~~
1234	- #: adminpages/orders.php:~~722~~ adminpages/orders.php:~~909~~
1235	- #: adminpages/orders.php:~~919~~ adminpages/orders.php:~~946~~
1236	- #: adminpages/orders.php:~~975~~ adminpages/orders.php:~~1112~~
1237	- #: adminpages/orders.php:~~1143~~ adminpages/orders.php:~~1149~~
1238	- #: adminpages/orders.php:~~1240~~ adminpages/orders.php:~~1316~~

1239	#: adminpages/orders.php:1361 includes/privacy.php:202 includes/privacy.php:309
1240	#: pages/invoice.php:29 shortcodes/pmpro_account.php:130
1241	msgid "Status"
	@@ -1249,12 +1283,13 @@ msgstr ""
1249	#: adminpages/orders.php:565 adminpages/orders.php:594
1250	#: adminpages/orders.php:607 adminpages/orders.php:679
1251	#: adminpages/orders.php:710 adminpages/orders.php:721
1252	- #: adminpages/orders.php:770 adminpages/orders.php:~~815~~
1253	- #: adminpages/orders.php:~~825~~ adminpages/orders.php:~~910~~
1254	- #: adminpages/orders.php:~~920~~ adminpages/orders.php:~~947~~
1255	- #: adminpages/orders.php:~~976~~ adminpages/orders.php:~~1113~~
1256	- #: adminpages/orders.php:~~1144~~ adminpages/orders.php:~~1150~~
1257	- #: adminpages/orders.php:~~1241~~ adminpages/orders.php:~~1317~~

1258	#: adminpages/orders.php:1362 pages/account.php:91 pages/invoice.php:87
1259	#: pages/invoice.php:100 pages/invoice.php:101 pages/invoice.php:105
1260	#: pages/invoice.php:107 shortcodes/pmpro_account.php:122
	@@ -1263,7 +1298,7 @@ msgstr ""
1263	msgid "Date"
1264	msgstr ""
1265
1266	- #: adminpages/dashboard.php:294 adminpages/orders.php:~~1462~~
1267	#: adminpages/dashboard.php:294 adminpages/dashboard.php:302
1268	#: adminpages/orders.php:674 adminpages/orders.php:977
1269	#: adminpages/orders.php:995 adminpages/orders.php:1005
	@@ -1275,21 +1310,21 @@ msgstr ""
1275	msgid "No orders found."
1276	msgstr ""
1277
1278	- #: adminpages/dashboard.php:311 adminpages/orders.php:~~1374~~
1279	#: adminpages/dashboard.php:311 adminpages/dashboard.php:319
1280	#: adminpages/orders.php:630 adminpages/orders.php:933
1281	#: adminpages/orders.php:943 adminpages/orders.php:972
1282	#: adminpages/orders.php:1001 adminpages/orders.php:1141
1283	#: adminpages/orders.php:1172 adminpages/orders.php:1178
1284	#: adminpages/orders.php:1273 adminpages/orders.php:1345
1285	- #: adminpages/orders.php:1395
1286	msgid "deleted"
1287	msgstr ""
1288
1289	- #: adminpages/dashboard.php:313 adminpages/orders.php:~~1376~~
1290	#: adminpages/dashboard.php:313 adminpages/dashboard.php:321
1291	#: adminpages/orders.php:1275 adminpages/orders.php:1347
1292	- #: adminpages/orders.php:1397
1293	msgid "none"
1294	msgstr ""
1295
	@@ -1414,7 +1449,7 @@ msgid "Add New Discount Code"
1414	msgstr ""
1415
1416	#: adminpages/discountcodes.php:442 adminpages/discountcodes.php:746
1417	- #: adminpages/membershiplevels.php:346 adminpages/membershiplevels.php:~~758~~
1418	#: adminpages/memberslist.php:168 adminpages/orders.php:1302
1419	#: adminpages/reports/login.php:178 adminpages/templates/orders-email.php:46
1420	#: adminpages/templates/orders-print.php:75 adminpages/discountcodes.php:306
	@@ -1437,18 +1472,19 @@ msgstr ""
1437	#: adminpages/membershiplevels.php:637 adminpages/membershiplevels.php:641
1438	#: adminpages/membershiplevels.php:653 adminpages/membershiplevels.php:663
1439	#: adminpages/membershiplevels.php:713 adminpages/membershiplevels.php:715
1440	- #: adminpages/membershiplevels.php:741 adminpages/membershiplevels.php:~~763~~
1441	- #: adminpages/~~memberslist~~.php:~~111~~ adminpages/memberslist.php:~~144~~
1442	- #: adminpages/memberslist.php:~~154~~ adminpages/memberslist.php:~~164~~

1443	#: adminpages/orders.php:597 adminpages/orders.php:900
1444	#: adminpages/orders.php:910 adminpages/orders.php:937
1445	#: adminpages/orders.php:966 adminpages/orders.php:1103
1446	#: adminpages/orders.php:1134 adminpages/orders.php:1140
1447	- #: adminpages/orders.php:1231 adminpages/orders.php:~~1307~~
1448	- #: adminpages/orders.php:~~1352~~ adminpages/~~reports/login~~.php:~~140~~
1449	- #: adminpages/reports/login.php:~~142~~ adminpages/reports/login.php:~~158~~
1450	- #: adminpages/reports/login.php:~~162~~ adminpages/reports/login.php:~~178~~
1451	- #: adminpages/templates/orders-email.php:46
1452	#: adminpages/templates/orders-print.php:75
1453	msgid "ID"
1454	msgstr ""
	@@ -1493,6 +1529,7 @@ msgstr ""
1493	#: classes/gateways/class.pmprogateway_braintree.php:423
1494	#: classes/gateways/class.pmprogateway_braintree.php:459
1495	#: classes/gateways/class.pmprogateway_braintree.php:479

1496	#: classes/gateways/class.pmprogateway_braintree.php:485
1497	#: classes/gateways/class.pmprogateway_braintree.php:486
1498	#: classes/gateways/class.pmprogateway_stripe.php:454
	@@ -1507,6 +1544,7 @@ msgstr ""
1507	#: classes/gateways/class.pmprogateway_stripe.php:532
1508	#: classes/gateways/class.pmprogateway_stripe.php:565
1509	#: classes/gateways/class.pmprogateway_stripe.php:570

1510	#: classes/gateways/class.pmprogateway_stripe.php:597
1511	#: classes/gateways/class.pmprogateway_stripe.php:598
1512	#: classes/gateways/class.pmprogateway_stripe.php:613
	@@ -1591,6 +1629,7 @@ msgstr ""
1591	#: adminpages/membershiplevels.php:356 adminpages/membershiplevels.php:357
1592	#: adminpages/membershiplevels.php:380 adminpages/membershiplevels.php:390
1593	#: adminpages/membershiplevels.php:413 adminpages/membershiplevels.php:415

1594	msgid "Recurring Subscription"
1595	msgstr ""
1596
	@@ -1604,6 +1643,7 @@ msgstr ""
1604	#: adminpages/membershiplevels.php:357 adminpages/membershiplevels.php:358
1605	#: adminpages/membershiplevels.php:381 adminpages/membershiplevels.php:391
1606	#: adminpages/membershiplevels.php:414 adminpages/membershiplevels.php:416

1607	msgid "Check if this level has a recurring subscription payment."
1608	msgstr ""
1609
	@@ -1616,17 +1656,18 @@ msgstr ""
1616	#: adminpages/membershiplevels.php:359 adminpages/membershiplevels.php:361
1617	#: adminpages/membershiplevels.php:362 adminpages/membershiplevels.php:385
1618	#: adminpages/membershiplevels.php:395 adminpages/membershiplevels.php:418
1619	- #: adminpages/membershiplevels.php:420
1620	msgid "Billing Amount"
1621	msgstr ""
1622
1623	#: adminpages/discountcodes.php:603 adminpages/membershiplevels.php:432
1624	#: classes/gateways/class.pmprogateway_stripe.php:750
1625	- #: adminpages/~~membershiplevels~~.php:~~349~~ adminpages/membershiplevels.php:~~351~~
1626	- #: adminpages/membershiplevels.php:~~370~~ adminpages/membershiplevels.php:~~372~~
1627	- #: adminpages/membershiplevels.php:~~373~~ adminpages/membershiplevels.php:~~396~~
1628	- #: adminpages/membershiplevels.php:~~406~~ adminpages/membershiplevels.php:~~429~~
1629	- #: adminpages/membershiplevels.php:431

1630	#: classes/gateways/class.pmprogateway_stripe.php:619
1631	#: classes/gateways/class.pmprogateway_stripe.php:620
1632	#: classes/gateways/class.pmprogateway_stripe.php:630
	@@ -1651,7 +1692,7 @@ msgid "per"
1651	msgstr ""
1652
1653	#: adminpages/discountcodes.php:607 adminpages/discountcodes.php:661
1654	- #: adminpages/membershiplevels.php:436 adminpages/membershiplevels.php:~~554~~
1655	#: classes/gateways/class.pmprogateway_stripe.php:616
1656	#: adminpages/discountcodes.php:446 adminpages/discountcodes.php:466
1657	#: adminpages/discountcodes.php:467 adminpages/discountcodes.php:468
	@@ -1665,11 +1706,12 @@ msgstr ""
1665	#: adminpages/membershiplevels.php:374 adminpages/membershiplevels.php:376
1666	#: adminpages/membershiplevels.php:377 adminpages/membershiplevels.php:400
1667	#: adminpages/membershiplevels.php:410 adminpages/membershiplevels.php:433
1668	- #: adminpages/membershiplevels.php:435 adminpages/membershiplevels.php:~~449~~
1669	- #: adminpages/membershiplevels.php:~~476~~ adminpages/membershiplevels.php:~~477~~
1670	- #: adminpages/membershiplevels.php:~~479~~ adminpages/membershiplevels.php:~~480~~
1671	- #: adminpages/membershiplevels.php:~~501~~ adminpages/membershiplevels.php:~~511~~
1672	- #: adminpages/membershiplevels.php:~~535~~ adminpages/membershiplevels.php:~~537~~

1673	#: adminpages/membershiplevels.php:559
1674	#: classes/gateways/class.pmprogateway_stripe.php:521
1675	#: classes/gateways/class.pmprogateway_stripe.php:522
	@@ -1683,6 +1725,7 @@ msgstr ""
1683	#: classes/gateways/class.pmprogateway_stripe.php:599
1684	#: classes/gateways/class.pmprogateway_stripe.php:608
1685	#: classes/gateways/class.pmprogateway_stripe.php:613

1686	#: classes/gateways/class.pmprogateway_stripe.php:637
1687	#: classes/gateways/class.pmprogateway_stripe.php:655
1688	#: classes/gateways/class.pmprogateway_stripe.php:664
	@@ -1695,7 +1738,7 @@ msgid "Day(s)"
1695	msgstr ""
1696
1697	#: adminpages/discountcodes.php:607 adminpages/discountcodes.php:661
1698	- #: adminpages/membershiplevels.php:436 adminpages/membershiplevels.php:~~554~~
1699	#: classes/gateways/class.pmprogateway_stripe.php:618
1700	#: adminpages/discountcodes.php:446 adminpages/discountcodes.php:466
1701	#: adminpages/discountcodes.php:467 adminpages/discountcodes.php:468
	@@ -1709,11 +1752,12 @@ msgstr ""
1709	#: adminpages/membershiplevels.php:374 adminpages/membershiplevels.php:376
1710	#: adminpages/membershiplevels.php:377 adminpages/membershiplevels.php:400
1711	#: adminpages/membershiplevels.php:410 adminpages/membershiplevels.php:433
1712	- #: adminpages/membershiplevels.php:435 adminpages/membershiplevels.php:~~449~~
1713	- #: adminpages/membershiplevels.php:~~476~~ adminpages/membershiplevels.php:~~477~~
1714	- #: adminpages/membershiplevels.php:~~479~~ adminpages/membershiplevels.php:~~480~~
1715	- #: adminpages/membershiplevels.php:~~501~~ adminpages/membershiplevels.php:~~511~~
1716	- #: adminpages/membershiplevels.php:~~535~~ adminpages/membershiplevels.php:~~537~~

1717	#: adminpages/membershiplevels.php:559
1718	#: classes/gateways/class.pmprogateway_stripe.php:521
1719	#: classes/gateways/class.pmprogateway_stripe.php:522
	@@ -1727,6 +1771,7 @@ msgstr ""
1727	#: classes/gateways/class.pmprogateway_stripe.php:599
1728	#: classes/gateways/class.pmprogateway_stripe.php:610
1729	#: classes/gateways/class.pmprogateway_stripe.php:615

1730	#: classes/gateways/class.pmprogateway_stripe.php:637
1731	#: classes/gateways/class.pmprogateway_stripe.php:655
1732	#: classes/gateways/class.pmprogateway_stripe.php:664
	@@ -1739,7 +1784,7 @@ msgid "Month(s)"
1739	msgstr ""
1740
1741	#: adminpages/discountcodes.php:607 adminpages/discountcodes.php:661
1742	- #: adminpages/membershiplevels.php:436 adminpages/membershiplevels.php:~~554~~
1743	#: classes/gateways/class.pmprogateway_stripe.php:617
1744	#: adminpages/discountcodes.php:446 adminpages/discountcodes.php:466
1745	#: adminpages/discountcodes.php:467 adminpages/discountcodes.php:468
	@@ -1753,11 +1798,12 @@ msgstr ""
1753	#: adminpages/membershiplevels.php:374 adminpages/membershiplevels.php:376
1754	#: adminpages/membershiplevels.php:377 adminpages/membershiplevels.php:400
1755	#: adminpages/membershiplevels.php:410 adminpages/membershiplevels.php:433
1756	- #: adminpages/membershiplevels.php:435 adminpages/membershiplevels.php:~~449~~
1757	- #: adminpages/membershiplevels.php:~~476~~ adminpages/membershiplevels.php:~~477~~
1758	- #: adminpages/membershiplevels.php:~~479~~ adminpages/membershiplevels.php:~~480~~
1759	- #: adminpages/membershiplevels.php:~~501~~ adminpages/membershiplevels.php:~~511~~
1760	- #: adminpages/membershiplevels.php:~~535~~ adminpages/membershiplevels.php:~~537~~

1761	#: adminpages/membershiplevels.php:559
1762	#: classes/gateways/class.pmprogateway_stripe.php:521
1763	#: classes/gateways/class.pmprogateway_stripe.php:522
	@@ -1771,6 +1817,7 @@ msgstr ""
1771	#: classes/gateways/class.pmprogateway_stripe.php:599
1772	#: classes/gateways/class.pmprogateway_stripe.php:609
1773	#: classes/gateways/class.pmprogateway_stripe.php:614

1774	#: classes/gateways/class.pmprogateway_stripe.php:637
1775	#: classes/gateways/class.pmprogateway_stripe.php:655
1776	#: classes/gateways/class.pmprogateway_stripe.php:664
	@@ -1783,7 +1830,7 @@ msgid "Week(s)"
1783	msgstr ""
1784
1785	#: adminpages/discountcodes.php:607 adminpages/discountcodes.php:661
1786	- #: adminpages/membershiplevels.php:436 adminpages/membershiplevels.php:~~554~~
1787	#: classes/gateways/class.pmprogateway_stripe.php:619
1788	#: adminpages/discountcodes.php:446 adminpages/discountcodes.php:466
1789	#: adminpages/discountcodes.php:467 adminpages/discountcodes.php:468
	@@ -1797,11 +1844,12 @@ msgstr ""
1797	#: adminpages/membershiplevels.php:374 adminpages/membershiplevels.php:376
1798	#: adminpages/membershiplevels.php:377 adminpages/membershiplevels.php:400
1799	#: adminpages/membershiplevels.php:410 adminpages/membershiplevels.php:433
1800	- #: adminpages/membershiplevels.php:435 adminpages/membershiplevels.php:~~449~~
1801	- #: adminpages/membershiplevels.php:~~476~~ adminpages/membershiplevels.php:~~477~~
1802	- #: adminpages/membershiplevels.php:~~479~~ adminpages/membershiplevels.php:~~480~~
1803	- #: adminpages/membershiplevels.php:~~501~~ adminpages/membershiplevels.php:~~511~~
1804	- #: adminpages/membershiplevels.php:~~535~~ adminpages/membershiplevels.php:~~537~~

1805	#: adminpages/membershiplevels.php:559
1806	#: classes/gateways/class.pmprogateway_stripe.php:521
1807	#: classes/gateways/class.pmprogateway_stripe.php:522
	@@ -1815,6 +1863,7 @@ msgstr ""
1815	#: classes/gateways/class.pmprogateway_stripe.php:599
1816	#: classes/gateways/class.pmprogateway_stripe.php:611
1817	#: classes/gateways/class.pmprogateway_stripe.php:616

1818	#: classes/gateways/class.pmprogateway_stripe.php:637
1819	#: classes/gateways/class.pmprogateway_stripe.php:655
1820	#: classes/gateways/class.pmprogateway_stripe.php:664
	@@ -1836,6 +1885,7 @@ msgstr ""
1836	#: adminpages/membershiplevels.php:385 adminpages/membershiplevels.php:386
1837	#: adminpages/membershiplevels.php:409 adminpages/membershiplevels.php:419
1838	#: adminpages/membershiplevels.php:442 adminpages/membershiplevels.php:444

1839	msgid "The amount to be billed one cycle after the initial payment."
1840	msgstr ""
1841
	@@ -1849,7 +1899,7 @@ msgstr ""
1849	#: adminpages/membershiplevels.php:403 adminpages/membershiplevels.php:404
1850	#: adminpages/membershiplevels.php:425 adminpages/membershiplevels.php:435
1851	#: adminpages/membershiplevels.php:438 adminpages/membershiplevels.php:459
1852	- #: adminpages/membershiplevels.php:461
1853	msgid "Billing Cycle Limit"
1854	msgstr ""
1855
	@@ -1863,14 +1913,14 @@ msgstr ""
1863	#: adminpages/membershiplevels.php:407 adminpages/membershiplevels.php:408
1864	#: adminpages/membershiplevels.php:429 adminpages/membershiplevels.php:439
1865	#: adminpages/membershiplevels.php:442 adminpages/membershiplevels.php:463
1866	- #: adminpages/membershiplevels.php:465
1867	msgid ""
1868	"The <strong>total</strong> number of recurring billing cycles for this "
1869	"level, including the trial period (if applicable) but not including the "
1870	"initial payment. Set to zero if membership is indefinite."
1871	msgstr ""
1872
1873	- #: adminpages/discountcodes.php:628 adminpages/membershiplevels.php:~~475~~
1874	#: adminpages/discountcodes.php:464 adminpages/discountcodes.php:467
1875	#: adminpages/discountcodes.php:487 adminpages/discountcodes.php:488
1876	#: adminpages/discountcodes.php:489 adminpages/discountcodes.php:494
	@@ -1880,10 +1930,11 @@ msgstr ""
1880	#: adminpages/membershiplevels.php:416 adminpages/membershiplevels.php:417
1881	#: adminpages/membershiplevels.php:438 adminpages/membershiplevels.php:448
1882	#: adminpages/membershiplevels.php:472 adminpages/membershiplevels.php:474

1883	msgid "Custom Trial"
1884	msgstr ""
1885
1886	- #: adminpages/discountcodes.php:629 adminpages/membershiplevels.php:~~477~~
1887	#: adminpages/discountcodes.php:465 adminpages/discountcodes.php:468
1888	#: adminpages/discountcodes.php:488 adminpages/discountcodes.php:489
1889	#: adminpages/discountcodes.php:490 adminpages/discountcodes.php:495
	@@ -1893,11 +1944,11 @@ msgstr ""
1893	#: adminpages/membershiplevels.php:416 adminpages/membershiplevels.php:418
1894	#: adminpages/membershiplevels.php:419 adminpages/membershiplevels.php:440
1895	#: adminpages/membershiplevels.php:450 adminpages/membershiplevels.php:474
1896	- #: adminpages/membershiplevels.php:476
1897	msgid "Check to add a custom trial period."
1898	msgstr ""
1899
1900	- #: adminpages/discountcodes.php:633 adminpages/membershiplevels.php:~~497~~
1901	#: adminpages/discountcodes.php:469 adminpages/discountcodes.php:472
1902	#: adminpages/discountcodes.php:492 adminpages/discountcodes.php:493
1903	#: adminpages/discountcodes.php:494 adminpages/discountcodes.php:499
	@@ -1908,10 +1959,11 @@ msgstr ""
1908	#: adminpages/membershiplevels.php:428 adminpages/membershiplevels.php:449
1909	#: adminpages/membershiplevels.php:459 adminpages/membershiplevels.php:483
1910	#: adminpages/membershiplevels.php:485 adminpages/membershiplevels.php:496

1911	msgid "Trial Billing Amount"
1912	msgstr ""
1913
1914	- #: adminpages/discountcodes.php:644 adminpages/membershiplevels.php:~~508~~
1915	#: adminpages/discountcodes.php:472 adminpages/discountcodes.php:475
1916	#: adminpages/discountcodes.php:503 adminpages/discountcodes.php:504
1917	#: adminpages/discountcodes.php:505 adminpages/discountcodes.php:510
	@@ -1922,10 +1974,11 @@ msgstr ""
1922	#: adminpages/membershiplevels.php:439 adminpages/membershiplevels.php:460
1923	#: adminpages/membershiplevels.php:470 adminpages/membershiplevels.php:494
1924	#: adminpages/membershiplevels.php:496 adminpages/membershiplevels.php:507

1925	msgid "for the first"
1926	msgstr ""
1927
1928	- #: adminpages/discountcodes.php:646 adminpages/membershiplevels.php:~~510~~
1929	#: adminpages/discountcodes.php:474 adminpages/discountcodes.php:477
1930	#: adminpages/discountcodes.php:505 adminpages/discountcodes.php:506
1931	#: adminpages/discountcodes.php:507 adminpages/discountcodes.php:512
	@@ -1936,10 +1989,11 @@ msgstr ""
1936	#: adminpages/membershiplevels.php:441 adminpages/membershiplevels.php:462
1937	#: adminpages/membershiplevels.php:472 adminpages/membershiplevels.php:496
1938	#: adminpages/membershiplevels.php:498 adminpages/membershiplevels.php:509

1939	msgid "subscription payments"
1940	msgstr ""
1941
1942	- #: adminpages/discountcodes.php:651 adminpages/membershiplevels.php:~~533~~
1943	#: adminpages/discountcodes.php:479 adminpages/discountcodes.php:482
1944	#: adminpages/discountcodes.php:510 adminpages/discountcodes.php:511
1945	#: adminpages/discountcodes.php:512 adminpages/discountcodes.php:517
	@@ -1950,11 +2004,11 @@ msgstr ""
1950	#: adminpages/membershiplevels.php:469 adminpages/membershiplevels.php:470
1951	#: adminpages/membershiplevels.php:491 adminpages/membershiplevels.php:501
1952	#: adminpages/membershiplevels.php:525 adminpages/membershiplevels.php:527
1953	- #: adminpages/membershiplevels.php:538
1954	msgid "Membership Expiration"
1955	msgstr ""
1956
1957	- #: adminpages/discountcodes.php:652 adminpages/membershiplevels.php:~~534~~
1958	#: adminpages/discountcodes.php:483 adminpages/discountcodes.php:511
1959	#: adminpages/discountcodes.php:512 adminpages/discountcodes.php:513
1960	#: adminpages/discountcodes.php:518 adminpages/discountcodes.php:591
	@@ -1964,11 +2018,12 @@ msgstr ""
1964	#: adminpages/membershiplevels.php:468 adminpages/membershiplevels.php:470
1965	#: adminpages/membershiplevels.php:471 adminpages/membershiplevels.php:492
1966	#: adminpages/membershiplevels.php:502 adminpages/membershiplevels.php:526
1967	- #: adminpages/membershiplevels.php:528 adminpages/membershiplevels.php:~~539~~

1968	msgid "Check this to set when membership access expires."
1969	msgstr ""
1970
1971	- #: adminpages/discountcodes.php:656 adminpages/membershiplevels.php:~~549~~
1972	#: adminpages/discountcodes.php:484 adminpages/discountcodes.php:487
1973	#: adminpages/discountcodes.php:515 adminpages/discountcodes.php:516
1974	#: adminpages/discountcodes.php:517 adminpages/discountcodes.php:522
	@@ -1979,11 +2034,11 @@ msgstr ""
1979	#: adminpages/membershiplevels.php:474 adminpages/membershiplevels.php:475
1980	#: adminpages/membershiplevels.php:496 adminpages/membershiplevels.php:506
1981	#: adminpages/membershiplevels.php:530 adminpages/membershiplevels.php:532
1982	- #: adminpages/membershiplevels.php:554
1983	msgid "Expires In"
1984	msgstr ""
1985
1986	- #: adminpages/discountcodes.php:669 adminpages/membershiplevels.php:~~562~~
1987	#: adminpages/discountcodes.php:500 adminpages/discountcodes.php:528
1988	#: adminpages/discountcodes.php:529 adminpages/discountcodes.php:530
1989	#: adminpages/discountcodes.php:535 adminpages/discountcodes.php:608
	@@ -1993,7 +2048,8 @@ msgstr ""
1993	#: adminpages/membershiplevels.php:485 adminpages/membershiplevels.php:487
1994	#: adminpages/membershiplevels.php:488 adminpages/membershiplevels.php:509
1995	#: adminpages/membershiplevels.php:519 adminpages/membershiplevels.php:543
1996	- #: adminpages/membershiplevels.php:545 adminpages/membershiplevels.php:~~567~~

1997	msgid ""
1998	"Set the duration of membership access. Note that the any future payments "
1999	"(recurring subscription, if any) will be cancelled when the membership "
	@@ -2046,17 +2102,19 @@ msgstr ""
2046	msgid "Starts"
2047	msgstr ""
2048
2049	- #: adminpages/discountcodes.php:767 adminpages/membershiplevels.php:~~777~~
2050	- #: adminpages/orders.php:~~1337~~ adminpages/discountcodes.php:765
2051	#: adminpages/discountcodes.php:767 adminpages/membershiplevels.php:760
2052	- #: adminpages/membershiplevels.php:~~782~~ adminpages/~~orders~~.php:~~1352~~

2053	msgid "Edit"
2054	msgstr ""
2055
2056	- #: adminpages/discountcodes.php:770 adminpages/membershiplevels.php:~~778~~
2057	- #: adminpages/orders.php:~~1340~~ adminpages/discountcodes.php:768
2058	#: adminpages/discountcodes.php:770 adminpages/membershiplevels.php:761
2059	- #: adminpages/membershiplevels.php:~~783~~ adminpages/~~orders~~.php:~~1355~~

2060	msgid "Copy"
2061	msgstr ""
2062
	@@ -2129,92 +2187,103 @@ msgstr ""
2129	#: adminpages/emailsettings.php:130 adminpages/emailsettings.php:86
2130	#: adminpages/emailsettings.php:104 adminpages/emailsettings.php:115
2131	#: adminpages/emailsettings.php:125 adminpages/emailsettings.php:129

2132	msgid "Send the site admin emails"
2133	msgstr ""
2134
2135	#: adminpages/emailsettings.php:136 adminpages/emailsettings.php:92
2136	#: adminpages/emailsettings.php:110 adminpages/emailsettings.php:121
2137	#: adminpages/emailsettings.php:131 adminpages/emailsettings.php:135

2138	msgid "Checkout"
2139	msgstr ""
2140
2141	#: adminpages/emailsettings.php:140 adminpages/emailsettings.php:96
2142	#: adminpages/emailsettings.php:114 adminpages/emailsettings.php:125
2143	#: adminpages/emailsettings.php:135 adminpages/emailsettings.php:139

2144	msgid "when a member checks out."
2145	msgstr ""
2146
2147	#: adminpages/emailsettings.php:145 adminpages/emailsettings.php:101
2148	#: adminpages/emailsettings.php:119 adminpages/emailsettings.php:130
2149	#: adminpages/emailsettings.php:140 adminpages/emailsettings.php:144

2150	msgid "Admin Changes"
2151	msgstr ""
2152
2153	#: adminpages/emailsettings.php:149 adminpages/emailsettings.php:105
2154	#: adminpages/emailsettings.php:123 adminpages/emailsettings.php:134
2155	#: adminpages/emailsettings.php:144 adminpages/emailsettings.php:148

2156	msgid "when an admin changes a user's membership level through the dashboard."
2157	msgstr ""
2158
2159	#: adminpages/emailsettings.php:154 adminpages/emailsettings.php:110
2160	#: adminpages/emailsettings.php:128 adminpages/emailsettings.php:139
2161	#: adminpages/emailsettings.php:149 adminpages/emailsettings.php:153

2162	msgid "Cancellation"
2163	msgstr ""
2164
2165	#: adminpages/emailsettings.php:158 adminpages/emailsettings.php:114
2166	#: adminpages/emailsettings.php:132 adminpages/emailsettings.php:143
2167	#: adminpages/emailsettings.php:153 adminpages/emailsettings.php:157

2168	msgid "when a user cancels his or her account."
2169	msgstr ""
2170
2171	#: adminpages/emailsettings.php:163 adminpages/emailsettings.php:119
2172	#: adminpages/emailsettings.php:137 adminpages/emailsettings.php:148
2173	#: adminpages/emailsettings.php:158 adminpages/emailsettings.php:162

2174	msgid "Bill Updates"
2175	msgstr ""
2176
2177	#: adminpages/emailsettings.php:167 adminpages/emailsettings.php:123
2178	#: adminpages/emailsettings.php:141 adminpages/emailsettings.php:152
2179	#: adminpages/emailsettings.php:162 adminpages/emailsettings.php:166

2180	msgid "when a user updates his or her billing information."
2181	msgstr ""
2182
2183	#: adminpages/emailsettings.php:174 adminpages/emailsettings.php:129
2184	#: adminpages/emailsettings.php:147 adminpages/emailsettings.php:158
2185	#: adminpages/emailsettings.php:168 adminpages/emailsettings.php:172

2186	msgid "Send members emails"
2187	msgstr ""
2188
2189	#: adminpages/emailsettings.php:180 adminpages/emailsettings.php:135
2190	#: adminpages/emailsettings.php:153 adminpages/emailsettings.php:164
2191	#: adminpages/emailsettings.php:174 adminpages/emailsettings.php:178

2192	msgid "New Users"
2193	msgstr ""
2194
2195	- #: adminpages/emailsettings.php:184
2196	msgid "Default WP notification email."
2197	msgstr ""
2198
2199	- #: adminpages/emailsettings.php:185
2200	msgid ""
2201	"Recommended: Leave unchecked. Members will still get an email confirmation "
2202	"from PMPro after checkout."
2203	msgstr ""
2204
2205	- #: adminpages/functions.php:~~270~~ adminpages/functions.php:270
2206	#: adminpages/orders.php:146 adminpages/orders.php:155
2207	#: adminpages/orders.php:158
2208	msgid "Invoice emailed successfully."
2209	msgstr ""
2210
2211	- #: adminpages/functions.php:~~274~~ adminpages/functions.php:274
2212	#: adminpages/orders.php:149 adminpages/orders.php:160
2213	#: adminpages/orders.php:161
2214	msgid "Error emailing invoice."
2215	msgstr ""
2216
2217	- #: adminpages/functions.php:~~301~~ adminpages/functions.php:301
2218	#: adminpages/orders.php:667 adminpages/orders.php:696
2219	#: adminpages/orders.php:800 adminpages/orders.php:831
2220	#: adminpages/orders.php:842 adminpages/orders.php:929
	@@ -2222,7 +2291,7 @@ msgstr ""
2222	msgid "Email Invoice"
2223	msgstr ""
2224
2225	- #: adminpages/functions.php:~~304~~ adminpages/functions.php:304
2226	#: adminpages/orders.php:670 adminpages/orders.php:699
2227	#: adminpages/orders.php:803 adminpages/orders.php:834
2228	#: adminpages/orders.php:845 adminpages/orders.php:932
	@@ -2230,7 +2299,7 @@ msgstr ""
2230	msgid "Send an invoice for this order to: "
2231	msgstr ""
2232
2233	- #: adminpages/functions.php:~~306~~ adminpages/functions.php:306
2234	#: adminpages/orders.php:672 adminpages/orders.php:701
2235	#: adminpages/orders.php:805 adminpages/orders.php:836
2236	#: adminpages/orders.php:847 adminpages/orders.php:934
	@@ -2238,16 +2307,17 @@ msgstr ""
2238	msgid "Send Email"
2239	msgstr ""
2240
2241	- #: adminpages/license.php:19 ~~includes~~/license.php:51 includes/license.php:54

2242	msgid "Your license key has been validated."
2243	msgstr ""
2244
2245	- #: adminpages/license.php:43 ~~includes~~/license.php:81 includes/license.php:83
2246	- #: includes/license.php:84
2247	msgid "Paid Memberships Pro Support License"
2248	msgstr ""
2249
2250	- #: adminpages/license.php:47 includes/license.php:91
2251	msgid ""
2252	"Enter your support license key.</strong> Your license key can be found in "
2253	"your membership email receipt or in your <a href=\"https://www."
	@@ -2257,7 +2327,7 @@ msgid ""
2257	"Account</a>."
2258	msgstr ""
2259
2260	- #: adminpages/license.php:49 includes/license.php:93
2261	msgid ""
2262	"Visit the PMPro <a href=\"https://www.paidmembershipspro.com/login/?"
2263	"redirect_to=%2Fmembership-account%2F%3Futm_source%3Dplugin%26utm_medium"
	@@ -2266,21 +2336,21 @@ msgid ""
2266	"account is active and to find your license key."
2267	msgstr ""
2268
2269	- #: adminpages/license.php:49 ~~includes~~/license.php:91 includes/license.php:93
2270	- #: includes/license.php:94
2271	msgid "Your license is invalid or expired."
2272	msgstr ""
2273
2274	- #: adminpages/license.php:59 ~~includes~~/license.php:~~100~~ includes/license.php:~~102~~
2275	- #: includes/license.php:103
2276	msgid "Enter license key here..."
2277	msgstr ""
2278
2279	- #: adminpages/license.php:61
2280	msgid "Validate Key"
2281	msgstr ""
2282
2283	- #: adminpages/license.php:95
2284	#, php-format
2285	msgid ""
2286	"Paid Memberships Pro and our Add Ons are distributed under the <a href=\"%s"
	@@ -2289,7 +2359,7 @@ msgid ""
2289	"site free of charge."
2290	msgstr ""
2291
2292	- #: adminpages/license.php:99
2293	msgid ""
2294	"<strong>Paid Memberships Pro offers plans for automatic updates of Add Ons "
2295	"and premium support.</strong> These plans include a Plus license key which "
	@@ -2299,7 +2369,7 @@ msgid ""
2299	"released."
2300	msgstr ""
2301
2302	- #: adminpages/license.php:103
2303	msgid ""
2304	"<strong>Need help?</strong> Your license allows you to open new tickets in "
2305	"our private support area. Purchases are backed by a 30 day, no questions "
	@@ -2379,7 +2449,7 @@ msgstr ""
2379	msgid "Add New Membership Level"
2380	msgstr ""
2381
2382	- #: adminpages/membershiplevels.php:353 adminpages/membershiplevels.php:~~759~~
2383	#: adminpages/reports/login.php:180 adminpages/membershiplevels.php:291
2384	#: adminpages/membershiplevels.php:293 adminpages/membershiplevels.php:295
2385	#: adminpages/membershiplevels.php:319 adminpages/membershiplevels.php:329
	@@ -2392,9 +2462,10 @@ msgstr ""
2392	#: adminpages/membershiplevels.php:642 adminpages/membershiplevels.php:654
2393	#: adminpages/membershiplevels.php:664 adminpages/membershiplevels.php:714
2394	#: adminpages/membershiplevels.php:716 adminpages/membershiplevels.php:742
2395	- #: adminpages/membershiplevels.php:~~764~~ adminpages/~~reports/login~~.php:~~142~~
2396	- #: adminpages/reports/login.php:~~144~~ adminpages/reports/login.php:~~160~~
2397	- #: adminpages/reports/login.php:~~164~~ adminpages/reports/login.php:~~180~~

2398	msgid "Name"
2399	msgstr ""
2400
	@@ -2410,7 +2481,7 @@ msgstr ""
2410	msgid "Check to include this message in the membership confirmation email."
2411	msgstr ""
2412
2413	- #: adminpages/membershiplevels.php:396 adminpages/membershiplevels.php:~~760~~
2414	#: adminpages/membershiplevels.php:333 adminpages/membershiplevels.php:335
2415	#: adminpages/membershiplevels.php:337 adminpages/membershiplevels.php:338
2416	#: adminpages/membershiplevels.php:361 adminpages/membershiplevels.php:371
	@@ -2421,7 +2492,7 @@ msgstr ""
2421	#: adminpages/membershiplevels.php:643 adminpages/membershiplevels.php:655
2422	#: adminpages/membershiplevels.php:665 adminpages/membershiplevels.php:715
2423	#: adminpages/membershiplevels.php:717 adminpages/membershiplevels.php:743
2424	- #: adminpages/membershiplevels.php:765
2425	msgid "Billing Details"
2426	msgstr ""
2427
	@@ -2430,6 +2501,7 @@ msgstr ""
2430	#: adminpages/membershiplevels.php:389 adminpages/membershiplevels.php:390
2431	#: adminpages/membershiplevels.php:413 adminpages/membershiplevels.php:423
2432	#: adminpages/membershiplevels.php:444 adminpages/membershiplevels.php:446

2433	msgid ""
2434	"Braintree integration currently only supports billing periods of \"Month\" "
2435	"or \"Year\"."
	@@ -2440,6 +2512,7 @@ msgstr ""
2440	#: adminpages/membershiplevels.php:395 adminpages/membershiplevels.php:396
2441	#: adminpages/membershiplevels.php:417 adminpages/membershiplevels.php:427
2442	#: adminpages/membershiplevels.php:448 adminpages/membershiplevels.php:450

2443	msgid ""
2444	"After saving this level, make note of the ID and create a \"Plan\" in your "
2445	"Braintree dashboard with the same settings and the \"Plan ID\" set to "
	@@ -2455,10 +2528,12 @@ msgstr ""
2455	#: adminpages/membershiplevels.php:417 adminpages/membershiplevels.php:419
2456	#: adminpages/membershiplevels.php:427 adminpages/membershiplevels.php:429
2457	#: adminpages/membershiplevels.php:432 adminpages/membershiplevels.php:448
2458	- #: adminpages/membershiplevels.php:450 adminpages/membershiplevels.php:~~453~~
2459	- #: adminpages/membershiplevels.php:~~455~~ adminpages/~~paymentsettings~~.php:~~170~~

2460	#: adminpages/paymentsettings.php:174 adminpages/paymentsettings.php:179
2461	#: classes/gateways/class.pmprogateway_cybersource.php:88

2462	#: classes/gateways/class.pmprogateway_cybersource.php:101
2463	#: classes/gateways/class.pmprogateway_paypal.php:118
2464	#: classes/gateways/class.pmprogateway_paypal.php:130
	@@ -2473,6 +2548,7 @@ msgstr ""
2473
2474	#: adminpages/membershiplevels.php:456 adminpages/membershiplevels.php:432
2475	#: adminpages/membershiplevels.php:453 adminpages/membershiplevels.php:455

2476	#, php-format
2477	msgid ""
2478	"You will need to create a \"Plan\" in your Braintree dashboard with the same "
	@@ -2484,22 +2560,33 @@ msgstr ""
2484	#: adminpages/membershiplevels.php:409 adminpages/membershiplevels.php:410
2485	#: adminpages/membershiplevels.php:431 adminpages/membershiplevels.php:441
2486	#: adminpages/membershiplevels.php:465 adminpages/membershiplevels.php:467

2487	msgid ""
2488	"Stripe integration currently does not support billing limits. You can still "
2489	"set an expiration date below."
2490	msgstr ""
2491
2492	- #: adminpages/membershiplevels.php:~~480 adminpages/membershiplevels.php:398~~








2493	#: adminpages/membershiplevels.php:400 adminpages/membershiplevels.php:419
2494	#: adminpages/membershiplevels.php:421 adminpages/membershiplevels.php:422
2495	#: adminpages/membershiplevels.php:443 adminpages/membershiplevels.php:453
2496	#: adminpages/membershiplevels.php:477 adminpages/membershiplevels.php:479

2497	msgid ""
2498	"2Checkout integration does not support custom trials. You can do one period "
2499	"trials by setting an initial payment different from the billing amount."
2500	msgstr ""
2501
2502	- #: adminpages/membershiplevels.php:~~493~~ adminpages/membershiplevels.php:492

2503	#, php-format
2504	msgid ""
2505	"Optional: Allow more customizable trial periods and renewal dates using the "
	@@ -2507,7 +2594,7 @@ msgid ""
2507	"target=\"_blank\">Subscription Delays Add On</a>."
2508	msgstr ""
2509
2510	- #: adminpages/membershiplevels.php:~~512~~ adminpages/membershiplevels.php:406
2511	#: adminpages/membershiplevels.php:412 adminpages/membershiplevels.php:414
2512	#: adminpages/membershiplevels.php:441 adminpages/membershiplevels.php:443
2513	#: adminpages/membershiplevels.php:444 adminpages/membershiplevels.php:465
	@@ -2517,50 +2604,53 @@ msgid ""
2517	"Stripe integration currently does not support trial amounts greater than $0."
2518	msgstr ""
2519
2520	- #: adminpages/membershiplevels.php:~~514~~ adminpages/membershiplevels.php:410
2521	#: adminpages/membershiplevels.php:416 adminpages/membershiplevels.php:418
2522	#: adminpages/membershiplevels.php:445 adminpages/membershiplevels.php:447
2523	#: adminpages/membershiplevels.php:448 adminpages/membershiplevels.php:469
2524	#: adminpages/membershiplevels.php:479 adminpages/membershiplevels.php:503
2525	- #: adminpages/membershiplevels.php:505 adminpages/membershiplevels.php:~~516~~

2526	msgid ""
2527	"Braintree integration currently does not support trial amounts greater than "
2528	"$0."
2529	msgstr ""
2530
2531	- #: adminpages/membershiplevels.php:~~516~~ adminpages/membershiplevels.php:414
2532	#: adminpages/membershiplevels.php:420 adminpages/membershiplevels.php:422
2533	#: adminpages/membershiplevels.php:449 adminpages/membershiplevels.php:451
2534	#: adminpages/membershiplevels.php:452 adminpages/membershiplevels.php:473
2535	#: adminpages/membershiplevels.php:483 adminpages/membershiplevels.php:507
2536	- #: adminpages/membershiplevels.php:509 adminpages/membershiplevels.php:~~520~~

2537	msgid ""
2538	"Payflow integration currently does not support trial amounts greater than $0."
2539	msgstr ""
2540
2541	- #: adminpages/membershiplevels.php:~~528~~ adminpages/membershiplevels.php:426
2542	#: adminpages/membershiplevels.php:432 adminpages/membershiplevels.php:434
2543	#: adminpages/membershiplevels.php:461 adminpages/membershiplevels.php:462
2544	#: adminpages/membershiplevels.php:464 adminpages/membershiplevels.php:465
2545	#: adminpages/membershiplevels.php:486 adminpages/membershiplevels.php:496
2546	#: adminpages/membershiplevels.php:520 adminpages/membershiplevels.php:522
2547	- #: adminpages/membershiplevels.php:533
2548	msgid "Disable New Signups"
2549	msgstr ""
2550
2551	- #: adminpages/membershiplevels.php:~~529~~ adminpages/membershiplevels.php:427
2552	#: adminpages/membershiplevels.php:433 adminpages/membershiplevels.php:435
2553	#: adminpages/membershiplevels.php:462 adminpages/membershiplevels.php:463
2554	#: adminpages/membershiplevels.php:465 adminpages/membershiplevels.php:466
2555	#: adminpages/membershiplevels.php:487 adminpages/membershiplevels.php:497
2556	#: adminpages/membershiplevels.php:521 adminpages/membershiplevels.php:523
2557	- #: adminpages/membershiplevels.php:534
2558	msgid ""
2559	"Check to hide this level from the membership levels page and disable "
2560	"registration."
2561	msgstr ""
2562
2563	- #: adminpages/membershiplevels.php:~~545~~ adminpages/membershiplevels.php:~~550~~

2564	#, php-format
2565	msgid ""
2566	"Optional: Allow more customizable expiration dates using the <a href=\"%s\" "
	@@ -2568,8 +2658,9 @@ msgid ""
2568	"\">Set Expiration Date Add On</a>."
2569	msgstr ""
2570
2571	- #: adminpages/membershiplevels.php:~~565~~ adminpages/membershiplevels.php:546
2572	- #: adminpages/membershiplevels.php:548 adminpages/membershiplevels.php:~~570~~

2573	#, php-format
2574	msgid ""
2575	"WARNING: This level is set with both a recurring billing amount and an "
	@@ -2578,16 +2669,16 @@ msgid ""
2578	"information, <a target=\"_blank\" href=\"%s\">see our post here</a>."
2579	msgstr ""
2580
2581	- #: adminpages/membershiplevels.php:~~605~~ adminpages/membershiplevels.php:588
2582	- #: adminpages/membershiplevels.php:610
2583	#, php-format
2584	msgid ""
2585	"Non-members will not see posts in these categories. You can <a href=\"%s\" "
2586	"title=\"Advanced Settings\" target=\"_blank\">update this setting here</a>."
2587	msgstr ""
2588
2589	- #: adminpages/membershiplevels.php:~~609~~ adminpages/membershiplevels.php:592
2590	- #: adminpages/membershiplevels.php:614
2591	#, php-format
2592	msgid ""
2593	"Non-members will see the title and excerpt for posts in these categories. "
	@@ -2595,8 +2686,8 @@ msgid ""
2595	"this setting here</a>."
2596	msgstr ""
2597
2598	- #: adminpages/membershiplevels.php:~~612~~ adminpages/membershiplevels.php:595
2599	- #: adminpages/membershiplevels.php:617
2600	#, php-format
2601	msgid ""
2602	"Non-members will see the title only for posts in these categories. You can "
	@@ -2604,36 +2695,38 @@ msgid ""
2604	"setting here</a>."
2605	msgstr ""
2606
2607	- #: adminpages/membershiplevels.php:~~619~~ adminpages/membershiplevels.php:461
2608	#: adminpages/membershiplevels.php:467 adminpages/membershiplevels.php:469
2609	#: adminpages/membershiplevels.php:496 adminpages/membershiplevels.php:497
2610	#: adminpages/membershiplevels.php:499 adminpages/membershiplevels.php:500
2611	#: adminpages/membershiplevels.php:521 adminpages/membershiplevels.php:531
2612	#: adminpages/membershiplevels.php:574 adminpages/membershiplevels.php:576
2613	- #: adminpages/membershiplevels.php:602 adminpages/membershiplevels.php:~~624~~

2614	msgid "Categories"
2615	msgstr ""
2616
2617	- #: adminpages/membershiplevels.php:~~627~~ adminpages/membershiplevels.php:505
2618	#: adminpages/membershiplevels.php:507 adminpages/membershiplevels.php:516
2619	#: adminpages/membershiplevels.php:517 adminpages/membershiplevels.php:529
2620	#: adminpages/membershiplevels.php:539 adminpages/membershiplevels.php:582
2621	#: adminpages/membershiplevels.php:584 adminpages/membershiplevels.php:610
2622	- #: adminpages/membershiplevels.php:632
2623	msgid "Save Level"
2624	msgstr ""
2625
2626	- #: adminpages/membershiplevels.php:~~628~~ adminpages/orders.php:934
2627	#: pages/billing.php:371 pages/cancel.php:83 shortcodes/pmpro_account.php:72
2628	#: adminpages/membershiplevels.php:506 adminpages/membershiplevels.php:508
2629	#: adminpages/membershiplevels.php:517 adminpages/membershiplevels.php:518
2630	#: adminpages/membershiplevels.php:530 adminpages/membershiplevels.php:540
2631	#: adminpages/membershiplevels.php:583 adminpages/membershiplevels.php:585
2632	- #: adminpages/membershiplevels.php:611 adminpages/membershiplevels.php:~~633~~
2633	- #: adminpages/~~orders~~.php:~~511~~ adminpages/orders.php:~~561~~
2634	- #: adminpages/orders.php:~~633~~ adminpages/orders.php:~~662~~
2635	- #: adminpages/orders.php:~~765~~ adminpages/orders.php:~~796~~
2636	- #: adminpages/orders.php:~~807~~ adminpages/orders.php:~~894~~

2637	#: adminpages/orders.php:939 adminpages/orders.php:949 pages/account.php:44
2638	#: pages/billing.php:295 pages/billing.php:299 pages/billing.php:330
2639	#: pages/billing.php:339 pages/billing.php:342 pages/billing.php:344
	@@ -2646,7 +2739,7 @@ msgstr ""
2646	msgid "Cancel"
2647	msgstr ""
2648
2649	- #: adminpages/membershiplevels.php:~~739~~ adminpages/membershiplevels.php:~~742~~
2650	#: adminpages/membershiplevels.php:493 adminpages/membershiplevels.php:496
2651	#: adminpages/membershiplevels.php:499 adminpages/membershiplevels.php:501
2652	#: adminpages/membershiplevels.php:502 adminpages/membershiplevels.php:504
	@@ -2662,11 +2755,12 @@ msgstr ""
2662	#: adminpages/membershiplevels.php:694 adminpages/membershiplevels.php:696
2663	#: adminpages/membershiplevels.php:697 adminpages/membershiplevels.php:699
2664	#: adminpages/membershiplevels.php:722 adminpages/membershiplevels.php:725

2665	#: adminpages/membershiplevels.php:744 adminpages/membershiplevels.php:747
2666	msgid "Search Levels"
2667	msgstr ""
2668
2669	- #: adminpages/membershiplevels.php:~~745~~ adminpages/membershiplevels.php:490
2670	#: adminpages/membershiplevels.php:496 adminpages/membershiplevels.php:498
2671	#: adminpages/membershiplevels.php:525 adminpages/membershiplevels.php:526
2672	#: adminpages/membershiplevels.php:569 adminpages/membershiplevels.php:607
	@@ -2674,20 +2768,21 @@ msgstr ""
2674	#: adminpages/membershiplevels.php:619 adminpages/membershiplevels.php:631
2675	#: adminpages/membershiplevels.php:641 adminpages/membershiplevels.php:700
2676	#: adminpages/membershiplevels.php:702 adminpages/membershiplevels.php:728
2677	- #: adminpages/membershiplevels.php:750
2678	msgid "Add New Level"
2679	msgstr ""
2680
2681	- #: adminpages/membershiplevels.php:~~748~~ adminpages/membershiplevels.php:579
2682	#: adminpages/membershiplevels.php:619 adminpages/membershiplevels.php:621
2683	#: adminpages/membershiplevels.php:630 adminpages/membershiplevels.php:631
2684	#: adminpages/membershiplevels.php:643 adminpages/membershiplevels.php:653
2685	#: adminpages/membershiplevels.php:703 adminpages/membershiplevels.php:705
2686	- #: adminpages/membershiplevels.php:731 adminpages/membershiplevels.php:~~753~~

2687	msgid "Drag and drop membership levels to reorder them on the Levels page."
2688	msgstr ""
2689
2690	- #: adminpages/membershiplevels.php:~~761~~ pages/cancel.php:61
2691	#: pages/confirmation.php:81 pages/invoice.php:64
2692	#: shortcodes/pmpro_account.php:46 adminpages/membershiplevels.php:510
2693	#: adminpages/membershiplevels.php:516 adminpages/membershiplevels.php:518
	@@ -2697,16 +2792,17 @@ msgstr ""
2697	#: adminpages/membershiplevels.php:640 adminpages/membershiplevels.php:644
2698	#: adminpages/membershiplevels.php:656 adminpages/membershiplevels.php:666
2699	#: adminpages/membershiplevels.php:716 adminpages/membershiplevels.php:718
2700	- #: adminpages/membershiplevels.php:744 adminpages/membershiplevels.php:~~766~~
2701	- #: ~~pages~~/~~account~~.php:20 pages/~~cancel~~.php:53 pages/cancel.php:61
2702	- #: pages/cancel.php:62 pages/~~confirmation~~.php:81 pages/confirmation.php:83
2703	- #: pages/confirmation.php:84 pages/confirmation.php:~~89 pages/invoice.php:63~~
2704	- #: pages/~~invoice~~.php:64 pages/invoice.php:68 pages/invoice.php:70
2705	- #: ~~shortcodes~~/~~pmpro_account~~.php:45 shortcodes/pmpro_account.php:46

2706	msgid "Expiration"
2707	msgstr ""
2708
2709	- #: adminpages/membershiplevels.php:~~762~~ adminpages/membershiplevels.php:511
2710	#: adminpages/membershiplevels.php:517 adminpages/membershiplevels.php:519
2711	#: adminpages/membershiplevels.php:545 adminpages/membershiplevels.php:546
2712	#: adminpages/membershiplevels.php:587 adminpages/membershiplevels.php:633
	@@ -2714,11 +2810,12 @@ msgstr ""
2714	#: adminpages/membershiplevels.php:641 adminpages/membershiplevels.php:645
2715	#: adminpages/membershiplevels.php:657 adminpages/membershiplevels.php:667
2716	#: adminpages/membershiplevels.php:717 adminpages/membershiplevels.php:719
2717	- #: adminpages/membershiplevels.php:745 adminpages/membershiplevels.php:~~767~~

2718	msgid "Allow Signups"
2719	msgstr ""
2720
2721	- #: adminpages/membershiplevels.php:~~779~~ adminpages/membershiplevels.php:566
2722	#: adminpages/membershiplevels.php:572 adminpages/membershiplevels.php:574
2723	#: adminpages/membershiplevels.php:580 adminpages/membershiplevels.php:601
2724	#: adminpages/membershiplevels.php:660 adminpages/membershiplevels.php:662
	@@ -2726,14 +2823,15 @@ msgstr ""
2726	#: adminpages/membershiplevels.php:670 adminpages/membershiplevels.php:674
2727	#: adminpages/membershiplevels.php:686 adminpages/membershiplevels.php:696
2728	#: adminpages/membershiplevels.php:746 adminpages/membershiplevels.php:748
2729	- #: adminpages/membershiplevels.php:762 adminpages/membershiplevels.php:~~784~~

2730	#, php-format
2731	msgid ""
2732	"Are you sure you want to delete membership level %s? All subscriptions will "
2733	"be cancelled."
2734	msgstr ""
2735
2736	- #: adminpages/membershiplevels.php:~~784~~ adminpages/membershiplevels.php:534
2737	#: adminpages/membershiplevels.php:540 adminpages/membershiplevels.php:542
2738	#: adminpages/membershiplevels.php:566 adminpages/membershiplevels.php:569
2739	#: adminpages/membershiplevels.php:646 adminpages/membershiplevels.php:648
	@@ -2741,11 +2839,12 @@ msgstr ""
2741	#: adminpages/membershiplevels.php:656 adminpages/membershiplevels.php:660
2742	#: adminpages/membershiplevels.php:672 adminpages/membershiplevels.php:682
2743	#: adminpages/membershiplevels.php:732 adminpages/membershiplevels.php:734
2744	- #: adminpages/membershiplevels.php:767 adminpages/membershiplevels.php:~~789~~

2745	msgid "FREE"
2746	msgstr ""
2747
2748	- #: adminpages/membershiplevels.php:~~793~~ adminpages/membershiplevels.php:560
2749	#: adminpages/membershiplevels.php:566 adminpages/membershiplevels.php:568
2750	#: adminpages/membershiplevels.php:575 adminpages/membershiplevels.php:595
2751	#: adminpages/membershiplevels.php:655 adminpages/membershiplevels.php:657
	@@ -2753,7 +2852,8 @@ msgstr ""
2753	#: adminpages/membershiplevels.php:665 adminpages/membershiplevels.php:669
2754	#: adminpages/membershiplevels.php:681 adminpages/membershiplevels.php:691
2755	#: adminpages/membershiplevels.php:741 adminpages/membershiplevels.php:743
2756	- #: adminpages/membershiplevels.php:776 adminpages/membershiplevels.php:~~798~~

2757	msgid "After"
2758	msgstr ""
2759
	@@ -2770,8 +2870,8 @@ msgstr ""
2770	#: adminpages/orders.php:591 adminpages/orders.php:698
2771	#: adminpages/orders.php:727 adminpages/orders.php:833
2772	#: adminpages/orders.php:864 adminpages/orders.php:875
2773	- #: adminpages/orders.php:962 adminpages/orders.php:~~973~~
2774	- #: adminpages/orders.php:1018
2775	msgid "Export to CSV"
2776	msgstr ""
2777
	@@ -2781,11 +2881,11 @@ msgstr ""
2781	#: adminpages/orders.php:603 adminpages/orders.php:710
2782	#: adminpages/orders.php:739 adminpages/orders.php:848
2783	#: adminpages/orders.php:879 adminpages/orders.php:890
2784	- #: adminpages/orders.php:981 adminpages/orders.php:~~992~~
2785	- #: adminpages/orders.php:~~1037~~ adminpages/~~reports/login~~.php:65
2786	- #: adminpages/reports/login.php:67 adminpages/reports/login.php:83
2787	- #: adminpages/reports/login.php:87 adminpages/reports/login.php:~~103~~
2788	- #: adminpages/reports/memberships.php:256
2789	#: adminpages/reports/memberships.php:263
2790	#: adminpages/reports/memberships.php:276
2791	#: adminpages/reports/memberships.php:292
	@@ -2823,17 +2923,19 @@ msgstr ""
2823
2824	#: adminpages/memberslist.php:42 adminpages/memberslist.php:280
2825	#: adminpages/memberslist.php:42 adminpages/memberslist.php:276

2826	msgid "Cancelled Members"
2827	msgstr ""
2828
2829	#: adminpages/memberslist.php:43 adminpages/memberslist.php:281
2830	#: adminpages/memberslist.php:43 adminpages/memberslist.php:277

2831	msgid "Expired Members"
2832	msgstr ""
2833
2834	#: adminpages/memberslist.php:44 adminpages/memberslist.php:282
2835	#: adminpages/memberslist.php:42 adminpages/memberslist.php:44
2836	- #: adminpages/memberslist.php:278
2837	msgid "Old Members"
2838	msgstr ""
2839
	@@ -2846,20 +2948,20 @@ msgstr ""
2846
2847	#: adminpages/memberslist.php:160 adminpages/memberslist.php:103
2848	#: adminpages/memberslist.php:136 adminpages/memberslist.php:146
2849	- #: adminpages/memberslist.php:156
2850	#, php-format
2851	msgid "%d members found."
2852	msgstr ""
2853
2854	#: adminpages/memberslist.php:170 adminpages/memberslist.php:113
2855	#: adminpages/memberslist.php:146 adminpages/memberslist.php:156
2856	- #: adminpages/memberslist.php:166
2857	msgid "First Name"
2858	msgstr ""
2859
2860	#: adminpages/memberslist.php:171 adminpages/memberslist.php:114
2861	#: adminpages/memberslist.php:147 adminpages/memberslist.php:157
2862	- #: adminpages/memberslist.php:167
2863	msgid "Last Name"
2864	msgstr ""
2865
	@@ -2867,37 +2969,41 @@ msgstr ""
2867	#: pages/confirmation.php:66 pages/invoice.php:49
2868	#: adminpages/memberslist.php:117 adminpages/memberslist.php:150
2869	#: adminpages/memberslist.php:160 adminpages/memberslist.php:170
2870	- #: ~~pages~~/~~account~~.php:90 pages/account.php:94 pages/~~billing~~.php:58
2871	- #: pages/billing.php:62 pages/billing.php:71 pages/billing.php:74
2872	- #: pages/billing.php:76 pages/billing.php:77 pages/billing.php:80
2873	- #: pages/billing.php:~~100~~ pages/billing.php:~~103~~ pages/billing.php:~~104~~
2874	- #: pages/billing.php:~~108~~ pages/~~checkout~~.php:~~226~~ pages/checkout.php:~~275~~
2875	- #: pages/checkout.php:~~283~~ pages/checkout.php:~~298~~ pages/checkout.php:~~300~~
2876	- #: pages/checkout.php:~~302~~ pages/checkout.php:~~311~~ pages/checkout.php:~~314~~
2877	- #: pages/checkout.php:~~317~~ pages/checkout.php:~~319~~ pages/checkout.php:~~321~~
2878	- #: pages/checkout.php:~~326~~ pages/checkout.php:~~329~~ pages/~~confirmation~~.php:59
2879	- #: pages/confirmation.php:61 pages/confirmation.php:66
2880	- #: pages/confirmation.php:67 pages/confirmation.php:~~69 pages/invoice.php:46~~
2881	- #: pages/invoice.php:48 pages/invoice.php:49

2882	msgid "Billing Address"
2883	msgstr ""
2884
2885	#: adminpages/memberslist.php:176 adminpages/memberslist.php:119
2886	#: adminpages/memberslist.php:152 adminpages/memberslist.php:162
2887	- #: adminpages/memberslist.php:172
2888	msgid "Fee"
2889	msgstr ""
2890
2891	#: adminpages/memberslist.php:181 adminpages/memberslist.php:157
2892	#: adminpages/memberslist.php:167 adminpages/memberslist.php:177

2893	msgid "Ended"
2894	msgstr ""
2895
2896	#: adminpages/memberslist.php:183 adminpages/memberslist.php:179

2897	msgid "Cancelled"
2898	msgstr ""
2899
2900	#: adminpages/memberslist.php:185 adminpages/memberslist.php:181

2901	msgid "Expired"
2902	msgstr ""
2903
	@@ -2905,24 +3011,28 @@ msgstr ""
2905	#: adminpages/memberslist.php:195 adminpages/memberslist.php:223
2906	#: adminpages/memberslist.php:251 adminpages/memberslist.php:261
2907	#: adminpages/memberslist.php:262 adminpages/memberslist.php:266
2908	- #: adminpages/memberslist.php:270 adminpages/~~reports/login~~.php:~~210~~
2909	- #: adminpages/reports/login.php:~~212~~ adminpages/reports/login.php:~~228~~
2910	- #: adminpages/reports/login.php:~~232~~ adminpages/reports/login.php:~~261~~

2911	msgid "Search all levels"
2912	msgstr ""
2913
2914	#: adminpages/memberslist.php:278 adminpages/memberslist.php:274

2915	msgid "You can also try searching:"
2916	msgstr ""
2917
2918	#: adminpages/memberslist.php:283 adminpages/reports/login.php:104
2919	- #: adminpages/memberslist.php:279 adminpages/~~reports/login~~.php:66
2920	- #: adminpages/reports/login.php:68 adminpages/reports/login.php:84
2921	- #: adminpages/reports/login.php:88 adminpages/reports/login.php:~~104~~

2922	msgid "All Users"
2923	msgstr ""
2924
2925	#: adminpages/memberslist.php:306 adminpages/memberslist.php:302

2926	#, php-format
2927	msgid ""
2928	"Optional: Capture additional member profile fields using the <a href=\"%s\" "
	@@ -2978,10 +3088,10 @@ msgstr ""
2978	msgid "Order"
2979	msgstr ""
2980
2981	- #: adminpages/orders.php:371 adminpages/orders.php:~~1346~~
2982	#: pages/confirmation.php:49 pages/invoice.php:24 adminpages/orders.php:371
2983	- #: adminpages/orders.php:~~1361~~ ~~pages~~/~~confirmation~~.php:43
2984	- #: pages/confirmation.php:49 pages/invoice.php:24
2985	msgid "Print"
2986	msgstr ""
2987
	@@ -2998,8 +3108,8 @@ msgstr ""
2998	#: adminpages/orders.php:270 adminpages/orders.php:342
2999	#: adminpages/orders.php:359 adminpages/orders.php:371
3000	#: adminpages/orders.php:390 adminpages/orders.php:401
3001	- #: adminpages/orders.php:413 adminpages/orders.php:~~421~~
3002	- #: adminpages/orders.php:431
3003	msgid "Randomly generated for you."
3004	msgstr ""
3005
	@@ -3007,8 +3117,8 @@ msgstr ""
3007	#: adminpages/orders.php:275 adminpages/orders.php:347
3008	#: adminpages/orders.php:364 adminpages/orders.php:376
3009	#: adminpages/orders.php:395 adminpages/orders.php:406
3010	- #: adminpages/orders.php:418 adminpages/orders.php:~~426~~
3011	- #: adminpages/orders.php:436
3012	msgid "User ID"
3013	msgstr ""
3014
	@@ -3016,8 +3126,8 @@ msgstr ""
3016	#: adminpages/orders.php:284 adminpages/orders.php:356
3017	#: adminpages/orders.php:376 adminpages/orders.php:385
3018	#: adminpages/orders.php:407 adminpages/orders.php:418
3019	- #: adminpages/orders.php:432 adminpages/orders.php:~~440~~
3020	- #: adminpages/orders.php:450
3021	msgid "Membership Level ID"
3022	msgstr ""
3023
	@@ -3025,8 +3135,8 @@ msgstr ""
3025	#: adminpages/orders.php:293 adminpages/orders.php:365
3026	#: adminpages/orders.php:389 adminpages/orders.php:394
3027	#: adminpages/orders.php:420 adminpages/orders.php:431
3028	- #: adminpages/orders.php:447 adminpages/orders.php:~~455~~
3029	- #: adminpages/orders.php:465 includes/privacy.php:245
3030	msgid "Billing Name"
3031	msgstr ""
3032
	@@ -3034,8 +3144,8 @@ msgstr ""
3034	#: adminpages/orders.php:301 adminpages/orders.php:373
3035	#: adminpages/orders.php:401 adminpages/orders.php:402
3036	#: adminpages/orders.php:432 adminpages/orders.php:443
3037	- #: adminpages/orders.php:461 adminpages/orders.php:~~469~~
3038	- #: adminpages/orders.php:479 includes/privacy.php:249
3039	msgid "Billing Street"
3040	msgstr ""
3041
	@@ -3044,8 +3154,8 @@ msgstr ""
3044	#: adminpages/orders.php:380 adminpages/orders.php:409
3045	#: adminpages/orders.php:412 adminpages/orders.php:443
3046	#: adminpages/orders.php:454 adminpages/orders.php:474
3047	- #: adminpages/orders.php:~~482~~ adminpages/orders.php:~~492 includes/privacy.php:253~~
3048	- #: includes/privacy.php:358
3049	msgid "Billing City"
3050	msgstr ""
3051
	@@ -3053,8 +3163,8 @@ msgstr ""
3053	#: adminpages/orders.php:315 adminpages/orders.php:387
3054	#: adminpages/orders.php:416 adminpages/orders.php:423
3055	#: adminpages/orders.php:454 adminpages/orders.php:465
3056	- #: adminpages/orders.php:487 adminpages/orders.php:~~495~~
3057	- #: adminpages/orders.php:505 includes/privacy.php:257
3058	msgid "Billing State"
3059	msgstr ""
3060
	@@ -3063,8 +3173,8 @@ msgstr ""
3063	#: adminpages/orders.php:394 adminpages/orders.php:423
3064	#: adminpages/orders.php:434 adminpages/orders.php:465
3065	#: adminpages/orders.php:476 adminpages/orders.php:500
3066	- #: adminpages/orders.php:~~508~~ adminpages/orders.php:~~518 includes/privacy.php:261~~
3067	- #: includes/privacy.php:360
3068	msgid "Billing Postal Code"
3069	msgstr ""
3070
	@@ -3073,8 +3183,8 @@ msgstr ""
3073	#: adminpages/orders.php:401 adminpages/orders.php:430
3074	#: adminpages/orders.php:445 adminpages/orders.php:476
3075	#: adminpages/orders.php:487 adminpages/orders.php:513
3076	- #: adminpages/orders.php:~~521~~ adminpages/orders.php:~~531 includes/privacy.php:265~~
3077	- #: includes/privacy.php:362
3078	msgid "Billing Country"
3079	msgstr ""
3080
	@@ -3082,8 +3192,8 @@ msgstr ""
3082	#: adminpages/orders.php:337 adminpages/orders.php:409
3083	#: adminpages/orders.php:438 adminpages/orders.php:457
3084	#: adminpages/orders.php:488 adminpages/orders.php:499
3085	- #: adminpages/orders.php:527 adminpages/orders.php:~~535~~
3086	- #: adminpages/orders.php:545 includes/privacy.php:269
3087	msgid "Billing Phone"
3088	msgstr ""
3089
	@@ -3095,7 +3205,8 @@ msgstr ""
3095	#: classes/gateways/class.pmprogateway_braintree.php:510
3096	#: classes/gateways/class.pmprogateway_stripe.php:586 pages/checkout.php:83
3097	#: pages/checkout.php:89 pages/checkout.php:426 pages/confirmation.php:58
3098	- #: pages/invoice.php:34 adminpages/orders.php:~~565~~ adminpages/orders.php:~~575~~

3099	#: adminpages/orders.php:1318 adminpages/orders.php:1363
3100	#: classes/class.pmproemail.php:216 classes/class.pmproemail.php:218
3101	#: classes/class.pmproemail.php:225 classes/class.pmproemail.php:227
	@@ -3140,6 +3251,7 @@ msgstr ""
3140	#: classes/gateways/class.pmprogateway_braintree.php:464
3141	#: classes/gateways/class.pmprogateway_braintree.php:489
3142	#: classes/gateways/class.pmprogateway_braintree.php:509

3143	#: classes/gateways/class.pmprogateway_braintree.php:515
3144	#: classes/gateways/class.pmprogateway_braintree.php:516
3145	#: classes/gateways/class.pmprogateway_stripe.php:495
	@@ -3154,6 +3266,7 @@ msgstr ""
3154	#: classes/gateways/class.pmprogateway_stripe.php:573
3155	#: classes/gateways/class.pmprogateway_stripe.php:578
3156	#: classes/gateways/class.pmprogateway_stripe.php:583

3157	#: classes/gateways/class.pmprogateway_stripe.php:611
3158	#: classes/gateways/class.pmprogateway_stripe.php:629
3159	#: classes/gateways/class.pmprogateway_stripe.php:638
	@@ -3178,16 +3291,17 @@ msgid "Discount Code"
3178	msgstr ""
3179
3180	#: adminpages/orders.php:575 classes/class.pmproemail.php:905
3181	- #: includes/init.php:193 includes/profile.php:48 adminpages/orders.php:~~576~~
3182	- #: adminpages/orders.php:~~586~~ ~~classes~~/~~class~~.~~pmproemail.~~php:~~868~~
3183	- #: classes/class.pmproemail.php:~~876~~ classes/class.pmproemail.php:~~877~~
3184	- #: classes/class.pmproemail.php:~~905~~ ~~includes~~/~~init~~.~~php:193 includes/init~~.php:~~229~~
3185	- #: includes/init.php:~~232~~ includes/init.php:~~233~~ includes/init.php:~~235~~
3186	- #: includes/init.php:~~237~~ includes/init.php:~~245~~ includes/init.php:~~253~~
3187	- #: includes/init.php:~~258~~ includes/init.php:~~259~~ includes/init.php:~~264~~
3188	- #: includes/init.php:~~265~~ includes/init.php:~~266~~ includes/init.php:~~280~~
3189	- #: includes/init.php:~~284~~ includes/~~profile~~.php:37 includes/~~profile~~.php:39
3190	- #: includes/profile.php:42 includes/profile.php:48

3191	msgid "None"
3192	msgstr ""
3193
	@@ -3195,8 +3309,8 @@ msgstr ""
3195	#: adminpages/orders.php:346 adminpages/orders.php:418
3196	#: adminpages/orders.php:447 adminpages/orders.php:470
3197	#: adminpages/orders.php:501 adminpages/orders.php:512
3198	- #: adminpages/orders.php:542 adminpages/orders.php:~~587~~
3199	- #: adminpages/orders.php:597 includes/privacy.php:273
3200	msgid "Sub Total"
3201	msgstr ""
3202
	@@ -3206,8 +3320,9 @@ msgstr ""
3206	#: adminpages/orders.php:354 adminpages/orders.php:426
3207	#: adminpages/orders.php:455 adminpages/orders.php:481
3208	#: adminpages/orders.php:512 adminpages/orders.php:523
3209	- #: adminpages/orders.php:555 adminpages/orders.php:~~600~~
3210	- #: adminpages/orders.php:~~610~~ adminpages/~~templates/~~orders~~-email~~.php:60

3211	#: adminpages/templates/orders-print.php:89 includes/privacy.php:277
3212	#: pages/confirmation.php:92 pages/invoice.php:74 pages/invoice.php:75
3213	#: pages/invoice.php:78 pages/invoice.php:80
	@@ -3218,8 +3333,8 @@ msgstr ""
3218	#: adminpages/orders.php:362 adminpages/orders.php:434
3219	#: adminpages/orders.php:463 adminpages/orders.php:492
3220	#: adminpages/orders.php:523 adminpages/orders.php:534
3221	- #: adminpages/orders.php:568 adminpages/orders.php:~~613~~
3222	- #: adminpages/orders.php:623 includes/privacy.php:281
3223	msgid "Coupon Amount"
3224	msgstr ""
3225
	@@ -3227,8 +3342,8 @@ msgstr ""
3227	#: adminpages/orders.php:375 adminpages/orders.php:447
3228	#: adminpages/orders.php:476 adminpages/orders.php:513
3229	#: adminpages/orders.php:544 adminpages/orders.php:555
3230	- #: adminpages/orders.php:593 adminpages/orders.php:~~638~~
3231	- #: adminpages/orders.php:648
3232	msgid "Should be subtotal + tax - couponamount."
3233	msgstr ""
3234
	@@ -3236,8 +3351,8 @@ msgstr ""
3236	#: adminpages/orders.php:380 adminpages/orders.php:452
3237	#: adminpages/orders.php:481 adminpages/orders.php:518
3238	#: adminpages/orders.php:549 adminpages/orders.php:560
3239	- #: adminpages/orders.php:598 adminpages/orders.php:~~643~~
3240	- #: adminpages/orders.php:653 includes/privacy.php:289
3241	msgid "Payment Type"
3242	msgstr ""
3243
	@@ -3245,8 +3360,8 @@ msgstr ""
3245	#: adminpages/orders.php:385 adminpages/orders.php:457
3246	#: adminpages/orders.php:486 adminpages/orders.php:528
3247	#: adminpages/orders.php:559 adminpages/orders.php:570
3248	- #: adminpages/orders.php:610 adminpages/orders.php:~~655~~
3249	- #: adminpages/orders.php:665
3250	msgid "e.g. PayPal Express, PayPal Standard,