diff --git a/languages/paid-memberships-pro-ca.mo b/languages/paid-memberships-pro-ca.mo
index bb38e8546..bdd550e17 100644
Binary files a/languages/paid-memberships-pro-ca.mo and b/languages/paid-memberships-pro-ca.mo differ
diff --git a/languages/paid-memberships-pro-ca.po b/languages/paid-memberships-pro-ca.po
index bc6f7a427..7af4f24aa 100644
--- a/languages/paid-memberships-pro-ca.po
+++ b/languages/paid-memberships-pro-ca.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:31+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:25+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -866,6 +866,7 @@ msgstr "Passarela de pagament (Payment Gateway) &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Correu electrònic"
 
@@ -1622,6 +1623,7 @@ msgstr "Seleccionat"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Desa la configuració"
 
@@ -3714,6 +3716,7 @@ msgstr "Salva nivell"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -3843,6 +3846,8 @@ msgstr "Arrossega i deixa anar els nivells de subscripció per a reordenar-los a
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Data final (d’expiració)"
 
@@ -4322,6 +4327,7 @@ msgstr "Cognoms"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Adreça de Facturació"
 
@@ -5953,6 +5959,7 @@ msgstr "Usuari"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Nivell de subscripció"
 
@@ -6042,6 +6049,7 @@ msgstr "IDs de transacció"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "esborrat"
 
@@ -6788,6 +6796,7 @@ msgstr "Escull una passarel·la"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Configuració de moneda i impostos"
 
@@ -6802,6 +6811,7 @@ msgstr "Configuració de moneda i impostos"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moneda"
 
@@ -6813,6 +6823,7 @@ msgstr "Moneda"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "No totes les monedes es poden usar a totes les passarel·les. Si us plau comprova la teva passarel·la."
 
@@ -6838,6 +6849,7 @@ msgstr "Tipus de tarjetes de crèdit acceptades."
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Impost a la venta"
 
@@ -6859,6 +6871,7 @@ msgstr "Impost a la venta"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -6872,6 +6885,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Estat/país de la taxa"
 
@@ -6885,6 +6899,7 @@ msgstr "Estat/país de la taxa"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviació, per exemple “PA”"
 
@@ -6894,6 +6909,7 @@ msgstr "abreviació, per exemple “PA”"
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Tarifa de l’impost"
 
@@ -6907,6 +6923,7 @@ msgstr "Tarifa de l’impost"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, per exemple \"0.06\""
 
@@ -7914,6 +7931,7 @@ msgstr "Confirmació per a la seva subscripció %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Codi de descompte"
 
@@ -8668,6 +8686,7 @@ msgstr "Per integrar totalment Braintree, assegura’t de configurar Web Hook UR
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informació de pagament"
 
@@ -8754,6 +8773,7 @@ msgstr "Acceptem %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Nombre de Tarjeta"
 
@@ -8871,6 +8891,7 @@ msgstr "què és això?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplica"
 
@@ -9149,6 +9170,7 @@ msgstr "Venedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Clau"
 
@@ -9367,6 +9389,7 @@ msgstr "Aquesta URL passa a PayPal per a tots els nous càrrecs i subscripcions.
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Check Out amb PayPal"
 
@@ -9406,6 +9429,7 @@ msgstr "Check Out amb PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Envia i fés el Check Out"
 
@@ -9451,6 +9475,7 @@ msgstr "Envia i fés el Check Out"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Envia i confirma"
 
@@ -11633,6 +11658,7 @@ msgstr "Si us plau especifica un ID de Nivell"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Cap"
 
@@ -12014,6 +12040,8 @@ msgstr "logout"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivell"
 
@@ -12107,6 +12135,7 @@ msgstr "El pagament de la teva subscripció és gestionat per PayPal. Si us plau
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nom"
 
@@ -12147,6 +12176,7 @@ msgstr "Nom"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Cognoms"
 
@@ -12172,6 +12202,7 @@ msgstr "Cognoms"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adreça 1"
 
@@ -12197,6 +12228,7 @@ msgstr "Adreça 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adreça 2"
 
@@ -12222,6 +12254,7 @@ msgstr "Adreça 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ciutat"
 
@@ -12247,6 +12280,7 @@ msgstr "Ciutat"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "State/província"
 
@@ -12272,6 +12306,7 @@ msgstr "State/província"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Codi Postal"
 
@@ -12322,6 +12357,7 @@ msgstr "Ciutat, CP"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -12348,6 +12384,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telèfon"
 
@@ -12385,6 +12422,8 @@ msgstr "Telèfon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Correu electrònic"
 
@@ -12410,6 +12449,7 @@ msgstr "Correu electrònic"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirma Correu electrònic"
 
@@ -12463,8 +12503,11 @@ msgstr "Aquesta subscripció no és recurrent. Per tant, no necessites actualitz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Estàs segur que vols cancel·lar la teva subscripció?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12502,6 +12545,7 @@ msgstr "No, conserva el meu compte"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Les meves subscripcions"
 
@@ -12512,6 +12556,7 @@ msgstr "Les meves subscripcions"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Cancel·la totes les subscripcions"
 
@@ -12640,6 +12685,7 @@ msgstr "Informació del compte"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Ja tens un compte?"
 
@@ -12656,6 +12702,7 @@ msgstr "Ja tens un compte?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Log in aquí"
 
@@ -12675,6 +12722,7 @@ msgstr "Log in aquí"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirma Clau"
 
@@ -12689,6 +12737,7 @@ msgstr "Confirma Clau"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirma correu electrònic"
 
@@ -12704,6 +12753,7 @@ msgstr "Confirma correu electrònic"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -12719,6 +12769,7 @@ msgstr "Nom complet"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEIXA AIXÒ EN BLANC"
 
@@ -12734,6 +12785,7 @@ msgstr "DEIXA AIXÒ EN BLANC"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Estàs logged in com a <strong>%s</strong>.Si vols utilitzar un compte diferent per a aquesta subscripció, <a href=\"%s\">log out now</a>."
@@ -12750,6 +12802,7 @@ msgstr "Estàs logged in com a <strong>%s</strong>.Si vols utilitzar un compte d
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Escull el mètode de pagament"
 
@@ -12766,6 +12819,7 @@ msgstr "Escull el mètode de pagament"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Check Out amb tarjeta de crèdit aquí"
 
@@ -12823,6 +12877,7 @@ msgstr "Completa pagament"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Processant…"
 
@@ -12906,6 +12961,7 @@ msgstr "Factura #%s a %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimeix"
 
@@ -13068,6 +13124,8 @@ msgstr "Pendent"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Mira el teu compte de subscripció &rarr;"
 
@@ -15545,6 +15603,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -16274,6 +16333,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -16940,6 +17000,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21622,6 +21684,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21770,6 +21833,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21779,6 +21843,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21798,6 +21863,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21821,6 +21887,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21840,6 +21907,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21850,6 +21918,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21859,6 +21928,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21868,6 +21938,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21880,6 +21951,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21897,6 +21969,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21921,6 +21994,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21943,6 +22017,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -22188,6 +22263,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -22254,6 +22330,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22460,6 +22537,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22569,7 +22649,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22578,7 +22660,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22597,6 +22681,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24401,6 +24486,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24418,6 +24505,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24431,6 +24520,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24444,6 +24534,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24562,6 +24653,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24786,6 +24878,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -25030,6 +25123,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28449,6 +28543,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -29045,6 +29140,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30935,6 +31031,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31914,6 +32011,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -32252,6 +32350,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32927,10 +33026,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32952,6 +33056,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32969,6 +33074,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32977,6 +33083,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -33064,3 +33171,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-ca_AD.mo b/languages/paid-memberships-pro-ca_AD.mo
index fcee37232..89d99b55a 100644
Binary files a/languages/paid-memberships-pro-ca_AD.mo and b/languages/paid-memberships-pro-ca_AD.mo differ
diff --git a/languages/paid-memberships-pro-ca_AD.po b/languages/paid-memberships-pro-ca_AD.po
index 6894d96d0..b3c6b7247 100644
--- a/languages/paid-memberships-pro-ca_AD.po
+++ b/languages/paid-memberships-pro-ca_AD.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:33+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:27+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -866,6 +866,7 @@ msgstr "Passarela de pagament (Payment Gateway) &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Correu electrònic"
 
@@ -1622,6 +1623,7 @@ msgstr "Seleccionat"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Desa la configuració"
 
@@ -3714,6 +3716,7 @@ msgstr "Salva nivell"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -3843,6 +3846,8 @@ msgstr "Arrossega i deixa anar els nivells de subscripció per a reordenar-los a
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Data final (d’expiració)"
 
@@ -4322,6 +4327,7 @@ msgstr "Cognoms"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Adreça de Facturació"
 
@@ -5953,6 +5959,7 @@ msgstr "Usuari"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Nivell de subscripció"
 
@@ -6042,6 +6049,7 @@ msgstr "IDs de transacció"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "esborrat"
 
@@ -6788,6 +6796,7 @@ msgstr "Escull una passarel·la"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Configuració de moneda i impostos"
 
@@ -6802,6 +6811,7 @@ msgstr "Configuració de moneda i impostos"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moneda"
 
@@ -6813,6 +6823,7 @@ msgstr "Moneda"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "No totes les monedes es poden usar a totes les passarel·les. Si us plau comprova la teva passarel·la."
 
@@ -6838,6 +6849,7 @@ msgstr "Tipus de tarjetes de crèdit acceptades."
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Impost a la venta"
 
@@ -6859,6 +6871,7 @@ msgstr "Impost a la venta"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -6872,6 +6885,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Estat/país de la taxa"
 
@@ -6885,6 +6899,7 @@ msgstr "Estat/país de la taxa"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviació, per exemple “PA”"
 
@@ -6894,6 +6909,7 @@ msgstr "abreviació, per exemple “PA”"
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Tarifa de l’impost"
 
@@ -6907,6 +6923,7 @@ msgstr "Tarifa de l’impost"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, per exemple \"0.06\""
 
@@ -7914,6 +7931,7 @@ msgstr "Confirmació per a la seva subscripció %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Codi de descompte"
 
@@ -8668,6 +8686,7 @@ msgstr "Per integrar totalment Braintree, assegura’t de configurar Web Hook UR
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informació de pagament"
 
@@ -8754,6 +8773,7 @@ msgstr "Acceptem %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Nombre de Tarjeta"
 
@@ -8871,6 +8891,7 @@ msgstr "què és això?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplica"
 
@@ -9149,6 +9170,7 @@ msgstr "Venedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Clau"
 
@@ -9367,6 +9389,7 @@ msgstr "Aquesta URL passa a PayPal per a tots els nous càrrecs i subscripcions.
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Check Out amb PayPal"
 
@@ -9406,6 +9429,7 @@ msgstr "Check Out amb PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Envia i fés el Check Out"
 
@@ -9451,6 +9475,7 @@ msgstr "Envia i fés el Check Out"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Envia i confirma"
 
@@ -11633,6 +11658,7 @@ msgstr "Si us plau especifica un ID de Nivell"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Cap"
 
@@ -12014,6 +12040,8 @@ msgstr "logout"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivell"
 
@@ -12107,6 +12135,7 @@ msgstr "El pagament de la teva subscripció és gestionat per PayPal. Si us plau
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nom"
 
@@ -12147,6 +12176,7 @@ msgstr "Nom"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Cognoms"
 
@@ -12172,6 +12202,7 @@ msgstr "Cognoms"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adreça 1"
 
@@ -12197,6 +12228,7 @@ msgstr "Adreça 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adreça 2"
 
@@ -12222,6 +12254,7 @@ msgstr "Adreça 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ciutat"
 
@@ -12247,6 +12280,7 @@ msgstr "Ciutat"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "State/província"
 
@@ -12272,6 +12306,7 @@ msgstr "State/província"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Codi Postal"
 
@@ -12322,6 +12357,7 @@ msgstr "Ciutat, CP"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -12348,6 +12384,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telèfon"
 
@@ -12385,6 +12422,8 @@ msgstr "Telèfon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Correu electrònic"
 
@@ -12410,6 +12449,7 @@ msgstr "Correu electrònic"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirma Correu electrònic"
 
@@ -12463,8 +12503,11 @@ msgstr "Aquesta subscripció no és recurrent. Per tant, no necessites actualitz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Estàs segur que vols cancel·lar la teva subscripció?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12502,6 +12545,7 @@ msgstr "No, conserva el meu compte"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Les meves subscripcions"
 
@@ -12512,6 +12556,7 @@ msgstr "Les meves subscripcions"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Cancel·la totes les subscripcions"
 
@@ -12640,6 +12685,7 @@ msgstr "Informació del compte"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Ja tens un compte?"
 
@@ -12656,6 +12702,7 @@ msgstr "Ja tens un compte?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Log in aquí"
 
@@ -12675,6 +12722,7 @@ msgstr "Log in aquí"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirma Clau"
 
@@ -12689,6 +12737,7 @@ msgstr "Confirma Clau"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirma correu electrònic"
 
@@ -12704,6 +12753,7 @@ msgstr "Confirma correu electrònic"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -12719,6 +12769,7 @@ msgstr "Nom complet"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEIXA AIXÒ EN BLANC"
 
@@ -12734,6 +12785,7 @@ msgstr "DEIXA AIXÒ EN BLANC"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Estàs logged in com a <strong>%s</strong>.Si vols utilitzar un compte diferent per a aquesta subscripció, <a href=\"%s\">log out now</a>."
@@ -12750,6 +12802,7 @@ msgstr "Estàs logged in com a <strong>%s</strong>.Si vols utilitzar un compte d
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Escull el mètode de pagament"
 
@@ -12766,6 +12819,7 @@ msgstr "Escull el mètode de pagament"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Check Out amb tarjeta de crèdit aquí"
 
@@ -12823,6 +12877,7 @@ msgstr "Completa pagament"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Processant…"
 
@@ -12906,6 +12961,7 @@ msgstr "Factura #%s a %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimeix"
 
@@ -13068,6 +13124,8 @@ msgstr "Pendent"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Mira el teu compte de subscripció &rarr;"
 
@@ -15545,6 +15603,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -16274,6 +16333,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -16940,6 +17000,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21622,6 +21684,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21770,6 +21833,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21779,6 +21843,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21798,6 +21863,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21821,6 +21887,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21840,6 +21907,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21850,6 +21918,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21859,6 +21928,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21868,6 +21938,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21880,6 +21951,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21897,6 +21969,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21921,6 +21994,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21943,6 +22017,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -22188,6 +22263,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -22254,6 +22330,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22460,6 +22537,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22569,7 +22649,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22578,7 +22660,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22597,6 +22681,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24401,6 +24486,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24418,6 +24505,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24431,6 +24520,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24444,6 +24534,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24562,6 +24653,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24786,6 +24878,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -25030,6 +25123,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28449,6 +28543,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -29045,6 +29140,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30935,6 +31031,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31914,6 +32011,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -32252,6 +32350,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32927,10 +33026,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32952,6 +33056,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32969,6 +33074,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32977,6 +33083,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -33064,3 +33171,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-ca_ES.mo b/languages/paid-memberships-pro-ca_ES.mo
index 1cb94e2c1..d114a6c15 100644
Binary files a/languages/paid-memberships-pro-ca_ES.mo and b/languages/paid-memberships-pro-ca_ES.mo differ
diff --git a/languages/paid-memberships-pro-ca_ES.po b/languages/paid-memberships-pro-ca_ES.po
index 83dbff7a1..ab319a8f3 100644
--- a/languages/paid-memberships-pro-ca_ES.po
+++ b/languages/paid-memberships-pro-ca_ES.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:35+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:29+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -866,6 +866,7 @@ msgstr "Passarela de pagament (Payment Gateway) &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Correu electrònic"
 
@@ -1622,6 +1623,7 @@ msgstr "Seleccionat"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Desa la configuració"
 
@@ -3714,6 +3716,7 @@ msgstr "Salva nivell"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -3843,6 +3846,8 @@ msgstr "Arrossega i deixa anar els nivells de subscripció per a reordenar-los a
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Data final (d’expiració)"
 
@@ -4322,6 +4327,7 @@ msgstr "Cognoms"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Adreça de Facturació"
 
@@ -5953,6 +5959,7 @@ msgstr "Usuari"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Nivell de subscripció"
 
@@ -6042,6 +6049,7 @@ msgstr "IDs de transacció"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "esborrat"
 
@@ -6788,6 +6796,7 @@ msgstr "Escull una passarel·la"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Configuració de moneda i impostos"
 
@@ -6802,6 +6811,7 @@ msgstr "Configuració de moneda i impostos"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moneda"
 
@@ -6813,6 +6823,7 @@ msgstr "Moneda"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "No totes les monedes es poden usar a totes les passarel·les. Si us plau comprova la teva passarel·la."
 
@@ -6838,6 +6849,7 @@ msgstr "Tipus de tarjetes de crèdit acceptades."
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Impost a la venta"
 
@@ -6859,6 +6871,7 @@ msgstr "Impost a la venta"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -6872,6 +6885,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Estat/país de la taxa"
 
@@ -6885,6 +6899,7 @@ msgstr "Estat/país de la taxa"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviació, per exemple “PA”"
 
@@ -6894,6 +6909,7 @@ msgstr "abreviació, per exemple “PA”"
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Tarifa de l’impost"
 
@@ -6907,6 +6923,7 @@ msgstr "Tarifa de l’impost"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, per exemple \"0.06\""
 
@@ -7914,6 +7931,7 @@ msgstr "Confirmació per a la seva subscripció %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Codi de descompte"
 
@@ -8668,6 +8686,7 @@ msgstr "Per integrar totalment Braintree, assegura’t de configurar Web Hook UR
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informació de pagament"
 
@@ -8754,6 +8773,7 @@ msgstr "Acceptem %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Nombre de Tarjeta"
 
@@ -8871,6 +8891,7 @@ msgstr "què és això?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplica"
 
@@ -9149,6 +9170,7 @@ msgstr "Venedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Clau"
 
@@ -9367,6 +9389,7 @@ msgstr "Aquesta URL passa a PayPal per a tots els nous càrrecs i subscripcions.
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Check Out amb PayPal"
 
@@ -9406,6 +9429,7 @@ msgstr "Check Out amb PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Envia i fés el Check Out"
 
@@ -9451,6 +9475,7 @@ msgstr "Envia i fés el Check Out"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Envia i confirma"
 
@@ -11633,6 +11658,7 @@ msgstr "Si us plau especifica un ID de Nivell"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Cap"
 
@@ -12014,6 +12040,8 @@ msgstr "logout"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivell"
 
@@ -12107,6 +12135,7 @@ msgstr "El pagament de la teva subscripció és gestionat per PayPal. Si us plau
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nom"
 
@@ -12147,6 +12176,7 @@ msgstr "Nom"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Cognoms"
 
@@ -12172,6 +12202,7 @@ msgstr "Cognoms"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adreça 1"
 
@@ -12197,6 +12228,7 @@ msgstr "Adreça 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adreça 2"
 
@@ -12222,6 +12254,7 @@ msgstr "Adreça 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ciutat"
 
@@ -12247,6 +12280,7 @@ msgstr "Ciutat"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "State/província"
 
@@ -12272,6 +12306,7 @@ msgstr "State/província"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Codi Postal"
 
@@ -12322,6 +12357,7 @@ msgstr "Ciutat, CP"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -12348,6 +12384,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telèfon"
 
@@ -12385,6 +12422,8 @@ msgstr "Telèfon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Correu electrònic"
 
@@ -12410,6 +12449,7 @@ msgstr "Correu electrònic"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirma Correu electrònic"
 
@@ -12463,8 +12503,11 @@ msgstr "Aquesta subscripció no és recurrent. Per tant, no necessites actualitz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Estàs segur que vols cancel·lar la teva subscripció?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12502,6 +12545,7 @@ msgstr "No, conserva el meu compte"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Les meves subscripcions"
 
@@ -12512,6 +12556,7 @@ msgstr "Les meves subscripcions"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Cancel·la totes les subscripcions"
 
@@ -12640,6 +12685,7 @@ msgstr "Informació del compte"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Ja tens un compte?"
 
@@ -12656,6 +12702,7 @@ msgstr "Ja tens un compte?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Log in aquí"
 
@@ -12675,6 +12722,7 @@ msgstr "Log in aquí"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirma Clau"
 
@@ -12689,6 +12737,7 @@ msgstr "Confirma Clau"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirma correu electrònic"
 
@@ -12704,6 +12753,7 @@ msgstr "Confirma correu electrònic"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -12719,6 +12769,7 @@ msgstr "Nom complet"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEIXA AIXÒ EN BLANC"
 
@@ -12734,6 +12785,7 @@ msgstr "DEIXA AIXÒ EN BLANC"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Estàs logged in com a <strong>%s</strong>.Si vols utilitzar un compte diferent per a aquesta subscripció, <a href=\"%s\">log out now</a>."
@@ -12750,6 +12802,7 @@ msgstr "Estàs logged in com a <strong>%s</strong>.Si vols utilitzar un compte d
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Escull el mètode de pagament"
 
@@ -12766,6 +12819,7 @@ msgstr "Escull el mètode de pagament"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Check Out amb tarjeta de crèdit aquí"
 
@@ -12823,6 +12877,7 @@ msgstr "Completa pagament"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Processant…"
 
@@ -12906,6 +12961,7 @@ msgstr "Factura #%s a %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimeix"
 
@@ -13068,6 +13124,8 @@ msgstr "Pendent"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Mira el teu compte de subscripció &rarr;"
 
@@ -15545,6 +15603,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -16274,6 +16333,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -16940,6 +17000,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21622,6 +21684,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21770,6 +21833,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21779,6 +21843,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21798,6 +21863,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21821,6 +21887,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21840,6 +21907,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21850,6 +21918,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21859,6 +21928,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21868,6 +21938,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21880,6 +21951,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21897,6 +21969,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21921,6 +21994,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21943,6 +22017,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -22188,6 +22263,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -22254,6 +22330,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22460,6 +22537,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22569,7 +22649,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22578,7 +22660,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22597,6 +22681,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24401,6 +24486,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24418,6 +24505,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24431,6 +24520,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24444,6 +24534,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24562,6 +24653,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24786,6 +24878,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -25030,6 +25123,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28449,6 +28543,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -29045,6 +29140,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30935,6 +31031,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31914,6 +32011,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -32252,6 +32350,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32927,10 +33026,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32952,6 +33056,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32969,6 +33074,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32977,6 +33083,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -33064,3 +33171,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-cs_CZ.mo b/languages/paid-memberships-pro-cs_CZ.mo
index dfc3d26a3..c0e0aaea4 100644
Binary files a/languages/paid-memberships-pro-cs_CZ.mo and b/languages/paid-memberships-pro-cs_CZ.mo differ
diff --git a/languages/paid-memberships-pro-cs_CZ.po b/languages/paid-memberships-pro-cs_CZ.po
index 639f977be..b8294793f 100644
--- a/languages/paid-memberships-pro-cs_CZ.po
+++ b/languages/paid-memberships-pro-cs_CZ.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:37+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:31+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -333,6 +333,7 @@ msgstr "Platební brána &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-mail"
 
@@ -1093,6 +1094,7 @@ msgstr "vybráno"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Uložit nastavení"
 
@@ -3011,6 +3013,8 @@ msgstr "Najít úrovně"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Vypršení"
 
@@ -3441,6 +3445,7 @@ msgstr "Příjmení"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Fakturační adresa"
 
@@ -4625,6 +4630,7 @@ msgstr "Uložit objednávku"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -4980,6 +4986,7 @@ msgstr "Uživatel"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Úroveň členství"
 
@@ -5058,6 +5065,7 @@ msgstr "ID transakce"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "smazáno"
 
@@ -5618,6 +5626,7 @@ msgstr "Více informací o <a title=\"Paid Memberships Pro - nastavení SSL\" ta
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Měna"
 
@@ -5629,6 +5638,7 @@ msgstr "Měna"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Ne všechny měny jsou podporovány každou platební branou. Prosíme, zkontrolujte si to u své platební brány."
 
@@ -5654,6 +5664,7 @@ msgstr "Akceptujeme tyto platební karty"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Daň z obratu"
 
@@ -5674,6 +5685,7 @@ msgstr "Daň z obratu"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "volitelné"
 
@@ -5687,6 +5699,7 @@ msgstr "volitelné"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Stát daně"
 
@@ -5700,6 +5713,7 @@ msgstr "Stát daně"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "zkratka, např. \"PA\""
 
@@ -5713,6 +5727,7 @@ msgstr "zkratka, např. \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "desetinný, např. \"0.06\""
 
@@ -6546,6 +6561,7 @@ msgstr "Potvrzení Vašeho členství v %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Slevový kód"
 
@@ -7256,6 +7272,7 @@ msgstr "Chcete-li plně integrovat Braintree, ujistěte se, že máte správně
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Platební informace"
 
@@ -7322,6 +7339,7 @@ msgstr "Přijímáme %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Číslo karty"
 
@@ -7406,6 +7424,7 @@ msgstr "co to je?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Použít"
 
@@ -7651,6 +7670,7 @@ msgstr "Prodejce"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Heslo"
 
@@ -7850,6 +7870,7 @@ msgstr "Tato URL adresa je předána PayPalu pro všechny nové debety a předpl
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Zde zaplaťte pomocí PayPalu"
 
@@ -7885,6 +7906,7 @@ msgstr "Zde zaplaťte pomocí PayPalu"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Odeslat a zaplatit"
 
@@ -7924,6 +7946,7 @@ msgstr "Odeslat a zaplatit"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Odeslat a potvrdit"
 
@@ -9610,6 +9633,7 @@ msgstr "Prosím, zadejte ID úrovně."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "žádný"
 
@@ -9745,6 +9769,7 @@ msgstr "Tento obsah je určen pouze pro členy !!levels!!. Pro čtení navštivt
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Moje členství"
 
@@ -9860,6 +9885,8 @@ msgstr "Moje členství"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Úroveň"
 
@@ -10139,6 +10166,7 @@ msgstr "Vaše placené předplatné spravuje PayPal. Pro aktualizazi Vašich fak
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Jméno"
 
@@ -10176,6 +10204,7 @@ msgstr "Jméno"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Příjmení"
 
@@ -10198,6 +10227,7 @@ msgstr "Příjmení"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresa"
 
@@ -10220,6 +10250,7 @@ msgstr "Adresa"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Upřesnění adresy"
 
@@ -10242,6 +10273,7 @@ msgstr "Upřesnění adresy"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Město"
 
@@ -10264,6 +10296,7 @@ msgstr "Město"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Kraj"
 
@@ -10286,6 +10319,7 @@ msgstr "Kraj"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "PSČ"
 
@@ -10328,6 +10362,7 @@ msgstr "Směrovací kód města, kraje"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Země"
 
@@ -10350,6 +10385,7 @@ msgstr "Země"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -10380,6 +10416,8 @@ msgstr "Telefon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mailová adresa"
 
@@ -10401,6 +10439,7 @@ msgstr "E-mailová adresa"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Potvrdit e-mail"
 
@@ -10447,8 +10486,11 @@ msgstr "Toto předplatné se neopakuje, takže nemusíte aktualizovat své faktu
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Jste si jisti, že chcete zrušit Vaše členství?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -10479,6 +10521,7 @@ msgstr "Ne, chci zůstat členem"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Zrušit všechna členství"
 
@@ -10587,6 +10630,7 @@ msgstr "Informace o účtu"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Již nějaký účet máte?"
 
@@ -10600,6 +10644,7 @@ msgstr "Již nějaký účet máte?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Přihlaste se zde"
 
@@ -10616,6 +10661,7 @@ msgstr "Přihlaste se zde"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Potvrzení hesla"
 
@@ -10628,6 +10674,7 @@ msgstr "Potvrzení hesla"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Potvrzení e-mailu"
 
@@ -10640,6 +10687,7 @@ msgstr "Potvrzení e-mailu"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Celé jméno"
 
@@ -10652,6 +10700,7 @@ msgstr "Celé jméno"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "NECHTE TO PRÁZDNÉ"
 
@@ -10664,6 +10713,7 @@ msgstr "NECHTE TO PRÁZDNÉ"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Jste přihlášeni jako <strong>%s</strong>. Pokud byste chtěli pro toto členství použít jiný účet, <a href=\"%s\">odhlaste se právě teď</a>."
@@ -10677,6 +10727,7 @@ msgstr "Jste přihlášeni jako <strong>%s</strong>. Pokud byste chtěli pro tot
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Vyberte si způsob platby"
 
@@ -10690,6 +10741,7 @@ msgstr "Vyberte si způsob platby"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Zde zaplaťte platební kartou"
 
@@ -10738,6 +10790,7 @@ msgstr "Dokončit platbu"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Zpracování..."
 
@@ -10821,6 +10874,7 @@ msgstr "Vyúčtování #%s z %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Tisk"
 
@@ -10983,6 +11037,8 @@ msgstr "Čekající"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Zobrazit Váš členský účet &rarr;"
 
@@ -13397,6 +13453,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -14281,6 +14338,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -14601,6 +14659,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -14609,6 +14668,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -15151,6 +15211,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -19932,6 +19994,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -20080,6 +20143,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -20089,6 +20153,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -20108,6 +20173,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -20131,6 +20197,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -20150,6 +20217,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -20160,6 +20228,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -20169,6 +20238,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -20178,6 +20248,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -20190,6 +20261,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -20207,6 +20279,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -20231,6 +20304,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -20258,6 +20332,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -20503,6 +20578,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -20579,6 +20655,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -20785,6 +20862,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -20907,7 +20987,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -20916,7 +20998,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -20935,6 +21019,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -22765,6 +22850,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -22782,6 +22869,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -22795,6 +22884,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -22808,6 +22898,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -22926,6 +23017,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -23150,6 +23242,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -23394,6 +23487,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -26823,6 +26917,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -27419,6 +27514,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -29309,6 +29405,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -30288,6 +30385,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -30626,6 +30724,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -31301,10 +31400,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -31326,6 +31430,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -31343,6 +31448,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -31351,6 +31457,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -31438,3 +31545,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-da_DK.mo b/languages/paid-memberships-pro-da_DK.mo
index d6c1e5208..088c1668d 100644
Binary files a/languages/paid-memberships-pro-da_DK.mo and b/languages/paid-memberships-pro-da_DK.mo differ
diff --git a/languages/paid-memberships-pro-da_DK.po b/languages/paid-memberships-pro-da_DK.po
index ca783d75b..1cf27401c 100644
--- a/languages/paid-memberships-pro-da_DK.po
+++ b/languages/paid-memberships-pro-da_DK.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:39+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:33+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -327,6 +327,7 @@ msgstr "Betalingsgateway &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-mail"
 
@@ -1001,6 +1002,7 @@ msgstr "valgte"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Gem Indstillinger"
 
@@ -2735,6 +2737,8 @@ msgstr "Prøveperiode-Cyklus"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Udløb"
 
@@ -3160,6 +3164,7 @@ msgstr "Efternavn"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Faktura Addresse"
 
@@ -4355,6 +4360,7 @@ msgstr "Gem Ordre"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Annullér"
 
