s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) - Version 120601

Version Description

= v120601 = Maintenance release. Upgrade immediately.

Download this release

Release Info

Developer PriMoThemes
Plugin Icon 128x128 s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members)
Version 120601
Comparing to
See all releases

Code changes from version 120517 to 120601

includes/classes/paypal-utilities.inc.php CHANGED
@@ -361,8 +361,7 @@ if(!class_exists("c_ws_plugin__s2member_paypal_utilities"))
361
  * @param str $period Expects a numeric value.
362
  * @return bool|str A full singular description of the term *( i.e. `DAY|WEEK|BIWK|MONT|QTER|YEAR` )*, else false.
363
  *
364
- * @note Payflow® unfortunately does NOT support bi-monthly billing.
365
- * It DOES support semi-monthly billing, but that can be confusing for customers.
366
  */
367
  public static function paypal_payflow_term($term = FALSE, $period = FALSE)
368
  {
361
  * @param str $period Expects a numeric value.
362
  * @return bool|str A full singular description of the term *( i.e. `DAY|WEEK|BIWK|MONT|QTER|YEAR` )*, else false.
363
  *
364
+ * @note Payflow® unfortunately does NOT support daily and/or bi-monthly billing.
 
365
  */
366
  public static function paypal_payflow_term($term = FALSE, $period = FALSE)
367
  {
includes/classes/registrations.inc.php CHANGED
@@ -625,7 +625,7 @@ if (!class_exists ("c_ws_plugin__s2member_registrations"))
625
  $role = (!$role) ? get_option ("default_role") : $role; /* Otherwise default. */
626
  /**/
627
  $level = (string)@$_pmr["ws_plugin__s2member_custom_reg_field_s2member_level"];
628
- $level = (!$level && preg_match ("/^(administrator|editor|author|contributor)$/i", $role)) ? "4" : $level;
629
  $level = (!$level && preg_match ("/^s2member_level[1-9][0-9]*$/i", $role)) ? preg_replace ("/^s2member_level/", "", $role) : $level;
630
  $level = (!$level && preg_match ("/^subscriber$/i", $role)) ? "0" : $level;
631
  $level = (!$level) ? "0" : $level;
@@ -770,7 +770,7 @@ if (!class_exists ("c_ws_plugin__s2member_registrations"))
770
  $role = (!$role) ? get_option ("default_role") : $role; /* Otherwise default. */
771
  /**/
772
  $level = (string)@$_pmr["ws_plugin__s2member_custom_reg_field_s2member_level"];
773
- $level = (!$level && preg_match ("/^(administrator|editor|author|contributor)$/i", $role)) ? "4" : $level;
774
  $level = (!$level && preg_match ("/^s2member_level[1-9][0-9]*$/i", $role)) ? preg_replace ("/^s2member_level/", "", $role) : $level;
775
  $level = (!$level && preg_match ("/^subscriber$/i", $role)) ? "0" : $level;
776
  $level = (!$level) ? "0" : $level;
625
  $role = (!$role) ? get_option ("default_role") : $role; /* Otherwise default. */
626
  /**/
627
  $level = (string)@$_pmr["ws_plugin__s2member_custom_reg_field_s2member_level"];
628
+ $level = (!$level && preg_match ("/^(administrator|editor|author|contributor)$/i", $role)) ? $GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["levels"] : $level;
629
  $level = (!$level && preg_match ("/^s2member_level[1-9][0-9]*$/i", $role)) ? preg_replace ("/^s2member_level/", "", $role) : $level;
630
  $level = (!$level && preg_match ("/^subscriber$/i", $role)) ? "0" : $level;
631
  $level = (!$level) ? "0" : $level;
770
  $role = (!$role) ? get_option ("default_role") : $role; /* Otherwise default. */
771
  /**/
772
  $level = (string)@$_pmr["ws_plugin__s2member_custom_reg_field_s2member_level"];
773
+ $level = (!$level && preg_match ("/^(administrator|editor|author|contributor)$/i", $role)) ? $GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["levels"] : $level;
774
  $level = (!$level && preg_match ("/^s2member_level[1-9][0-9]*$/i", $role)) ? preg_replace ("/^s2member_level/", "", $role) : $level;
775
  $level = (!$level && preg_match ("/^subscriber$/i", $role)) ? "0" : $level;
776
  $level = (!$level) ? "0" : $level;
includes/translations/s2member.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the s2Member® Framework package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: s2Member® Framework 120514\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/___s2member\n"
7
- "POT-Creation-Date: 2012-05-17 23:20:25+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -1681,6 +1681,7 @@ msgstr ""
1681
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:8
1682
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:7
1683
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:8
 
1684
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:8
1685
  msgctxt "s2member-admin"
1686
  msgid "Weekly ( recurring charge, for ongoing access )"
@@ -1689,6 +1690,7 @@ msgstr ""
1689
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:9
1690
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:8
1691
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:9
 
1692
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:9
1693
  msgctxt "s2member-admin"
1694
  msgid "Bi-Weekly ( recurring charge, for ongoing access )"
@@ -1698,6 +1700,7 @@ msgstr ""
1698
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:9
1699
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:7
1700
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:10
 
1701
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:10
1702
  msgctxt "s2member-admin"
1703
  msgid "Monthly ( recurring charge, for ongoing access )"
@@ -1716,6 +1719,7 @@ msgstr ""
1716
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:11
1717
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:9
1718
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:12
 
1719
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:12
1720
  msgctxt "s2member-admin"
1721
  msgid "Quarterly ( recurring charge, for ongoing access )"
@@ -1724,6 +1728,7 @@ msgstr ""
1724
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:13
1725
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:12
1726
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:13
 
1727
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:13
1728
  msgctxt "s2member-admin"
1729
  msgid "Yearly ( recurring charge, for ongoing access )"
@@ -1731,6 +1736,7 @@ msgstr ""
1731
 
1732
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:19
1733
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:19
 
1734
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:19
1735
  msgctxt "s2member-admin"
1736
  msgid "One Time ( for 1 day access, non-recurring )"
@@ -1738,6 +1744,7 @@ msgstr ""
1738
 
1739
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:20
1740
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:20
 
1741
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:20
1742
  msgctxt "s2member-admin"
1743
  msgid "One Time ( for 2 day access, non-recurring )"
@@ -1745,6 +1752,7 @@ msgstr ""
1745
 
1746
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:21
1747
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:21
 
1748
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:21
1749
  msgctxt "s2member-admin"
1750
  msgid "One Time ( for 3 day access, non-recurring )"
@@ -1752,6 +1760,7 @@ msgstr ""
1752
 
1753
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:22
1754
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:22
 
1755
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:22
1756
  msgctxt "s2member-admin"
1757
  msgid "One Time ( for 4 day access, non-recurring )"
@@ -1759,6 +1768,7 @@ msgstr ""
1759
 
1760
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:23
1761
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:23
 
1762
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:23
1763
  msgctxt "s2member-admin"
1764
  msgid "One Time ( for 5 day access, non-recurring )"
@@ -1766,6 +1776,7 @@ msgstr ""
1766
 
1767
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:24
1768
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:24
 
1769
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:24
1770
  msgctxt "s2member-admin"
1771
  msgid "One Time ( for 6 day access, non-recurring )"
@@ -1774,6 +1785,7 @@ msgstr ""
1774
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:26
1775
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:18
1776
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:26
 
1777
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:26
1778
  msgctxt "s2member-admin"
1779
  msgid "One Time ( for 1 week access, non-recurring )"
@@ -1782,6 +1794,7 @@ msgstr ""
1782
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:27
1783
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:19
1784
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:27
 
1785
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:27
1786
  msgctxt "s2member-admin"
1787
  msgid "One Time ( for 2 week access, non-recurring )"
@@ -1790,6 +1803,7 @@ msgstr ""
1790
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:28
1791
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:20
1792
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:28
 
1793
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:28
1794
  msgctxt "s2member-admin"
1795
  msgid "One Time ( for 3 week access, non-recurring )"
@@ -1798,6 +1812,7 @@ msgstr ""
1798
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:30
1799
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:22
1800
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:30
 
1801
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:30
1802
  msgctxt "s2member-admin"
1803
  msgid "One Time ( for 1 month access, non-recurring )"
@@ -1806,6 +1821,7 @@ msgstr ""
1806
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:31
1807
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:23
1808
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:31
 
1809
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:31
1810
  msgctxt "s2member-admin"
1811
  msgid "One Time ( for 2 month access, non-recurring )"
@@ -1814,6 +1830,7 @@ msgstr ""
1814
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:32
1815
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:24
1816
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:32
 
1817
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:32
1818
  msgctxt "s2member-admin"
1819
  msgid "One Time ( for 3 month access, non-recurring )"
@@ -1822,6 +1839,7 @@ msgstr ""
1822
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:33
1823
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:25
1824
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:33
 
1825
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:33
1826
  msgctxt "s2member-admin"
1827
  msgid "One Time ( for 4 month access, non-recurring )"
@@ -1830,6 +1848,7 @@ msgstr ""
1830
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:34
1831
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:26
1832
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:34
 
1833
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:34
1834
  msgctxt "s2member-admin"
1835
  msgid "One Time ( for 5 month access, non-recurring )"
@@ -1838,6 +1857,7 @@ msgstr ""
1838
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:35
1839
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:27
1840
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:35
 
1841
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:35
1842
  msgctxt "s2member-admin"
1843
  msgid "One Time ( for 6 month access, non-recurring )"
@@ -1846,6 +1866,7 @@ msgstr ""
1846
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:37
1847
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:29
1848
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:37
 
1849
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:37
1850
  msgctxt "s2member-admin"
1851
  msgid "One Time ( for 1 year access, non-recurring )"
@@ -1854,6 +1875,7 @@ msgstr ""
1854
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:43
1855
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:35
1856
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:43
 
1857
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:43
1858
  msgctxt "s2member-admin"
1859
  msgid "One Time ( for 1 day access, non-recurring, no trial )"
@@ -1863,6 +1885,7 @@ msgstr ""
1863
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:36
1864
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:15
1865
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:44
 
1866
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:44
1867
  msgctxt "s2member-admin"
1868
  msgid "One Time ( for 2 day access, non-recurring, no trial )"
@@ -1872,6 +1895,7 @@ msgstr ""
1872
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:37
1873
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:16
1874
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:45
 
1875
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:45
1876
  msgctxt "s2member-admin"
1877
  msgid "One Time ( for 3 day access, non-recurring, no trial )"
@@ -1881,6 +1905,7 @@ msgstr ""
1881
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:38
1882
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:17
1883
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:46
 
1884
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:46
1885
  msgctxt "s2member-admin"
1886
  msgid "One Time ( for 4 day access, non-recurring, no trial )"
@@ -1890,6 +1915,7 @@ msgstr ""
1890
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:39
1891
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:18
1892
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:47
 
1893
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:47
1894
  msgctxt "s2member-admin"
1895
  msgid "One Time ( for 5 day access, non-recurring, no trial )"
@@ -1899,6 +1925,7 @@ msgstr ""
1899
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:40
1900
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:19
1901
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:48
 
1902
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:48
1903
  msgctxt "s2member-admin"
1904
  msgid "One Time ( for 6 day access, non-recurring, no trial )"
@@ -1908,6 +1935,7 @@ msgstr ""
1908
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:42
1909
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:21
1910
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:50
 
1911
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:50
1912
  msgctxt "s2member-admin"
1913
  msgid "One Time ( for 1 week access, non-recurring, no trial )"
@@ -1917,6 +1945,7 @@ msgstr ""
1917
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:43
1918
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:22
1919
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:51
 
1920
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:51
1921
  msgctxt "s2member-admin"
1922
  msgid "One Time ( for 2 week access, non-recurring, no trial )"
@@ -1926,6 +1955,7 @@ msgstr ""
1926
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:44
1927
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:23
1928
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:52
 
1929
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:52
1930
  msgctxt "s2member-admin"
1931
  msgid "One Time ( for 3 week access, non-recurring, no trial )"
@@ -1935,6 +1965,7 @@ msgstr ""
1935
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:46
1936
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:25
1937
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:54
 
1938
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:54
1939
  msgctxt "s2member-admin"
1940
  msgid "One Time ( for 1 month access, non-recurring, no trial )"
@@ -1944,6 +1975,7 @@ msgstr ""
1944
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:47
1945
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:26
1946
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:55
 
1947
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:55
1948
  msgctxt "s2member-admin"
1949
  msgid "One Time ( for 2 month access, non-recurring, no trial )"
@@ -1953,6 +1985,7 @@ msgstr ""
1953
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:48
1954
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:27
1955
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:56
 
1956
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:56
1957
  msgctxt "s2member-admin"
1958
  msgid "One Time ( for 3 month access, non-recurring, no trial )"
@@ -1962,6 +1995,7 @@ msgstr ""
1962
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:49
1963
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:28
1964
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:57
 
1965
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:57
1966
  msgctxt "s2member-admin"
1967
  msgid "One Time ( for 4 month access, non-recurring, no trial )"
@@ -1971,6 +2005,7 @@ msgstr ""
1971
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:50
1972
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:29
1973
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:58
 
1974
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:58
1975
  msgctxt "s2member-admin"
1976
  msgid "One Time ( for 5 month access, non-recurring, no trial )"
@@ -1980,6 +2015,7 @@ msgstr ""
1980
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:51
1981
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:30
1982
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:59
 
1983
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:59
1984
  msgctxt "s2member-admin"
1985
  msgid "One Time ( for 6 month access, non-recurring, no trial )"
@@ -1989,6 +2025,7 @@ msgstr ""
1989
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:53
1990
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:32
1991
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:61
 
1992
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:61
1993
  msgctxt "s2member-admin"
1994
  msgid "One Time ( for 1 year access, non-recurring, no trial )"
@@ -1997,6 +2034,7 @@ msgstr ""
1997
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:62
1998
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:54
1999
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:62
 
2000
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:62
2001
  msgctxt "s2member-admin"
2002
  msgid "One Time ( for 2 year access, non-recurring, no trial )"
@@ -2005,6 +2043,7 @@ msgstr ""
2005
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:63
2006
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:55
2007
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:63
 
2008
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:63
2009
  msgctxt "s2member-admin"
2010
  msgid "One Time ( for 3 year access, non-recurring, no trial )"
@@ -2013,6 +2052,7 @@ msgstr ""
2013
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:64
2014
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:56
2015
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:64
 
2016
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:64
2017
  msgctxt "s2member-admin"
2018
  msgid "One Time ( for 4 year access, non-recurring, no trial )"
@@ -2021,6 +2061,7 @@ msgstr ""
2021
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:65
2022
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:57
2023
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:65
 
2024
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:65
2025
  msgctxt "s2member-admin"
2026
  msgid "One Time ( for 5 year access, non-recurring, no trial )"
@@ -2029,6 +2070,7 @@ msgstr ""
2029
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:67
2030
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:59
2031
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:67
 
2032
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:67
2033
  msgctxt "s2member-admin"
2034
  msgid "One Time ( for lifetime access, non-recurring, no trial )"
@@ -3659,7 +3701,7 @@ msgstr ""
3659
 
3660
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:526
3661
  msgctxt "s2member-admin"
3662
- msgid "Invalid Payflow® form configuration. Invalid \"rt, rp, rr\" attributes. Payflow® supports a specific set of recurring intervals. Pro Forms can be configured to charge: daily, weekly, bi-weekly, monthly, quarterly, or yearly. Any other combination results in this error. This is a Payflow® limitation. Note that Payflow® does NOT support bi-monthly billing."
3663
  msgstr ""
3664
 
3665
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:583
@@ -4428,18 +4470,21 @@ msgctxt "s2member-admin"
4428
  msgid "Google® ( Subscriptions )"
4429
  msgstr ""
4430
 
4431
- #: s2member-pro/includes/templates/options/paypal-membership-ccap-terms.php:6
4432
- #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:42
4433
- msgctxt "s2member-admin"
4434
- msgid "PayPal® Pro ( Buy Now )"
4435
- msgstr ""
4436
-
4437
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:6
4438
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:18
4439
  msgctxt "s2member-admin"
4440
  msgid "PayPal® Pro ( Subscriptions )"
4441
  msgstr ""
4442
 
 
 
 
 
 
 
 
4443
  #: s2member-pro/includes/templates/shortcodes/authnet-cancellation-form-shortcode.php:6
4444
  #: s2member-pro/includes/templates/shortcodes/paypal-cancellation-form-shortcode.php:6
4445
  msgctxt "s2member-front"
2
  # This file is distributed under the same license as the s2Member® Framework package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: s2Member® Framework 120517\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/___s2member\n"
7
+ "POT-Creation-Date: 2012-06-01 15:20:42+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
1681
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:8
1682
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:7
1683
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:8
1684
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:7
1685
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:8
1686
  msgctxt "s2member-admin"
1687
  msgid "Weekly ( recurring charge, for ongoing access )"
1690
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:9
1691
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:8
1692
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:9
1693
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:8
1694
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:9
1695
  msgctxt "s2member-admin"
1696
  msgid "Bi-Weekly ( recurring charge, for ongoing access )"
1700
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:9
1701
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:7
1702
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:10
1703
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:9
1704
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:10
1705
  msgctxt "s2member-admin"
1706
  msgid "Monthly ( recurring charge, for ongoing access )"
1719
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:11
1720
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:9
1721
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:12
1722
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:10
1723
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:12
1724
  msgctxt "s2member-admin"
1725
  msgid "Quarterly ( recurring charge, for ongoing access )"
1728
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:13
1729
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:12
1730
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:13
1731
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:11
1732
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:13
1733
  msgctxt "s2member-admin"
1734
  msgid "Yearly ( recurring charge, for ongoing access )"
1736
 
1737
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:19
1738
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:19
1739
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:17
1740
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:19
1741
  msgctxt "s2member-admin"
1742
  msgid "One Time ( for 1 day access, non-recurring )"
1744
 
1745
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:20
1746
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:20
1747
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:18
1748
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:20
1749
  msgctxt "s2member-admin"
1750
  msgid "One Time ( for 2 day access, non-recurring )"
1752
 
1753
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:21
1754
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:21
1755
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:19
1756
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:21
1757
  msgctxt "s2member-admin"
1758
  msgid "One Time ( for 3 day access, non-recurring )"
1760
 
1761
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:22
1762
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:22
1763
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:20
1764
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:22
1765
  msgctxt "s2member-admin"
1766
  msgid "One Time ( for 4 day access, non-recurring )"
1768
 
1769
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:23
1770
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:23
1771
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:21
1772
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:23
1773
  msgctxt "s2member-admin"
1774
  msgid "One Time ( for 5 day access, non-recurring )"
1776
 
1777
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:24
1778
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:24
1779
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:22
1780
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:24
1781
  msgctxt "s2member-admin"
1782
  msgid "One Time ( for 6 day access, non-recurring )"
1785
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:26
1786
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:18
1787
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:26
1788
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:24
1789
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:26
1790
  msgctxt "s2member-admin"
1791
  msgid "One Time ( for 1 week access, non-recurring )"
1794
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:27
1795
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:19
1796
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:27
1797
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:25
1798
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:27
1799
  msgctxt "s2member-admin"
1800
  msgid "One Time ( for 2 week access, non-recurring )"
1803
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:28
1804
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:20
1805
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:28
1806
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:26
1807
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:28
1808
  msgctxt "s2member-admin"
1809
  msgid "One Time ( for 3 week access, non-recurring )"
1812
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:30
1813
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:22
1814
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:30
1815
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:28
1816
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:30
1817
  msgctxt "s2member-admin"
1818
  msgid "One Time ( for 1 month access, non-recurring )"
1821
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:31
1822
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:23
1823
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:31
1824
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:29
1825
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:31
1826
  msgctxt "s2member-admin"
1827
  msgid "One Time ( for 2 month access, non-recurring )"
1830
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:32
1831
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:24
1832
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:32
1833
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:30
1834
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:32
1835
  msgctxt "s2member-admin"
1836
  msgid "One Time ( for 3 month access, non-recurring )"
1839
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:33
1840
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:25
1841
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:33
1842
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:31
1843
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:33
1844
  msgctxt "s2member-admin"
1845
  msgid "One Time ( for 4 month access, non-recurring )"
1848
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:34
1849
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:26
1850
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:34
1851
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:32
1852
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:34
1853
  msgctxt "s2member-admin"
1854
  msgid "One Time ( for 5 month access, non-recurring )"
1857
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:35
1858
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:27
1859
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:35
1860
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:33
1861
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:35
1862
  msgctxt "s2member-admin"
1863
  msgid "One Time ( for 6 month access, non-recurring )"
1866
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:37
1867
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:29
1868
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:37
1869
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:35
1870
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:37
1871
  msgctxt "s2member-admin"
1872
  msgid "One Time ( for 1 year access, non-recurring )"
1875
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:43
1876
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:35
1877
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:43
1878
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:41
1879
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:43
1880
  msgctxt "s2member-admin"
1881
  msgid "One Time ( for 1 day access, non-recurring, no trial )"
1885
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:36
1886
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:15
1887
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:44
1888
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:42
1889
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:44
1890
  msgctxt "s2member-admin"
1891
  msgid "One Time ( for 2 day access, non-recurring, no trial )"
1895
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:37
1896
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:16
1897
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:45
1898
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:43
1899
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:45
1900
  msgctxt "s2member-admin"
1901
  msgid "One Time ( for 3 day access, non-recurring, no trial )"
1905
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:38
1906
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:17
1907
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:46
1908
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:44
1909
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:46
1910
  msgctxt "s2member-admin"
1911
  msgid "One Time ( for 4 day access, non-recurring, no trial )"
1915
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:39
1916
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:18
1917
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:47
1918
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:45
1919
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:47
1920
  msgctxt "s2member-admin"
1921
  msgid "One Time ( for 5 day access, non-recurring, no trial )"
1925
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:40
1926
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:19
1927
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:48
1928
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:46
1929
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:48
1930
  msgctxt "s2member-admin"
1931
  msgid "One Time ( for 6 day access, non-recurring, no trial )"
1935
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:42
1936
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:21
1937
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:50
1938
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:48
1939
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:50
1940
  msgctxt "s2member-admin"
1941
  msgid "One Time ( for 1 week access, non-recurring, no trial )"
1945
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:43
1946
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:22
1947
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:51
1948
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:49
1949
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:51
1950
  msgctxt "s2member-admin"
1951
  msgid "One Time ( for 2 week access, non-recurring, no trial )"
1955
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:44
1956
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:23
1957
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:52
1958
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:50
1959
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:52
1960
  msgctxt "s2member-admin"
1961
  msgid "One Time ( for 3 week access, non-recurring, no trial )"
1965
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:46
1966
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:25
1967
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:54
1968
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:52
1969
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:54
1970
  msgctxt "s2member-admin"
1971
  msgid "One Time ( for 1 month access, non-recurring, no trial )"
1975
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:47
1976
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:26
1977
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:55
1978
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:53
1979
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:55
1980
  msgctxt "s2member-admin"
1981
  msgid "One Time ( for 2 month access, non-recurring, no trial )"
1985
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:48
1986
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:27
1987
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:56
1988
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:54
1989
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:56
1990
  msgctxt "s2member-admin"
1991
  msgid "One Time ( for 3 month access, non-recurring, no trial )"
1995
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:49
1996
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:28
1997
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:57
1998
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:55
1999
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:57
2000
  msgctxt "s2member-admin"
2001
  msgid "One Time ( for 4 month access, non-recurring, no trial )"
2005
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:50
2006
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:29
2007
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:58
2008
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:56
2009
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:58
2010
  msgctxt "s2member-admin"
2011
  msgid "One Time ( for 5 month access, non-recurring, no trial )"
2015
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:51
2016
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:30
2017
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:59
2018
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:57
2019
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:59
2020
  msgctxt "s2member-admin"
2021
  msgid "One Time ( for 6 month access, non-recurring, no trial )"
2025
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:53
2026
  #: s2member-pro/includes/templates/options/ccbill-membership-regular-terms.php:32
2027
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:61
2028
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:59
2029
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:61
2030
  msgctxt "s2member-admin"
2031
  msgid "One Time ( for 1 year access, non-recurring, no trial )"
2034
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:62
2035
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:54
2036
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:62
2037
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:60
2038
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:62
2039
  msgctxt "s2member-admin"
2040
  msgid "One Time ( for 2 year access, non-recurring, no trial )"
2043
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:63
2044
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:55
2045
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:63
2046
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:61
2047
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:63
2048
  msgctxt "s2member-admin"
2049
  msgid "One Time ( for 3 year access, non-recurring, no trial )"
2052
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:64
2053
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:56
2054
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:64
2055
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:62
2056
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:64
2057
  msgctxt "s2member-admin"
2058
  msgid "One Time ( for 4 year access, non-recurring, no trial )"
2061
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:65
2062
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:57
2063
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:65
2064
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:63
2065
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:65
2066
  msgctxt "s2member-admin"
2067
  msgid "One Time ( for 5 year access, non-recurring, no trial )"
2070
  #: s2member/includes/templates/options/paypal-membership-regular-terms.php:67
2071
  #: s2member-pro/includes/templates/options/authnet-membership-regular-terms.php:59
2072
  #: s2member-pro/includes/templates/options/google-membership-regular-terms.php:67
2073
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:65
2074
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:67
2075
  msgctxt "s2member-admin"
2076
  msgid "One Time ( for lifetime access, non-recurring, no trial )"
3701
 
3702
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:526
3703
  msgctxt "s2member-admin"
3704
+ msgid "Invalid Payflow® form configuration. Invalid \"rt, rp, rr\" attributes. Payflow® supports a specific set of recurring intervals. Pro Forms can be configured to charge: weekly, bi-weekly, monthly, quarterly, or yearly. Any other combination results in this error. This is a Payflow® limitation. Note that Payflow® does NOT support daily and/or bi-monthly billing."
3705
  msgstr ""
3706
 
3707
  #: s2member-pro/includes/classes/gateways/paypal/paypal-responses.inc.php:583
4470
  msgid "Google® ( Subscriptions )"
4471
  msgstr ""
4472
 
4473
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:6
4474
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:16
 
 
 
 
4475
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:6
4476
  #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:18
4477
  msgctxt "s2member-admin"
4478
  msgid "PayPal® Pro ( Subscriptions )"
4479
  msgstr ""
4480
 
4481
+ #: s2member-pro/includes/templates/options/payflow-membership-regular-terms.php:40
4482
+ #: s2member-pro/includes/templates/options/paypal-membership-ccap-terms.php:6
4483
+ #: s2member-pro/includes/templates/options/paypal-membership-regular-terms.php:42
4484
+ msgctxt "s2member-admin"
4485
+ msgid "PayPal® Pro ( Buy Now )"
4486
+ msgstr ""
4487
+
4488
  #: s2member-pro/includes/templates/shortcodes/authnet-cancellation-form-shortcode.php:6
4489
  #: s2member-pro/includes/templates/shortcodes/paypal-cancellation-form-shortcode.php:6
4490
  msgctxt "s2member-front"
readme.txt CHANGED
@@ -1,7 +1,7 @@
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
- Version: 120517
4
- Stable tag: 120517
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
@@ -85,11 +85,16 @@ Please see [this FAQ entry](http://www.s2member.com/faqs/#s2-faqs-translations)
85
 
86
  == Upgrade Notice ==
87
 
88
- = v120514 =
89
  Maintenance release. Upgrade immediately.
90
 
91
  == Changelog ==
92
 
 
 
 
 
 
93
  = v120517 =
94
  * **(Maintenance Release) Upgrade immediately.**
95
  * (s2Member Pro) **PayPal® Pro Forms**. This release removes all limitations on the maximum length of an initial trial/period. It is now possible to offer any number of days/weeks/months/years for free, or at a different initial rate.
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
+ Version: 120601
4
+ Stable tag: 120601
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
85
 
86
  == Upgrade Notice ==
87
 
88
+ = v120601 =
89
  Maintenance release. Upgrade immediately.
90
 
91
  == Changelog ==
92
 
93
+ = v120601 =
94
+ * **(Maintenance Release) Upgrade immediately.**
95
+ * (s2Member Pro) **ClickBank® Button Shortcodes**. This release works around a bug that has been discovered on the ClickBank® side of things, when a `+` character appears in the `desc=""` attribute of your ClickBank® Button Shortcode. Resolved in this release. Please see [this thread](http://www.s2member.com/forums/topic/clickbank-output-url/#post-15166) for further details.
96
+ * (s2Member Pro) **Payflow® Daily Recurrence (Limitation)**. PayPal® Pro accounts with the Payflow® Edition API, are NOT capable of charging on a `daily` recurring basis. Previous releases of s2Member® Pro mistakenly documented this as being possible. Resolved in this release. PayPal® Pro accounts operating with the Payflow® Edition (and integrated with s2Member®), are only capable of charging recurring fees on the following schedules: `weekly, bi-weekly, monthly, quarterly, or yearly`. This is in large part, a limitation in the Payflow® API, which we hope will be resolved by PayPal® in a future version. Please feel free to contact PayPal® if you'd like to vote for this feature! This limitation does NOT affect existing PayPal® Pro accounts operating exclusively under the PayPal® Pro API (e.g. without Payflow®).
97
+ * (s2Member Pro) **New ccBill® Shortcodes**. s2Member® Pro now includes two new Shortcode Attributes for ccBill® payment button integrations. These include: `sub_account` and `form`. Making it possible to integrate a single installation of s2Member® Pro with multiple ccBill® sub-accounts, and/or multiple ccBill® forms (as they exist in your ccBill® account). For further details, please read the Shortcode documentation, found in your Dashboard under: `s2Member® -> ccBill® Buttons -> Shortcode Attributes (Explained)`.
98
  = v120517 =
99
  * **(Maintenance Release) Upgrade immediately.**
100
  * (s2Member Pro) **PayPal® Pro Forms**. This release removes all limitations on the maximum length of an initial trial/period. It is now possible to offer any number of days/weeks/months/years for free, or at a different initial rate.
s2member.php CHANGED
@@ -19,8 +19,8 @@
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
- Version: 120517
23
- Stable tag: 120517
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
@@ -75,7 +75,7 @@ if(realpath(__FILE__) === realpath($_SERVER["SCRIPT_FILENAME"]))
75
  * @var str
76
  */
77
  if(!defined("WS_PLUGIN__S2MEMBER_VERSION"))
78
- define("WS_PLUGIN__S2MEMBER_VERSION", "120517" /* !#distro-version#! */);
79
  /**
80
  * Minimum PHP version required to run s2Member.
81
  *
@@ -105,7 +105,7 @@ if(!defined("WS_PLUGIN__S2MEMBER_MIN_WP_VERSION"))
105
  * @var str
106
  */
107
  if(!defined("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION"))
108
- define("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION", "120517" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
+ Version: 120601
23
+ Stable tag: 120601
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
75
  * @var str
76
  */
77
  if(!defined("WS_PLUGIN__S2MEMBER_VERSION"))
78
+ define("WS_PLUGIN__S2MEMBER_VERSION", "120601" /* !#distro-version#! */);
79
  /**
80
  * Minimum PHP version required to run s2Member.
81
  *
105
  * @var str
106
  */
107
  if(!defined("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION"))
108
+ define("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION", "120601" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.