@@ -4705,6 +4711,7 @@ msgstr "Bruger"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Medlemsniveau"
 
@@ -4782,6 +4789,7 @@ msgstr "Transaktion ID'er"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "slettet"
 
@@ -5372,6 +5380,7 @@ msgstr "Sælger"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -5568,6 +5577,7 @@ msgstr "Transaktion Sikkerheds Nøgle"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Valuta"
 
@@ -5577,6 +5587,7 @@ msgstr "Valuta"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Ikke alt Valuta understøtter af alle gateways. - Kontroller venligst med din Gateway."
 
@@ -5650,6 +5661,7 @@ msgstr "Stripe behøver ikke regnings adresse-felter. Vælg 'Nej' for at skjule
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Moms"
 
@@ -5668,6 +5680,7 @@ msgstr "Moms"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "valgfri"
 
@@ -5679,6 +5692,7 @@ msgstr "valgfri"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Moms sats"
 
@@ -5690,6 +5704,7 @@ msgstr "Moms sats"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "forkortelse, e.g. \"PA\""
 
@@ -5701,6 +5716,7 @@ msgstr "forkortelse, e.g. \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, e.g \"0.06\""
 
@@ -6542,6 +6558,7 @@ msgstr "Bekræftigelse af dit medlemskab  for %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Rabatkode"
 
@@ -8198,6 +8215,7 @@ msgstr "Nuværrende Niveau"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Ingen"
 
@@ -8335,6 +8353,8 @@ msgstr "Dit medlemskab er <strong>aktiv</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Niveau"
 
@@ -8610,6 +8630,7 @@ msgstr "Dit betalings-abonnement bliver styret af PayPal. Venligst <a href=\"htt
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Fornavn"
 
@@ -8645,6 +8666,7 @@ msgstr "Fornavn"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Efternavn"
 
@@ -8665,6 +8687,7 @@ msgstr "Efternavn"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresse 1"
 
@@ -8685,6 +8708,7 @@ msgstr "Adresse 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adresse 2"
 
@@ -8705,6 +8729,7 @@ msgstr "Adresse 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "By"
 
@@ -8725,6 +8750,7 @@ msgstr "By"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Region"
 
@@ -8745,6 +8771,7 @@ msgstr "Region"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postnummer"
 
@@ -8783,6 +8810,7 @@ msgstr "By, Region, Postnummer"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Land"
 
@@ -8803,6 +8831,7 @@ msgstr "Land"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon nr."
 
@@ -8830,6 +8859,8 @@ msgstr "Telefon nr."
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mail Adresse"
 
@@ -8849,6 +8880,7 @@ msgstr "E-mail Adresse"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Bekræft E-mail"
 
@@ -8908,6 +8940,7 @@ msgstr "Vi accepterer %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kortnummer"
 
@@ -9003,8 +9036,11 @@ msgstr "Dette abonnement er ikke gentagene. - Så du behøver ikke at opdatere d
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Er du sikker på at du vil annullere dit medlemsskab?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -9123,6 +9159,7 @@ msgstr "Har du en rabatkode?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Anvend"
 
@@ -9147,6 +9184,7 @@ msgstr "Konto Informationer"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Har du allerede en konto?"
 
@@ -9159,6 +9197,7 @@ msgstr "Har du allerede en konto?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Log ind her"
 
@@ -9174,6 +9213,7 @@ msgstr "Log ind her"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Bekræft Adgangskode"
 
@@ -9185,6 +9225,7 @@ msgstr "Bekræft Adgangskode"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Bekræft E-mail Adresse"
 
@@ -9196,6 +9237,7 @@ msgstr "Bekræft E-mail Adresse"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Fulde Navn"
 
@@ -9207,6 +9249,7 @@ msgstr "Fulde Navn"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "EFTERLAD DETTE BLANK"
 
@@ -9218,6 +9261,7 @@ msgstr "EFTERLAD DETTE BLANK"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Du er logget ind som <strong>%s</strong>. - Hvis du gerne ville bruge en anden konto til dette medlemsskab, <a href=\"%s\">log ud nu</a>."
@@ -9230,6 +9274,7 @@ msgstr "Du er logget ind som <strong>%s</strong>. - Hvis du gerne ville bruge en
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Vælg din Betalingsmetode"
 
@@ -9242,6 +9287,7 @@ msgstr "Vælg din Betalingsmetode"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Gå til Kassen med Kreditkort her"
 
@@ -9270,6 +9316,7 @@ msgstr "Gå til Kassen med Kreditkort her"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Gå til Kassen med PayPal"
 
@@ -9309,6 +9356,7 @@ msgstr "Gå til Kassen med PayPal"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Betalings-Information"
 
@@ -9387,6 +9435,7 @@ msgstr "Gennemfør Betaling"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Anvend og Gå til Kassen"
 
@@ -9420,6 +9469,7 @@ msgstr "Anvend og Gå til Kassen"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Anvend og Bekræft"
 
@@ -9439,6 +9489,7 @@ msgstr "Anvend og Betal med 2CheckOut"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Bearbejder..."
 
@@ -9521,6 +9572,7 @@ msgstr "Faktura #%s den %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Print"
 
@@ -9647,6 +9699,8 @@ msgstr "Afventer"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Se Din Medlemsskabs-Konto &rarr;"
 
@@ -11832,6 +11886,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -12716,6 +12771,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -13036,6 +13092,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -13044,6 +13101,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -13638,6 +13696,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -18814,6 +18874,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -18962,6 +19023,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -18971,6 +19033,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -18990,6 +19053,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -19013,6 +19077,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -19032,6 +19097,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -19042,6 +19108,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -19051,6 +19118,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -19060,6 +19128,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -19072,6 +19141,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -19089,6 +19159,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -19113,6 +19184,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -19140,6 +19212,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -19385,6 +19458,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -19466,6 +19540,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -19672,6 +19747,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -19804,7 +19882,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -19813,7 +19893,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -19826,6 +19908,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -19835,6 +19918,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -19855,6 +19939,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -21763,6 +21848,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -21780,6 +21867,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -21793,6 +21882,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -21806,6 +21896,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -21924,6 +22015,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -22148,6 +22240,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -22392,6 +22485,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -25821,6 +25915,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -26417,6 +26512,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -28307,6 +28403,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -29286,6 +29383,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -29624,6 +29722,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -30299,10 +30398,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -30324,6 +30428,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -30341,6 +30446,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -30349,6 +30455,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -30436,3 +30543,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-de_DE.mo b/languages/paid-memberships-pro-de_DE.mo
index 3577a2538..d5e711715 100644
Binary files a/languages/paid-memberships-pro-de_DE.mo and b/languages/paid-memberships-pro-de_DE.mo differ
diff --git a/languages/paid-memberships-pro-de_DE.po b/languages/paid-memberships-pro-de_DE.po
index 38790113a..6bb866162 100644
--- a/languages/paid-memberships-pro-de_DE.po
+++ b/languages/paid-memberships-pro-de_DE.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:41+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:35+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -1010,6 +1010,7 @@ msgstr "Zahlungsdienstleister &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -1911,6 +1912,7 @@ msgstr "Falls Ja, erstellen Sie eine WordPress Seite mit Ihren AGB und wählen S
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
@@ -4540,6 +4542,7 @@ msgstr "Paket speichern"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Stornieren"
 
@@ -4696,6 +4699,8 @@ msgstr "Pakete mit der Maus verschieben, um sie auf der Pakete-Seite zu sortiere
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Gültig bis"
 
@@ -5245,6 +5250,7 @@ msgstr "Nachname"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Rechnungsadresse"
 
@@ -7237,6 +7243,7 @@ msgstr "User"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Paket"
 
@@ -7342,6 +7349,7 @@ msgstr "Transaktions-IDs"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "gelöscht"
 
@@ -8238,6 +8246,7 @@ msgstr "Gateway wählen"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Währungs- und Steuereinstellungen"
 
@@ -8253,6 +8262,7 @@ msgstr "Währungs- und Steuereinstellungen"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Währung"
 
@@ -8265,6 +8275,7 @@ msgstr "Währung"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Nicht alle Währungen werden von allen Zahlungsdienstleistern unterstützt. Bitte überprüfen Sie dies bei Ihrem Zahlungsdienstleister."
 
@@ -8292,6 +8303,7 @@ msgstr "Akzeptierete Kreditkarten"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Mehrwertsteuer"
 
@@ -8322,6 +8334,7 @@ msgstr "Mehrwertsteuer"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "optional"
 
@@ -8336,6 +8349,7 @@ msgstr "optional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Steuerstaat"
 
@@ -8350,6 +8364,7 @@ msgstr "Steuerstaat"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "Abkürzung, z.B. \"PA\""
 
@@ -8360,6 +8375,7 @@ msgstr "Abkürzung, z.B. \"PA\""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Steuersatz"
 
@@ -8374,6 +8390,7 @@ msgstr "Steuersatz"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "dezimal, z.B. \"0.06\""
 
@@ -9581,6 +9598,7 @@ msgstr "Bestätigung Ihrer Anmeldung bei %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Gutscheincode"
 
@@ -10058,6 +10076,7 @@ msgstr "Diese Mitgliedschaft läuft nicht ab"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Kein"
 
@@ -10670,6 +10689,7 @@ msgstr "Um Braintree vollständig zu integrieren, stellen Sie Ihre Web Hook URL
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Zahlungsinformationen"
 
@@ -10804,6 +10824,7 @@ msgstr "Wir aktzeptieren %s"
 #: classes/gateways/class.pmprogateway_braintree.php:458
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kartennummer"
 
@@ -10999,6 +11020,7 @@ msgstr "Was ist das?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "übernehmen"
 
@@ -11438,6 +11460,7 @@ msgstr "Anbieter"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Passwort"
 
@@ -11703,6 +11726,7 @@ msgstr "Diese URL wird an PayPal für alle neuen Zahlungen und Anmeldungen weite
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Zahlung mit PayPal abschließen"
 
@@ -11751,6 +11775,7 @@ msgstr "Zahlung mit PayPal abschließen"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Zahlung bestätigen"
 
@@ -11805,6 +11830,7 @@ msgstr "Zahlung bestätigen"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Senden und Bestätigen"
 
@@ -12204,6 +12230,7 @@ msgstr "Um Stripe vollständig zu integrieren, stellen Sie Ihre Web Hook URL auf
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -16160,6 +16187,8 @@ msgstr "Bestelldatum"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Paket"
 
@@ -16538,6 +16567,7 @@ msgstr "Ihre Zahlungen werden von PayPal abgewickelt. Sie können sich <a href=\
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Vorname"
 
@@ -16589,6 +16619,7 @@ msgstr "Vorname"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Nachname"
 
@@ -16625,6 +16656,7 @@ msgstr "Nachname"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresse 1"
 
@@ -16661,6 +16693,7 @@ msgstr "Adresse 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adresse 2"
 
@@ -16697,6 +16730,7 @@ msgstr "Adresse 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ort"
 
@@ -16733,6 +16767,7 @@ msgstr "Ort"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Bundesland"
 
@@ -16769,6 +16804,7 @@ msgstr "Bundesland"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
@@ -16841,6 +16877,7 @@ msgstr "Ort, Bundesland"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Land"
 
@@ -16878,6 +16915,7 @@ msgstr "Land"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -16929,6 +16967,8 @@ msgstr "Telefon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "e-mail Adresse"
 
@@ -16965,6 +17005,7 @@ msgstr "e-mail Adresse"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "e-mail bestätigen"
 
@@ -17046,8 +17087,11 @@ msgstr "Keine weiteren Zahlungen erforderlich. Ihre Zahlungsinformationen müsse
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Sind Sie sicher, dass Sie Ihren Account löschen wollen?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:41
 #: pages/cancel.php:32
@@ -17072,7 +17116,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr "Ja, Mitgliedschaft kündigen"
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:47
 #: pages/cancel.php:46
@@ -17083,7 +17129,9 @@ msgstr "Ja, Mitgliedschaft kündigen"
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr "Nein, diese Mitgliedschaft behalten."
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: shortcodes/pmpro_account.php:40
@@ -17102,6 +17150,7 @@ msgstr "Nein, diese Mitgliedschaft behalten."
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Meine Mitgliedschaften"
 
@@ -17114,6 +17163,7 @@ msgstr "Meine Mitgliedschaften"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Alle Mitgliedschaften kündigen"
 
@@ -17267,6 +17317,7 @@ msgstr "Account Informationen"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Sie haben schon einen Account?"
 
@@ -17285,6 +17336,7 @@ msgstr "Sie haben schon einen Account?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Hier einloggen"
 
@@ -17307,6 +17359,7 @@ msgstr "Hier einloggen"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Passwort bestätigen"
 
@@ -17324,6 +17377,7 @@ msgstr "Passwort bestätigen"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "e-mail Adresse bestätigen"
 
@@ -17342,6 +17396,7 @@ msgstr "e-mail Adresse bestätigen"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
@@ -17360,6 +17415,7 @@ msgstr "Vollständiger Name"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "FREI LASSEN"
 
@@ -17378,6 +17434,7 @@ msgstr "FREI LASSEN"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Sie sind eingeloggt als <strong>%s</strong>. Wenn Sie für diese Mitgliedschaft einen anderen Account verwenden wollen, <a href=\"%s\">loggen Sie sich hier aus</a>."
@@ -17396,6 +17453,7 @@ msgstr "Sie sind eingeloggt als <strong>%s</strong>. Wenn Sie für diese Mitglie
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Wählen Sie Ihre Zahlungsmethode"
 
@@ -17415,6 +17473,7 @@ msgstr "Wählen Sie Ihre Zahlungsmethode"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Mit Kreditkarte bezahlen"
 
@@ -17487,6 +17546,7 @@ msgstr "Zahlung abschließen"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "wird bearbeitet..."
 
@@ -17572,6 +17632,7 @@ msgstr "Rechnung  Nr. %s vom %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Drucken"
 
@@ -17783,6 +17844,8 @@ msgstr "ausstehend"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Ihren Account anzeigen &rarr;"
 
@@ -20579,6 +20642,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -21266,6 +21330,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -21920,6 +21985,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -25146,6 +25213,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -25294,6 +25362,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -25303,6 +25372,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -25322,6 +25392,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -25345,6 +25416,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -25364,6 +25436,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -25374,6 +25447,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -25383,6 +25457,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -25392,6 +25467,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -25404,6 +25480,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -25421,6 +25498,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -25445,6 +25523,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -25467,6 +25546,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -25515,6 +25595,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -25559,6 +25640,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -25765,6 +25847,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -27658,6 +27743,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -27675,6 +27762,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -27688,6 +27777,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -27701,6 +27791,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -27793,6 +27884,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -28017,6 +28109,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -28261,6 +28354,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -31649,6 +31743,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -32245,6 +32340,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -34135,6 +34231,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -35114,6 +35211,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -35452,6 +35550,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -36127,10 +36226,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -36152,6 +36256,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -36169,6 +36274,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -36177,6 +36283,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -36264,3 +36371,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-de_DE_formal.mo b/languages/paid-memberships-pro-de_DE_formal.mo
index 2b2abd644..16683167b 100644
Binary files a/languages/paid-memberships-pro-de_DE_formal.mo and b/languages/paid-memberships-pro-de_DE_formal.mo differ
diff --git a/languages/paid-memberships-pro-de_DE_formal.po b/languages/paid-memberships-pro-de_DE_formal.po
index 938e63f4a..2ae082e8d 100644
--- a/languages/paid-memberships-pro-de_DE_formal.po
+++ b/languages/paid-memberships-pro-de_DE_formal.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:43+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:37+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -982,6 +982,7 @@ msgstr "Zahlungsdienstleister &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1833,6 +1834,7 @@ msgstr "Falls Ja, erstellen Sie eine WordPress Seite mit Ihren AGB und wählen S
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
@@ -4423,6 +4425,7 @@ msgstr "Paket speichern"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Stornieren"
 
@@ -4579,6 +4582,8 @@ msgstr "Pakete mit der Maus verschieben, um sie auf der Pakete-Seite zu sortiere
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Gültig bis"
 
@@ -5116,6 +5121,7 @@ msgstr "Nachname"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Rechnungsadresse"
 
@@ -6991,6 +6997,7 @@ msgstr "Benutzer"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Paket"
 
@@ -7086,6 +7093,7 @@ msgstr "Transaktions-IDs"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "gelöscht"
 
@@ -7871,6 +7879,7 @@ msgstr "Gateway wählen"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Währungs- und Steuereinstellungen"
 
@@ -7885,6 +7894,7 @@ msgstr "Währungs- und Steuereinstellungen"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Währung"
 
@@ -7896,6 +7906,7 @@ msgstr "Währung"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Nicht alle Währungen werden von allen Zahlungsdienstleistern unterstützt. Bitte überprüfen Sie dies bei Ihrem Zahlungsdienstleister."
 
@@ -7921,6 +7932,7 @@ msgstr "Akzeptierete Kreditkarten"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Mehrwertsteuer"
 
@@ -7950,6 +7962,7 @@ msgstr "Mehrwertsteuer"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "optional"
 
@@ -7963,6 +7976,7 @@ msgstr "optional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Steuerstaat"
 
@@ -7976,6 +7990,7 @@ msgstr "Steuerstaat"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "Abkürzung, z.B. \"PA\""
 
@@ -7985,6 +8000,7 @@ msgstr "Abkürzung, z.B. \"PA\""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Steuersatz"
 
@@ -7998,6 +8014,7 @@ msgstr "Steuersatz"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "dezimal, z.B. \"0.06\""
 
@@ -9172,6 +9189,7 @@ msgstr "Ihre Mitgliedschaftsbestätigung für %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Rabattcode"
 
@@ -9622,6 +9640,7 @@ msgstr "Diese Mitgliedschaft läuft nicht ab"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Kein"
 
@@ -10229,6 +10248,7 @@ msgstr "Um Braintree vollständig zu integrieren, stellen Sie Ihre Web Hook URL
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Zahlungsinformationen"
 
@@ -10361,6 +10381,7 @@ msgstr "Wir aktzeptieren %s"
 #: classes/gateways/class.pmprogateway_braintree.php:458
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kartennummer"
 
@@ -10555,6 +10576,7 @@ msgstr "Was ist das?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Übernehmen"
 
@@ -10982,6 +11004,7 @@ msgstr "Anbieter"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Passwort"
 
@@ -11245,6 +11268,7 @@ msgstr "Diese URL wird an PayPal für alle neuen Zahlungen und Anmeldungen weite
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Zahlung mit PayPal abschließen"
 
@@ -11292,6 +11316,7 @@ msgstr "Zahlung mit PayPal abschließen"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Zahlung bestätigen"
 
@@ -11345,6 +11370,7 @@ msgstr "Zahlung bestätigen"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Senden und Bestätigen"
 
@@ -11732,6 +11758,7 @@ msgstr "Um Stripe vollständig zu integrieren, stellen Sie Ihre Web Hook URL auf
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr "Kartenprüfnummer (CVC)"
 
@@ -15611,6 +15638,8 @@ msgstr "Bestelldatum"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Paket"
 
@@ -15982,6 +16011,7 @@ msgstr "Ihre Zahlungen werden von PayPal abgewickelt. Sie können sich <a href=\
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Vorname"
 
@@ -16032,6 +16062,7 @@ msgstr "Vorname"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Nachname"
 
@@ -16068,6 +16099,7 @@ msgstr "Nachname"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresse 1"
 
@@ -16104,6 +16136,7 @@ msgstr "Adresse 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adresse 2"
 
@@ -16140,6 +16173,7 @@ msgstr "Adresse 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ort"
 
@@ -16176,6 +16210,7 @@ msgstr "Ort"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Bundesland"
 
@@ -16212,6 +16247,7 @@ msgstr "Bundesland"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
@@ -16284,6 +16320,7 @@ msgstr "Ort, Bundesland"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Land"
 
@@ -16321,6 +16358,7 @@ msgstr "Land"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -16372,6 +16410,8 @@ msgstr "Telefon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-Mail Adresse"
 
@@ -16408,6 +16448,7 @@ msgstr "E-Mail Adresse"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "E-Mail bestätigen"
 
@@ -16488,8 +16529,11 @@ msgstr "Keine weiteren Zahlungen erforderlich. Ihre Zahlungsinformationen müsse
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Sind Sie sicher, dass Sie Ihren Konto löschen wollen?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:41
 #: pages/cancel.php:32
@@ -16514,7 +16558,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr "Ja, Mitgliedschaft kündigen"
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:47
 #: pages/cancel.php:46
@@ -16525,7 +16571,9 @@ msgstr "Ja, Mitgliedschaft kündigen"
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr "Nein, diese Mitgliedschaft behalten."
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: shortcodes/pmpro_account.php:40
@@ -16544,6 +16592,7 @@ msgstr "Nein, diese Mitgliedschaft behalten."
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Meine Mitgliedschaften"
 
@@ -16556,6 +16605,7 @@ msgstr "Meine Mitgliedschaften"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Alle Mitgliedschaften kündigen"
 
@@ -16709,6 +16759,7 @@ msgstr "Konto Informationen"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Sie haben schon einen Konto?"
 
@@ -16727,6 +16778,7 @@ msgstr "Sie haben schon einen Konto?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Hier einloggen"
 
@@ -16749,6 +16801,7 @@ msgstr "Hier einloggen"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Passwort bestätigen"
 
@@ -16766,6 +16819,7 @@ msgstr "Passwort bestätigen"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "E-Mail Adresse bestätigen"
 
@@ -16784,6 +16838,7 @@ msgstr "E-Mail Adresse bestätigen"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
@@ -16802,6 +16857,7 @@ msgstr "Vollständiger Name"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DIESES FELD LEER LASSEN"
 
@@ -16820,6 +16876,7 @@ msgstr "DIESES FELD LEER LASSEN"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Sie sind eingeloggt als <strong>%s</strong>. Wenn Sie für diese Mitgliedschaft einen anderen Konto verwenden wollen, <a href=\"%s\">ausloggen</a>."
@@ -16838,6 +16895,7 @@ msgstr "Sie sind eingeloggt als <strong>%s</strong>. Wenn Sie für diese Mitglie
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Wählen Sie Ihre Zahlungsmethode"
 
@@ -16857,6 +16915,7 @@ msgstr "Wählen Sie Ihre Zahlungsmethode"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Mit Kreditkarte bezahlen"
 
@@ -16929,6 +16988,7 @@ msgstr "Zahlung abschließen"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "wird bearbeitet..."
 
@@ -17008,6 +17068,7 @@ msgstr "Rechnungs-Nr. %s vom %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Drucken"
 
@@ -17216,6 +17277,8 @@ msgstr "Ausstehend"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Ihr Mitgliedskonto anzeigen &rarr;"
 
@@ -19935,6 +19998,7 @@ msgstr "Code bearbeiten: %s"
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -20598,6 +20662,7 @@ msgstr "Ihr Profil"
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr "Log In"
 
@@ -21206,6 +21271,8 @@ msgstr "Sie können auch eine Suche durchführen:"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -24605,6 +24672,7 @@ msgstr "Passwort vergessen"
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr "Passwort zurücksetzen"
 
@@ -24751,6 +24819,7 @@ msgstr "Sie sind bereits angemeldet."
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr "Nutzername oder E-Mail Adresse"
 
@@ -24760,6 +24829,7 @@ msgstr "Nutzername oder E-Mail Adresse"
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr "Neues Passwort anfordern"
 
@@ -24778,6 +24848,7 @@ msgstr "Neues Passwort anfordern"
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr "Neues Passwort"
 
@@ -24800,6 +24871,7 @@ msgstr "Neues Passwort"
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr "Passwortstärke-Anzeiger"
 
@@ -24818,6 +24890,7 @@ msgstr "Passwortstärke-Anzeiger"
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr "Neues Passwort bestätigen"
 
@@ -24828,6 +24901,7 @@ msgstr "Neues Passwort bestätigen"
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr "Registrieren"
 
@@ -24837,6 +24911,7 @@ msgstr "Registrieren"
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr "Registrieren"
 
@@ -24846,6 +24921,7 @@ msgstr "Registrieren"
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr "Passwort vergessen?"
 
@@ -24858,6 +24934,7 @@ msgstr "Passwort vergessen?"
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr "Ungültige Anfrage"
 
@@ -24875,6 +24952,7 @@ msgstr "Ungültige Anfrage"
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr "Willkommen, %s"
 
@@ -24899,6 +24977,7 @@ msgstr "Willkommen, %s"
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr "Abmelden"
 
@@ -24921,6 +25000,7 @@ msgstr "Log In Widget - PMPro"
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr "Diesen Hinweis ausblenden."
 
@@ -24969,6 +25049,7 @@ msgstr "Schließen"
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr "Bezahlt"
 
@@ -25009,6 +25090,7 @@ msgstr "Ihre bisherigen Mitgliedschaften"
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr "Keine Mitgliedschaftsbestellungen gefunden."
 
@@ -25198,6 +25280,9 @@ msgstr "Aktuelles Passwort"
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr "Pflichtfeld"
 
@@ -26221,6 +26306,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -26501,6 +26587,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -26538,6 +26625,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -28308,6 +28396,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -28325,6 +28415,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -28338,6 +28430,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -28351,6 +28444,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -30930,6 +31024,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -31526,6 +31621,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -33416,6 +33512,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -34395,6 +34492,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -34733,6 +34831,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -35408,10 +35507,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -35433,6 +35537,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -35450,6 +35555,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -35458,6 +35564,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -35545,3 +35652,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-el_GR.mo b/languages/paid-memberships-pro-el_GR.mo
index dafba4c0a..1e40d5ab7 100644
Binary files a/languages/paid-memberships-pro-el_GR.mo and b/languages/paid-memberships-pro-el_GR.mo differ
diff --git a/languages/paid-memberships-pro-el_GR.po b/languages/paid-memberships-pro-el_GR.po
index 34f72965f..13823f268 100644
--- a/languages/paid-memberships-pro-el_GR.po
+++ b/languages/paid-memberships-pro-el_GR.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:44+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:39+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -867,6 +867,7 @@ msgstr "Τρόποι Πληρωμής &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -1623,6 +1624,7 @@ msgstr "επιλεγμένο"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Αποθήκευση ρυθμίσεων"
 
@@ -3784,6 +3786,7 @@ msgstr "Αποθηκεύστε το Επίπεδο"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -3913,6 +3916,8 @@ msgstr "Σύρετε τα επίπεδα συνδρομών για να τα α
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Λήξη"
 
@@ -4396,6 +4401,7 @@ msgstr "Last&nbsp;Name"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Διεύθυνση Πληρωμής"
 
@@ -6031,6 +6037,7 @@ msgstr "Χρήστης"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Membership Level"
 
@@ -6120,6 +6127,7 @@ msgstr "ID Συναλλαγών"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "διεγραμμένο"
 
@@ -6866,6 +6874,7 @@ msgstr "Διαλέξτε έναν τρόπο πληρωμής"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Ρυθμίσης Ισοτιμίας και Φορολογίας"
 
@@ -6880,6 +6889,7 @@ msgstr "Ρυθμίσης Ισοτιμίας και Φορολογίας"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Νόμισμα"
 
@@ -6891,6 +6901,7 @@ msgstr "Νόμισμα"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Δεν θα υποστηρίζονται όλες οι ισοτιμίες από κάθε gateway. Παρακαλούμε ελέγξτε με το δικό σας gateway."
 
@@ -6916,6 +6927,7 @@ msgstr "Αποδεκτοί Τύποι Πιστωτικών Καρτών"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Φόρος επί των πωλήσεων"
 
@@ -6938,6 +6950,7 @@ msgstr "Φόρος επί των πωλήσεων"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "προαιρετικό"
 
@@ -6951,6 +6964,7 @@ msgstr "προαιρετικό"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Κρατική Φορολογία"
 
@@ -6964,6 +6978,7 @@ msgstr "Κρατική Φορολογία"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "σύντμηση, π.χ “PA”"
 
@@ -6973,6 +6988,7 @@ msgstr "σύντμηση, π.χ “PA”"
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Φορολογικό ποσοστό"
 
@@ -6986,6 +7002,7 @@ msgstr "Φορολογικό ποσοστό"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "δεκαδικό, π.χ “0.06“"
 
@@ -8009,6 +8026,7 @@ msgstr "Η επιβεβαίωση της συνδρομή σας για %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Εκπτωτικός Κωδικός"
 
@@ -8783,6 +8801,7 @@ msgstr "To fully integrate with Braintree, be sure to set your Web Hook URL to"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Πληροφορίες Πληρωμής"
 
@@ -8874,6 +8893,7 @@ msgstr "Δεχόμαστε %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Αριθμός Κάρτας"
 
@@ -9002,6 +9022,7 @@ msgstr "τι είναι αυτό;"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Εφαρμογή"
 
@@ -9293,6 +9314,7 @@ msgstr "Προμηθευτής"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Κωδικός"
 
@@ -9512,6 +9534,7 @@ msgstr "This URL is passed to PayPal for all new charges and subscriptions. You
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Πληρωμή με PayPal"
 
@@ -9552,6 +9575,7 @@ msgstr "Πληρωμή με PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Υποβολή και Πληρωμή"
 
@@ -9598,6 +9622,7 @@ msgstr "Υποβολή και Πληρωμή"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Υποβολή και Επιβεβαίωση"
 
@@ -11839,6 +11864,7 @@ msgstr "Παρακαλούμε διευκρινήστε ένα id επιπέδο
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Κανένα"
 
@@ -12232,6 +12258,8 @@ msgstr "αποσύνδεση"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Επίπεδο"
 
@@ -12331,6 +12359,7 @@ msgstr "Την πληρωμή της συνδρομής σας διαχειρί
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Όνομα"
 
@@ -12372,6 +12401,7 @@ msgstr "Όνομα"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Επώνυμο"
 
@@ -12398,6 +12428,7 @@ msgstr "Επώνυμο"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Διεύθυνση 1"
 
@@ -12424,6 +12455,7 @@ msgstr "Διεύθυνση 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Διεύθυνση 2"
 
@@ -12450,6 +12482,7 @@ msgstr "Διεύθυνση 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Πόλη"
 
@@ -12476,6 +12509,7 @@ msgstr "Πόλη"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Πολιτεία"
 
@@ -12502,6 +12536,7 @@ msgstr "Πολιτεία"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Τ.Κ"
 
@@ -12554,6 +12589,7 @@ msgstr "City, State Zip"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Χώρα"
 
@@ -12581,6 +12617,7 @@ msgstr "Χώρα"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
@@ -12619,6 +12656,8 @@ msgstr "Τηλέφωνο"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Ηλεκτρονική Διεύθυνση"
 
@@ -12645,6 +12684,7 @@ msgstr "Ηλεκτρονική Διεύθυνση"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Επιβεβαίωση Ηλεκτρονικής Διεύθυνσης"
 
@@ -12701,8 +12741,11 @@ msgstr "Η παρούσα συνδρομή δεν είναι επαναληπτ
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Είστε σίγουρος/η πως επιθυμείτε να ακυρώσεται την συνδρομή σας;"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12740,6 +12783,7 @@ msgstr "Όχι, διατηρείστε τον λογαριασμό μου"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Οι Συνδρομές μου"
 
@@ -12750,6 +12794,7 @@ msgstr "Οι Συνδρομές μου"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Ακύρωση Όλων των Συνδρομών"
 
@@ -12878,6 +12923,7 @@ msgstr "Πληροφορίες Λογαριασμού"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Έχετε ήδη λογαριασμό;"
 
@@ -12894,6 +12940,7 @@ msgstr "Έχετε ήδη λογαριασμό;"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Συνδεθείτε εδώ"
 
@@ -12913,6 +12960,7 @@ msgstr "Συνδεθείτε εδώ"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Επιβεβαίωση Κωδικού"
 
@@ -12927,6 +12975,7 @@ msgstr "Επιβεβαίωση Κωδικού"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Επιβεβαίωση Ηλεκτρονικής Διεύθυνσης"
 
@@ -12942,6 +12991,7 @@ msgstr "Επιβεβαίωση Ηλεκτρονικής Διεύθυνσης"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Πλήρες Όνομα"
 
@@ -12957,6 +13007,7 @@ msgstr "Πλήρες Όνομα"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "ΑΦΗΣΤΕ ΤΟ ΚΕΝΟ"
 
@@ -12972,6 +13023,7 @@ msgstr "ΑΦΗΣΤΕ ΤΟ ΚΕΝΟ"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Είστε συνδεδεμένος/η ως <strong>%s</strong>. Εάν επιθυμείτε να χρησιμοποιήσετε διαφορετικό λογαριασμό γι αυτή τη συνδρομή, <a href=\"%s\">αποσυνδεθείτε τώρα</a>."
@@ -12988,6 +13040,7 @@ msgstr "Είστε συνδεδεμένος/η ως <strong>%s</strong>. Εάν
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Επιλέξτε τον Τρόπο Πληρωμής σας"
 
@@ -13004,6 +13057,7 @@ msgstr "Επιλέξτε τον Τρόπο Πληρωμής σας"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Πληρωμή με Πιστωτική Κάρτα Εδώ"
 
@@ -13064,6 +13118,7 @@ msgstr "Ολοκλήρωση Πληρωμής"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Επεξεργασία"
 
@@ -13147,6 +13202,7 @@ msgstr "Τιμολόγιο #%s σε %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Εκτύπωση"
 
@@ -13309,6 +13365,8 @@ msgstr "Σε αναμονή"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Προβολή Λογαριασμού &rarr;"
 
@@ -15805,6 +15863,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -16534,6 +16593,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -17200,6 +17260,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21882,6 +21944,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -22030,6 +22093,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -22039,6 +22103,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -22058,6 +22123,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -22081,6 +22147,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -22100,6 +22167,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -22110,6 +22178,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -22119,6 +22188,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -22128,6 +22198,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -22140,6 +22211,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -22157,6 +22229,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -22181,6 +22254,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -22203,6 +22277,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -22448,6 +22523,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -22514,6 +22590,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22720,6 +22797,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22829,7 +22909,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22838,7 +22920,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22857,6 +22941,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24661,6 +24746,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24678,6 +24765,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24691,6 +24780,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24704,6 +24794,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24822,6 +24913,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -25046,6 +25138,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -25290,6 +25383,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28709,6 +28803,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -29305,6 +29400,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -31195,6 +31291,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -32174,6 +32271,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -32512,6 +32610,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -33187,10 +33286,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -33212,6 +33316,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -33229,6 +33334,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -33237,6 +33343,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -33324,3 +33431,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-en_GB.mo b/languages/paid-memberships-pro-en_GB.mo
index f38d8ab54..96416c6bc 100644
Binary files a/languages/paid-memberships-pro-en_GB.mo and b/languages/paid-memberships-pro-en_GB.mo differ
diff --git a/languages/paid-memberships-pro-en_GB.po b/languages/paid-memberships-pro-en_GB.po
index 0fe36e6eb..439536006 100644
--- a/languages/paid-memberships-pro-en_GB.po
+++ b/languages/paid-memberships-pro-en_GB.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:46+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:41+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -564,6 +564,7 @@ msgstr ""
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr ""
 
@@ -638,6 +639,7 @@ msgstr ""
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr ""
 
@@ -1485,6 +1487,7 @@ msgstr ""
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr ""
 
@@ -1519,6 +1522,7 @@ msgstr ""
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr ""
 
@@ -1615,6 +1619,8 @@ msgstr ""
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr ""
 
@@ -1871,6 +1877,8 @@ msgstr ""
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr ""
 
@@ -1994,6 +2002,8 @@ msgstr ""
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr ""
 
@@ -2152,6 +2162,7 @@ msgstr ""
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr ""
 
@@ -2360,6 +2371,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr ""
 
@@ -2370,6 +2382,7 @@ msgstr ""
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr ""
 
@@ -2381,6 +2394,7 @@ msgstr ""
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr ""
 
@@ -2412,6 +2426,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr ""
 
@@ -2426,6 +2441,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr ""
 
@@ -2449,6 +2465,8 @@ msgstr ""
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr ""
 
@@ -2459,6 +2477,7 @@ msgstr ""
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr ""
 
@@ -2469,6 +2488,7 @@ msgstr ""
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr ""
 
@@ -2479,6 +2499,7 @@ msgstr ""
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr ""
 
@@ -2489,6 +2510,7 @@ msgstr ""
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr ""
@@ -2512,6 +2534,7 @@ msgstr ""
 #: pages/checkout.php:244
 #: pages/checkout.php:276
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr ""
 
@@ -2522,6 +2545,7 @@ msgstr ""
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr ""
 
@@ -2546,6 +2570,7 @@ msgstr ""
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr ""
 
@@ -2578,6 +2603,7 @@ msgstr ""
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr ""
 
@@ -2610,6 +2636,7 @@ msgstr ""
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr ""
 
@@ -2627,6 +2654,7 @@ msgstr ""
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr ""
 
@@ -2644,6 +2672,7 @@ msgstr ""
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr ""
 
@@ -2661,6 +2690,7 @@ msgstr ""
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr ""
 
@@ -2678,6 +2708,7 @@ msgstr ""
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "County"
 
@@ -2695,6 +2726,7 @@ msgstr "County"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr ""
 
@@ -2727,6 +2759,7 @@ msgstr ""
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr ""
 
@@ -2744,6 +2777,7 @@ msgstr ""
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr ""
 
@@ -2760,6 +2794,7 @@ msgstr ""
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr ""
 
@@ -2815,6 +2850,7 @@ msgstr ""
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr ""
 
@@ -2886,6 +2922,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr ""
 
@@ -2997,6 +3034,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr ""
 
@@ -3028,6 +3066,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr ""
 
@@ -3040,6 +3079,7 @@ msgstr ""
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr ""
 
@@ -3050,8 +3090,11 @@ msgstr ""
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr ""
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -3136,6 +3179,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr ""
 
@@ -3210,6 +3254,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr ""
 
@@ -3341,6 +3386,7 @@ msgstr ""
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr ""
 
@@ -6374,6 +6420,7 @@ msgstr ""
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr ""
 
@@ -6937,6 +6984,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr ""
 
@@ -7001,6 +7049,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr ""
 
@@ -7010,6 +7059,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr ""
 
@@ -7019,6 +7069,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
@@ -7028,6 +7079,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr ""
 
@@ -7168,6 +7220,7 @@ msgstr ""
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr ""
 
@@ -10325,6 +10378,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -11425,6 +11479,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -11745,6 +11800,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -11753,6 +11809,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -11761,6 +11818,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -12408,6 +12466,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -17652,6 +17712,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -17800,6 +17861,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -17809,6 +17871,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -17828,6 +17891,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -17851,6 +17915,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -17870,6 +17935,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -17880,6 +17946,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -17889,6 +17956,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -17898,6 +17966,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -17910,6 +17979,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -17927,6 +17997,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -17951,6 +18022,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -17978,6 +18050,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -18223,6 +18296,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -18304,6 +18378,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -18510,6 +18585,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -18642,7 +18720,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -18651,7 +18731,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -18664,6 +18746,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -18673,6 +18756,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -18693,6 +18777,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -20601,6 +20686,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -20618,6 +20705,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -20631,6 +20720,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -20644,6 +20734,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -20762,6 +20853,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -20986,6 +21078,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -21230,6 +21323,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -24659,6 +24753,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -25255,6 +25350,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -27145,6 +27241,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -28124,6 +28221,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -28462,6 +28560,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -29137,10 +29236,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -29162,6 +29266,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -29179,6 +29284,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -29187,6 +29293,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -29274,3 +29381,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-es_CL.mo b/languages/paid-memberships-pro-es_CL.mo
index fbd368ab8..04506e2b7 100644
Binary files a/languages/paid-memberships-pro-es_CL.mo and b/languages/paid-memberships-pro-es_CL.mo differ
diff --git a/languages/paid-memberships-pro-es_CL.po b/languages/paid-memberships-pro-es_CL.po
index a791a8112..69a660e80 100644
--- a/languages/paid-memberships-pro-es_CL.po
+++ b/languages/paid-memberships-pro-es_CL.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:48+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:43+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -868,6 +868,7 @@ msgstr "Requerir membresía"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Nivel de membresía"
 
@@ -942,6 +943,7 @@ msgstr "Nivel actual"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Ninguno"
 
@@ -1492,6 +1494,7 @@ msgstr "Pasarela de pagos &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -1758,6 +1761,7 @@ msgstr "En caso positivo, crear una página WordPress que contiene tus términos
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Guardar opciones"
 
@@ -3230,6 +3234,8 @@ msgstr "Periodo de prueba"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Expiración"
 
@@ -3579,6 +3585,7 @@ msgstr "Apellidos"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Dirección de facturación"
 
@@ -4720,6 +4727,7 @@ msgstr "Guardar pago"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -4876,6 +4884,7 @@ msgstr "IDs de transacción"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "borrado"
 
@@ -5250,6 +5259,7 @@ msgstr "Vendedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Contraseña"
 
@@ -5399,6 +5409,7 @@ msgstr "Llave de encripción para el lado del cliente (Client-Side Encryption Ke
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moneda"
 
@@ -5428,6 +5439,7 @@ msgstr "A nombre de quien escribir el cheque. Donde enviarlo. Mostrado durante c
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "IVA (impuesto a las ventas)"
 
@@ -5443,6 +5455,7 @@ msgstr "IVA (impuesto a las ventas)"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -5452,6 +5465,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Impuesto del estado"
 
@@ -5461,6 +5475,7 @@ msgstr "Impuesto del estado"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviación, p.ej. \"PA\""
 
@@ -5470,6 +5485,7 @@ msgstr "abreviación, p.ej. \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, p.ej. \"0.06\""
 
@@ -6071,6 +6087,7 @@ msgstr "Confirmación de membresía para %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Cupón de descuento"
 
@@ -6771,6 +6788,8 @@ msgstr "Tu membresía esta <strong>activa</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivel"
 
@@ -6993,6 +7012,7 @@ msgstr "Tu subscripción de pago es gestionada por Paypal. Por favor <a href=\"h
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nombre"
 
@@ -7025,6 +7045,7 @@ msgstr "Nombre"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Apellidos"
 
@@ -7042,6 +7063,7 @@ msgstr "Apellidos"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Direccion 1"
 
@@ -7059,6 +7081,7 @@ msgstr "Direccion 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Direccion 2"
 
@@ -7076,6 +7099,7 @@ msgstr "Direccion 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ciudad"
 
@@ -7093,6 +7117,7 @@ msgstr "Ciudad"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Estado"
 
@@ -7110,6 +7135,7 @@ msgstr "Estado"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Código postal"
 
@@ -7142,6 +7168,7 @@ msgstr "Ciudad, Código postal de estado"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -7159,6 +7186,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -7182,6 +7210,8 @@ msgstr "Teléfono"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Dirección de Email"
 
@@ -7198,6 +7228,7 @@ msgstr "Dirección de Email"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirmar E-mail"
 
@@ -7252,6 +7283,7 @@ msgstr "Información de la tarjeta de crédito"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Número de la Tarjeta"
 
@@ -7337,8 +7369,11 @@ msgstr "Esta subscripción no es recurrente.  Por lo tanto no necesitas actualiz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "¿Estas seguro de que quieres cancelar tu membresía?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -7446,6 +7481,7 @@ msgstr "Haz click aquí para introducir tu cupón de descuento"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -7456,6 +7492,7 @@ msgstr "Aplicar"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "¿Ya tienes una cuenta?"
 
@@ -7467,6 +7504,7 @@ msgstr "¿Ya tienes una cuenta?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "logeate aquí"
 
@@ -7493,6 +7531,7 @@ msgstr "Información de la cuenta"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirma tu contraseña"
 
@@ -7503,6 +7542,7 @@ msgstr "Confirma tu contraseña"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirma tu dirección de E-mail"
 
@@ -7513,6 +7553,7 @@ msgstr "Confirma tu dirección de E-mail"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -7523,6 +7564,7 @@ msgstr "Nombre Completo"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEJA ESTO EN BLANCO"
 
@@ -7533,6 +7575,7 @@ msgstr "DEJA ESTO EN BLANCO"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Estas logeado como <strong>%s</strong>. Si deseas usar una cuenta diferente para esta membresía,<a href=\"%s\">deslogeate ahora</a>."
@@ -7556,6 +7599,7 @@ msgstr "Acepto %s"
 #: pages/checkout.php:244
 #: pages/checkout.php:276
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Elije tu método de pago"
 
@@ -7566,6 +7610,7 @@ msgstr "Elije tu método de pago"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Pague con su tarjeta de crédito aquí"
 
@@ -7590,6 +7635,7 @@ msgstr "Pague con su tarjeta de crédito aquí"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "pague con PayPal"
 
@@ -7645,6 +7691,7 @@ msgstr "Aceptamos %s"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Información de pago"
 
@@ -7685,6 +7732,7 @@ msgstr "Completa el pago"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Envíar y pagar"
 
@@ -7716,6 +7764,7 @@ msgstr "Envíar y pagar"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Enviar y confirmar"
 
@@ -7728,6 +7777,7 @@ msgstr "Enviar y confirmar"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Procesando..."
 
@@ -7807,6 +7857,7 @@ msgstr "Factura #%s en %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimir"
 
@@ -7921,6 +7972,8 @@ msgstr "Pendiente"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Ver tu cuenta de miembro &rarr;"
 
@@ -9988,6 +10041,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -11095,6 +11149,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -11480,6 +11535,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -11488,6 +11544,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -11496,6 +11553,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -12186,6 +12244,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -17539,6 +17599,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -17687,6 +17748,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -17696,6 +17758,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -17715,6 +17778,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -17738,6 +17802,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -17757,6 +17822,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -17767,6 +17833,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -17776,6 +17843,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -17785,6 +17853,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -17797,6 +17866,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -17814,6 +17884,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -17838,6 +17909,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -17865,6 +17937,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -18110,6 +18183,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -18191,6 +18265,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -18397,6 +18472,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -18529,7 +18607,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -18538,7 +18618,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -18551,6 +18633,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -18560,6 +18643,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -18580,6 +18664,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -20521,6 +20606,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -20538,6 +20625,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -20551,6 +20640,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -20564,6 +20654,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -20682,6 +20773,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -20906,6 +20998,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -21150,6 +21243,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -24595,6 +24689,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -25191,6 +25286,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -27081,6 +27177,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -28060,6 +28157,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -28398,6 +28496,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -29073,10 +29172,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -29098,6 +29202,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -29115,6 +29220,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -29123,6 +29229,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -29210,3 +29317,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-es_ES.mo b/languages/paid-memberships-pro-es_ES.mo
index 0e0164347..fac6b7a64 100644
Binary files a/languages/paid-memberships-pro-es_ES.mo and b/languages/paid-memberships-pro-es_ES.mo differ
diff --git a/languages/paid-memberships-pro-es_ES.po b/languages/paid-memberships-pro-es_ES.po
index c7ffff303..07bd0ad8b 100644
--- a/languages/paid-memberships-pro-es_ES.po
+++ b/languages/paid-memberships-pro-es_ES.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:50+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:45+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -892,6 +892,7 @@ msgstr "Requerir suscripción"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Tipo de suscripción"
 
@@ -966,6 +967,7 @@ msgstr "Nivel actual"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Ninguno"
 
@@ -1516,6 +1518,7 @@ msgstr "Pasarela de pagos &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -1782,6 +1785,7 @@ msgstr "En caso positivo, crear una página WordPress que contiene tus términos
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Guardar opciones"
 
@@ -3254,6 +3258,8 @@ msgstr "Periodo de prueba"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Expiración"
 
@@ -3603,6 +3609,7 @@ msgstr "Apellidos"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Dirección de facturación"
 
@@ -4744,6 +4751,7 @@ msgstr "Guardar pago"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -4900,6 +4908,7 @@ msgstr "IDs de transacción"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "borrado"
 
@@ -5274,6 +5283,7 @@ msgstr "Vendedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Contraseña"
 
@@ -5423,6 +5433,7 @@ msgstr "Llave de encripción para el lado del cliente (Client-Side Encryption Ke
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moneda"
 
@@ -5452,6 +5463,7 @@ msgstr "A nombre de quien escribir el cheque. Donde enviarlo. Mostrado durante c
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "IVA (impuesto a las ventas)"
 
@@ -5467,6 +5479,7 @@ msgstr "IVA (impuesto a las ventas)"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -5476,6 +5489,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Impuesto del estado"
 
@@ -5485,6 +5499,7 @@ msgstr "Impuesto del estado"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviación, p.ej. \"PA\""
 
@@ -5494,6 +5509,7 @@ msgstr "abreviación, p.ej. \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, p.ej. \"0.06\""
 
@@ -6095,6 +6111,7 @@ msgstr "Confirmación de suscripción para %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Cupón de descuento"
 
@@ -6795,6 +6812,8 @@ msgstr "Tu suscripción esta <strong>activa</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivel"
 
@@ -7017,6 +7036,7 @@ msgstr "Tu subscripción de pago es gestionada por Paypal. Por favor <a href=\"h
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nombre"
 
@@ -7049,6 +7069,7 @@ msgstr "Nombre"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Apellidos"
 
@@ -7066,6 +7087,7 @@ msgstr "Apellidos"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Direccion 1"
 
@@ -7083,6 +7105,7 @@ msgstr "Direccion 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Direccion 2"
 
@@ -7100,6 +7123,7 @@ msgstr "Direccion 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ciudad"
 
@@ -7117,6 +7141,7 @@ msgstr "Ciudad"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Estado"
 
@@ -7134,6 +7159,7 @@ msgstr "Estado"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Código postal"
 
@@ -7166,6 +7192,7 @@ msgstr "Ciudad, Código postal de estado"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -7183,6 +7210,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -7206,6 +7234,8 @@ msgstr "Teléfono"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Dirección de Email"
 
@@ -7222,6 +7252,7 @@ msgstr "Dirección de Email"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirmar E-mail"
 
@@ -7276,6 +7307,7 @@ msgstr "Información de la tarjeta de crédito"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Número de la Tarjeta"
 
@@ -7361,8 +7393,11 @@ msgstr "Esta subscripción no es recurrente.  Por lo tanto no necesitas actualiz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "¿Estas seguro de que quieres cancelar tu suscripción?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -7470,6 +7505,7 @@ msgstr "Haz click aquí para introducir tu cupón de descuento"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -7480,6 +7516,7 @@ msgstr "Aplicar"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "¿Ya tienes una cuenta?"
 
@@ -7491,6 +7528,7 @@ msgstr "¿Ya tienes una cuenta?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "logeate aquí"
 
@@ -7517,6 +7555,7 @@ msgstr "Información de la cuenta"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirma tu contraseña"
 
@@ -7527,6 +7566,7 @@ msgstr "Confirma tu contraseña"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirma tu dirección de E-mail"
 
@@ -7537,6 +7577,7 @@ msgstr "Confirma tu dirección de E-mail"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -7547,6 +7588,7 @@ msgstr "Nombre Completo"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEJA ESTO EN BLANCO"
 
@@ -7557,6 +7599,7 @@ msgstr "DEJA ESTO EN BLANCO"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Estas logeado como <strong>%s</strong>. Si deseas usar una cuenta diferente para esta suscripción,<a href=\"%s\">deslogeate ahora</a>."
@@ -7580,6 +7623,7 @@ msgstr "Acepto %s"
 #: pages/checkout.php:244
 #: pages/checkout.php:276
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Elije tu método de pago"
 
@@ -7590,6 +7634,7 @@ msgstr "Elije tu método de pago"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Pague con su tarjeta de crédito aquí"
 
@@ -7614,6 +7659,7 @@ msgstr "Pague con su tarjeta de crédito aquí"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "pague con PayPal"
 
@@ -7669,6 +7715,7 @@ msgstr "Aceptamos %s"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Información de pago"
 
@@ -7709,6 +7756,7 @@ msgstr "Completa el pago"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Envíar y pagar"
 
@@ -7740,6 +7788,7 @@ msgstr "Envíar y pagar"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Enviar y confirmar"
 
@@ -7752,6 +7801,7 @@ msgstr "Enviar y confirmar"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Procesando..."
 
@@ -7831,6 +7881,7 @@ msgstr "Factura #%s en %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimir"
 
@@ -7945,6 +7996,8 @@ msgstr "Pendiente"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Ver tu cuenta de miembro &rarr;"
 
@@ -10012,6 +10065,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -11119,6 +11173,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -11504,6 +11559,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -11512,6 +11568,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -11520,6 +11577,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -12210,6 +12268,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -17543,6 +17603,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -17691,6 +17752,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -17700,6 +17762,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -17719,6 +17782,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -17742,6 +17806,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -17761,6 +17826,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -17771,6 +17837,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -17780,6 +17847,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -17789,6 +17857,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -17801,6 +17870,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -17818,6 +17888,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -17842,6 +17913,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -17869,6 +17941,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -18114,6 +18187,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -18195,6 +18269,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -18401,6 +18476,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -18533,7 +18611,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -18542,7 +18622,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -18555,6 +18637,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -18564,6 +18647,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -18584,6 +18668,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -20525,6 +20610,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -20542,6 +20629,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -20555,6 +20644,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -20568,6 +20658,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -20686,6 +20777,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -20910,6 +21002,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -21154,6 +21247,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -24599,6 +24693,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -25195,6 +25290,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -27085,6 +27181,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -28064,6 +28161,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -28402,6 +28500,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -29077,10 +29176,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -29102,6 +29206,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -29119,6 +29224,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -29127,6 +29233,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -29214,3 +29321,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-es_PE.mo b/languages/paid-memberships-pro-es_PE.mo
index 738bb1326..fece31c80 100644
Binary files a/languages/paid-memberships-pro-es_PE.mo and b/languages/paid-memberships-pro-es_PE.mo differ
diff --git a/languages/paid-memberships-pro-es_PE.po b/languages/paid-memberships-pro-es_PE.po
index 1adb0cf9c..f858abdbc 100644
--- a/languages/paid-memberships-pro-es_PE.po
+++ b/languages/paid-memberships-pro-es_PE.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:52+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:47+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -868,6 +868,7 @@ msgstr "Requerir membresía"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Nivel de membresía"
 
@@ -942,6 +943,7 @@ msgstr "Nivel actual"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Ninguno"
 
@@ -1492,6 +1494,7 @@ msgstr "Pasarela de pagos &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -1758,6 +1761,7 @@ msgstr "En caso positivo, crear una página WordPress que contiene tus términos
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Guardar opciones"
 
@@ -3230,6 +3234,8 @@ msgstr "Periodo de prueba"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Expiración"
 
@@ -3579,6 +3585,7 @@ msgstr "Apellidos"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Dirección de facturación"
 
@@ -4720,6 +4727,7 @@ msgstr "Guardar pago"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -4876,6 +4884,7 @@ msgstr "IDs de transacción"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "borrado"
 
@@ -5250,6 +5259,7 @@ msgstr "Vendedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Contraseña"
 
@@ -5399,6 +5409,7 @@ msgstr "Llave de encripción para el lado del cliente (Client-Side Encryption Ke
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moneda"
 
@@ -5428,6 +5439,7 @@ msgstr "A nombre de quien escribir el cheque. Donde enviarlo. Mostrado durante c
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "IVA (impuesto a las ventas)"
 
@@ -5443,6 +5455,7 @@ msgstr "IVA (impuesto a las ventas)"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -5452,6 +5465,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Impuesto del estado"
 
@@ -5461,6 +5475,7 @@ msgstr "Impuesto del estado"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviación, p.ej. \"PA\""
 
@@ -5470,6 +5485,7 @@ msgstr "abreviación, p.ej. \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, p.ej. \"0.06\""
 
@@ -6071,6 +6087,7 @@ msgstr "Confirmación de membresía para %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Cupón de descuento"
 
@@ -6771,6 +6788,8 @@ msgstr "Tu membresía esta <strong>activa</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivel"
 
@@ -6993,6 +7012,7 @@ msgstr "Tu subscripción de pago es gestionada por Paypal. Por favor <a href=\"h
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nombre"
 
@@ -7025,6 +7045,7 @@ msgstr "Nombre"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Apellidos"
 
@@ -7042,6 +7063,7 @@ msgstr "Apellidos"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Direccion 1"
 
@@ -7059,6 +7081,7 @@ msgstr "Direccion 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Direccion 2"
 
@@ -7076,6 +7099,7 @@ msgstr "Direccion 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ciudad"
 
@@ -7093,6 +7117,7 @@ msgstr "Ciudad"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Estado"
 
@@ -7110,6 +7135,7 @@ msgstr "Estado"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Código postal"
 
@@ -7142,6 +7168,7 @@ msgstr "Ciudad, Código postal de estado"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -7159,6 +7186,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -7182,6 +7210,8 @@ msgstr "Teléfono"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Dirección de Email"
 
@@ -7198,6 +7228,7 @@ msgstr "Dirección de Email"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirmar E-mail"
 
@@ -7252,6 +7283,7 @@ msgstr "Información de la tarjeta de crédito"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Número de la Tarjeta"
 
@@ -7337,8 +7369,11 @@ msgstr "Esta subscripción no es recurrente.  Por lo tanto no necesitas actualiz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "¿Estas seguro de que quieres cancelar tu membresía?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -7446,6 +7481,7 @@ msgstr "Haz click aquí para introducir tu cupón de descuento"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -7456,6 +7492,7 @@ msgstr "Aplicar"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "¿Ya tienes una cuenta?"
 
@@ -7467,6 +7504,7 @@ msgstr "¿Ya tienes una cuenta?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "logeate aquí"
 
@@ -7493,6 +7531,7 @@ msgstr "Información de la cuenta"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirma tu contraseña"
 
@@ -7503,6 +7542,7 @@ msgstr "Confirma tu contraseña"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirma tu dirección de E-mail"
 
@@ -7513,6 +7553,7 @@ msgstr "Confirma tu dirección de E-mail"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -7523,6 +7564,7 @@ msgstr "Nombre Completo"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEJA ESTO EN BLANCO"
 
@@ -7533,6 +7575,7 @@ msgstr "DEJA ESTO EN BLANCO"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Estas logeado como <strong>%s</strong>. Si deseas usar una cuenta diferente para esta membresía,<a href=\"%s\">deslogeate ahora</a>."
@@ -7556,6 +7599,7 @@ msgstr "Acepto %s"
 #: pages/checkout.php:244
 #: pages/checkout.php:276
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Elije tu método de pago"
 
@@ -7566,6 +7610,7 @@ msgstr "Elije tu método de pago"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Pague con su tarjeta de crédito aquí"
 
@@ -7590,6 +7635,7 @@ msgstr "Pague con su tarjeta de crédito aquí"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "pague con PayPal"
 
@@ -7645,6 +7691,7 @@ msgstr "Aceptamos %s"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Información de pago"
 
@@ -7685,6 +7732,7 @@ msgstr "Completa el pago"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Envíar y pagar"
 
@@ -7716,6 +7764,7 @@ msgstr "Envíar y pagar"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Enviar y confirmar"
 
@@ -7728,6 +7777,7 @@ msgstr "Enviar y confirmar"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Procesando..."
 
@@ -7807,6 +7857,7 @@ msgstr "Factura #%s en %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimir"
 
@@ -7921,6 +7972,8 @@ msgstr "Pendiente"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Ver tu cuenta de miembro &rarr;"
 
@@ -9988,6 +10041,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -11095,6 +11149,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -11480,6 +11535,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -11488,6 +11544,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -11496,6 +11553,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -12186,6 +12244,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -17539,6 +17599,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -17687,6 +17748,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -17696,6 +17758,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -17715,6 +17778,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -17738,6 +17802,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -17757,6 +17822,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -17767,6 +17833,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -17776,6 +17843,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -17785,6 +17853,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -17797,6 +17866,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -17814,6 +17884,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -17838,6 +17909,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -17865,6 +17937,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -18110,6 +18183,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -18191,6 +18265,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -18397,6 +18472,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -18529,7 +18607,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -18538,7 +18618,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -18551,6 +18633,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -18560,6 +18643,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -18580,6 +18664,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -20521,6 +20606,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -20538,6 +20625,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -20551,6 +20640,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -20564,6 +20654,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -20682,6 +20773,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -20906,6 +20998,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -21150,6 +21243,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -24595,6 +24689,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -25191,6 +25286,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -27081,6 +27177,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -28060,6 +28157,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -28398,6 +28496,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -29073,10 +29172,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -29098,6 +29202,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -29115,6 +29220,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -29123,6 +29229,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -29210,3 +29317,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-et_EE.mo b/languages/paid-memberships-pro-et_EE.mo
index aae30c514..408dd033a 100644
Binary files a/languages/paid-memberships-pro-et_EE.mo and b/languages/paid-memberships-pro-et_EE.mo differ
diff --git a/languages/paid-memberships-pro-et_EE.po b/languages/paid-memberships-pro-et_EE.po
index 75ba2ebe5..0575edc0d 100644
--- a/languages/paid-memberships-pro-et_EE.po
+++ b/languages/paid-memberships-pro-et_EE.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:55+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:49+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -859,6 +859,7 @@ msgstr "Makse meetod &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -1611,6 +1612,7 @@ msgstr "valitud"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Salvesta sätted"
 
@@ -3681,6 +3683,7 @@ msgstr "Salvesta tase"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Tühista"
 
@@ -3810,6 +3813,8 @@ msgstr "Lohista ja lase lahti, et asetada need tasemete lehele."
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Aegumine"
 
@@ -4280,6 +4285,7 @@ msgstr "Perekonna&nbsp;Nimi"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Arve aadress"
 
@@ -5845,6 +5851,7 @@ msgstr "Kasutaja"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Liikme tase"
 
@@ -5930,6 +5937,7 @@ msgstr "Ülekande ID-d"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "kustutatud"
 
@@ -6668,6 +6676,7 @@ msgstr "Rohkem infot <a title=\"Paid Memberships Pro - SSL Settings\" target=\"_
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Valuuta"
 
@@ -6679,6 +6688,7 @@ msgstr "Valuuta"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Kõik valuutad ei ole toetatud iga makse meetodiga-iga. Palun kontrollige oma makse meetodit-d."
 
@@ -6704,6 +6714,7 @@ msgstr "Aktsepteeritavad krediitkaardi tüübid"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Müügi maks"
 
@@ -6725,6 +6736,7 @@ msgstr "Müügi maks"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "valikuline"
 
@@ -6738,6 +6750,7 @@ msgstr "valikuline"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Käibemaks riigile"
 
@@ -6751,6 +6764,7 @@ msgstr "Käibemaks riigile"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "lühend, näiteks: \"PA\""
 
@@ -6764,6 +6778,7 @@ msgstr "lühend, näiteks: \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "kümnendik, näiteks: \"0.06\""
 
@@ -7708,6 +7723,7 @@ msgstr "Teie liikme kinnitus %s tasemele"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Allahindluse kood"
 
@@ -8431,6 +8447,7 @@ msgstr "Täielikuks Braintree-ga integreerimiseks, veenduge, et olete seadistanu
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Makse informatsioon"
 
@@ -8511,6 +8528,7 @@ msgstr "Me aktsepteerime %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kaardi number"
 
@@ -8619,6 +8637,7 @@ msgstr "mis see on?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Rakenda"
 
@@ -8883,6 +8902,7 @@ msgstr "Hankija/Vendor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Salasõna "
 
@@ -9097,6 +9117,7 @@ msgstr "See URL edastati PayPal'ile kõikide uute hindade ja tellimuste jaoks. T
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Välju PayPal-iga"
 
@@ -9135,6 +9156,7 @@ msgstr "Välju PayPal-iga"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Esitada ja välju"
 
@@ -9178,6 +9200,7 @@ msgstr "Esitada ja välju"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Esita ja kinnita"
 
@@ -11263,6 +11286,7 @@ msgstr "Palun täpsustage taseme id."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "pole"
 
@@ -11619,6 +11643,8 @@ msgstr "logi välja"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Tase"
 
@@ -11711,6 +11737,7 @@ msgstr "Teie makse tellimust haldab  PayPal. Palun <a href=\"http://www.paypal.c
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Eesnimi"
 
@@ -11750,6 +11777,7 @@ msgstr "Eesnimi"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
@@ -11774,6 +11802,7 @@ msgstr "Perekonnanimi"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Aadress 1"
 
@@ -11798,6 +11827,7 @@ msgstr "Aadress 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Aadress 2"
 
@@ -11822,6 +11852,7 @@ msgstr "Aadress 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Linn"
 
@@ -11846,6 +11877,7 @@ msgstr "Linn"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Riik"
 
@@ -11870,6 +11902,7 @@ msgstr "Riik"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postiindeks"
 
@@ -11918,6 +11951,7 @@ msgstr "Linna, riigi postiindeks"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Riik"
 
@@ -11943,6 +11977,7 @@ msgstr "Riik"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -11978,6 +12013,8 @@ msgstr "Telefon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Meiliaadress"
 
@@ -12002,6 +12039,7 @@ msgstr "Meiliaadress"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Kinnita E-mail"
 
@@ -12054,8 +12092,11 @@ msgstr "See tellimus pole korduv. Seega, te ei pea värskendama oma arveldusteav
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Kas olete kindel, et soovite katkestada oma liikme taseme?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12093,6 +12134,7 @@ msgstr "Ei, säilita minu konto"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Minu liikme andmed"
 
@@ -12103,6 +12145,7 @@ msgstr "Minu liikme andmed"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Tühista kõik liikme staatused"
 
@@ -12229,6 +12272,7 @@ msgstr "Konto andmed"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Juba on konto"
 
@@ -12244,6 +12288,7 @@ msgstr "Juba on konto"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Logige sisse siit"
 
@@ -12262,6 +12307,7 @@ msgstr "Logige sisse siit"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Kinnitage parool"
 
@@ -12276,6 +12322,7 @@ msgstr "Kinnitage parool"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Kinnitage Emaili aadress"
 
@@ -12290,6 +12337,7 @@ msgstr "Kinnitage Emaili aadress"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Täisnimi"
 
@@ -12304,6 +12352,7 @@ msgstr "Täisnimi"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "JÄTKE SEE TÜHJAKS"
 
@@ -12318,6 +12367,7 @@ msgstr "JÄTKE SEE TÜHJAKS"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Sa oled sisse loginud kui <strong>%s</strong>. Kui soovite kasutada teist kontot selle liikmeks tegemisel, <a href=\"%s\">logige välja nüüd</a>."
@@ -12333,6 +12383,7 @@ msgstr "Sa oled sisse loginud kui <strong>%s</strong>. Kui soovite kasutada teis
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Valige oma makseviis"
 
@@ -12348,6 +12399,7 @@ msgstr "Valige oma makseviis"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Registreeruge välja krediit kaardiga siit"
 
@@ -12402,6 +12454,7 @@ msgstr "Täielik/Lõpetage makse"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Töötlemine..."
 
@@ -12485,6 +12538,7 @@ msgstr "Arve #%s , %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Prindi"
 
@@ -12647,6 +12701,8 @@ msgstr "Ootel"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Vaata oma liikme kontot &rarr;"
 
@@ -15072,6 +15128,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -15807,6 +15864,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -16041,6 +16099,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -16049,6 +16108,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -16536,6 +16596,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21270,6 +21332,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21418,6 +21481,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21427,6 +21491,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21446,6 +21511,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21469,6 +21535,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21488,6 +21555,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21498,6 +21566,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21507,6 +21576,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21516,6 +21586,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21528,6 +21599,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21545,6 +21617,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21569,6 +21642,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21591,6 +21665,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -21836,6 +21911,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -21902,6 +21978,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22108,6 +22185,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22226,7 +22306,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22235,7 +22317,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22254,6 +22338,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24073,6 +24158,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24090,6 +24177,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24103,6 +24192,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24116,6 +24206,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24234,6 +24325,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24458,6 +24550,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -24702,6 +24795,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28121,6 +28215,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -28717,6 +28812,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30607,6 +30703,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31586,6 +31683,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -31924,6 +32022,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32599,10 +32698,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32624,6 +32728,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32641,6 +32746,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32649,6 +32755,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -32736,3 +32843,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-fa_IR.mo b/languages/paid-memberships-pro-fa_IR.mo
index 9d93bdef2..f2ae36a72 100644
Binary files a/languages/paid-memberships-pro-fa_IR.mo and b/languages/paid-memberships-pro-fa_IR.mo differ
diff --git a/languages/paid-memberships-pro-fa_IR.po b/languages/paid-memberships-pro-fa_IR.po
index bb2af32fe..39b80610a 100644
--- a/languages/paid-memberships-pro-fa_IR.po
+++ b/languages/paid-memberships-pro-fa_IR.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:57+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:51+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -857,6 +857,7 @@ msgstr "درگاه پرداخت و گواهی اس اس ال"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "ایمیل"
 
@@ -1609,6 +1610,7 @@ msgstr "انتخاب شده"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "ذخیره تنظیمات"
 
@@ -3658,6 +3660,7 @@ msgstr "ذخیره سطح"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "لغو کردن"
 
@@ -3787,6 +3790,8 @@ msgstr "برای جابجایی ترتیب سطوح عضویت را بکشید 
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "انقضا"
 
@@ -4245,6 +4250,7 @@ msgstr "نام&nbsp;خانوادگی"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "آدرس  صورت حساب"
 
@@ -5697,6 +5703,7 @@ msgstr "کاربر"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "سطح عضویت"
 
@@ -5779,6 +5786,7 @@ msgstr "شناسه تراکنش"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "پاک شد"
 
@@ -6506,6 +6514,7 @@ msgstr "بیشتر بدانید <a title=\"Paid Memberships Pro - SSL Settings\"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "واحد پول"
 
@@ -6517,6 +6526,7 @@ msgstr "واحد پول"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "همه واحدهای پول با هر درگاهی پشتیبانی نمی شوند. درگاه خود را بررسی کنید"
 
@@ -6542,6 +6552,7 @@ msgstr "کارتهای پرداخت مورد قبول"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "مالیات فروش"
 
@@ -6563,6 +6574,7 @@ msgstr "مالیات فروش"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "اختیاری"
 
@@ -6576,6 +6588,7 @@ msgstr "اختیاری"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "محدوده مالیات"
 
@@ -6589,6 +6602,7 @@ msgstr "محدوده مالیات"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "مخفف، به عنوان مثال \"PA\""
 
@@ -6602,6 +6616,7 @@ msgstr "مخفف، به عنوان مثال \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "ده دهی، به عنوان مثال \"0.06\""
 
@@ -7466,6 +7481,7 @@ msgstr "تایید عضویت شما برای %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "کد تخفیف"
 
@@ -8180,6 +8196,7 @@ msgstr "برای ادغام کامل با Braintree، مطمئن شوید که 
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "اطلاعات پرداخت"
 
@@ -8255,6 +8272,7 @@ msgstr "ما پذیرفتیم %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "شماره کارت"
 
@@ -8354,6 +8372,7 @@ msgstr "این چیست؟"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "اعمال"
 
@@ -8615,6 +8634,7 @@ msgstr "فروشنده"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "رمزعبور"
 
@@ -8827,6 +8847,7 @@ msgstr "This URL is passed to PayPal for all new charges and subscriptions. You
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Check Out with PayPal"
 
@@ -8864,6 +8885,7 @@ msgstr "Check Out with PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Submit and Check Out"
 
@@ -8906,6 +8928,7 @@ msgstr "Submit and Check Out"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Submit and Confirm"
 
@@ -10859,6 +10882,7 @@ msgstr "لطفا یک شناسه سطح را مشخص کنید."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "هیچ"
 
@@ -11210,6 +11234,8 @@ msgstr "خروج"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "سطح"
 
@@ -11302,6 +11328,7 @@ msgstr "پرداخت اشتراک شما با پی پال صورت گرفته ل
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "نام"
 
@@ -11341,6 +11368,7 @@ msgstr "نام"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "نام خانوادگی"
 
@@ -11365,6 +11393,7 @@ msgstr "نام خانوادگی"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "نشانی ۱"
 
@@ -11389,6 +11418,7 @@ msgstr "نشانی ۱"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "نشانی ۲"
 
@@ -11412,6 +11442,7 @@ msgstr "نشانی ۲"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "شهر"
 
@@ -11435,6 +11466,7 @@ msgstr "شهر"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "ایالت"
 
@@ -11458,6 +11490,7 @@ msgstr "ایالت"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "کد پستی"
 
@@ -11504,6 +11537,7 @@ msgstr "کد پستی شهر، استان"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "کشور"
 
@@ -11528,6 +11562,7 @@ msgstr "کشور"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "شماره تلفن"
 
@@ -11561,6 +11596,8 @@ msgstr "شماره تلفن"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "آدرس ایمیل"
 
@@ -11584,6 +11621,7 @@ msgstr "آدرس ایمیل"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "تایید آدرس ایمیل"
 
@@ -11633,8 +11671,11 @@ msgstr "این اشتراک دوره ای نیست، نیازی به بروز ر
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "آیا از لغو عضویت %s اطمینان دارید؟"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -11672,6 +11713,7 @@ msgstr "خیر، حسابم را لغو نمیکنم!"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "عضویت های من"
 
@@ -11682,6 +11724,7 @@ msgstr "عضویت های من"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "لغو همه عضویت ها"
 
@@ -11800,6 +11843,7 @@ msgstr "اطلاعات حساب"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "قبلا ثبت نام کرده اید؟"
 
@@ -11814,6 +11858,7 @@ msgstr "قبلا ثبت نام کرده اید؟"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "از اینجا وارد شوید"
 
@@ -11831,6 +11876,7 @@ msgstr "از اینجا وارد شوید"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "تایید رمز عبور"
 
@@ -11844,6 +11890,7 @@ msgstr "تایید رمز عبور"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "تایید آدرس ایمیل"
 
@@ -11857,6 +11904,7 @@ msgstr "تایید آدرس ایمیل"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "نام و نام خانوادگی"
 
@@ -11870,6 +11918,7 @@ msgstr "نام و نام خانوادگی"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "اینجا را خالی بگذارید"
 
@@ -11883,6 +11932,7 @@ msgstr "اینجا را خالی بگذارید"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "با نام کاربری <strong>%s</strong> وارد شده اید. اگر میخواهید برای این عضویت از یک حساب دیگر استفاده کنید، پس <a href=\"%s\">ابتدا خارج شوید</a>."
@@ -11897,6 +11947,7 @@ msgstr "با نام کاربری <strong>%s</strong> وارد شده اید. ا
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "روش پرداخت خود را انتخاب کنید"
 
@@ -11911,6 +11962,7 @@ msgstr "روش پرداخت خود را انتخاب کنید"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "پرداخت توسط کارت اعتباری از اینجا"
 
@@ -11962,6 +12014,7 @@ msgstr "تکمیل پرداخت"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "در حال پردازش..."
 
@@ -12045,6 +12098,7 @@ msgstr "فاکتور  #%s در %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "چاپ"
 
@@ -12207,6 +12261,8 @@ msgstr "در حال بررسی"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "مشاهده حساب کاربری و عضویت شما &rarr;"
 
@@ -14563,6 +14619,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -15329,6 +15386,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -15563,6 +15621,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -15571,6 +15630,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -16113,6 +16173,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -20900,6 +20962,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21048,6 +21111,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21057,6 +21121,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21076,6 +21141,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21099,6 +21165,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21118,6 +21185,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21128,6 +21196,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21137,6 +21206,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21146,6 +21216,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21158,6 +21229,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21175,6 +21247,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21199,6 +21272,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21221,6 +21295,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -21466,6 +21541,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -21532,6 +21608,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -21738,6 +21815,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -21856,7 +21936,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -21865,7 +21947,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -21884,6 +21968,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -23703,6 +23788,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -23720,6 +23807,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -23733,6 +23822,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -23746,6 +23836,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -23864,6 +23955,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24088,6 +24180,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -24332,6 +24425,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -27751,6 +27845,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -28347,6 +28442,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30237,6 +30333,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31216,6 +31313,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -31554,6 +31652,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32229,10 +32328,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32254,6 +32358,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32271,6 +32376,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32279,6 +32385,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -32366,3 +32473,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-fi.mo b/languages/paid-memberships-pro-fi.mo
index 6553dee52..858927cdd 100644
Binary files a/languages/paid-memberships-pro-fi.mo and b/languages/paid-memberships-pro-fi.mo differ
diff --git a/languages/paid-memberships-pro-fi.po b/languages/paid-memberships-pro-fi.po
index 34322a41f..e17bb2299 100644
--- a/languages/paid-memberships-pro-fi.po
+++ b/languages/paid-memberships-pro-fi.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:59+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:53+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -316,6 +316,7 @@ msgstr "Maksuväylä &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -976,6 +977,7 @@ msgstr "valittu"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Tallenna asetukset"
 
@@ -2550,6 +2552,7 @@ msgstr "Tallenna taso"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -2646,6 +2649,8 @@ msgstr "Vedä ja pudota tilaajatasot uudelleen järjestääksesi ne Tilaajataso
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Päättymispäivä"
 
@@ -3004,6 +3009,7 @@ msgstr "Sukunimi"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Laskutusosoite"
 
@@ -4321,6 +4327,7 @@ msgstr "Käyttäjä"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Tilaajataso"
 
@@ -4394,6 +4401,7 @@ msgstr "Maksutapahtumat"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "poistettu"
 
@@ -4940,6 +4948,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Valuutta"
 
@@ -4949,6 +4958,7 @@ msgstr "Valuutta"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -4966,6 +4976,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "ALV"
 
@@ -4981,6 +4992,7 @@ msgstr "ALV"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "vapaavalintainen"
 
@@ -4990,6 +5002,7 @@ msgstr "vapaavalintainen"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Veroalue (ei merkitystä Suomessa)"
 
@@ -4999,6 +5012,7 @@ msgstr "Veroalue (ei merkitystä Suomessa)"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
@@ -5008,6 +5022,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "desimaaliluku, esim \"0.24\""
 
@@ -5749,6 +5764,7 @@ msgstr ""
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Alennuskoodi"
 
@@ -6313,6 +6329,7 @@ msgstr "Maksuvälineenä käyvät %s"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Maksutiedot"
 
@@ -6350,6 +6367,7 @@ msgstr "Maksutiedot"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kortin numero"
 
@@ -6403,6 +6421,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Käytä"
 
@@ -6588,6 +6607,7 @@ msgstr "Myyjä"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Salasana"
 
@@ -6757,6 +6777,7 @@ msgstr ""
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr ""
 
@@ -6788,6 +6809,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr ""
 
@@ -6823,6 +6845,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr ""
 
@@ -8171,6 +8194,7 @@ msgstr ""
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Ei mitään"
 
@@ -8420,6 +8444,8 @@ msgstr "uloskirjaus"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Taso"
 
@@ -8491,6 +8517,7 @@ msgstr ""
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Etunimi"
 
@@ -8523,6 +8550,7 @@ msgstr "Etunimi"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Sukunimi"
 
@@ -8540,6 +8568,7 @@ msgstr "Sukunimi"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Osoite 1"
 
@@ -8557,6 +8586,7 @@ msgstr "Osoite 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Osoite 2"
 
@@ -8573,6 +8603,7 @@ msgstr "Osoite 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Kaupunki"
 
@@ -8589,6 +8620,7 @@ msgstr "Kaupunki"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Alue"
 
@@ -8605,6 +8637,7 @@ msgstr "Alue"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postinumero"
 
@@ -8637,6 +8670,7 @@ msgstr "Kaupunki"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Maa"
 
@@ -8654,6 +8688,7 @@ msgstr "Maa"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Puhelinnumero"
 
@@ -8677,6 +8712,8 @@ msgstr "Puhelinnumero"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Sähköposti"
 
@@ -8693,6 +8730,7 @@ msgstr "Sähköposti"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Vahvista Sähköposti"
 
@@ -8734,8 +8772,11 @@ msgstr ""
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr ""
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -8770,6 +8811,7 @@ msgstr "Ei, pidä tilini"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -8780,6 +8822,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -8856,6 +8899,7 @@ msgstr ""
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Onko sinulla jo tili?"
 
@@ -8867,6 +8911,7 @@ msgstr "Onko sinulla jo tili?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Kirjaudu sisään täältä"
 
@@ -8893,6 +8938,7 @@ msgstr "Tilitiedot"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Vahvista salasana"
 
@@ -8903,6 +8949,7 @@ msgstr "Vahvista salasana"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Vahvista sähköpostiosoite"
 
@@ -8913,6 +8960,7 @@ msgstr "Vahvista sähköpostiosoite"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Kokonimi"
 
@@ -8923,6 +8971,7 @@ msgstr "Kokonimi"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "JÄTÄ TYHJÄKSI"
 
@@ -8933,6 +8982,7 @@ msgstr "JÄTÄ TYHJÄKSI"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Olet kirjautunut sisään käyttäjänä <strong>%s</strong>. Jos haluat käyttää eri tiliä, <a href=\"%s\">kirjaudu ulos</a>."
@@ -8944,6 +8994,7 @@ msgstr "Olet kirjautunut sisään käyttäjänä <strong>%s</strong>. Jos haluat
 #: pages/checkout.php:244
 #: pages/checkout.php:276
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr ""
 
@@ -8954,6 +9005,7 @@ msgstr ""
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr ""
 
@@ -8990,6 +9042,7 @@ msgstr ""
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Prosessoidaan..."
 
@@ -9073,6 +9126,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Tulosta"
 
@@ -9195,6 +9249,8 @@ msgstr ""
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr ""
 
@@ -11449,6 +11505,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -12378,6 +12435,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -12646,6 +12704,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -12654,6 +12713,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -13214,6 +13274,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -18024,6 +18086,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -18172,6 +18235,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -18181,6 +18245,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -18200,6 +18265,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -18223,6 +18289,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -18242,6 +18309,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -18252,6 +18320,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -18261,6 +18330,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -18270,6 +18340,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -18282,6 +18353,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -18299,6 +18371,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -18323,6 +18396,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -18350,6 +18424,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -18595,6 +18670,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -18661,6 +18737,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -18867,6 +18944,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -18989,7 +19069,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -18998,7 +19080,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -19017,6 +19101,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -20860,6 +20945,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -20877,6 +20964,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -20890,6 +20979,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -20903,6 +20993,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -21021,6 +21112,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -21226,6 +21318,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -21470,6 +21563,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -24899,6 +24993,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -25495,6 +25590,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -27392,6 +27488,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -28371,6 +28468,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -28709,6 +28807,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -29384,10 +29483,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -29409,6 +29513,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -29426,6 +29531,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -29434,6 +29540,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -29521,3 +29628,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-fr_FR.mo b/languages/paid-memberships-pro-fr_FR.mo
index 051911f6a..ebaa73612 100755
Binary files a/languages/paid-memberships-pro-fr_FR.mo and b/languages/paid-memberships-pro-fr_FR.mo differ
diff --git a/languages/paid-memberships-pro-fr_FR.po b/languages/paid-memberships-pro-fr_FR.po
index 5302b3066..559952f22 100755
--- a/languages/paid-memberships-pro-fr_FR.po
+++ b/languages/paid-memberships-pro-fr_FR.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:01+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:55+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -316,6 +316,7 @@ msgstr "Passerelle de paiement et SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Courriel"
 
@@ -976,6 +977,7 @@ msgstr "choisi"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Enregistrer les paramètres"
 
@@ -2551,6 +2553,7 @@ msgstr "Enregistrer le niveau d'adhésion"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -2635,6 +2638,8 @@ msgstr "Recherche de niveaux"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Expiration"
 
@@ -3008,6 +3013,7 @@ msgstr "Nom"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Adresse de facturation"
 
@@ -4357,6 +4363,7 @@ msgstr "Utilisateur"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Niveau d'adhésion"
 
@@ -4430,6 +4437,7 @@ msgstr "IDs de transactions"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "supprimé"
 
@@ -4976,6 +4984,7 @@ msgstr "En savoir plus <a title=\"Paid Memberships Pro - SSL Settings\" target=\
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Devise"
 
@@ -4985,6 +4994,7 @@ msgstr "Devise"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Toutes les devises ne sont pas supportées par chaque passerelle de paiement. Veuillez vérifier votre passerelle de paiement."
 
@@ -5002,6 +5012,7 @@ msgstr "Type de cartes de crédit acceptées"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Taxes sur les ventes"
 
@@ -5017,6 +5028,7 @@ msgstr "Taxes sur les ventes"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "optionnel"
 
@@ -5026,6 +5038,7 @@ msgstr "optionnel"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Taxe d'État"
 
@@ -5035,6 +5048,7 @@ msgstr "Taxe d'État"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abréviation, par exemple « PA »"
 
@@ -5044,6 +5058,7 @@ msgstr "abréviation, par exemple « PA »"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "décimal, par exemple \"0.06\""
 
@@ -5800,6 +5815,7 @@ msgstr "Votre confirmation d'adhésion pour %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Code de remise"
 
@@ -6365,6 +6381,7 @@ msgstr "Nous acceptons %s"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Information de paiement"
 
@@ -6402,6 +6419,7 @@ msgstr "Information de paiement"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Numéro de la carte"
 
@@ -6470,6 +6488,7 @@ msgstr "qu'est ce que c'est ?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Soumettre"
 
@@ -6655,6 +6674,7 @@ msgstr "Fournisseur"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -6824,6 +6844,7 @@ msgstr "Cette URL est transmise à PayPal pour tous les paiements et abonnements
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Payer avec Paypal"
 
@@ -6855,6 +6876,7 @@ msgstr "Payer avec Paypal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Soumettre et payer"
 
@@ -6890,6 +6912,7 @@ msgstr "Soumettre et payer"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Soumettre et confirmer"
 
@@ -8225,6 +8248,7 @@ msgstr "Veuillez spécifier un n° de niveau."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Aucun"
 
@@ -8469,6 +8493,8 @@ msgstr "déconnexion"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Niveau"
 
@@ -8540,6 +8566,7 @@ msgstr "Votre abonnement est géré par PayPal. S'il vous plait <a href=\"http:/
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Prénom"
 
@@ -8572,6 +8599,7 @@ msgstr "Prénom"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Nom"
 
@@ -8589,6 +8617,7 @@ msgstr "Nom"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresse 1"
 
@@ -8606,6 +8635,7 @@ msgstr "Adresse 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adresse 2"
 
@@ -8623,6 +8653,7 @@ msgstr "Adresse 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ville"
 
@@ -8640,6 +8671,7 @@ msgstr "Ville"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Province"
 
@@ -8657,6 +8689,7 @@ msgstr "Province"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Code postal"
 
@@ -8689,6 +8722,7 @@ msgstr "Ville, code d'État"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Pays"
 
@@ -8706,6 +8740,7 @@ msgstr "Pays"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -8729,6 +8764,8 @@ msgstr "Téléphone"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Adresse courriel"
 
@@ -8745,6 +8782,7 @@ msgstr "Adresse courriel"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirmer courriel"
 
@@ -8786,8 +8824,11 @@ msgstr "Cet abonnement n'est pas récurrent. Vous n'avez donc pas besoin de mett
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Êtes-vous sûr de vouloir résilier votre adhésion?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -8822,6 +8863,7 @@ msgstr "Non, garder mon compte"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Mes adhésions"
 
@@ -8832,6 +8874,7 @@ msgstr "Mes adhésions"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Résilier toutes mes adhésions"
 
@@ -8908,6 +8951,7 @@ msgstr "Cliquez ici pour entrer votre code de réduction"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Vous avez déjà un compte ?"
 
@@ -8919,6 +8963,7 @@ msgstr "Vous avez déjà un compte ?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Connectez-vous ici"
 
@@ -8945,6 +8990,7 @@ msgstr "Informations du compte"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirmez le mot de passe"
 
@@ -8955,6 +9001,7 @@ msgstr "Confirmez le mot de passe"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirmer l'email"
 
@@ -8965,6 +9012,7 @@ msgstr "Confirmer l'email"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nom et prénom"
 
@@ -8975,6 +9023,7 @@ msgstr "Nom et prénom"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "Laissez ce champ vide"
 
@@ -8985,6 +9034,7 @@ msgstr "Laissez ce champ vide"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Vous êtes connecté en tant que <strong>%s </ strong>. Si vous souhaitez utiliser un compte différent pour cette adhésion, <a href=\"%s\">déconnectez-vous</a>."
@@ -8995,6 +9045,7 @@ msgstr "Vous êtes connecté en tant que <strong>%s </ strong>. Si vous souhaite
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Choisissez votre mode de paiement"
 
@@ -9005,6 +9056,7 @@ msgstr "Choisissez votre mode de paiement"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Payer avec une carte de crédit ici"
 
@@ -9041,6 +9093,7 @@ msgstr "Terminer le paiement"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Traitement en cours ..."
 
@@ -9128,6 +9181,7 @@ msgstr "Reçu #%s on %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimer"
 
@@ -9270,6 +9324,8 @@ msgstr "En attente"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Voir votre Compte &rarr;"
 
@@ -11566,6 +11622,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -12445,6 +12502,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -12713,6 +12771,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -12721,6 +12780,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -13263,6 +13323,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -18045,6 +18107,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -18193,6 +18256,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -18202,6 +18266,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -18221,6 +18286,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -18244,6 +18310,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -18263,6 +18330,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -18273,6 +18341,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -18282,6 +18351,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -18291,6 +18361,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -18303,6 +18374,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -18320,6 +18392,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -18344,6 +18417,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -18371,6 +18445,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -18616,6 +18691,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -18682,6 +18758,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -18888,6 +18965,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -19010,7 +19090,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -19019,7 +19101,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -19038,6 +19122,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -20868,6 +20953,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -20885,6 +20972,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -20898,6 +20987,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -20911,6 +21001,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -21029,6 +21120,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -21253,6 +21345,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -21497,6 +21590,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -24926,6 +25020,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -25522,6 +25617,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -27412,6 +27508,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -28391,6 +28488,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -28729,6 +28827,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -29404,10 +29503,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -29429,6 +29533,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -29446,6 +29551,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -29454,6 +29560,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -29541,3 +29648,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-he_IL.mo b/languages/paid-memberships-pro-he_IL.mo
index 2cc48c73d..f2fb8bbff 100644
Binary files a/languages/paid-memberships-pro-he_IL.mo and b/languages/paid-memberships-pro-he_IL.mo differ
diff --git a/languages/paid-memberships-pro-he_IL.po b/languages/paid-memberships-pro-he_IL.po
index 8bee6ecf2..104f44836 100644
--- a/languages/paid-memberships-pro-he_IL.po
+++ b/languages/paid-memberships-pro-he_IL.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:03+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:57+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -866,6 +866,7 @@ msgstr ""
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "‎אימייל"
 
@@ -1622,6 +1623,7 @@ msgstr ""
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr ""
 
@@ -3774,6 +3776,7 @@ msgstr ""
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr ""
 
@@ -3903,6 +3906,8 @@ msgstr ""
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "תוקף"
 
@@ -4384,6 +4389,7 @@ msgstr ""
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "כתובת חיוב"
 
@@ -6015,6 +6021,7 @@ msgstr ""
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr ""
 
@@ -6104,6 +6111,7 @@ msgstr ""
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr ""
 
@@ -6850,6 +6858,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -6864,6 +6873,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr ""
 
@@ -6875,6 +6885,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -6900,6 +6911,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr ""
 
@@ -6921,6 +6933,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr ""
 
@@ -6934,6 +6947,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr ""
 
@@ -6947,6 +6961,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
@@ -6956,6 +6971,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -6969,6 +6985,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr ""
 
@@ -7986,6 +8003,7 @@ msgstr ""
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr ""
 
@@ -8742,6 +8760,7 @@ msgstr ""
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr ""
 
@@ -8828,6 +8847,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "מספר כרטיס"
 
@@ -8945,6 +8965,7 @@ msgstr "איפה זה?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr ""
 
@@ -9224,6 +9245,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "סיסמה"
 
@@ -9443,6 +9465,7 @@ msgstr ""
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "שלם עם פייפאל"
 
@@ -9482,6 +9505,7 @@ msgstr "שלם עם פייפאל"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "שלח ושלם"
 
@@ -9527,6 +9551,7 @@ msgstr "שלח ושלם"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr ""
 
@@ -11719,6 +11744,7 @@ msgstr ""
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "‎כלום"
 
@@ -12103,6 +12129,8 @@ msgstr "‎התנתק"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "‎דרגה"
 
@@ -12198,6 +12226,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "‎שם פרטי"
 
@@ -12238,6 +12267,7 @@ msgstr "‎שם פרטי"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "‎שם משפחה"
 
@@ -12263,6 +12293,7 @@ msgstr "‎שם משפחה"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "‎כתובת"
 
@@ -12288,6 +12319,7 @@ msgstr "‎כתובת"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "‎כתובת 2"
 
@@ -12313,6 +12345,7 @@ msgstr "‎כתובת 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "‎עיר"
 
@@ -12338,6 +12371,7 @@ msgstr "‎עיר"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "איזור"
 
@@ -12363,6 +12397,7 @@ msgstr "איזור"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "‎מיקוד"
 
@@ -12413,6 +12448,7 @@ msgstr "‎עיר‫,‬ מדינה ומיקוד"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "‎מדינה"
 
@@ -12439,6 +12475,7 @@ msgstr "‎מדינה"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "‎טלפון"
 
@@ -12476,6 +12513,8 @@ msgstr "‎טלפון"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "‎כתובת אימייל"
 
@@ -12501,6 +12540,7 @@ msgstr "‎כתובת אימייל"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "‎אימות אימייל"
 
@@ -12554,8 +12594,11 @@ msgstr "‎אין צורך להזין פרטי תשלום‫.‬"
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "‎אתה בטוח שאתה רוצה לבטל את החשבון שלך‫?‬"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12593,6 +12636,7 @@ msgstr "‎לא‫,‬ השאר את החשבון שלי"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "‎הדרגות שלי"
 
@@ -12603,6 +12647,7 @@ msgstr "‎הדרגות שלי"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "‎בטל את כל הדרגות"
 
@@ -12731,6 +12776,7 @@ msgstr "פרטי משתמש"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "כבר יש לך משתמש?"
 
@@ -12747,6 +12793,7 @@ msgstr "כבר יש לך משתמש?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "התחבר כאן"
 
@@ -12766,6 +12813,7 @@ msgstr "התחבר כאן"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "אימות סיסמה"
 
@@ -12780,6 +12828,7 @@ msgstr "אימות סיסמה"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "אימות אימייל"
 
@@ -12795,6 +12844,7 @@ msgstr "אימות אימייל"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "שם מלא"
 
@@ -12810,6 +12860,7 @@ msgstr "שם מלא"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "השאר את זה ריק"
 
@@ -12825,6 +12876,7 @@ msgstr "השאר את זה ריק"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "אתה מחובר כעת, אם ברצונך להחליף משתמש אנא התנתק."
@@ -12841,6 +12893,7 @@ msgstr "אתה מחובר כעת, אם ברצונך להחליף משתמש אנ
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "בחר אמצעי תשלום"
 
@@ -12857,6 +12910,7 @@ msgstr "בחר אמצעי תשלום"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "שלם עם כרטיס אשראי כאן"
 
@@ -12914,6 +12968,7 @@ msgstr "השלמת תשלום"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "מעבד נתונים…"
 
@@ -12997,6 +13052,7 @@ msgstr "קבלה #%s  ב%s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr ""
 
@@ -13159,6 +13215,8 @@ msgstr ""
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "צפה בפרטי החשבון שלך &rarr;"
 
@@ -15646,6 +15704,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -16375,6 +16434,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -17041,6 +17101,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21723,6 +21785,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21871,6 +21934,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21880,6 +21944,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21899,6 +21964,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21922,6 +21988,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21941,6 +22008,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21951,6 +22019,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21960,6 +22029,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21969,6 +22039,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21981,6 +22052,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21998,6 +22070,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -22022,6 +22095,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -22044,6 +22118,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -22289,6 +22364,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -22355,6 +22431,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22561,6 +22638,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22670,7 +22750,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22679,7 +22761,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22698,6 +22782,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24502,6 +24587,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24519,6 +24606,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24532,6 +24621,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24545,6 +24635,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24663,6 +24754,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24887,6 +24979,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -25131,6 +25224,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28550,6 +28644,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -29146,6 +29241,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -31036,6 +31132,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -32015,6 +32112,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -32353,6 +32451,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -33028,10 +33127,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -33053,6 +33157,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -33070,6 +33175,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -33078,6 +33184,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -33165,3 +33272,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-it_IT.mo b/languages/paid-memberships-pro-it_IT.mo
index 16db768c4..dd8ad4c08 100644
Binary files a/languages/paid-memberships-pro-it_IT.mo and b/languages/paid-memberships-pro-it_IT.mo differ
diff --git a/languages/paid-memberships-pro-it_IT.po b/languages/paid-memberships-pro-it_IT.po
index c901fd8b9..f3116ddce 100644
--- a/languages/paid-memberships-pro-it_IT.po
+++ b/languages/paid-memberships-pro-it_IT.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:06+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:59+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -909,6 +909,7 @@ msgstr "Pagamento &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -1676,6 +1677,7 @@ msgstr "selezionato"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
@@ -3893,6 +3895,7 @@ msgstr "Salva Livello"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -4032,6 +4035,8 @@ msgstr "Trascina e rilascia i livelli di sottoscrizione per riordinarli nella pa
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Scadenza"
 
@@ -4538,6 +4543,7 @@ msgstr "Cognome"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Indirizzo di Fatturazione"
 
@@ -6319,6 +6325,7 @@ msgstr "Utente"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Livello d'iscrizione"
 
@@ -6416,6 +6423,7 @@ msgstr "ID Transazioni"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "eliminato"
 
@@ -7172,6 +7180,7 @@ msgstr "Scegli un Metodo di Pagamento"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Impostazioni Valuta e Tasse"
 
@@ -7186,6 +7195,7 @@ msgstr "Impostazioni Valuta e Tasse"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moneta"
 
@@ -7197,6 +7207,7 @@ msgstr "Moneta"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Non tutte le valute sono accettate da ogni metodo di pagamento. Si prega di verificare con il metodo di pagamento prescelto."
 
@@ -7222,6 +7233,7 @@ msgstr "Tipi di Carta di Credito accettati"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Spese di spedizione"
 
@@ -7246,6 +7258,7 @@ msgstr "Spese di spedizione"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opzionale"
 
@@ -7259,6 +7272,7 @@ msgstr "opzionale"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Stato per Spedizione"
 
@@ -7272,6 +7286,7 @@ msgstr "Stato per Spedizione"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abbreviazione, es. \"PA\""
 
@@ -7281,6 +7296,7 @@ msgstr "abbreviazione, es. \"PA\""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Percentuale Tasse"
 
@@ -7294,6 +7310,7 @@ msgstr "Percentuale Tasse"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimale, es. \"0.06\""
 
@@ -8351,6 +8368,7 @@ msgstr "La tua conferma di iscrizione per %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Codice Sconto"
 
@@ -9180,6 +9198,7 @@ msgstr "Per l'integrazione completa con Braintree accertati di aver impostato il
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informazioni di Pagamento"
 
@@ -9283,6 +9302,7 @@ msgstr "Accettiamo %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Numero di Carta"
 
@@ -9435,6 +9455,7 @@ msgstr "cos'è?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Applica"
 
@@ -9744,6 +9765,7 @@ msgstr "Venditore"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Password"
 
@@ -9995,6 +10017,7 @@ msgstr "Questa URL viene trasmessa a PayPal per tutti i nuovi pagamenti e sottos
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Paga con PayPal"
 
@@ -10040,6 +10063,7 @@ msgstr "Paga con PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Invia e Paga"
 
@@ -10091,6 +10115,7 @@ msgstr "Invia e Paga"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Invia e Conferma"
 
@@ -12673,6 +12698,7 @@ msgstr "Specifica un ID di livello."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Non definito"
 
@@ -13076,6 +13102,8 @@ msgstr "esci"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Livello"
 
@@ -13183,6 +13211,7 @@ msgstr "Il pagamento è gestito da PayPal. <a href=\"http://www.paypal.com\">Eff
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nome"
 
@@ -13227,6 +13256,7 @@ msgstr "Nome"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Cognome"
 
@@ -13256,6 +13286,7 @@ msgstr "Cognome"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Via e numero"
 
@@ -13285,6 +13316,7 @@ msgstr "Via e numero"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Appartamento, suite, unità, ecc."
 
@@ -13314,6 +13346,7 @@ msgstr "Appartamento, suite, unità, ecc."
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Città"
 
@@ -13343,6 +13376,7 @@ msgstr "Città"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Provincia"
 
@@ -13372,6 +13406,7 @@ msgstr "Provincia"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "C.A.P."
 
@@ -13430,6 +13465,7 @@ msgstr "Città, Provincia e C.A.P."
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Comune"
 
@@ -13460,6 +13496,7 @@ msgstr "Comune"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefono"
 
@@ -13502,6 +13539,8 @@ msgstr "Telefono"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Indirizzo email"
 
@@ -13531,6 +13570,7 @@ msgstr "Indirizzo email"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Conferma email"
 
@@ -13596,8 +13636,11 @@ msgstr "L'iscrizione non è ricorrente. Quindi non dovrai aggiornare le informaz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Sicuro di voler cancellare l'iscrizione?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:41
 #: pages/cancel.php:32
@@ -13622,7 +13665,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr "Sì, annulla questa iscrizione"
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:47
 #: pages/cancel.php:46
@@ -13633,7 +13678,9 @@ msgstr "Sì, annulla questa iscrizione"
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr "No, mantieni questa iscrizione"
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: shortcodes/pmpro_account.php:40
@@ -13652,6 +13699,7 @@ msgstr "No, mantieni questa iscrizione"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Iscrizione corrente"
 
@@ -13664,6 +13712,7 @@ msgstr "Iscrizione corrente"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Elimina Tutte le  Iscrizioni"
 
@@ -13801,6 +13850,7 @@ msgstr "Informazioni sul Conto"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Hai già un conto?"
 
@@ -13818,6 +13868,7 @@ msgstr "Hai già un conto?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Accedi"
 
@@ -13838,6 +13889,7 @@ msgstr "Accedi"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Conferma Password"
 
@@ -13853,6 +13905,7 @@ msgstr "Conferma Password"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Conferma Email"
 
@@ -13869,6 +13922,7 @@ msgstr "Conferma Email"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nome Completo"
 
@@ -13885,6 +13939,7 @@ msgstr "Nome Completo"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "LASCIARE VUOTO"
 
@@ -13901,6 +13956,7 @@ msgstr "LASCIARE VUOTO"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Sei autenticato come <strong>%s</strong>. Se preferisci utilizzare un altro conto, <a href=\"%s\">esci ora e riaccedi</a>."
@@ -13918,6 +13974,7 @@ msgstr "Sei autenticato come <strong>%s</strong>. Se preferisci utilizzare un al
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Seleziona il Metodo di Pagamento"
 
@@ -13935,6 +13992,7 @@ msgstr "Seleziona il Metodo di Pagamento"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Paga con Carta di Credito"
 
@@ -14004,6 +14062,7 @@ msgstr "Completa Pagamento"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Elaborando..."
 
@@ -14089,6 +14148,7 @@ msgstr "Fattura #%s di %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Stampa"
 
@@ -14260,6 +14320,8 @@ msgstr "In attesa"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Visualizza il tuo Conto Utente &rarr;"
 
@@ -15829,6 +15891,7 @@ msgstr "Imposta il tuo conto"
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 #~ msgid "Edit"
 #~ msgstr "Modifica"
 
@@ -17595,6 +17658,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -18253,6 +18317,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -22826,6 +22892,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -22974,6 +23041,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -22983,6 +23051,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -23002,6 +23071,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -23025,6 +23095,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -23044,6 +23115,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -23054,6 +23126,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -23063,6 +23136,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -23072,6 +23146,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -23084,6 +23159,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -23101,6 +23177,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -23125,6 +23202,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -23147,6 +23225,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -23392,6 +23471,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -23458,6 +23538,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -23664,6 +23745,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -23777,6 +23861,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -25581,6 +25666,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -25598,6 +25685,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -25611,6 +25700,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -25624,6 +25714,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -25742,6 +25833,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -25966,6 +26058,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -26210,6 +26303,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -29615,6 +29709,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -30211,6 +30306,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -32101,6 +32197,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -33080,6 +33177,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -33418,6 +33516,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -34093,10 +34192,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -34118,6 +34222,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -34135,6 +34240,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -34143,6 +34249,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -34230,3 +34337,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-nb_NO.mo b/languages/paid-memberships-pro-nb_NO.mo
index 7541ffd12..7c4dccbd8 100644
Binary files a/languages/paid-memberships-pro-nb_NO.mo and b/languages/paid-memberships-pro-nb_NO.mo differ
diff --git a/languages/paid-memberships-pro-nb_NO.po b/languages/paid-memberships-pro-nb_NO.po
index 4f5d844e7..ed09526fe 100644
--- a/languages/paid-memberships-pro-nb_NO.po
+++ b/languages/paid-memberships-pro-nb_NO.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:08+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:01+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -807,6 +807,7 @@ msgstr "Betalingsmåter &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-post"
 
@@ -1467,6 +1468,7 @@ msgstr "valgte"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Lagre innstillingene"
 
@@ -3129,6 +3131,7 @@ msgstr "Lagre nivået"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -3228,6 +3231,8 @@ msgstr "Bruk “dra og slipp” prinsippet for å endre rekkefølgen på nivåen
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Utløpsdato"
 
@@ -3613,6 +3618,7 @@ msgstr "Etternavn"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Fakturadresse"
 
@@ -4993,6 +4999,7 @@ msgstr "Bruker"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Type medlemskap"
 
@@ -5069,6 +5076,7 @@ msgstr "Transaksjons ID"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "slettet"
 
@@ -5689,6 +5697,7 @@ msgstr "Lær mer om <a title=\"Paid Memberships Pro - SSL Settings\" target=\"_b
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Valuta"
 
@@ -5698,6 +5707,7 @@ msgstr "Valuta"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Ikke alle valuttaer støttes av alle betalingsbehandlingsportalene. Vennligst bekreft valuttaen med din portal."
 
@@ -5717,6 +5727,7 @@ msgstr "Aksepterte kredittkort"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Salgsskatt (US)"
 
@@ -5733,6 +5744,7 @@ msgstr "Salgsskatt (US)"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "valgfritt"
 
@@ -5743,6 +5755,7 @@ msgstr "valgfritt"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Stat å betale skatt i"
 
@@ -5753,6 +5766,7 @@ msgstr "Stat å betale skatt i"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "Statsforkortelse, f.eks “NY”"
 
@@ -5763,6 +5777,7 @@ msgstr "Statsforkortelse, f.eks “NY”"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "desimaltall, f.eks “0.06”"
 
@@ -6617,6 +6632,7 @@ msgstr "Bekreftelse på medlemskap i %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Rabattkode"
 
@@ -7242,6 +7258,7 @@ msgstr "Vi aksepterer følgende %s"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Betalingsinformasjon"
 
@@ -7280,6 +7297,7 @@ msgstr "Betalingsinformasjon"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kortnummer"
 
@@ -7332,6 +7350,7 @@ msgstr "hva er dette?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Godta"
 
@@ -7534,6 +7553,7 @@ msgstr "Selger"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Passord"
 
@@ -7711,6 +7731,7 @@ msgstr "Denne URL’en blir sendt til PayPal hver gang det skjer en betaling ell
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Betal med Paypal"
 
@@ -7743,6 +7764,7 @@ msgstr "Betal med Paypal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Lagre og betal"
 
@@ -7779,6 +7801,7 @@ msgstr "Lagre og betal"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Lagre og bekreft"
 
@@ -9271,6 +9294,7 @@ msgstr "Oppgi id for nivået"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Ingen"
 
@@ -9625,6 +9649,8 @@ msgstr "Logg ut"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Kurs"
 
@@ -9702,6 +9728,7 @@ msgstr "Din innbetaling blir håndtert av PayPal. <a href=«http://www.paypal.co
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Fornavn"
 
@@ -9735,6 +9762,7 @@ msgstr "Fornavn"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Etternavn"
 
@@ -9753,6 +9781,7 @@ msgstr "Etternavn"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresse 1"
 
@@ -9771,6 +9800,7 @@ msgstr "Adresse 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adresse 2"
 
@@ -9789,6 +9819,7 @@ msgstr "Adresse 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Sted/By"
 
@@ -9807,6 +9838,7 @@ msgstr "Sted/By"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Fylke"
 
@@ -9825,6 +9857,7 @@ msgstr "Fylke"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postnummer"
 
@@ -9859,6 +9892,7 @@ msgstr "Sted/By, Postnummer"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Land"
 
@@ -9877,6 +9911,7 @@ msgstr "Land"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -9901,6 +9936,8 @@ msgstr "Telefon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-post-adresse"
 
@@ -9918,6 +9955,7 @@ msgstr "E-post-adresse"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Bekreft e-post-adresse"
 
@@ -9963,8 +10001,11 @@ msgstr "Dette abonnementet har ikke periodiske betalinger, derfor trenger du ikk
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Er du sikker på at du vil kansellere medlemskapet ditt?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -10001,6 +10042,7 @@ msgstr "Nei, behold kontoen min"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Mine abonnement"
 
@@ -10011,6 +10053,7 @@ msgstr "Mine abonnement"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Avbryt alle medlemsskap."
 
@@ -10109,6 +10152,7 @@ msgstr "Kontoinformasjon"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Har du allerede en konto?"
 
@@ -10121,6 +10165,7 @@ msgstr "Har du allerede en konto?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Logg inn her"
 
@@ -10136,6 +10181,7 @@ msgstr "Logg inn her"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Bekreft passord"
 
@@ -10146,6 +10192,7 @@ msgstr "Bekreft passord"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Bekreft e-post-adresse"
 
@@ -10157,6 +10204,7 @@ msgstr "Bekreft e-post-adresse"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -10168,6 +10216,7 @@ msgstr "Fullt navn"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "LA FELTET VÆRE TOMT"
 
@@ -10179,6 +10228,7 @@ msgstr "LA FELTET VÆRE TOMT"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Du er nå logget på som <strong>%s</strong>. Hvis du ønsker å logge deg på med en annen konto, <a href=\"%s\">logg ut nå</a>."
@@ -10191,6 +10241,7 @@ msgstr "Du er nå logget på som <strong>%s</strong>. Hvis du ønsker å logge d
 #: pages/checkout.php:244
 #: pages/checkout.php:276
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Velg betalingsmetode"
 
@@ -10202,6 +10253,7 @@ msgstr "Velg betalingsmetode"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Betal med et kredittkort"
 
@@ -10268,6 +10320,7 @@ msgstr "Fullfør betaling"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Prosesserer.."
 
@@ -10356,6 +10409,7 @@ msgstr "Faktura #%s for %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -10484,6 +10538,8 @@ msgstr "Avventer"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Se kontoen for medlemskapet ditt &rarr;"
 
@@ -12618,6 +12674,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -13399,6 +13456,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -13633,6 +13691,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -13641,6 +13700,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -14134,6 +14194,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -18786,6 +18848,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -18934,6 +18997,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -18943,6 +19007,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -18962,6 +19027,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -18985,6 +19051,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -19004,6 +19071,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -19014,6 +19082,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -19023,6 +19092,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -19032,6 +19102,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -19044,6 +19115,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -19061,6 +19133,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -19085,6 +19158,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -19107,6 +19181,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -19352,6 +19427,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -19418,6 +19494,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -19624,6 +19701,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -19733,7 +19813,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -19742,7 +19824,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -19761,6 +19845,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -21576,6 +21661,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -21593,6 +21680,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -21606,6 +21695,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -21619,6 +21709,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -21737,6 +21828,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -21942,6 +22034,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -22186,6 +22279,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -25605,6 +25699,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -26201,6 +26296,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -28091,6 +28187,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -29070,6 +29167,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -29408,6 +29506,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -30083,10 +30182,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -30108,6 +30212,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -30125,6 +30230,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -30133,6 +30239,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -30220,3 +30327,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-nl_NL.mo b/languages/paid-memberships-pro-nl_NL.mo
index df9922737..7fa692000 100644
Binary files a/languages/paid-memberships-pro-nl_NL.mo and b/languages/paid-memberships-pro-nl_NL.mo differ
diff --git a/languages/paid-memberships-pro-nl_NL.po b/languages/paid-memberships-pro-nl_NL.po
index 95a2de038..c409590c6 100644
--- a/languages/paid-memberships-pro-nl_NL.po
+++ b/languages/paid-memberships-pro-nl_NL.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:10+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:03+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -326,6 +326,7 @@ msgstr "Payment Gateway &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-mail"
 
@@ -998,6 +999,7 @@ msgstr "geselecteerd"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Bewaar instellingen"
 
@@ -2731,6 +2733,8 @@ msgstr "Testperiode"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Verloop"
 
@@ -3155,6 +3159,7 @@ msgstr "Achternaam"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "factuuradres"
 
@@ -4386,6 +4391,7 @@ msgstr "Bewaar bestelling"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -4735,6 +4741,7 @@ msgstr "Gebruiker"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Soort lidmaatschap"
 
@@ -4812,6 +4819,7 @@ msgstr "Transactie ID's"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "verwijderd"
 
@@ -5402,6 +5410,7 @@ msgstr "Verkoper"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -5598,6 +5607,7 @@ msgstr "Transaction Security Sleutel"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Valuta"
 
@@ -5607,6 +5617,7 @@ msgstr "Valuta"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Niet alle valuta wordt ondersteund door elke gateway. Controleer dit bij je gateway. "
 
@@ -5680,6 +5691,7 @@ msgstr "Stripe heeft geen factuuradres velden nodig. Kies 'Nee' om ze te verberg
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "BTW"
 
@@ -5698,6 +5710,7 @@ msgstr "BTW"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "optioneel"
 
@@ -5709,6 +5722,7 @@ msgstr "optioneel"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Staat BTW"
 
@@ -5720,6 +5734,7 @@ msgstr "Staat BTW"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "afkorting, bijv. \"PA\""
 
@@ -5731,6 +5746,7 @@ msgstr "afkorting, bijv. \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimaal, bijv. \"0.06\""
 
@@ -6572,6 +6588,7 @@ msgstr "Je lidmaatschap bevestiging voor %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "kortingscode"
 
@@ -8192,6 +8209,7 @@ msgstr "Huidig lidmaatschap"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Geen"
 
@@ -8326,6 +8344,8 @@ msgstr "Je lidmaatschao is <strong>actief</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Lidmaatschap"
 
@@ -8601,6 +8621,7 @@ msgstr "Je betalingen worden gemanaged door PayPal. <a href=\"http://www.paypal.
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Voornaam"
 
@@ -8636,6 +8657,7 @@ msgstr "Voornaam"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Achternaam"
 
@@ -8656,6 +8678,7 @@ msgstr "Achternaam"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adres 1"
 
@@ -8676,6 +8699,7 @@ msgstr "Adres 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adres 2"
 
@@ -8696,6 +8720,7 @@ msgstr "Adres 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Woonplaats"
 
@@ -8716,6 +8741,7 @@ msgstr "Woonplaats"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Staat"
 
@@ -8736,6 +8762,7 @@ msgstr "Staat"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postcode"
 
@@ -8774,6 +8801,7 @@ msgstr "Stad, Staat code"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Land"
 
@@ -8794,6 +8822,7 @@ msgstr "Land"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefoon"
 
@@ -8821,6 +8850,8 @@ msgstr "Telefoon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mail adres"
 
@@ -8840,6 +8871,7 @@ msgstr "E-mail adres"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Bevestig e-mail"
 
@@ -8899,6 +8931,7 @@ msgstr "Wij accepteren %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kaartnummer"
 
@@ -8994,8 +9027,11 @@ msgstr "Er zijn geen betalingen meer nodig voor dit lidmaatschap. Het is dus nie
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Weet je zeker dat je het lidmaatschap wilt beëindigen?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -9113,6 +9149,7 @@ msgstr "Heb je een kortingscode?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -9137,6 +9174,7 @@ msgstr "Account informatie"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Heb je al een account?"
 
@@ -9149,6 +9187,7 @@ msgstr "Heb je al een account?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Log hier in"
 
@@ -9164,6 +9203,7 @@ msgstr "Log hier in"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Bevestig wachtwoord"
 
@@ -9175,6 +9215,7 @@ msgstr "Bevestig wachtwoord"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Bevestig e-mail adres"
 
@@ -9186,6 +9227,7 @@ msgstr "Bevestig e-mail adres"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Volledige naam"
 
@@ -9197,6 +9239,7 @@ msgstr "Volledige naam"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "LAAT DIT LEEG"
 
@@ -9208,6 +9251,7 @@ msgstr "LAAT DIT LEEG"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Je bent ingelogd als <strong>%s</strong>.Als je een ander account wilt gebruiken voor dit lidmaatschap, <a href=\"%s\">log je nu uit</a>."
@@ -9220,6 +9264,7 @@ msgstr "Je bent ingelogd als <strong>%s</strong>.Als je een ander account wilt g
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Kies betaalmethode"
 
@@ -9232,6 +9277,7 @@ msgstr "Kies betaalmethode"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Betaal Hier met je Credit Card"
 
@@ -9260,6 +9306,7 @@ msgstr "Betaal Hier met je Credit Card"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Betaal met PayPal"
 
@@ -9299,6 +9346,7 @@ msgstr "Betaal met PayPal"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Betalingsinformatie"
 
@@ -9377,6 +9425,7 @@ msgstr "Complete betaling"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Stuur in en schrijf je in."
 
@@ -9410,6 +9459,7 @@ msgstr "Stuur in en schrijf je in."
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Bevestigen en insturen"
 
@@ -9429,6 +9479,7 @@ msgstr "Stuur in en betaal mey @CheckOut"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Verwerken..."
 
@@ -9511,6 +9562,7 @@ msgstr "factuur #%s op %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Print"
 
@@ -9637,6 +9689,8 @@ msgstr "Wachten"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Bekijk je accountgegevens &rarr;"
 
@@ -11778,6 +11832,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -12662,6 +12717,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -12982,6 +13038,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -12990,6 +13047,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -13584,6 +13642,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -18760,6 +18820,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -18908,6 +18969,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -18917,6 +18979,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -18936,6 +18999,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -18959,6 +19023,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -18978,6 +19043,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -18988,6 +19054,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -18997,6 +19064,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -19006,6 +19074,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -19018,6 +19087,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -19035,6 +19105,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -19059,6 +19130,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -19086,6 +19158,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -19331,6 +19404,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -19412,6 +19486,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -19618,6 +19693,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -19750,7 +19828,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -19759,7 +19839,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -19772,6 +19854,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -19781,6 +19864,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -19801,6 +19885,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -21709,6 +21794,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -21726,6 +21813,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -21739,6 +21828,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -21752,6 +21842,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -21870,6 +21961,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -22094,6 +22186,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -22338,6 +22431,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -25767,6 +25861,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -26363,6 +26458,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -28253,6 +28349,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -29232,6 +29329,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -29570,6 +29668,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -30245,10 +30344,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -30270,6 +30374,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -30287,6 +30392,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -30295,6 +30401,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -30382,3 +30489,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-pt_BR.mo b/languages/paid-memberships-pro-pt_BR.mo
index 436c1bc9e..51dbc5015 100644
Binary files a/languages/paid-memberships-pro-pt_BR.mo and b/languages/paid-memberships-pro-pt_BR.mo differ
diff --git a/languages/paid-memberships-pro-pt_BR.po b/languages/paid-memberships-pro-pt_BR.po
index 14d92b7db..ca064d26f 100644
--- a/languages/paid-memberships-pro-pt_BR.po
+++ b/languages/paid-memberships-pro-pt_BR.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:12+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:05+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -866,6 +866,7 @@ msgstr "Gateway de Pagamentos &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-mail"
 
@@ -1622,6 +1623,7 @@ msgstr "selecionado"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Salvar Configurações"
 
@@ -3714,6 +3716,7 @@ msgstr "Salvar Nível"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -3843,6 +3846,8 @@ msgstr "Drag and drop os níveis de assinatura para reordená-los na página de
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Expiração"
 
@@ -4322,6 +4327,7 @@ msgstr "Sobrenome"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Endereço de Faturamento"
 
@@ -5953,6 +5959,7 @@ msgstr "Usuário"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Nível de Assinatura"
 
@@ -6042,6 +6049,7 @@ msgstr "IDs das transações"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "deletado"
 
@@ -6788,6 +6796,7 @@ msgstr "Escolha um Gateway"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Configurações de Moedas e Impostos"
 
@@ -6802,6 +6811,7 @@ msgstr "Configurações de Moedas e Impostos"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moeda"
 
@@ -6813,6 +6823,7 @@ msgstr "Moeda"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Nem todas as moedas serão suportadas por gateway. Por favor, verifique com seu gateway."
 
@@ -6838,6 +6849,7 @@ msgstr "Operadoras de Cartão Aceitas"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Imposto Sobre Vendas"
 
@@ -6859,6 +6871,7 @@ msgstr "Imposto Sobre Vendas"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -6872,6 +6885,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Imposto Estadual"
 
@@ -6885,6 +6899,7 @@ msgstr "Imposto Estadual"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviação, ex: \"PA\""
 
@@ -6894,6 +6909,7 @@ msgstr "abreviação, ex: \"PA\""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Taxa do imposto"
 
@@ -6907,6 +6923,7 @@ msgstr "Taxa do imposto"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, ex: \"0.06\""
 
@@ -7914,6 +7931,7 @@ msgstr "Confirmação de assinatura no %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Código de Desconto"
 
@@ -8668,6 +8686,7 @@ msgstr "Para integrar completamente com o Braintree, assegure-se de apontar o se
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informações de Pagamento"
 
@@ -8754,6 +8773,7 @@ msgstr "Aceitamos %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Número do Cartão"
 
@@ -8871,6 +8891,7 @@ msgstr "o que é isso?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -9149,6 +9170,7 @@ msgstr "Vendedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Senha"
 
@@ -9367,6 +9389,7 @@ msgstr ""
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Pagar pelo PayPal"
 
@@ -9406,6 +9429,7 @@ msgstr "Pagar pelo PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Fazer Checkout"
 
@@ -9451,6 +9475,7 @@ msgstr "Fazer Checkout"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Enviar e Confirmar"
 
@@ -11633,6 +11658,7 @@ msgstr "Por favor, especifique um id de nível de assinatura."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Nenhum"
 
@@ -12014,6 +12040,8 @@ msgstr "sair"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nível"
 
@@ -12107,6 +12135,7 @@ msgstr "Os pagamentos recorrentes são controlados pelo Paypal. Por favor <a hre
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nome"
 
@@ -12147,6 +12176,7 @@ msgstr "Nome"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Sobrenome"
 
@@ -12172,6 +12202,7 @@ msgstr "Sobrenome"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Endereço"
 
@@ -12197,6 +12228,7 @@ msgstr "Endereço"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Complemento (Endereço)"
 
@@ -12222,6 +12254,7 @@ msgstr "Complemento (Endereço)"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Cidade"
 
@@ -12247,6 +12280,7 @@ msgstr "Cidade"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Estado"
 
@@ -12272,6 +12306,7 @@ msgstr "Estado"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Código Postal"
 
@@ -12322,6 +12357,7 @@ msgstr "Cidade, Estado CEP"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -12348,6 +12384,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefone"
 
@@ -12385,6 +12422,8 @@ msgstr "Telefone"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mail"
 
@@ -12410,6 +12449,7 @@ msgstr "E-mail"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirmar E-mail"
 
@@ -12463,8 +12503,11 @@ msgstr "Essa assinatura não é recorrente. Portanto, você não precisa atualiz
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Tem certeza que quer cancelar sua assinatura?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12502,6 +12545,7 @@ msgstr "Não, mantenha minha conta"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Minhas Assinaturas"
 
@@ -12512,6 +12556,7 @@ msgstr "Minhas Assinaturas"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Cancelar Todas Assinaturas"
 
@@ -12640,6 +12685,7 @@ msgstr "Informações da Conta"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Já tem uma conta?"
 
@@ -12656,6 +12702,7 @@ msgstr "Já tem uma conta?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Fazer Login"
 
@@ -12675,6 +12722,7 @@ msgstr "Fazer Login"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirmar Senha"
 
@@ -12689,6 +12737,7 @@ msgstr "Confirmar Senha"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirmar Email"
 
@@ -12704,6 +12753,7 @@ msgstr "Confirmar Email"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nome Completo"
 
@@ -12719,6 +12769,7 @@ msgstr "Nome Completo"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEIXE EM BRANCO"
 
@@ -12734,6 +12785,7 @@ msgstr "DEIXE EM BRANCO"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Você está logado como <strong>%s</strong>. Se quiser usar uma conta diferente para essa assinatura,<a href=\"%s\">faça logout agora</a>."
@@ -12750,6 +12802,7 @@ msgstr "Você está logado como <strong>%s</strong>. Se quiser usar uma conta di
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Escolha sua Forma de Pagamento"
 
@@ -12766,6 +12819,7 @@ msgstr "Escolha sua Forma de Pagamento"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Pague com Cartão de Crédito"
 
@@ -12823,6 +12877,7 @@ msgstr "Complete o Pagamento"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Processando..."
 
@@ -12906,6 +12961,7 @@ msgstr "Fatura #%s no %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimir"
 
@@ -13068,6 +13124,8 @@ msgstr "Pendente"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Ver sua Conta &rarr;"
 
@@ -15548,6 +15606,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -16277,6 +16336,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -16943,6 +17003,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21625,6 +21687,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21773,6 +21836,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21782,6 +21846,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21801,6 +21866,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21824,6 +21890,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21843,6 +21910,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21853,6 +21921,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21862,6 +21931,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21871,6 +21941,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21883,6 +21954,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21900,6 +21972,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21924,6 +21997,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21946,6 +22020,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -22191,6 +22266,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -22257,6 +22333,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22463,6 +22540,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22572,7 +22652,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22581,7 +22663,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22600,6 +22684,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24404,6 +24489,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24421,6 +24508,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24434,6 +24523,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24447,6 +24537,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24565,6 +24656,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24789,6 +24881,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -25033,6 +25126,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28452,6 +28546,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -29048,6 +29143,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30938,6 +31034,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31917,6 +32014,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -32255,6 +32353,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32930,10 +33029,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32955,6 +33059,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32972,6 +33077,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32980,6 +33086,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -33067,3 +33174,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-pt_PT.mo b/languages/paid-memberships-pro-pt_PT.mo
index 004c67d46..0648c426a 100644
Binary files a/languages/paid-memberships-pro-pt_PT.mo and b/languages/paid-memberships-pro-pt_PT.mo differ
diff --git a/languages/paid-memberships-pro-pt_PT.po b/languages/paid-memberships-pro-pt_PT.po
index 17de0956a..b79ac7559 100644
--- a/languages/paid-memberships-pro-pt_PT.po
+++ b/languages/paid-memberships-pro-pt_PT.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:13+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:07+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -866,6 +866,7 @@ msgstr "Gateway de Pagamentos &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-mail"
 
@@ -1622,6 +1623,7 @@ msgstr "selecionado"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Gravar Configurações"
 
@@ -3714,6 +3716,7 @@ msgstr "Gravar Tipo"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -3843,6 +3846,8 @@ msgstr "Clicar e Arrastar os tipos de assinatura para reordená-los na página d
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Expiração"
 
@@ -4322,6 +4327,7 @@ msgstr "Apelido"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Endereço de Faturação"
 
@@ -5953,6 +5959,7 @@ msgstr "Utilizador"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Tipo de Assinatura"
 
@@ -6042,6 +6049,7 @@ msgstr "IDs das transações"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "eliminado"
 
@@ -6788,6 +6796,7 @@ msgstr "Escolha um Gateway"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Configurações de Moedas e Impostos"
 
@@ -6802,6 +6811,7 @@ msgstr "Configurações de Moedas e Impostos"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Moeda"
 
@@ -6813,6 +6823,7 @@ msgstr "Moeda"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Nem todas as moedas são suportadas por cada gateway. Por favor, verifique com seu gateway."
 
@@ -6838,6 +6849,7 @@ msgstr "Operadores de Cartão Aceites"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Imposto Sobre Vendas"
 
@@ -6859,6 +6871,7 @@ msgstr "Imposto Sobre Vendas"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opcional"
 
@@ -6872,6 +6885,7 @@ msgstr "opcional"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Imposto Estadual"
 
@@ -6885,6 +6899,7 @@ msgstr "Imposto Estadual"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "abreviatura, ex: \"PA\""
 
@@ -6894,6 +6909,7 @@ msgstr "abreviatura, ex: \"PA\""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Taxa do imposto"
 
@@ -6907,6 +6923,7 @@ msgstr "Taxa do imposto"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, ex: \"0.23\""
 
@@ -7914,6 +7931,7 @@ msgstr "Confirmação de assinatura para %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Código de Desconto"
 
@@ -8668,6 +8686,7 @@ msgstr "Para integrar completamente com o Braintree, assegure-se de apontar o se
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informações de Pagamento"
 
@@ -8754,6 +8773,7 @@ msgstr "Aceitamos %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Número do Cartão"
 
@@ -8871,6 +8891,7 @@ msgstr "o que é isso?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -9149,6 +9170,7 @@ msgstr "Vendedor"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Senha"
 
@@ -9367,6 +9389,7 @@ msgstr ""
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Pagar pelo PayPal"
 
@@ -9406,6 +9429,7 @@ msgstr "Pagar pelo PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Enviar e Fazer Checkout"
 
@@ -9451,6 +9475,7 @@ msgstr "Enviar e Fazer Checkout"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Enviar e Confirmar"
 
@@ -11633,6 +11658,7 @@ msgstr "Por favor, especifique um id de tipo de assinatura."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Nenhum"
 
@@ -12014,6 +12040,8 @@ msgstr "SAIR"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Tipo"
 
@@ -12107,6 +12135,7 @@ msgstr "Os pagamentos recorrentes são controlados pelo Paypal. Por favor <a hre
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Nome"
 
@@ -12147,6 +12176,7 @@ msgstr "Nome"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Apelido"
 
@@ -12172,6 +12202,7 @@ msgstr "Apelido"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Endereço 1"
 
@@ -12197,6 +12228,7 @@ msgstr "Endereço 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Endereço 2"
 
@@ -12222,6 +12254,7 @@ msgstr "Endereço 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Cidade"
 
@@ -12247,6 +12280,7 @@ msgstr "Cidade"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Distrito"
 
@@ -12272,6 +12306,7 @@ msgstr "Distrito"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Código Postal (Número)"
 
@@ -12322,6 +12357,7 @@ msgstr "Código Postal (Localidade)"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "País"
 
@@ -12348,6 +12384,7 @@ msgstr "País"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefone"
 
@@ -12385,6 +12422,8 @@ msgstr "Telefone"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mail"
 
@@ -12410,6 +12449,7 @@ msgstr "E-mail"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Confirmar E-mail"
 
@@ -12463,8 +12503,11 @@ msgstr "Esta assinatura não é recorrente. Portanto, não precisa atualizar sua
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Tem a certeza que quer cancelar a sua assinatura?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -12502,6 +12545,7 @@ msgstr "Não, manter a minha conta"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Minhas Assinaturas"
 
@@ -12512,6 +12556,7 @@ msgstr "Minhas Assinaturas"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Cancelar Todas as Assinaturas"
 
@@ -12640,6 +12685,7 @@ msgstr "Informações da Conta"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Já tem uma conta?"
 
@@ -12656,6 +12702,7 @@ msgstr "Já tem uma conta?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Iniciar sessão"
 
@@ -12675,6 +12722,7 @@ msgstr "Iniciar sessão"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Confirmar Senha"
 
@@ -12689,6 +12737,7 @@ msgstr "Confirmar Senha"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Confirmar E-mail"
 
@@ -12704,6 +12753,7 @@ msgstr "Confirmar E-mail"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Nome Completo"
 
@@ -12719,6 +12769,7 @@ msgstr "Nome Completo"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "DEIXE EM BRANCO"
 
@@ -12734,6 +12785,7 @@ msgstr "DEIXE EM BRANCO"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Tem sessão iniciada como <strong>%s</strong>. Se quiser usar uma conta diferente para esta assinatura, <a href=\"%s\">termine sessão agora</a>."
@@ -12750,6 +12802,7 @@ msgstr "Tem sessão iniciada como <strong>%s</strong>. Se quiser usar uma conta
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Escolha a Forma de Pagamento"
 
@@ -12766,6 +12819,7 @@ msgstr "Escolha a Forma de Pagamento"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Pague com Cartão de Crédito"
 
@@ -12823,6 +12877,7 @@ msgstr "Efetue o Pagamento"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "A processar..."
 
@@ -12906,6 +12961,7 @@ msgstr "Fatura #%s - %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Imprimir"
 
@@ -13068,6 +13124,8 @@ msgstr "Pendente"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Ver sua Conta &rarr;"
 
@@ -15548,6 +15606,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -16277,6 +16336,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -16943,6 +17003,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -21625,6 +21687,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -21773,6 +21836,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -21782,6 +21846,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -21801,6 +21866,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -21824,6 +21890,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -21843,6 +21910,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -21853,6 +21921,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -21862,6 +21931,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -21871,6 +21941,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21883,6 +21954,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21900,6 +21972,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21924,6 +21997,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21946,6 +22020,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -22191,6 +22266,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -22257,6 +22333,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -22463,6 +22540,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -22572,7 +22652,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -22581,7 +22663,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -22600,6 +22684,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -24404,6 +24489,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -24421,6 +24508,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -24434,6 +24523,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -24447,6 +24537,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -24565,6 +24656,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -24789,6 +24881,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -25033,6 +25126,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -28452,6 +28546,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -29048,6 +29143,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30938,6 +31034,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31917,6 +32014,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -32255,6 +32353,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32930,10 +33029,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32955,6 +33059,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32972,6 +33077,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32980,6 +33086,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -33067,3 +33174,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-sk_SK.mo b/languages/paid-memberships-pro-sk_SK.mo
index 695115273..4336717e9 100644
Binary files a/languages/paid-memberships-pro-sk_SK.mo and b/languages/paid-memberships-pro-sk_SK.mo differ
diff --git a/languages/paid-memberships-pro-sk_SK.po b/languages/paid-memberships-pro-sk_SK.po
index a17492322..c29f0da30 100644
--- a/languages/paid-memberships-pro-sk_SK.po
+++ b/languages/paid-memberships-pro-sk_SK.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:15+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:09+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -347,6 +347,7 @@ msgstr ""
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr ""
 
@@ -1048,6 +1049,7 @@ msgstr "Vybraté"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr ""
 
@@ -2871,6 +2873,8 @@ msgstr ""
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr ""
 
@@ -3311,6 +3315,7 @@ msgstr ""
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr ""
 
@@ -4595,6 +4600,7 @@ msgstr ""
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr ""
 
@@ -4949,6 +4955,7 @@ msgstr ""
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Úroveň členstva"
 
@@ -5029,6 +5036,7 @@ msgstr ""
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr ""
 
@@ -5651,6 +5659,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Heslo"
 
@@ -5862,6 +5871,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr ""
 
@@ -5871,6 +5881,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -5950,6 +5961,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr ""
 
@@ -5969,6 +5981,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr ""
 
@@ -5981,6 +5994,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr ""
 
@@ -5993,6 +6007,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
@@ -6005,6 +6020,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr ""
 
@@ -6777,6 +6793,7 @@ msgstr "Potvrdenie vášho členstva v %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Zľavový kód"
 
@@ -8420,6 +8437,7 @@ msgstr "Aktuálna úroveň"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Žiadny"
 
@@ -8557,6 +8575,8 @@ msgstr "Vaše členstvo je <strong>aktívne</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Úroveň"
 
@@ -8855,6 +8875,7 @@ msgstr "Vaša platba predplatného je spravovaná PayPal-om. Prosím <a href=\"h
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Meno"
 
@@ -8891,6 +8912,7 @@ msgstr "Meno"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Priezvisko"
 
@@ -8912,6 +8934,7 @@ msgstr "Priezvisko"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresa 1"
 
@@ -8933,6 +8956,7 @@ msgstr "Adresa 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adresa 2"
 
@@ -8954,6 +8978,7 @@ msgstr "Adresa 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Mesto"
 
@@ -8975,6 +9000,7 @@ msgstr "Mesto"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr ""
 
@@ -8996,6 +9022,7 @@ msgstr ""
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "PSČ"
 
@@ -9036,6 +9063,7 @@ msgstr "Mesto, kód"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Krajina"
 
@@ -9057,6 +9085,7 @@ msgstr "Krajina"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefón"
 
@@ -9085,6 +9114,8 @@ msgstr "Telefón"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mail"
 
@@ -9105,6 +9136,7 @@ msgstr "E-mail"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Potvrdiť e-mail"
 
@@ -9167,6 +9199,7 @@ msgstr "Akceptujeme %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Číslo karty"
 
@@ -9264,8 +9297,11 @@ msgstr "Toto predplatné na odber nie je opakované. Takže nemusíte aktualizov
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Naozaj chcete zrušiť vaše členstvo?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 # @ pmpro
 #: pages/cancel.php:17
@@ -9394,6 +9430,7 @@ msgstr "Máte zľavový kód?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Použiť"
 
@@ -9420,6 +9457,7 @@ msgstr "Informácie o účte"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Máte už účet?"
 
@@ -9433,6 +9471,7 @@ msgstr "Máte už účet?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Prihláste sa tu"
 
@@ -9449,6 +9488,7 @@ msgstr "Prihláste sa tu"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Potvrdiť heslo"
 
@@ -9461,6 +9501,7 @@ msgstr "Potvrdiť heslo"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Potvrdiť e-mail"
 
@@ -9473,6 +9514,7 @@ msgstr "Potvrdiť e-mail"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Celé meno"
 
@@ -9485,6 +9527,7 @@ msgstr "Celé meno"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "PONECHAJTE TOTO POLE PRÁZDNE"
 
@@ -9497,6 +9540,7 @@ msgstr "PONECHAJTE TOTO POLE PRÁZDNE"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Ste prihlásený ako <strong>%s</strong>. Ak by ste chceli použiť iný účet pre toto členstvo, <a href=\"%s\"> odhláste sa</a>."
@@ -9510,6 +9554,7 @@ msgstr "Ste prihlásený ako <strong>%s</strong>. Ak by ste chceli použiť iný
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Zvoľte spôsob platby"
 
@@ -9523,6 +9568,7 @@ msgstr "Zvoľte spôsob platby"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Vyskúšajte s kreditnou kartou"
 
@@ -9552,6 +9598,7 @@ msgstr "Vyskúšajte s kreditnou kartou"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Vyskúšajte s PayPal"
 
@@ -9592,6 +9639,7 @@ msgstr "Vyskúšajte s PayPal"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informácie o platbe"
 
@@ -9674,6 +9722,7 @@ msgstr "Dokončiť platbu"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Odoslať a vyskúšať"
 
@@ -9708,6 +9757,7 @@ msgstr "Odoslať a vyskúšať"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Odoslať a potvrdiť"
 
@@ -9729,6 +9779,7 @@ msgstr "Odoslať a zaplatiť pomocou 2CheckOut"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Spracovanie..."
 
@@ -9816,6 +9867,7 @@ msgstr "Faktúra #%s na %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Tlačiť"
 
@@ -9948,6 +10000,8 @@ msgstr "Čakajúce"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Zobraziť vaše členské konto &rarr;"
 
@@ -12136,6 +12190,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -13066,6 +13121,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -13386,6 +13442,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -13394,6 +13451,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -14029,6 +14087,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -19260,6 +19320,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -19408,6 +19469,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -19417,6 +19479,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -19436,6 +19499,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -19459,6 +19523,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -19478,6 +19543,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -19488,6 +19554,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -19497,6 +19564,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -19506,6 +19574,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -19518,6 +19587,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -19535,6 +19605,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -19559,6 +19630,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -19586,6 +19658,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -19831,6 +19904,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -19912,6 +19986,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -20118,6 +20193,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -20250,7 +20328,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -20259,7 +20339,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -20272,6 +20354,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -20281,6 +20364,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -20301,6 +20385,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -22209,6 +22294,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -22226,6 +22313,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -22239,6 +22328,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -22252,6 +22342,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -22370,6 +22461,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -22594,6 +22686,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -22838,6 +22931,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -26267,6 +26361,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -26863,6 +26958,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -28753,6 +28849,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -29732,6 +29829,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -30070,6 +30168,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -30745,10 +30844,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -30770,6 +30874,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -30787,6 +30892,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -30795,6 +30901,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -30882,3 +30989,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-sr_RS.mo b/languages/paid-memberships-pro-sr_RS.mo
index 90586425e..31fca5319 100644
Binary files a/languages/paid-memberships-pro-sr_RS.mo and b/languages/paid-memberships-pro-sr_RS.mo differ
diff --git a/languages/paid-memberships-pro-sr_RS.po b/languages/paid-memberships-pro-sr_RS.po
index cf8160a4b..f905efd01 100644
--- a/languages/paid-memberships-pro-sr_RS.po
+++ b/languages/paid-memberships-pro-sr_RS.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:17+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:11+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -564,6 +564,7 @@ msgstr "Nivoi Članstva"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Nivo Članstva"
 
@@ -638,6 +639,7 @@ msgstr "Trenutni Nivo"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Nijedan"
 
@@ -1485,6 +1487,7 @@ msgstr "Članstvo ističe"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Kod za Popust"
 
@@ -1519,6 +1522,7 @@ msgstr "Kod za Popust"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Adresa za naplatu"
 
@@ -1615,6 +1619,8 @@ msgstr "Ističe za"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Isticanje"
 
@@ -1871,6 +1877,8 @@ msgstr "Faktura nije pronađena"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Pregled vašeg naloga članstva &rarr;"
 
@@ -1994,6 +2002,8 @@ msgstr "Vaše članstvo je <strong>aktivno</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivo"
 
@@ -2152,6 +2162,7 @@ msgstr "Korisničko Ime"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr ""
 
@@ -2360,6 +2371,7 @@ msgstr "Kliknite ovdje da unestete Vaš kod za popust."
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Primijeniti"
 
@@ -2370,6 +2382,7 @@ msgstr "Primijeniti"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Već imate nalog?"
 
@@ -2381,6 +2394,7 @@ msgstr "Već imate nalog?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Prijavite se ovdje"
 
@@ -2412,6 +2426,7 @@ msgstr "Informacije o Nalogu"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Lozinka"
 
@@ -2426,6 +2441,7 @@ msgstr "Lozinka"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Potvrdite Lozinku"
 
@@ -2449,6 +2465,8 @@ msgstr "Potvrdite Lozinku"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mail Adresa"
 
@@ -2459,6 +2477,7 @@ msgstr "E-mail Adresa"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Potvrdite E-mail Adresu"
 
@@ -2469,6 +2488,7 @@ msgstr "Potvrdite E-mail Adresu"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Puno Ime"
 
@@ -2479,6 +2499,7 @@ msgstr "Puno Ime"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "OSTAVITE PRAZNO"
 
@@ -2489,6 +2510,7 @@ msgstr "OSTAVITE PRAZNO"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Prijavljeni ste kao <strong>%s</strong>. Ako želite da koristite drugi nalog za ovo članstvo, <a href=\"%s\">odjavite se sada</a>."
@@ -2512,6 +2534,7 @@ msgstr "Saglasan sam sa %s"
 #: pages/checkout.php:244
 #: pages/checkout.php:276
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Odaberite Vaš Način Plačanja"
 
@@ -2522,6 +2545,7 @@ msgstr "Odaberite Vaš Način Plačanja"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Platite sa Kreditnom Karticom Ovdje"
 
@@ -2546,6 +2570,7 @@ msgstr "Platite sa Kreditnom Karticom Ovdje"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Platite sa Paypal"
 
@@ -2578,6 +2603,7 @@ msgstr "Platite sa Paypal"
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Ime"
 
@@ -2610,6 +2636,7 @@ msgstr "Ime"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Prezime"
 
@@ -2627,6 +2654,7 @@ msgstr "Prezime"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adresa 1"
 
@@ -2644,6 +2672,7 @@ msgstr "Adresa 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adresa 2"
 
@@ -2661,6 +2690,7 @@ msgstr "Adresa 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Grad"
 
@@ -2678,6 +2708,7 @@ msgstr "Grad"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Oblast"
 
@@ -2695,6 +2726,7 @@ msgstr "Oblast"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Poštanski Broj"
 
@@ -2727,6 +2759,7 @@ msgstr "Grad, Oblast Poštanski broj "
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Država"
 
@@ -2744,6 +2777,7 @@ msgstr "Država"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -2760,6 +2794,7 @@ msgstr "Telefon"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Potvrdite E-mail"
 
@@ -2815,6 +2850,7 @@ msgstr "Mi Prihvatamo %s"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Informacije o Plaćanju"
 
@@ -2886,6 +2922,7 @@ msgstr "Tip Kartice"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Broj Kartice"
 
@@ -2997,6 +3034,7 @@ msgstr "Podnesite i Platite sa 2CheckOut"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Podnesite i Platite"
 
@@ -3028,6 +3066,7 @@ msgstr "Podnesite i Platite"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Podnesite i Potvrdite"
 
@@ -3040,6 +3079,7 @@ msgstr "Podnesite i Potvrdite"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Obrada..."
 
@@ -3050,8 +3090,11 @@ msgstr "Obrada..."
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Da li ste sigurni da želite da otkažete Vaše članstvo?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -3136,6 +3179,7 @@ msgstr "Ispod su detalji o Vašem nalogu i račun za Vašu prvu člansku fakturu
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Štampaj"
 
@@ -3210,6 +3254,7 @@ msgstr "Vašom pretplatom upravlja PayPal. Molim Vas <a href=\"http://www.paypal
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "opciono"
 
@@ -3341,6 +3386,7 @@ msgstr "Ažuriraj"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -6374,6 +6420,7 @@ msgstr "Transakcijski ID"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "obrisano"
 
@@ -6937,6 +6984,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Valuta"
 
@@ -7001,6 +7049,7 @@ msgstr "Stripe nije potrbna polja za adresu za plaćanje"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Porez Na Prodaju"
 
@@ -7010,6 +7059,7 @@ msgstr "Porez Na Prodaju"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Stanje Poreza"
 
@@ -7019,6 +7069,7 @@ msgstr "Stanje Poreza"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
@@ -7028,6 +7079,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr ""
 
@@ -7168,6 +7220,7 @@ msgstr ""
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Sačuvaj promijene"
 
@@ -10325,6 +10378,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -11425,6 +11479,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -11745,6 +11800,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -11753,6 +11809,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -11761,6 +11818,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -12408,6 +12466,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -17652,6 +17712,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -17800,6 +17861,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -17809,6 +17871,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -17828,6 +17891,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -17851,6 +17915,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -17870,6 +17935,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -17880,6 +17946,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -17889,6 +17956,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -17898,6 +17966,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -17910,6 +17979,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -17927,6 +17997,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -17951,6 +18022,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -17978,6 +18050,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -18223,6 +18296,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -18304,6 +18378,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -18510,6 +18585,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -18642,7 +18720,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -18651,7 +18731,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -18664,6 +18746,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -18673,6 +18756,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -18693,6 +18777,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -20601,6 +20686,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -20618,6 +20705,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -20631,6 +20720,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -20644,6 +20734,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -20762,6 +20853,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -20986,6 +21078,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -21230,6 +21323,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -24659,6 +24753,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -25255,6 +25350,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -27145,6 +27241,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -28124,6 +28221,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -28462,6 +28560,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -29137,10 +29236,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -29162,6 +29266,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -29179,6 +29284,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -29187,6 +29293,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -29274,3 +29381,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-sv_SE.mo b/languages/paid-memberships-pro-sv_SE.mo
index 9d2af4c1e..9cb2f55e0 100644
Binary files a/languages/paid-memberships-pro-sv_SE.mo and b/languages/paid-memberships-pro-sv_SE.mo differ
diff --git a/languages/paid-memberships-pro-sv_SE.po b/languages/paid-memberships-pro-sv_SE.po
index c84e1ecdc..dbaa7b324 100644
--- a/languages/paid-memberships-pro-sv_SE.po
+++ b/languages/paid-memberships-pro-sv_SE.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:20+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:13+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -927,6 +927,7 @@ msgstr "Betal-gateway &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "E-post"
 
@@ -1707,6 +1708,7 @@ msgstr "Valda"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Spara inställningarna"
 
@@ -4065,6 +4067,7 @@ msgstr "Spara nivå"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -4214,6 +4217,8 @@ msgstr "Dra och släpp medlemskapsnivåer för att ändra ordning på Nivå sida
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Utgång"
 
@@ -4733,6 +4738,7 @@ msgstr "Efter&nbsp;Namn"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Fakturaadress"
 
@@ -6521,6 +6527,7 @@ msgstr "Användare"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Medlemskapsnivå"
 
@@ -6618,6 +6625,7 @@ msgstr "Transaktions-ID"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "raderat"
 
@@ -7374,6 +7382,7 @@ msgstr "Välja en Gateway"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "Valuta och momsinställningar"
 
@@ -7388,6 +7397,7 @@ msgstr "Valuta och momsinställningar"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Valuta"
 
@@ -7399,6 +7409,7 @@ msgstr "Valuta"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Inte alla valutor kommer att stödjas av varje gateway. Kontrollera med din gateway."
 
@@ -7424,6 +7435,7 @@ msgstr "Accepterade kreditkortstyper"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Moms på försäljning"
 
@@ -7449,6 +7461,7 @@ msgstr "Moms på försäljning"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "valfritt"
 
@@ -7462,6 +7475,7 @@ msgstr "valfritt"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Moms för stat"
 
@@ -7475,6 +7489,7 @@ msgstr "Moms för stat"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "förkortning, t.ex. \"PA\""
 
@@ -7484,6 +7499,7 @@ msgstr "förkortning, t.ex. \"PA\""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "Momssats"
 
@@ -7497,6 +7513,7 @@ msgstr "Momssats"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "decimal, t.ex. \"0,06\""
 
@@ -8577,6 +8594,7 @@ msgstr "Din medlemskapsbekräftelse för  %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "Rabattkod"
 
@@ -9453,6 +9471,7 @@ msgstr "För att fullt ut integrera med Braintree, måste du ange din Web Hook U
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Betalningsinformation"
 
@@ -9565,6 +9584,7 @@ msgstr "Vi accepterar %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kortnummer"
 
@@ -9730,6 +9750,7 @@ msgstr "vad är detta?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Applicera"
 
@@ -10063,6 +10084,7 @@ msgstr "Försäljare"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Lösenord"
 
@@ -10314,6 +10336,7 @@ msgstr "Den här webbadressen skickas till PayPal för alla nya avgifter och abo
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "Betala med PayPal"
 
@@ -10359,6 +10382,7 @@ msgstr "Betala med PayPal"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Skicka och Betala"
 
@@ -10410,6 +10434,7 @@ msgstr "Skicka och Betala"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Skicka in och bekräfta"
 
@@ -13029,6 +13054,7 @@ msgstr "Vänligen ange nivå-ID."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Ingen"
 
@@ -13445,6 +13471,8 @@ msgstr "logga ut"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Nivå"
 
@@ -13558,6 +13586,7 @@ msgstr "Din betalning hanteras av PayPal. Vänligen <a href=“http://www.paypal
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Förnamn"
 
@@ -13603,6 +13632,7 @@ msgstr "Förnamn"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Efternamn"
 
@@ -13633,6 +13663,7 @@ msgstr "Efternamn"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adress 1"
 
@@ -13663,6 +13694,7 @@ msgstr "Adress 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adress 2"
 
@@ -13693,6 +13725,7 @@ msgstr "Adress 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Ort"
 
@@ -13723,6 +13756,7 @@ msgstr "Ort"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Region/län"
 
@@ -13753,6 +13787,7 @@ msgstr "Region/län"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Postnummer"
 
@@ -13813,6 +13848,7 @@ msgstr "Postnummer, Ort"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Land"
 
@@ -13844,6 +13880,7 @@ msgstr "Land"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -13887,6 +13924,8 @@ msgstr "Telefon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-post adress"
 
@@ -13917,6 +13956,7 @@ msgstr "E-post adress"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Verifiera e-post"
 
@@ -13985,8 +14025,11 @@ msgstr "Denna prenumeration är inte återkommande, så du behöver inte uppdate
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Är du säker på att du vill avbryta ditt medlemskap?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:41
 #: pages/cancel.php:32
@@ -14011,7 +14054,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr "Ja, avbryt mitt medlemskap"
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:47
 #: pages/cancel.php:46
@@ -14022,7 +14067,9 @@ msgstr "Ja, avbryt mitt medlemskap"
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr "Nej, behåll medlemskap"
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: shortcodes/pmpro_account.php:40
@@ -14041,6 +14088,7 @@ msgstr "Nej, behåll medlemskap"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Mina medlemskap"
 
@@ -14053,6 +14101,7 @@ msgstr "Mina medlemskap"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Avbryt alla medlemskap"
 
@@ -14190,6 +14239,7 @@ msgstr "Kontoinformation"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Har du redan ett konto?"
 
@@ -14207,6 +14257,7 @@ msgstr "Har du redan ett konto?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Logga in här"
 
@@ -14227,6 +14278,7 @@ msgstr "Logga in här"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Bekräfta lösenord"
 
@@ -14242,6 +14294,7 @@ msgstr "Bekräfta lösenord"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Bekräfta e-postadress"
 
@@ -14258,6 +14311,7 @@ msgstr "Bekräfta e-postadress"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
@@ -14274,6 +14328,7 @@ msgstr "Fullständigt namn"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "LÄMNA DETTA TOMT"
 
@@ -14290,6 +14345,7 @@ msgstr "LÄMNA DETTA TOMT"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Du är inloggad som <strong>%s</strong>. Om du vill använda ett annat konto för detta medlemskap,<a href=\"%s\">logga ut nu</a>."
@@ -14307,6 +14363,7 @@ msgstr "Du är inloggad som <strong>%s</strong>. Om du vill använda ett annat k
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Välj din betalningsmetod"
 
@@ -14324,6 +14381,7 @@ msgstr "Välj din betalningsmetod"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Betala med kreditkort här"
 
@@ -14393,6 +14451,7 @@ msgstr "Fullfölj betalning"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Bearbetar…"
 
@@ -14478,6 +14537,7 @@ msgstr "Faktura #%s den %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -14649,6 +14709,8 @@ msgstr "Väntande"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Visa ditt medlemskonto &rarr;"
 
@@ -17257,6 +17319,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -17986,6 +18049,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -18644,6 +18708,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -23195,6 +23261,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -23343,6 +23410,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -23352,6 +23420,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -23371,6 +23440,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -23394,6 +23464,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -23413,6 +23484,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -23423,6 +23495,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -23432,6 +23505,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -23441,6 +23515,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -23453,6 +23528,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -23470,6 +23546,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -23494,6 +23571,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -23516,6 +23594,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -23761,6 +23840,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -23827,6 +23907,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -24033,6 +24114,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -24146,6 +24230,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -25950,6 +26035,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -25967,6 +26054,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -25980,6 +26069,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -25993,6 +26083,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -26111,6 +26202,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -26335,6 +26427,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -26579,6 +26672,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -29984,6 +30078,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -30580,6 +30675,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -32470,6 +32566,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -33449,6 +33546,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -33787,6 +33885,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -34462,10 +34561,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -34487,6 +34591,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -34504,6 +34609,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -34512,6 +34618,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -34599,3 +34706,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-tr_TR.mo b/languages/paid-memberships-pro-tr_TR.mo
index 4be11d3fa..8c84113c5 100644
Binary files a/languages/paid-memberships-pro-tr_TR.mo and b/languages/paid-memberships-pro-tr_TR.mo differ
diff --git a/languages/paid-memberships-pro-tr_TR.po b/languages/paid-memberships-pro-tr_TR.po
index 11d97abbe..a95c6df78 100644
--- a/languages/paid-memberships-pro-tr_TR.po
+++ b/languages/paid-memberships-pro-tr_TR.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:22+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:15+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -325,6 +325,7 @@ msgstr "Ödeme Kanalı &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "Email"
 
@@ -999,6 +1000,7 @@ msgstr "seçildi"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "Ayarları Kaydet"
 
@@ -2733,6 +2735,8 @@ msgstr "Deneme Döngüsü"
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "Son erme"
 
@@ -3158,6 +3162,7 @@ msgstr "Soyad&nbsp;"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "Fatura Adresi"
 
@@ -4353,6 +4358,7 @@ msgstr "Siparişi kaydet"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "Vazgeç"
 
@@ -4703,6 +4709,7 @@ msgstr "Kullanıcı"
 #: adminpages/subscriptions.php:162
 #: includes/init.php:222
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "Üyelik Seviyesi"
 
@@ -4780,6 +4787,7 @@ msgstr "Transaction IDs"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "silindi"
 
@@ -5370,6 +5378,7 @@ msgstr "Bayi"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "Parola"
 
@@ -5566,6 +5575,7 @@ msgstr "Transaction Security Key"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "Para Birimi"
 
@@ -5575,6 +5585,7 @@ msgstr "Para Birimi"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "Tüm para birimleri her ağ geçidi tarafından desteklenecektir. Lütfen ağ geçidi ile kontrol edin."
 
@@ -5648,6 +5659,7 @@ msgstr "Stripe fatura adresi alanları gerekmez. Ödeme sayfasında gizlemek iç
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "Satış vergisi"
 
@@ -5666,6 +5678,7 @@ msgstr "Satış vergisi"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "isteğe bağlı"
 
@@ -5677,6 +5690,7 @@ msgstr "isteğe bağlı"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "Devlet Vergisi"
 
@@ -5688,6 +5702,7 @@ msgstr "Devlet Vergisi"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "kısaltma, örn.  \"PA\""
 
@@ -5699,6 +5714,7 @@ msgstr "kısaltma, örn.  \"PA\""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "ondalık, örn. \"0.06\""
 
@@ -6540,6 +6556,7 @@ msgstr " %s üyeliğinizi onaylamak için"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "İndirim Kodu"
 
@@ -8196,6 +8213,7 @@ msgstr "Mevcut Seviye"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Yok"
 
@@ -8333,6 +8351,8 @@ msgstr "Üyeliğiniz <strong>aktif</strong>."
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Seviye"
 
@@ -8608,6 +8628,7 @@ msgstr "Abonelik ödemeniz PayPal tarafından sağlanmıştır. Fatura bilgileri
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Ad"
 
@@ -8643,6 +8664,7 @@ msgstr "Ad"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Soyad"
 
@@ -8663,6 +8685,7 @@ msgstr "Soyad"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Adres 1"
 
@@ -8683,6 +8706,7 @@ msgstr "Adres 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Adres 2"
 
@@ -8703,6 +8727,7 @@ msgstr "Adres 2"
 #: pages/checkout.php:320
 #: pages/billing.php:216
 #: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Şehir"
 
@@ -8723,6 +8748,7 @@ msgstr "Şehir"
 #: pages/checkout.php:324
 #: pages/billing.php:220
 #: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Ülke"
 
@@ -8743,6 +8769,7 @@ msgstr "Ülke"
 #: pages/checkout.php:328
 #: pages/billing.php:224
 #: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Posta Kodu"
 
@@ -8781,6 +8808,7 @@ msgstr "Şehir Posta Kodu"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Ülke"
 
@@ -8801,6 +8829,7 @@ msgstr "Ülke"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Telefon"
 
@@ -8828,6 +8857,8 @@ msgstr "Telefon"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "E-mail Adresi"
 
@@ -8847,6 +8878,7 @@ msgstr "E-mail Adresi"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "E-mail tekrar"
 
@@ -8906,6 +8938,7 @@ msgstr " %s Kabul ediyoruz"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "Kart Numarası"
 
@@ -9001,8 +9034,11 @@ msgstr "Bu abonelik yinelenen değil. Fatura bilgilerinizi güncellemek zorunda
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Üyeliğinizi iptal etmek istediğinizden emin misiniz?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:17
 msgid "Yes, cancel my account"
@@ -9121,6 +9157,7 @@ msgstr "İndirim kuponunuz var mı?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "Uygula"
 
@@ -9145,6 +9182,7 @@ msgstr "Hesap Bilgileri"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Zaten bir hesabınız var mı?"
 
@@ -9157,6 +9195,7 @@ msgstr "Zaten bir hesabınız var mı?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Giriş Yap"
 
@@ -9172,6 +9211,7 @@ msgstr "Giriş Yap"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Parola Tekrar"
 
@@ -9183,6 +9223,7 @@ msgstr "Parola Tekrar"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "E-mail doğrula"
 
@@ -9194,6 +9235,7 @@ msgstr "E-mail doğrula"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Ad Soyad"
 
@@ -9205,6 +9247,7 @@ msgstr "Ad Soyad"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "BU ALANI BOŞ BIRAKIN"
 
@@ -9216,6 +9259,7 @@ msgstr "BU ALANI BOŞ BIRAKIN"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "<strong>%s</strong> olarak oturum açtınız. Farklı bir hesaptan oturum açmak için <a href=\"%s\">çıkış yapın</a>."
@@ -9228,6 +9272,7 @@ msgstr "<strong>%s</strong> olarak oturum açtınız. Farklı bir hesaptan oturu
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Ödeme Yönetmi Değiştir"
 
@@ -9240,6 +9285,7 @@ msgstr "Ödeme Yönetmi Değiştir"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Kredi Kartı İle Ödeme Yap"
 
@@ -9268,6 +9314,7 @@ msgstr "Kredi Kartı İle Ödeme Yap"
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "PayPal İle Ödeme Yap"
 
@@ -9307,6 +9354,7 @@ msgstr "PayPal İle Ödeme Yap"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "Ödeme Bilgisi"
 
@@ -9385,6 +9433,7 @@ msgstr "Ödemeyi Tamamla"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "Gönder ve Öde"
 
@@ -9418,6 +9467,7 @@ msgstr "Gönder ve Öde"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "Gönder ve Onayla"
 
@@ -9437,6 +9487,7 @@ msgstr "2CheckOut ile ödeme"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "İşlem yapılıyor..."
 
@@ -9519,6 +9570,7 @@ msgstr "Fatura #%s  %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "Yazdır"
 
@@ -9645,6 +9697,8 @@ msgstr "Bekleniyor"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Üyelik Hesabını Gör &rarr;"
 
@@ -11805,6 +11859,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -12689,6 +12744,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -13009,6 +13065,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -13017,6 +13074,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -13611,6 +13669,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -18787,6 +18847,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -18935,6 +18996,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -18944,6 +19006,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -18963,6 +19026,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -18986,6 +19050,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -19005,6 +19070,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -19015,6 +19081,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -19024,6 +19091,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -19033,6 +19101,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -19045,6 +19114,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -19062,6 +19132,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -19086,6 +19157,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -19113,6 +19185,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -19358,6 +19431,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -19439,6 +19513,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -19645,6 +19720,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -19777,7 +19855,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -19786,7 +19866,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:66
 #: shortcodes/pmpro_account.php:38
@@ -19799,6 +19881,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -19808,6 +19891,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -19828,6 +19912,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -21783,6 +21868,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -21800,6 +21887,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -21813,6 +21902,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -21826,6 +21916,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -21944,6 +22035,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -22168,6 +22260,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -22412,6 +22505,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -25841,6 +25935,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -26437,6 +26532,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -28327,6 +28423,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -29306,6 +29403,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -29644,6 +29742,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -30319,10 +30418,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -30344,6 +30448,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -30361,6 +30466,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -30369,6 +30475,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -30456,3 +30563,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-vi.mo b/languages/paid-memberships-pro-vi.mo
index 516de6464..13bc1de53 100644
Binary files a/languages/paid-memberships-pro-vi.mo and b/languages/paid-memberships-pro-vi.mo differ
diff --git a/languages/paid-memberships-pro-vi.po b/languages/paid-memberships-pro-vi.po
index 73656e90a..e41565479 100644
--- a/languages/paid-memberships-pro-vi.po
+++ b/languages/paid-memberships-pro-vi.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:24+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:17+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -818,6 +818,7 @@ msgstr ""
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr ""
 
@@ -1563,6 +1564,7 @@ msgstr ""
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr ""
 
@@ -3600,6 +3602,7 @@ msgstr ""
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr ""
 
@@ -3724,6 +3727,8 @@ msgstr ""
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr ""
 
@@ -4161,6 +4166,7 @@ msgstr ""
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr ""
 
@@ -5611,6 +5617,7 @@ msgstr ""
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr ""
 
@@ -5693,6 +5700,7 @@ msgstr ""
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr ""
 
@@ -6340,6 +6348,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr ""
 
@@ -6351,6 +6360,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -6376,6 +6386,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr ""
 
@@ -6397,6 +6408,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr ""
 
@@ -6410,6 +6422,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr ""
 
@@ -6423,6 +6436,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
@@ -6436,6 +6450,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr ""
 
@@ -7299,6 +7314,7 @@ msgstr ""
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr ""
 
@@ -8011,6 +8027,7 @@ msgstr ""
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr ""
 
@@ -8084,6 +8101,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr ""
 
@@ -8180,6 +8198,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr ""
 
@@ -8440,6 +8459,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr ""
 
@@ -8652,6 +8672,7 @@ msgstr ""
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr ""
 
@@ -8689,6 +8710,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr ""
 
@@ -8731,6 +8753,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr ""
 
@@ -10663,6 +10686,7 @@ msgstr "Hay chỉ rõ kiểu thành viên7"
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "Không"
 
@@ -11002,6 +11026,8 @@ msgstr "đăng xuất"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "Kiểu/Cấp độ"
 
@@ -11094,6 +11120,7 @@ msgstr "Đăng ký thanh toán của bạn được quản lý bằng PayPal. H
 #: includes/profile.php:1145
 #: pages/billing.php:199
 #: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "Tên"
 
@@ -11133,6 +11160,7 @@ msgstr "Tên"
 #: includes/profile.php:1146
 #: pages/billing.php:203
 #: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "Họ"
 
@@ -11157,6 +11185,7 @@ msgstr "Họ"
 #: pages/checkout.php:309
 #: pages/billing.php:207
 #: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "Địa chỉ 1"
 
@@ -11181,6 +11210,7 @@ msgstr "Địa chỉ 1"
 #: pages/checkout.php:313
 #: pages/billing.php:211
 #: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "Địa chỉ 2"
 
@@ -11204,6 +11234,7 @@ msgstr "Địa chỉ 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "Thành phố"
 
@@ -11227,6 +11258,7 @@ msgstr "Thành phố"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "Quận"
 
@@ -11250,6 +11282,7 @@ msgstr "Quận"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "Mã vùng"
 
@@ -11296,6 +11329,7 @@ msgstr "Bang Hạt"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "Quốc gia"
 
@@ -11320,6 +11354,7 @@ msgstr "Quốc gia"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "Số điện thoại"
 
@@ -11353,6 +11388,8 @@ msgstr "Số điện thoại"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "Địa chỉ Email"
 
@@ -11376,6 +11413,7 @@ msgstr "Địa chỉ Email"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "Xác nhận E-mail"
 
@@ -11425,8 +11463,11 @@ msgstr "Đăng ký này không định kỳ. Vì vậy, bạn không cần phả
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "Bạn có chắc chắn muốn hủy bỏ quyền thành viên của bạn?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:32
 #: pages/cancel.php:51
@@ -11464,6 +11505,7 @@ msgstr "Không, giữ lại tài khoản của tôi"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "Quyền Thành Viên Của Tôi"
 
@@ -11474,6 +11516,7 @@ msgstr "Quyền Thành Viên Của Tôi"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "Hủy Bỏ Các Quyền Thành Viên"
 
@@ -11592,6 +11635,7 @@ msgstr "Thông tin tài khoản"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "Bạn đã có tài khoản?"
 
@@ -11606,6 +11650,7 @@ msgstr "Bạn đã có tài khoản?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "Đăng nhập ở đây"
 
@@ -11623,6 +11668,7 @@ msgstr "Đăng nhập ở đây"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "Xác nhận mật khẩu"
 
@@ -11636,6 +11682,7 @@ msgstr "Xác nhận mật khẩu"
 #: pages/checkout.php:197
 #: pages/checkout.php:229
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "Xác nhận địa chỉ E-mail"
 
@@ -11649,6 +11696,7 @@ msgstr "Xác nhận địa chỉ E-mail"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "Họ tên"
 
@@ -11662,6 +11710,7 @@ msgstr "Họ tên"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "ĐỂ TRỐNG"
 
@@ -11675,6 +11724,7 @@ msgstr "ĐỂ TRỐNG"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "Bạn đã đăng nhập là d<strong>%s</strong>.Nếu bạn muốn sử dụng tài khoản khác cho thành viên này, <a href=\"%s\">Đăng xuất ngay</a>."
@@ -11689,6 +11739,7 @@ msgstr "Bạn đã đăng nhập là d<strong>%s</strong>.Nếu bạn muốn s
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "Chọn cách thanh toán của bạn"
 
@@ -11703,6 +11754,7 @@ msgstr "Chọn cách thanh toán của bạn"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "Thanh toán với Thẻ tín dung ở đây"
 
@@ -11754,6 +11806,7 @@ msgstr "Hoàn thành thanh toán"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "Đang xử lý..."
 
@@ -11837,6 +11890,7 @@ msgstr "Hóa đơn số#%s trên %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "In ấn"
 
@@ -11999,6 +12053,8 @@ msgstr "Đang xử lý"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "Xem thông tin thành viên của bạn &rarr;"
 
@@ -14366,6 +14422,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -15139,6 +15196,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -15407,6 +15465,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -15415,6 +15474,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -15957,6 +16017,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -20744,6 +20806,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -20892,6 +20955,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -20901,6 +20965,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -20920,6 +20985,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -20943,6 +21009,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -20962,6 +21029,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -20972,6 +21040,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -20981,6 +21050,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -20990,6 +21060,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -21002,6 +21073,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -21019,6 +21091,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -21043,6 +21116,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -21070,6 +21144,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -21315,6 +21390,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -21381,6 +21457,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -21587,6 +21664,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -21705,7 +21785,9 @@ msgstr ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: pages/cancel.php:59
@@ -21714,7 +21796,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/checkout.php:85
 #: pages/checkout.php:89
@@ -21733,6 +21817,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -23552,6 +23637,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -23569,6 +23656,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -23582,6 +23671,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -23595,6 +23685,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -23713,6 +23804,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -23937,6 +24029,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -24181,6 +24274,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -27600,6 +27694,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -28196,6 +28291,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -30086,6 +30182,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -31065,6 +31162,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -31403,6 +31501,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -32078,10 +32177,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -32103,6 +32207,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -32120,6 +32225,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -32128,6 +32234,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -32215,3 +32322,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro-zh_HK.mo b/languages/paid-memberships-pro-zh_HK.mo
index 03ef84868..cb4268e60 100644
Binary files a/languages/paid-memberships-pro-zh_HK.mo and b/languages/paid-memberships-pro-zh_HK.mo differ
diff --git a/languages/paid-memberships-pro-zh_HK.po b/languages/paid-memberships-pro-zh_HK.po
index cb75edf78..1c9bf2461 100644
--- a/languages/paid-memberships-pro-zh_HK.po
+++ b/languages/paid-memberships-pro-zh_HK.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:49:27+00:00\n"
+"POT-Creation-Date: 2024-07-17T18:00:19+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -927,6 +927,7 @@ msgstr "付款通道(payment gateway) &amp; SSL"
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr "電郵"
 
@@ -1707,6 +1708,7 @@ msgstr "選擇"
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr "保存設定"
 
@@ -4065,6 +4067,7 @@ msgstr "保存程度"
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr "取消"
 
@@ -4214,6 +4217,8 @@ msgstr "在程度頁拉和落下這個會籍程度來再訂購."
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr "到期"
 
@@ -4733,6 +4738,7 @@ msgstr "姓氏"
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr "付款帳單地址"
 
@@ -6521,6 +6527,7 @@ msgstr "用者"
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr "會員會籍程度"
 
@@ -6618,6 +6625,7 @@ msgstr "交易IDs"
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr "清除"
 
@@ -7384,6 +7392,7 @@ msgstr "選擇一個網關入口"
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr "貨幣和稅款設定"
 
@@ -7398,6 +7407,7 @@ msgstr "貨幣和稅款設定"
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr "貨幣"
 
@@ -7409,6 +7419,7 @@ msgstr "貨幣"
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr "網關入口不支援所有的流通貨幣. 請檢查您的網關入口."
 
@@ -7434,6 +7445,7 @@ msgstr "接受這個信用卡的種類"
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr "銷售稅"
 
@@ -7459,6 +7471,7 @@ msgstr "銷售稅"
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr "可選擇的"
 
@@ -7472,6 +7485,7 @@ msgstr "可選擇的"
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr "稅州"
 
@@ -7485,6 +7499,7 @@ msgstr "稅州"
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr "縮寫, e.g. \"PA\""
 
@@ -7494,6 +7509,7 @@ msgstr "縮寫, e.g. \"PA\""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr "税率"
 
@@ -7507,6 +7523,7 @@ msgstr "税率"
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr "小數點, e.g. \"0.06\""
 
@@ -8587,6 +8604,7 @@ msgstr "你的會籍確認給 %s"
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr "减價密碼"
 
@@ -9463,6 +9481,7 @@ msgstr "全面同Braintree配合, 你需要設定網鉤URL到"
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr "付款資料"
 
@@ -9575,6 +9594,7 @@ msgstr "我們接受 %s"
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr "卡號碼"
 
@@ -9740,6 +9760,7 @@ msgstr "這是怎麼?"
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr "啟用"
 
@@ -10073,6 +10094,7 @@ msgstr "賣主"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr "密碼"
 
@@ -10324,6 +10346,7 @@ msgstr "所有的收費和訂閱會在這個URL是送給 PayPal. 您不需要設
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr "PayPal來結帳"
 
@@ -10369,6 +10392,7 @@ msgstr "PayPal來結帳"
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr "提交和結帳"
 
@@ -10420,6 +10444,7 @@ msgstr "提交和結帳"
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr "提交和確認"
 
@@ -13046,6 +13071,7 @@ msgstr "請明確指出程度 id."
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr "無"
 
@@ -13462,6 +13488,8 @@ msgstr "登出"
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr "程度"
 
@@ -13575,6 +13603,7 @@ msgstr "您的會籍付款是給PayPal管理. 請 <a href=\"http://www.paypal.co
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr "名字"
 
@@ -13620,6 +13649,7 @@ msgstr "名字"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr "姓氏"
 
@@ -13650,6 +13680,7 @@ msgstr "姓氏"
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr "地址 1"
 
@@ -13680,6 +13711,7 @@ msgstr "地址 1"
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr "地址 2"
 
@@ -13710,6 +13742,7 @@ msgstr "地址 2"
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr "都市"
 
@@ -13740,6 +13773,7 @@ msgstr "都市"
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr "州"
 
@@ -13770,6 +13804,7 @@ msgstr "州"
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr "郵遞區號"
 
@@ -13830,6 +13865,7 @@ msgstr "都市, 州編碼"
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr "國家"
 
@@ -13861,6 +13897,7 @@ msgstr "國家"
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr "電話"
 
@@ -13904,6 +13941,8 @@ msgstr "電話"
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr "電子郵件地址"
 
@@ -13934,6 +13973,7 @@ msgstr "電子郵件地址"
 #: pages/billing.php:286
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr "確認電子郵件"
 
@@ -14002,8 +14042,11 @@ msgstr "這個會籍不是定期的訂閱. 所以你不需要更新你的付款
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr "你真是想除消你的會籍?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:41
 #: pages/cancel.php:32
@@ -14028,7 +14071,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr "是的, 消你這個會籍"
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:47
 #: pages/cancel.php:46
@@ -14039,7 +14084,9 @@ msgstr "是的, 消你這個會籍"
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr "不是的, 保留這個會籍"
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:57
 #: shortcodes/pmpro_account.php:40
@@ -14058,6 +14105,7 @@ msgstr "不是的, 保留這個會籍"
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr "我的會籍"
 
@@ -14070,6 +14118,7 @@ msgstr "我的會籍"
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr "消你的會籍"
 
@@ -14207,6 +14256,7 @@ msgstr "戶口資料"
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr "您已經有戶口嗎?"
 
@@ -14224,6 +14274,7 @@ msgstr "您已經有戶口嗎?"
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr "在這裡請登入"
 
@@ -14244,6 +14295,7 @@ msgstr "在這裡請登入"
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr "確認密碼"
 
@@ -14259,6 +14311,7 @@ msgstr "確認密碼"
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr "確認電郵地址"
 
@@ -14275,6 +14328,7 @@ msgstr "確認電郵地址"
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr "全名"
 
@@ -14291,6 +14345,7 @@ msgstr "全名"
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr "留下這裡空白"
 
@@ -14307,6 +14362,7 @@ msgstr "留下這裡空白"
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr "您的證入身份是 <strong>%s</strong>. 如果您想改變證入戶口在這個會籍, <a href=\"%s\">馬上證入</a>."
@@ -14324,6 +14380,7 @@ msgstr "您的證入身份是 <strong>%s</strong>. 如果您想改變證入戶
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr "付款方式"
 
@@ -14341,6 +14398,7 @@ msgstr "付款方式"
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr "在這裡用信用卡來結帳"
 
@@ -14410,6 +14468,7 @@ msgstr "完成付款"
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr "做變化過程..."
 
@@ -14495,6 +14554,7 @@ msgstr "付款發票 #%s 在 %s"
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr "印出"
 
@@ -14666,6 +14726,8 @@ msgstr "未決定"
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr "審視您的會籍戶口 &rarr;"
 
@@ -17340,6 +17402,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -18069,6 +18132,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -18727,6 +18791,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -23278,6 +23344,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -23426,6 +23493,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -23435,6 +23503,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -23454,6 +23523,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -23477,6 +23547,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -23496,6 +23567,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -23506,6 +23578,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -23515,6 +23588,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -23524,6 +23598,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -23536,6 +23611,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -23553,6 +23629,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 msgid "Welcome, %s"
 msgstr ""
 
@@ -23577,6 +23654,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -23599,6 +23677,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -23844,6 +23923,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -23910,6 +23990,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -24116,6 +24197,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -24229,6 +24313,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -26033,6 +26118,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -26050,6 +26137,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -26063,6 +26152,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -26076,6 +26166,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -26194,6 +26285,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -26418,6 +26510,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -26662,6 +26755,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -30067,6 +30161,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -30663,6 +30758,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -32553,6 +32649,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -33532,6 +33629,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -33870,6 +33968,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -34545,10 +34644,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -34570,6 +34674,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -34587,6 +34692,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -34595,6 +34701,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -34682,3 +34789,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro.mo b/languages/paid-memberships-pro.mo
index 98c826c6b..5c339871e 100644
Binary files a/languages/paid-memberships-pro.mo and b/languages/paid-memberships-pro.mo differ
diff --git a/languages/paid-memberships-pro.po b/languages/paid-memberships-pro.po
index 6aef7a13a..dbb90bd49 100644
--- a/languages/paid-memberships-pro.po
+++ b/languages/paid-memberships-pro.po
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:29+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:23+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -1625,6 +1625,7 @@ msgstr ""
 #: includes/profile.php:1148
 #: pages/confirmation.php:105
 #: shortcodes/pmpro_account.php:77
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 msgid "Email"
 msgstr ""
 
@@ -3195,6 +3196,7 @@ msgstr ""
 #: adminpages/pagesettings.php:719
 #: adminpages/paymentsettings.php:222
 #: adminpages/securitysettings.php:423
+#: adminpages/paymentsettings.php:223
 msgid "Save Settings"
 msgstr ""
 
@@ -3799,6 +3801,8 @@ msgstr ""
 #: pages/levels.php:76
 #: shortcodes/pmpro_account.php:331
 #: shortcodes/pmpro_account.php:366
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 msgid "Level"
 msgstr ""
 
@@ -4523,6 +4527,7 @@ msgstr ""
 #: adminpages/dashboard.php:368
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
 #: classes/class-pmpro-orders-list-table.php:1083
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 msgid "deleted"
 msgstr ""
 
@@ -6808,6 +6813,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:970
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
 #: includes/fields.php:1385
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 msgid "Edit"
 msgstr ""
 
@@ -7986,6 +7992,7 @@ msgstr ""
 #: pages/billing.php:379
 #: pages/cancel.php:123
 #: shortcodes/pmpro_account.php:256
+#: pages/cancel.php:153
 msgid "Cancel"
 msgstr ""
 
@@ -8242,6 +8249,8 @@ msgstr ""
 #: pages/cancel.php:100
 #: adminpages/membershiplevels.php:364
 #: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr ""
 
@@ -8651,6 +8660,7 @@ msgstr ""
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 msgid "Print"
 msgstr ""
 
@@ -9277,6 +9287,7 @@ msgstr ""
 #: pages/checkout.php:164
 #: pages/checkout.php:473
 #: pages/invoice.php:300
+#: pages/checkout.php:501
 msgid "Discount Code"
 msgstr ""
 
@@ -9379,6 +9390,7 @@ msgstr ""
 #: adminpages/levels/edit-level.php:619
 #: classes/class-pmpro-discount-code-list-table.php:560
 #: includes/init.php:243
+#: includes/init.php:250
 msgid "None"
 msgstr ""
 
@@ -11226,6 +11238,7 @@ msgstr ""
 #: includes/login.php:751
 #: includes/login.php:502
 #: includes/login.php:848
+#: includes/login.php:841
 msgid "Log In"
 msgstr ""
 
@@ -12257,6 +12270,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:199
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
@@ -12276,6 +12290,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:204
 #: adminpages/paymentsettings.php:212
 #: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr ""
 
@@ -12292,6 +12307,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:220
 #: adminpages/paymentsettings.php:228
 #: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
@@ -12327,6 +12343,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:239
 #: adminpages/paymentsettings.php:247
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr ""
 
@@ -12366,6 +12383,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:247
 #: pages/billing.php:165
 #: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr ""
 
@@ -12384,6 +12402,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:242
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr ""
 
@@ -12402,6 +12421,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:243
 #: adminpages/paymentsettings.php:251
 #: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
@@ -12416,6 +12436,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:244
 #: adminpages/paymentsettings.php:252
 #: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
@@ -12434,6 +12455,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:245
 #: adminpages/paymentsettings.php:253
 #: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr ""
 
@@ -13799,6 +13821,8 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: pages/invoice.php:96
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 msgid "&#8212;"
 msgstr ""
 
@@ -15268,6 +15292,7 @@ msgstr ""
 #: pages/billing.php:170
 #: pages/billing.php:283
 #: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr ""
 
@@ -15443,6 +15468,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_braintree.php:458
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr ""
 
@@ -15681,6 +15707,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr ""
 
@@ -16648,6 +16675,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
 #: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr ""
 
@@ -16956,6 +16984,7 @@ msgstr ""
 #: pages/checkout.php:285
 #: classes/gateways/class.pmprogateway_paypalexpress.php:531
 #: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr ""
 
@@ -17017,6 +17046,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr ""
 
@@ -17085,6 +17115,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
 #: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr ""
 
@@ -22730,6 +22761,7 @@ msgstr ""
 #: adminpages/subscriptions.php:144
 #: adminpages/subscriptions.php:162
 #: pages/confirmation.php:107
+#: includes/init.php:229
 msgid "Membership Level"
 msgstr ""
 
@@ -22869,6 +22901,7 @@ msgstr ""
 #: includes/login.php:733
 #: includes/login.php:561
 #: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -23132,6 +23165,7 @@ msgstr ""
 #: includes/login.php:591
 #: includes/login.php:589
 #: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
@@ -23143,6 +23177,7 @@ msgstr ""
 #: includes/login.php:597
 #: includes/login.php:595
 #: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
@@ -23164,6 +23199,8 @@ msgstr ""
 #: includes/login.php:694
 #: includes/login.php:769
 #: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
@@ -23185,6 +23222,8 @@ msgstr ""
 #: includes/login.php:696
 #: includes/login.php:771
 #: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
@@ -23211,6 +23250,7 @@ msgstr ""
 #: includes/login.php:721
 #: includes/login.php:808
 #: includes/profile.php:1315
+#: includes/login.php:801
 msgid "New Password"
 msgstr ""
 
@@ -23245,6 +23285,7 @@ msgstr ""
 #: includes/login.php:827
 #: includes/profile.php:1329
 #: includes/scripts.php:81
+#: includes/login.php:820
 msgid "Strength Indicator"
 msgstr ""
 
@@ -23271,6 +23312,7 @@ msgstr ""
 #: includes/login.php:727
 #: includes/login.php:820
 #: includes/profile.php:1322
+#: includes/login.php:813
 msgid "Confirm New Password"
 msgstr ""
 
@@ -23283,6 +23325,7 @@ msgstr ""
 #: includes/login.php:758
 #: includes/functions.php:2136
 #: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -23294,6 +23337,7 @@ msgstr ""
 #: includes/login.php:762
 #: includes/login.php:760
 #: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
@@ -23305,6 +23349,7 @@ msgstr ""
 #: includes/login.php:767
 #: includes/login.php:765
 #: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
@@ -23319,6 +23364,7 @@ msgstr ""
 #: includes/login.php:865
 #: includes/login.php:863
 #: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
@@ -23338,6 +23384,7 @@ msgstr ""
 #: includes/login.php:1097
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
+#: includes/login.php:1090
 #, php-format
 msgid "Welcome, %s"
 msgstr ""
@@ -23366,6 +23413,7 @@ msgstr ""
 #: includes/login.php:1034
 #: includes/login.php:1134
 #: shortcodes/pmpro_account.php:102
+#: includes/login.php:1127
 msgid "Log Out"
 msgstr ""
 
@@ -23384,6 +23432,7 @@ msgstr ""
 #: includes/login.php:1069
 #: includes/login.php:1067
 #: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
@@ -23402,6 +23451,7 @@ msgstr ""
 #: includes/login.php:1073
 #: includes/login.php:1071
 #: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -23467,6 +23517,7 @@ msgstr ""
 #: includes/admin.php:200
 #: includes/updates/upgrade_2_10_6.php:48
 #: includes/deprecated.php:1048
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -23771,6 +23822,7 @@ msgstr ""
 #: pages/invoice.php:45
 #: pages/invoice.php:350
 #: shortcodes/pmpro_account.php:353
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 msgid "Paid"
 msgstr ""
 
@@ -23989,6 +24041,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:109
 #: includes/profile.php:1145
 #: pages/billing.php:199
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr ""
 
@@ -24054,6 +24107,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:113
 #: includes/profile.php:1146
 #: pages/billing.php:203
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr ""
 
@@ -24268,6 +24322,9 @@ msgstr ""
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 msgid "Required Field"
 msgstr ""
 
@@ -24574,6 +24631,8 @@ msgstr ""
 #: pages/cancel.php:158
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 msgid "View Your Membership Account &rarr;"
 msgstr ""
 
@@ -24682,6 +24741,7 @@ msgstr ""
 #: classes/class-pmpro-members-list-table.php:139
 #: pages/billing.php:195
 #: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr ""
 
@@ -24728,6 +24788,7 @@ msgstr ""
 #: pages/billing.php:160
 #: pages/checkout.php:309
 #: pages/billing.php:207
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr ""
 
@@ -24774,6 +24835,7 @@ msgstr ""
 #: pages/billing.php:164
 #: pages/checkout.php:313
 #: pages/billing.php:211
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr ""
 
@@ -24820,6 +24882,7 @@ msgstr ""
 #: pages/billing.php:175
 #: pages/checkout.php:320
 #: pages/billing.php:216
+#: pages/checkout.php:368
 msgid "City"
 msgstr ""
 
@@ -24866,6 +24929,7 @@ msgstr ""
 #: pages/billing.php:179
 #: pages/checkout.php:324
 #: pages/billing.php:220
+#: pages/checkout.php:372
 msgid "State"
 msgstr ""
 
@@ -24912,6 +24976,7 @@ msgstr ""
 #: pages/billing.php:183
 #: pages/checkout.php:328
 #: pages/billing.php:224
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr ""
 
@@ -25004,6 +25069,7 @@ msgstr ""
 #: pages/checkout.php:370
 #: pages/billing.php:234
 #: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr ""
 
@@ -25050,6 +25116,7 @@ msgstr ""
 #: pages/checkout.php:386
 #: pages/billing.php:260
 #: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr ""
 
@@ -25114,6 +25181,8 @@ msgstr ""
 #: pages/checkout.php:401
 #: pages/checkout.php:232
 #: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr ""
 
@@ -25159,6 +25228,7 @@ msgstr ""
 #: pages/checkout.php:376
 #: pages/checkout.php:408
 #: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr ""
 
@@ -25308,8 +25378,11 @@ msgstr ""
 #: pages/cancel.php:48
 #: pages/cancel.php:49
 #: pages/cancel.php:50
+#: pages/cancel.php:63
 msgid "Are you sure you want to cancel your membership?"
-msgstr ""
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:41
 #: pages/cancel.php:32
@@ -25334,7 +25407,9 @@ msgstr[1] ""
 #: pages/cancel.php:78
 #: pages/cancel.php:79
 msgid "Yes, cancel this membership"
-msgstr ""
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:47
 #: pages/cancel.php:46
@@ -25345,7 +25420,9 @@ msgstr ""
 #: pages/cancel.php:79
 #: pages/cancel.php:80
 msgid "No, keep this membership"
-msgstr ""
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
 #: pages/cancel.php:56
 #: shortcodes/pmpro_account.php:38
@@ -25364,6 +25441,7 @@ msgstr ""
 #: pages/cancel.php:95
 #: pages/cancel.php:98
 #: shortcodes/pmpro_account.php:144
+#: pages/cancel.php:127
 msgid "My Memberships"
 msgstr ""
 
@@ -25377,6 +25455,7 @@ msgstr ""
 #: pages/cancel.php:120
 #: pages/cancel.php:128
 #: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
@@ -25536,6 +25615,7 @@ msgstr ""
 #: pages/checkout.php:155
 #: pages/checkout.php:187
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr ""
 
@@ -25558,6 +25638,7 @@ msgstr ""
 #: pages/checkout.php:187
 #: includes/functions.php:2181
 #: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr ""
 
@@ -25584,6 +25665,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:137
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
 #: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr ""
 
@@ -25604,6 +25686,7 @@ msgstr ""
 #: pages/checkout.php:196
 #: pages/checkout.php:197
 #: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr ""
 
@@ -25626,6 +25709,7 @@ msgstr ""
 #: pages/checkout.php:210
 #: pages/checkout.php:242
 #: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr ""
 
@@ -25648,6 +25732,7 @@ msgstr ""
 #: pages/checkout.php:211
 #: pages/checkout.php:243
 #: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr ""
 
@@ -25671,6 +25756,7 @@ msgstr ""
 #: pages/checkout.php:227
 #: pages/checkout.php:259
 #: pages/checkout.php:267
+#: pages/checkout.php:295
 #, php-format
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr ""
@@ -25694,6 +25780,7 @@ msgstr ""
 #: pages/checkout.php:243
 #: pages/checkout.php:244
 #: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr ""
 
@@ -25718,6 +25805,7 @@ msgstr ""
 #: pages/checkout.php:249
 #: pages/checkout.php:281
 #: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr ""
 
@@ -25739,6 +25827,7 @@ msgstr ""
 #: pages/checkout.php:459
 #: pages/checkout.php:491
 #: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
@@ -25829,6 +25918,7 @@ msgstr ""
 #: pages/checkout.php:619
 #: pages/checkout.php:621
 #: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr ""
 
@@ -31009,6 +31099,7 @@ msgstr ""
 #: includes/profile.php:844
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:174
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 msgid "No membership orders found."
 msgstr ""
 
@@ -32821,6 +32912,7 @@ msgstr ""
 #: adminpages/paymentsettings.php:250
 #: adminpages/paymentsettings.php:258
 #: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -33045,6 +33137,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:67
 #: classes/class-pmpro-orders-list-table.php:955
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 msgid "ID: %s"
 msgstr ""
 
@@ -33289,6 +33382,7 @@ msgstr ""
 #: adminpages/subscriptions.php:261
 #: adminpages/subscriptions.php:275
 #: includes/functions.php:641
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 msgid "%1$s at %2$s"
 msgstr ""
 
@@ -36673,6 +36767,7 @@ msgstr ""
 #: includes/login.php:923
 #: includes/login.php:921
 #: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -37260,6 +37355,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
 #: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
@@ -39150,6 +39246,7 @@ msgstr ""
 #: pages/cancel.php:134
 #: pages/cancel.php:142
 #: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -40129,6 +40226,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:102
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:103
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
@@ -40467,6 +40565,7 @@ msgstr ""
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:214
 #: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 msgid "test"
 msgstr ""
 
@@ -41142,10 +41241,15 @@ msgstr ""
 #: includes/login.php:813
 #: includes/profile.php:1307
 #: pages/checkout.php:209
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
 #: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
@@ -41167,6 +41271,7 @@ msgid "Important Upgrade Notice"
 msgstr ""
 
 #: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
@@ -41184,6 +41289,7 @@ msgid "Your payment subscription is managed by PayPal. Please <a href=\"https://
 msgstr ""
 
 #: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
@@ -41192,6 +41298,7 @@ msgid "Membership Information"
 msgstr ""
 
 #: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
@@ -41279,3 +41386,43 @@ msgstr ""
 msgctxt "block description"
 msgid "Dynamic page section that displays a list of all orders (purchase history) for the active member. Each order can be selected and viewed in full detail."
 msgstr ""
+
+#: classes/gateways/class.pmprogateway_authorizenet.php:131
+msgid "API Login ID"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
+msgstr ""
+
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
+msgstr ""
+
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
+msgstr ""
+
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
+msgstr ""
diff --git a/languages/paid-memberships-pro.pot b/languages/paid-memberships-pro.pot
index 6571cb238..8529fa452 100644
--- a/languages/paid-memberships-pro.pot
+++ b/languages/paid-memberships-pro.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Paid Memberships Pro plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Paid Memberships Pro 3.0.99\n"
+"Project-Id-Version: Paid Memberships Pro 3.1\n"
 "Report-Msgid-Bugs-To: info@paidmembershipspro.com\n"
 "Last-Translator: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "Language-Team: Paid Memberships Pro <info@paidmembershipspro.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-07-05T18:48:27+00:00\n"
+"POT-Creation-Date: 2024-07-17T17:59:21+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: paid-memberships-pro\n"
@@ -750,7 +750,7 @@ msgstr ""
 #: adminpages/pagesettings.php:476
 #: adminpages/pagesettings.php:538
 #: adminpages/pagesettings.php:719
-#: adminpages/paymentsettings.php:222
+#: adminpages/paymentsettings.php:223
 #: adminpages/securitysettings.php:423
 msgid "Save Settings"
 msgstr ""
@@ -957,7 +957,8 @@ msgstr ""
 #: includes/profile.php:866
 #: includes/profile.php:913
 #: pages/billing.php:78
-#: pages/cancel.php:104
+#: pages/cancel.php:134
+#: pages/cancel.php:144
 #: pages/invoice.php:334
 #: pages/invoice.php:363
 #: pages/levels.php:76
@@ -1063,7 +1064,7 @@ msgstr ""
 
 #: adminpages/dashboard.php:353
 #: adminpages/dashboard.php:368
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:94
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
 #: classes/class-pmpro-orders-list-table.php:1064
 #: classes/class-pmpro-orders-list-table.php:1083
 #: includes/profile.php:801
@@ -1255,7 +1256,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_braintree.php:463
 #: classes/gateways/class.pmprogateway_stripe.php:943
 #: pages/billing.php:317
-#: pages/checkout.php:432
+#: pages/checkout.php:460
 msgid "Expiration Date"
 msgstr ""
 
@@ -1444,7 +1445,7 @@ msgstr ""
 #: includes/profile.php:1189
 #: includes/profile.php:1336
 #: pages/billing.php:379
-#: pages/cancel.php:123
+#: pages/cancel.php:153
 #: shortcodes/pmpro_account.php:256
 msgid "Cancel"
 msgstr ""
@@ -1995,7 +1996,7 @@ msgstr ""
 #: adminpages/orders.php:427
 #: adminpages/orders.php:603
 #: classes/class-pmpro-discount-code-list-table.php:560
-#: includes/init.php:243
+#: includes/init.php:250
 #: includes/metaboxes.php:19
 #: includes/profile.php:210
 #: includes/terms.php:29
@@ -2197,7 +2198,8 @@ msgstr ""
 #: adminpages/orders.php:710
 #: includes/profile.php:49
 #: includes/profile.php:313
-#: pages/cancel.php:105
+#: pages/cancel.php:135
+#: pages/cancel.php:147
 msgid "Expiration"
 msgstr ""
 
@@ -2214,7 +2216,7 @@ msgid "Subscription"
 msgstr ""
 
 #: adminpages/member-edit/pmpro-class-member-edit-panel-memberships.php:112
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:76
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:78
 #: adminpages/membershiplevels.php:418
 #: adminpages/membershiplevels.php:428
 #: classes/class-pmpro-discount-code-list-table.php:400
@@ -2426,9 +2428,9 @@ msgid "N/A"
 msgstr ""
 
 #: adminpages/member-edit/pmpro-class-member-edit-panel-memberships.php:650
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:96
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:146
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:153
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:98
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:148
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:155
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:128
 #: adminpages/membershiplevels.php:488
 #: classes/class-pmpro-orders-list-table.php:1085
@@ -2527,7 +2529,7 @@ msgid "Gateway"
 msgstr ""
 
 #. translators: %1$s is the date and %2$s is the time.
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:59
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:60
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:182
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:221
 #: adminpages/subscriptions.php:248
@@ -2542,14 +2544,14 @@ msgstr ""
 
 #. translators: %s is the Order ID.
 #. translators: %s is the User ID.
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:71
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:73
 #: adminpages/reports/logins.php:250
 #: classes/class-pmpro-orders-list-table.php:955
 #: includes/profile.php:778
 msgid "ID: %s"
 msgstr ""
 
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:79
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:81
 #: adminpages/orders.php:288
 #: classes/class-pmpro-orders-list-table.php:995
 #: classes/class-pmpro-orders-list-table.php:1005
@@ -2557,7 +2559,7 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:84
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:86
 #: adminpages/orders.php:289
 #: classes/class-pmpro-members-list-table.php:138
 #: classes/class-pmpro-orders-list-table.php:1009
@@ -2569,16 +2571,16 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:106
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:108
 msgid "View all orders with this discount code"
 msgstr ""
 
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:121
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:123
 #: adminpages/member-edit/pmpro-class-member-edit-panel-subscriptions.php:203
 msgid "test"
 msgstr ""
 
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:157
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:159
 #: classes/class-pmpro-orders-list-table.php:359
 #: classes/class-pmpro-orders-list-table.php:1245
 #: includes/profile.php:824
@@ -2588,7 +2590,7 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
-#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:177
+#: adminpages/member-edit/pmpro-class-member-edit-panel-orders.php:179
 #: includes/profile.php:844
 msgid "No membership orders found."
 msgstr ""
@@ -2740,7 +2742,7 @@ msgstr ""
 #: classes/class-pmpro-members-list-table.php:135
 #: includes/profile.php:1145
 #: pages/billing.php:199
-#: pages/checkout.php:324
+#: pages/checkout.php:352
 msgid "First Name"
 msgstr ""
 
@@ -2748,13 +2750,13 @@ msgstr ""
 #: classes/class-pmpro-members-list-table.php:136
 #: includes/profile.php:1146
 #: pages/billing.php:203
-#: pages/checkout.php:328
+#: pages/checkout.php:356
 msgid "Last Name"
 msgstr ""
 
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:123
 #: classes/gateways/class.pmprogateway_payflowpro.php:141
-#: pages/checkout.php:205
+#: pages/checkout.php:214
 msgid "Password"
 msgstr ""
 
@@ -2780,7 +2782,7 @@ msgid "Hide"
 msgstr ""
 
 #: adminpages/member-edit/pmpro-class-member-edit-panel-user-info.php:144
-#: pages/checkout.php:219
+#: pages/checkout.php:229
 msgid "Confirm Password"
 msgstr ""
 
@@ -3103,7 +3105,7 @@ msgstr ""
 
 #: adminpages/orders.php:466
 #: pages/billing.php:195
-#: pages/checkout.php:320
+#: pages/checkout.php:348
 msgid "Billing Address"
 msgstr ""
 
@@ -3151,7 +3153,7 @@ msgstr ""
 #: pages/billing.php:159
 #: pages/billing.php:170
 #: pages/billing.php:283
-#: pages/checkout.php:422
+#: pages/checkout.php:450
 msgid "Payment Information"
 msgstr ""
 
@@ -3167,7 +3169,7 @@ msgstr ""
 #: includes/profile.php:751
 #: pages/checkout.php:161
 #: pages/checkout.php:164
-#: pages/checkout.php:473
+#: pages/checkout.php:501
 #: pages/invoice.php:300
 msgid "Discount Code"
 msgstr ""
@@ -3348,7 +3350,7 @@ msgstr ""
 #: adminpages/pagesettings.php:135
 #: adminpages/wizard/save-steps.php:67
 #: includes/login.php:502
-#: includes/login.php:848
+#: includes/login.php:841
 #: includes/menus.php:66
 #: includes/menus.php:70
 #: includes/menus.php:160
@@ -3682,44 +3684,44 @@ msgstr ""
 msgid "It is not connected to a live gateway environment and cannot accept payments."
 msgstr ""
 
-#: adminpages/paymentsettings.php:172
+#: adminpages/paymentsettings.php:173
 msgid "Currency and Tax Settings"
 msgstr ""
 
-#: adminpages/paymentsettings.php:180
+#: adminpages/paymentsettings.php:181
 msgid "Currency"
 msgstr ""
 
-#: adminpages/paymentsettings.php:196
+#: adminpages/paymentsettings.php:197
 msgid "Not all currencies will be supported by every gateway. Please check with your gateway."
 msgstr ""
 
-#: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "Sales Tax"
 msgstr ""
 
-#: adminpages/paymentsettings.php:201
+#: adminpages/paymentsettings.php:202
 msgid "optional"
 msgstr ""
 
-#: adminpages/paymentsettings.php:204
+#: adminpages/paymentsettings.php:205
 msgid "Tax State"
 msgstr ""
 
-#: adminpages/paymentsettings.php:205
+#: adminpages/paymentsettings.php:206
 msgid "abbreviation, e.g. \"PA\""
 msgstr ""
 
-#: adminpages/paymentsettings.php:206
+#: adminpages/paymentsettings.php:207
 msgid "Tax Rate"
 msgstr ""
 
-#: adminpages/paymentsettings.php:207
+#: adminpages/paymentsettings.php:208
 msgid "decimal, e.g. \"0.06\""
 msgstr ""
 
 #. translators: %s: A link to the docs for the pmpro_tax filter.
-#: adminpages/paymentsettings.php:212
+#: adminpages/paymentsettings.php:213
 msgid "US only. If values are given, tax will be applied for any members ordering from the selected state. For non-US or more complex tax rules, use the %s."
 msgstr ""
 
@@ -4319,7 +4321,7 @@ msgid "Unknown Member"
 msgstr ""
 
 #: adminpages/subscriptions.php:162
-#: includes/init.php:222
+#: includes/init.php:229
 #: pages/confirmation.php:107
 #: blocks/build/checkout-page/index.js:1
 #: blocks/src/checkout-page/edit.js:40
@@ -5027,9 +5029,9 @@ msgid "Replace"
 msgstr ""
 
 #: classes/class-pmpro-field.php:1256
-#: includes/login.php:672
-#: includes/login.php:809
-#: includes/login.php:821
+#: includes/login.php:665
+#: includes/login.php:802
+#: includes/login.php:814
 #: includes/profile.php:1303
 #: includes/profile.php:1316
 #: includes/profile.php:1323
@@ -5689,7 +5691,7 @@ msgid "Authorize.net Settings"
 msgstr ""
 
 #: classes/gateways/class.pmprogateway_authorizenet.php:131
-msgid "Login Name"
+msgid "API Login ID"
 msgstr ""
 
 #: classes/gateways/class.pmprogateway_authorizenet.php:139
@@ -5777,7 +5779,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_braintree.php:458
 #: classes/gateways/class.pmprogateway_stripe.php:938
 #: pages/billing.php:313
-#: pages/checkout.php:427
+#: pages/checkout.php:455
 msgid "Card Number"
 msgstr ""
 
@@ -5789,14 +5791,14 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_braintree.php:507
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
-#: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply discount code"
 msgstr ""
 
 #: classes/gateways/class.pmprogateway_braintree.php:507
 #: classes/gateways/class.pmprogateway_stripe.php:961
 #: pages/checkout.php:167
-#: pages/checkout.php:476
+#: pages/checkout.php:504
 msgid "Apply"
 msgstr ""
 
@@ -6225,7 +6227,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypal.php:207
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
-#: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Check Out"
 msgstr ""
 
@@ -6233,7 +6235,7 @@ msgstr ""
 #: classes/gateways/class.pmprogateway_paypalexpress.php:523
 #: classes/gateways/class.pmprogateway_paypalstandard.php:176
 #: classes/gateways/class.pmprogateway_twocheckout.php:209
-#: pages/checkout.php:586
+#: pages/checkout.php:614
 msgid "Submit and Confirm"
 msgstr ""
 
@@ -6923,6 +6925,7 @@ msgstr ""
 #: includes/deprecated.php:1048
 #: includes/notifications.php:25
 #: includes/updates/upgrade_2_10_6.php:48
+#: includes/updates/upgrade_3_1.php:78
 msgid "Dismiss this notice."
 msgstr ""
 
@@ -9487,7 +9490,7 @@ msgid " You must be a !!levels!! member to access this content."
 msgstr ""
 
 #: includes/functions.php:2136
-#: includes/login.php:855
+#: includes/login.php:848
 msgid "Join Now"
 msgstr ""
 
@@ -9496,7 +9499,7 @@ msgid "Already a member?"
 msgstr ""
 
 #: includes/functions.php:2181
-#: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Log in here"
 msgstr ""
 
@@ -9602,7 +9605,7 @@ msgstr ""
 #: includes/login.php:272
 #: includes/login.php:296
 #: includes/login.php:561
-#: includes/login.php:831
+#: includes/login.php:824
 msgid "Reset Password"
 msgstr ""
 
@@ -9624,7 +9627,7 @@ msgid "<strong>Error:</strong> The username field is empty."
 msgstr ""
 
 #: includes/login.php:342
-#: includes/login.php:1018
+#: includes/login.php:1011
 msgid "<strong>Error:</strong> The password field is empty."
 msgstr ""
 
@@ -9711,73 +9714,73 @@ msgstr ""
 msgid "You are already signed in."
 msgstr ""
 
-#: includes/login.php:604
-#: includes/login.php:653
-#: includes/login.php:813
+#: includes/login.php:606
+#: includes/login.php:645
+#: includes/login.php:806
 #: includes/profile.php:1307
-#: pages/checkout.php:209
+#: pages/checkout.php:220
 msgid "Show Password"
 msgstr ""
 
-#: includes/login.php:644
+#: includes/login.php:636
 msgid "Hide Password"
 msgstr ""
 
-#: includes/login.php:671
+#: includes/login.php:664
 msgid "Username or Email Address"
 msgstr ""
 
-#: includes/login.php:679
+#: includes/login.php:672
 msgid "Get New Password"
 msgstr ""
 
-#: includes/login.php:769
-#: includes/login.php:778
+#: includes/login.php:762
+#: includes/login.php:771
 msgid "Your password reset link appears to be invalid. Please request a new link below."
 msgstr ""
 
-#: includes/login.php:771
-#: includes/login.php:780
+#: includes/login.php:764
+#: includes/login.php:773
 msgid "Your password reset link has expired. Please request a new link below."
 msgstr ""
 
-#: includes/login.php:808
+#: includes/login.php:801
 #: includes/profile.php:1315
 msgid "New Password"
 msgstr ""
 
-#: includes/login.php:820
+#: includes/login.php:813
 #: includes/profile.php:1322
 msgid "Confirm New Password"
 msgstr ""
 
-#: includes/login.php:827
+#: includes/login.php:820
 #: includes/profile.php:1329
 #: includes/scripts.php:81
 msgid "Strength Indicator"
 msgstr ""
 
-#: includes/login.php:857
+#: includes/login.php:850
 msgid "Register"
 msgstr ""
 
-#: includes/login.php:862
+#: includes/login.php:855
 msgid "Lost Password?"
 msgstr ""
 
-#: includes/login.php:960
+#: includes/login.php:953
 msgid "Invalid Request"
 msgstr ""
 
 #. translators: a generated link to the user's account or profile page
 #. translators: the current user's display name
-#: includes/login.php:1097
+#: includes/login.php:1090
 #: pages/confirmation.php:99
 #: shortcodes/pmpro_account.php:70
 msgid "Welcome, %s"
 msgstr ""
 
-#: includes/login.php:1134
+#: includes/login.php:1127
 #: includes/menus.php:76
 #: includes/menus.php:79
 #: includes/menus.php:169
@@ -9785,11 +9788,11 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-#: includes/login.php:1168
+#: includes/login.php:1161
 msgid "Missing request ID."
 msgstr ""
 
-#: includes/login.php:1172
+#: includes/login.php:1165
 msgid "Missing confirm key."
 msgstr ""
 
@@ -10070,8 +10073,8 @@ msgid "Your password has been updated."
 msgstr ""
 
 #: includes/profile.php:1283
-#: pages/cancel.php:138
-#: pages/cancel.php:158
+#: pages/cancel.php:175
+#: pages/cancel.php:192
 #: pages/confirmation.php:128
 #: pages/invoice.php:389
 msgid "View Your Membership Account &rarr;"
@@ -10155,10 +10158,18 @@ msgstr[1] ""
 msgid "For more information, read our post here"
 msgstr ""
 
-#: includes/updates/upgrade_3_1.php:18
+#: includes/updates/upgrade_3_1.php:20
 msgid "This content is for !!levels!! members only.<br /><a href=\"!!levels_page_url!!\">Join Now</a>"
 msgstr ""
 
+#: includes/updates/upgrade_3_1.php:66
+msgid "Important Notice: Paid Memberships Pro v3.1 Update"
+msgstr ""
+
+#: includes/updates/upgrade_3_1.php:71
+msgid "In previous versions of PMPro, we discovered an issue where subscriptions were not linked to the correct user ID in the database. The current version you are running has resolved this issue, however we detect that some of your subscriptions need to be manually corrected. For more information and steps to resolve this for your site, read our <a href=\"%s\">v3.1 release notes post here</a>."
+msgstr ""
+
 #: includes/widgets.php:17
 msgid "Display a login form and optional \"Logged In\" member content."
 msgstr ""
@@ -10205,37 +10216,37 @@ msgid "Your billing information cannot be updated at this time."
 msgstr ""
 
 #: pages/billing.php:207
-#: pages/checkout.php:332
+#: pages/checkout.php:360
 msgid "Address 1"
 msgstr ""
 
 #: pages/billing.php:211
-#: pages/checkout.php:336
+#: pages/checkout.php:364
 msgid "Address 2"
 msgstr ""
 
 #: pages/billing.php:216
-#: pages/checkout.php:340
+#: pages/checkout.php:368
 msgid "City"
 msgstr ""
 
 #: pages/billing.php:220
-#: pages/checkout.php:344
+#: pages/checkout.php:372
 msgid "State"
 msgstr ""
 
 #: pages/billing.php:224
-#: pages/checkout.php:348
+#: pages/checkout.php:376
 msgid "Postal Code"
 msgstr ""
 
 #: pages/billing.php:234
-#: pages/checkout.php:355
+#: pages/checkout.php:383
 msgid "Country"
 msgstr ""
 
 #: pages/billing.php:260
-#: pages/checkout.php:397
+#: pages/checkout.php:425
 msgid "Phone"
 msgstr ""
 
@@ -10252,54 +10263,72 @@ msgstr ""
 msgid "You do not have an active membership. <a href='%s'>Choose a membership level.</a>"
 msgstr ""
 
-#: pages/cancel.php:50
-msgid "Are you sure you want to cancel your membership?"
-msgstr ""
-
-#: pages/cancel.php:53
+#: pages/cancel.php:55
 msgid "Are you sure you want to cancel your %s membership?"
 msgid_plural "Are you sure you want to cancel your %s memberships?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: pages/cancel.php:73
-msgid "Yes, cancel all of my memberships"
-msgstr ""
+#: pages/cancel.php:56
+msgid "Yes, cancel this membership"
+msgid_plural "Yes, cancel these memberships"
+msgstr[0] ""
+msgstr[1] ""
 
-#: pages/cancel.php:74
-msgid "No, keep my memberships"
-msgstr ""
+#: pages/cancel.php:57
+msgid "No, keep this membership"
+msgid_plural "No, keep these memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:63
+msgid "Are you sure you want to cancel your membership?"
+msgid_plural "Are you sure you want to cancel all of your memberships?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:64
+msgid "Yes, cancel my membership"
+msgid_plural "Yes, cancel all of my memberships"
+msgstr[0] ""
+msgstr[1] ""
+
+#: pages/cancel.php:65
+msgid "No, keep my membership"
+msgid_plural "No, keep my memberships"
+msgstr[0] ""
+msgstr[1] ""
 
-#: pages/cancel.php:76
-msgid "Yes, cancel these memberships"
+#: pages/cancel.php:79
+msgid "Your subscription will be cancelled. You will not be billed again. Your membership will remain active until %s. "
 msgstr ""
 
-#: pages/cancel.php:77
-msgid "No, keep these memberships"
+#: pages/cancel.php:82
+msgid "Your membership will be cancelled immediately."
 msgstr ""
 
-#: pages/cancel.php:79
-msgid "Yes, cancel this membership"
+#: pages/cancel.php:87
+msgid "Some of the memberships you are cancelling have a recurring subscription. These subscriptions will be cancelled, you will not be billed again, and the associated memberships will remain active through the end of the current payment period."
 msgstr ""
 
-#: pages/cancel.php:80
-msgid "No, keep this membership"
+#: pages/cancel.php:90
+msgid "Your memberships will be cancelled immediately."
 msgstr ""
 
-#: pages/cancel.php:98
+#: pages/cancel.php:127
 #: shortcodes/pmpro_account.php:144
 msgid "My Memberships"
 msgstr ""
 
-#: pages/cancel.php:100
+#: pages/cancel.php:129
 msgid "You have the following active memberships."
 msgstr ""
 
-#: pages/cancel.php:133
+#: pages/cancel.php:167
 msgid "Cancel All Memberships"
 msgstr ""
 
-#: pages/cancel.php:153
+#: pages/cancel.php:187
 msgid "View the Homepage &rarr;"
 msgstr ""
 
@@ -10338,60 +10367,60 @@ msgstr ""
 msgid "Click here to enter your discount code"
 msgstr ""
 
-#: pages/checkout.php:232
-#: pages/checkout.php:382
+#: pages/checkout.php:256
+#: pages/checkout.php:410
 msgid "Email Address"
 msgstr ""
 
-#: pages/checkout.php:240
+#: pages/checkout.php:264
 msgid "Confirm Email Address"
 msgstr ""
 
-#: pages/checkout.php:252
+#: pages/checkout.php:280
 msgid "Full Name"
 msgstr ""
 
-#: pages/checkout.php:253
+#: pages/checkout.php:281
 msgid "LEAVE THIS BLANK"
 msgstr ""
 
-#: pages/checkout.php:267
+#: pages/checkout.php:295
 msgid "You are logged in as <strong>%s</strong>. If you would like to use a different account for this membership, <a href=\"%s\">log out now</a>."
 msgstr ""
 
-#: pages/checkout.php:275
+#: pages/checkout.php:303
 msgid "Already have an account?"
 msgstr ""
 
-#: pages/checkout.php:290
+#: pages/checkout.php:318
 msgid "Choose your Payment Method"
 msgstr ""
 
-#: pages/checkout.php:297
+#: pages/checkout.php:325
 msgid "Check Out with a Credit Card Here"
 msgstr ""
 
-#: pages/checkout.php:303
+#: pages/checkout.php:331
 msgid "Check Out with PayPal"
 msgstr ""
 
-#: pages/checkout.php:389
+#: pages/checkout.php:417
 msgid "Confirm Email"
 msgstr ""
 
-#: pages/checkout.php:465
+#: pages/checkout.php:493
 msgid "Security Code (CVC)"
 msgstr ""
 
-#: pages/checkout.php:506
+#: pages/checkout.php:534
 msgid "I agree to the <a href=\"%1$s\" target=\"_blank\">%2$s</a>"
 msgstr ""
 
-#: pages/checkout.php:569
+#: pages/checkout.php:597
 msgid "Complete Payment"
 msgstr ""
 
-#: pages/checkout.php:596
+#: pages/checkout.php:624
 msgid "Processing..."
 msgstr ""