diff --git a/locale/ast/main.ftl b/locale/ast/payments.ftl
similarity index 100%
rename from locale/ast/main.ftl
rename to locale/ast/payments.ftl
diff --git a/locale/be/main.ftl b/locale/be/payments.ftl
similarity index 100%
rename from locale/be/main.ftl
rename to locale/be/payments.ftl
diff --git a/locale/bg/main.ftl b/locale/bg/payments.ftl
similarity index 100%
rename from locale/bg/main.ftl
rename to locale/bg/payments.ftl
diff --git a/locale/ca/main.ftl b/locale/ca/payments.ftl
similarity index 100%
rename from locale/ca/main.ftl
rename to locale/ca/payments.ftl
diff --git a/locale/cak/main.ftl b/locale/cak/payments.ftl
similarity index 100%
rename from locale/cak/main.ftl
rename to locale/cak/payments.ftl
diff --git a/locale/cs/main.ftl b/locale/cs/payments.ftl
similarity index 100%
rename from locale/cs/main.ftl
rename to locale/cs/payments.ftl
diff --git a/locale/cy/main.ftl b/locale/cy/payments.ftl
similarity index 100%
rename from locale/cy/main.ftl
rename to locale/cy/payments.ftl
diff --git a/locale/da/main.ftl b/locale/da/payments.ftl
similarity index 100%
rename from locale/da/main.ftl
rename to locale/da/payments.ftl
diff --git a/locale/de/main.ftl b/locale/de/payments.ftl
similarity index 100%
rename from locale/de/main.ftl
rename to locale/de/payments.ftl
diff --git a/locale/dsb/main.ftl b/locale/dsb/payments.ftl
similarity index 100%
rename from locale/dsb/main.ftl
rename to locale/dsb/payments.ftl
diff --git a/locale/el/main.ftl b/locale/el/payments.ftl
similarity index 100%
rename from locale/el/main.ftl
rename to locale/el/payments.ftl
diff --git a/locale/en/main.ftl b/locale/en/payments.ftl
similarity index 84%
rename from locale/en/main.ftl
rename to locale/en/payments.ftl
index a9bbbfce3f..9a419c9aa9 100644
--- a/locale/en/main.ftl
+++ b/locale/en/payments.ftl
@@ -2,65 +2,136 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-## Branding
+### Terms and messages used in fxa-payments-server
+
+## Firefox and Mozilla must be treated as a brand.
+##
+## They cannot be:
+## - Transliterated.
+## - Translated.
+##
+## Declension should be avoided where possible, leaving the original
+## brand unaltered in prominent UI positions.
+##
+## For further details, consult:
+## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
 
-project-brand = Firefox Accounts
 -brand-name-mozilla = Mozilla
 -brand-name-firefox = Firefox
+
+# “Accounts” can be localized, “Firefox” must be treated as a brand.
+# 'Firefox Accounts' refers to the service
+project-brand = Firefox Accounts
+
+## Brands cannot be transliterated or translated. Decelension should be avoided where possible.
+
 -brand-name-paypal = PayPal
 -brand-name-stripe = Stripe
 -brand-name-google = Google
 -brand-name-apple = Apple
 -brand-name-pocket = Pocket
 
-# The following are not terms because they are not used directly in messages,
-# but rather looked up in code and passed into the message as variables.
-brand-name-google-play = { -brand-name-google } Play Store
-# App Store here refers to Apple's App Store not the generic app store.
-brand-name-apple-app-store = App Store
+## Component - AppLayout
 
-document =
-  .title = Firefox Accounts
+settings-home = Account Home
 
-## General aria-label
+## Component - CouponForm
 
-close-aria =
-  .aria-label = Close modal
+# Title of container showing discount coupon code applied to a subscription.
+coupon-promo-code-applied = Promo Code Applied
+coupon-submit = Apply
+coupon-remove = Remove
+coupon-error = The code you entered is invalid or expired.
+coupon-error-generic = An error occurred processing the code. Please try again.
+coupon-error-expired = The code you entered has expired.
+coupon-error-limit-reached = The code you entered has reached its limit.
+coupon-error-invalid = The code you entered is invalid.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+coupon-enter-code =
+  .placeholder = Enter Code
 
-## App error dialog
+## Component - Fields
 
-general-error-heading = General application error
+default-input-error = This field is required
+input-error-is-required = { $label } is required
+
+## Component - Header
+
+brand-name-firefox-logo = { -brand-name-firefox } logo
+
+## Component - NewUserEmailForm
+
+new-user-sign-in-link = Already have a { -brand-name-firefox } account? <a>Sign in</a>
+# "Required" to indicate that the user must use the checkbox below this text to
+# agree to a payment method's terms of service and privacy notice in order to
+# continue.
+new-user-email =
+  .label = Enter your email
+new-user-confirm-email =
+  .label = Confirm your email
+new-user-subscribe-product-updates = I’d like to receive product updates from { -brand-name-firefox }
+new-user-subscribe-product-assurance = We only use your email to create your account. We will never sell it to a third party.
+new-user-email-validate = Email is not valid
+new-user-email-validate-confirm = Emails do not match
+new-user-already-has-account-sign-in = You already have an account. <a>Sign in</a>
+# $domain (String) - the email domain provided by the user during sign up
+new-user-invalid-email-domain = Mistyped email? { $domain } does not offer email.
+
+## Component - PaymentConfirmation
+
+payment-confirmation-thanks-heading = Thank you!
+payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
+
+# $email (string) - The user's email.
+# $productName (String) - The name of the subscribed product.
+payment-confirmation-thanks-subheading = A confirmation email has been sent to { $email } with details on how to get started with { $product_name }.
+
+# $email (string) - The user's email.
+payment-confirmation-thanks-subheading-account-exists = You’ll receive an email at { $email } with instructions for setting up your account, as well as your payment details.
+
+payment-confirmation-order-heading = Order details
+payment-confirmation-invoice-number = Invoice #{ $invoiceNumber }
+payment-confirmation-details-heading-2 = Payment information
+
+payment-confirmation-amount = { $amount } per { $interval }
+
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in days.
+payment-confirmation-amount-day = { $intervalCount ->
+  [one] { $amount } daily
+  *[other] { $amount } every { $intervalCount } days
+}
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in weeks.
+payment-confirmation-amount-week = { $intervalCount ->
+  [one] { $amount } weekly
+  *[other] { $amount } every { $intervalCount } weeks
+}
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in months.
+payment-confirmation-amount-month = { $intervalCount ->
+  [one] { $amount } monthly
+  *[other] { $amount } every { $intervalCount } months
+}
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in years.
+payment-confirmation-amount-year = { $intervalCount ->
+  [one] { $amount } yearly
+  *[other] { $amount } every { $intervalCount } years
+}
+
+payment-confirmation-download-button = Continue to download
+
+## Component - PaymentConsentCheckbox
+
+payment-confirm-with-legal-links-static = I authorize { -brand-name-mozilla }, maker of { -brand-name-firefox } products, to charge my payment method for the amount shown, according to <termsOfServiceLink>Terms of Service</termsOfServiceLink> and <privacyNoticeLink>Privacy Notice</privacyNoticeLink>, until I cancel my subscription.
+
+## Component - PaymentErrorView
 
-basic-error-message = Something went wrong. Please try again later.
-payment-error-1 = Hmm. There was a problem authorizing your payment. Try again or get in touch with your card issuer.
-payment-error-2 = Hmm. There was a problem authorizing your payment. Get in touch with your card issuer.
-payment-error-3b = An unexpected error has occurred while processing your payment, please try again.
 payment-error-retry-button = Try again
 payment-error-manage-subscription-button = Manage my subscription
 
-country-currency-mismatch = The currency of this subscription is not valid for the country associated with your payment.
-currency-currency-mismatch = Sorry. You can’t switch between currencies.
-
-no-subscription-change = Sorry. You can’t change your subscription plan.
-
-# $mobileAppStore (String) - "Google Play Store" or "App Store", localized when the translation is available.
-iap-already-subscribed = You’re already subscribed through the { $mobileAppStore }.
-
-expired-card-error = It looks like your credit card has expired. Try another card.
-insufficient-funds-error = It looks like your card has insufficient funds. Try another card.
-withdrawal-count-limit-exceeded-error = It looks like this transaction will put you over your credit limit. Try another card.
-charge-exceeds-source-limit = It looks like this transaction will put you over your daily credit limit. Try another card or in 24 hours.
-instant-payouts-unsupported = It looks like your debit card isn’t setup for instant payments. Try another debit or credit card.
-duplicate-transaction = Hmm. Looks like an identical transaction was just sent. Check your payment history.
-coupon-expired = It looks like that promo code has expired.
-card-error = Your transaction could not be processed. Please verify your credit card information and try again.
-
-# $productName (String) - The name of the subscribed product.
-fxa-account-signup-error-2 = A system error caused your { $productName } sign-up to fail. Your payment method has not been charged. Please try again.
-newsletter-signup-error = You’re not signed up for product update emails. You can try again in your account settings.
-fxa-post-passwordless-sub-error = Subscription confirmed, but the confirmation page failed to load. Please check your email to set up your account.
-
-## IAP upgrade errors
+## Component - PaymentErrorView - IAP upgrade errors
 
 # $productName (String) - The name of the subscribed product.
 iap-upgrade-already-subscribed = You already have a { $productName } subscription via the { -brand-name-google } or { -brand-name-apple } app stores.
@@ -68,63 +139,22 @@ iap-upgrade-no-bundle-support = We don’t support upgrades for these subscripti
 iap-upgrade-contact-support = You can still get this product — please contact support so we can help you.
 iap-upgrade-get-help-button = Get help
 
-## Settings
+## Component - PaymentForm
 
-settings-home = Account Home
-settings-subscriptions-title = Subscriptions
+payment-name =
+  .placeholder = Full Name
+  .label = Name as it appears on your card
+payment-cc =
+  .label = Your card
 
-## Legal footer
+payment-cancel-btn = Cancel
+payment-update-btn = Update
+payment-pay-btn = Pay now
+payment-pay-with-paypal-btn = Pay with {-brand-name-paypal}
 
-terms = Terms of Service
-privacy = Privacy Notice
-terms-download = Download Terms
+payment-validate-name-error = Please enter your name
 
-## Subscription titles
-
-subscription-create-title = Set up your subscription
-subscription-success-title = Subscription confirmation
-subscription-processing-title = Confirming subscription…
-subscription-error-title = Error confirming subscription…
-subscription-noplanchange-title = This subscription plan change is not supported
-subscription-iapsubscribed-title = Already subscribed
-subscription-iaperrorupgrade-title = We can’t upgrade you quite yet
-
-## $productName (String) - The name of the subscribed product.
-## $amount (Number) - The amount billed. It will be formatted as currency.
-
-# $intervalCount (Number) - The interval between payments, in days.
-day-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } daily
-  *[other] { $productName } billed { $amount } every { $intervalCount } days
-}
-# $intervalCount (Number) - The interval between payments, in weeks.
-week-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } weekly
-  *[other] { $productName } billed { $amount } every { $intervalCount } weeks
-}
-# $intervalCount (Number) - The interval between payments, in months.
-month-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } monthly
-  *[other] { $productName } billed { $amount } every { $intervalCount } months
-}
-# $intervalCount (Number) - The interval between payments, in years.
-year-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } yearly
-  *[other] { $productName } billed { $amount } every { $intervalCount } years
-}
-
-## Product route
-
-product-plan-error =
-  .title = Problem loading plans
-product-profile-error =
-  .title = Problem loading profile
-product-customer-error =
-  .title = Problem loading customer
-product-plan-not-found = Plan not found
-product-no-such-plan = No such plan for this product.
-
-## Payment legal blurb
+## Component - PaymentLegalBlurb
 
 payment-legal-copy-stripe-and-paypal-2 = { -brand-name-mozilla } uses { -brand-name-stripe } and { -brand-name-paypal } for secure payment processing.
 payment-legal-link-stripe-paypal = <stripePrivacyLink>{ -brand-name-stripe } privacy policy</stripePrivacyLink> &nbsp; <paypalPrivacyLink>{ -brand-name-paypal } privacy policy</paypalPrivacyLink>
@@ -135,65 +165,69 @@ payment-legal-link-paypal-2 = <paypalPrivacyLink>{ -brand-name-paypal } privacy
 payment-legal-copy-stripe-2 = { -brand-name-mozilla } uses { -brand-name-stripe } for secure payment processing.
 payment-legal-link-stripe-3 = <stripePrivacyLink>{ -brand-name-stripe } privacy policy</stripePrivacyLink>
 
-## Payment form
+## Component - PaymentMethodHeader
 
-payment-name =
-  .placeholder = Full Name
-  .label = Name as it appears on your card
-payment-cc =
-  .label = Your card
-payment-ccn =
-  .label = Card number
-payment-exp =
-  .label = Expiration
-payment-cvc =
-  .label = CVC
-payment-zip =
-  .label = ZIP code
+payment-method-header = Choose your payment method
+# This message is used to indicate the second step in a multi step process.
+payment-method-header-second-step = 2. { payment-method-header }
+payment-method-required = Required
 
-payment-confirm-with-legal-links-static = I authorize { -brand-name-mozilla }, maker of { -brand-name-firefox } products, to charge my payment method for the amount shown, according to <termsOfServiceLink>Terms of Service</termsOfServiceLink> and <privacyNoticeLink>Privacy Notice</privacyNoticeLink>, until I cancel my subscription.
+## Component - PaymentProcessing
 
-payment-cancel-btn = Cancel
-payment-update-btn = Update
-payment-pay-btn = Pay now
-payment-pay-with-paypal-btn = Pay with {-brand-name-paypal}
+payment-processing-message = Please wait while we process your payment…
 
-payment-validate-name-error = Please enter your name
-payment-validate-zip-required = Zip code is required
-payment-validate-zip-short = Zip code is too short
+## Component - PaymentProviderDetails
 
-## Subscription redirect
+payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
 
-sub-redirect-ready = Your subscription is ready
-sub-redirect-copy = Please take a moment to tell us about your experience.
-sub-redirect-skip-survey = No thanks, just take me to my product.
+## Component - PlanDetails
 
-## Fields
+plan-details-header = Product details
+plan-details-list-price = List Price
+plan-details-show-button = Show details
+plan-details-hide-button = Hide details
+plan-details-total-label = Total
+plan-details-tax = Taxes and Fees
 
-default-input-error = This field is required
-input-error-is-required = { $label } is required
+## Component - PlanErrorDialog
 
-## Subscription upgrade
+product-no-such-plan = No such plan for this product.
 
-product-plan-change-heading = Review your change
-sub-change-failed = Plan change failed
-sub-update-payment-title = Payment information
-sub-update-card-exp = Expires { $cardExpMonth }/{ $cardExpYear }
-sub-update-copy =
-    Your plan will change immediately, and you’ll be charged an adjusted
-    amount for the rest of your billing cycle. Starting { $startingDate }
-    you’ll be charged the full amount.
+## Component - SubscriptionTitle
 
-##
+subscription-create-title = Set up your subscription
+subscription-success-title = Subscription confirmation
+subscription-processing-title = Confirming subscription…
+subscription-error-title = Error confirming subscription…
+subscription-noplanchange-title = This subscription plan change is not supported
+subscription-iapsubscribed-title = Already subscribed
 
-sub-change-submit = Confirm change
-sub-change-indicator =
-  .aria-label = change indicator
-sub-update-current-plan-label = Current plan
-sub-update-new-plan-label = New plan
-sub-update-total-label = New total
+sub-guarantee = 30-day money-back guarantee
 
-## Subscription upgrade plan details
+## Component - TermsAndPrivacy
+
+terms = Terms of Service
+privacy = Privacy Notice
+terms-download = Download Terms
+
+## App-level string(s) and messages shared by multiple components or routes
+
+document =
+  .title = Firefox Accounts
+
+# General aria-label for closing modals
+close-aria =
+  .aria-label = Close modal
+
+# Aria label for spinner image indicating data is loading
+app-loading-spinner-aria-label-loading = Loading…
+
+settings-subscriptions-title = Subscriptions
+
+# Title of container where a user can input a coupon code to get a discount on a subscription.
+coupon-promo-code = Promo Code
+
+## Subscription upgrade plan details - shared by multiple components, including plan details and payment form
 ## $amount (Number) - The amount billed. It will be formatted as currency.
 
 # $intervalCount (Number) - The interval between payments, in days.
@@ -233,6 +267,98 @@ plan-price-year = { $intervalCount ->
     *[other] { $amount } every { $intervalCount } years
   }
 
+## Error messages
+
+# App error dialog
+general-error-heading = General application error
+
+basic-error-message = Something went wrong. Please try again later.
+payment-error-1 = Hmm. There was a problem authorizing your payment. Try again or get in touch with your card issuer.
+payment-error-2 = Hmm. There was a problem authorizing your payment. Get in touch with your card issuer.
+payment-error-3b = An unexpected error has occurred while processing your payment, please try again.
+expired-card-error = It looks like your credit card has expired. Try another card.
+insufficient-funds-error = It looks like your card has insufficient funds. Try another card.
+withdrawal-count-limit-exceeded-error = It looks like this transaction will put you over your credit limit. Try another card.
+charge-exceeds-source-limit = It looks like this transaction will put you over your daily credit limit. Try another card or in 24 hours.
+instant-payouts-unsupported = It looks like your debit card isn’t setup for instant payments. Try another debit or credit card.
+duplicate-transaction = Hmm. Looks like an identical transaction was just sent. Check your payment history.
+coupon-expired = It looks like that promo code has expired.
+card-error = Your transaction could not be processed. Please verify your credit card information and try again.
+country-currency-mismatch = The currency of this subscription is not valid for the country associated with your payment.
+currency-currency-mismatch = Sorry. You can’t switch between currencies.
+no-subscription-change = Sorry. You can’t change your subscription plan.
+# $mobileAppStore (String) - "Google Play Store" or "App Store", localized when the translation is available.
+iap-already-subscribed = You’re already subscribed through the { $mobileAppStore }.
+# $productName (String) - The name of the subscribed product.
+fxa-account-signup-error-2 = A system error caused your { $productName } sign-up to fail. Your payment method has not been charged. Please try again.
+fxa-post-passwordless-sub-error = Subscription confirmed, but the confirmation page failed to load. Please check your email to set up your account.
+newsletter-signup-error = You’re not signed up for product update emails. You can try again in your account settings.
+
+product-plan-error =
+  .title = Problem loading plans
+product-profile-error =
+  .title = Problem loading profile
+product-customer-error =
+  .title = Problem loading customer
+product-plan-not-found = Plan not found
+
+## Hooks - coupons
+
+coupon-success = Your plan will automatically renew at the list price.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
+
+## Routes - Checkout - New user
+
+new-user-step-1 = 1. Create a { -brand-name-firefox } account
+new-user-card-title = Enter your card information
+new-user-submit = Subscribe Now
+
+## Routes - Product and Subscriptions
+sub-update-payment-title = Payment information
+
+## Routes - Checkout and Product/Subscription create
+pay-with-heading-card-or = Or pay with card
+pay-with-heading-card-only = Pay with card
+
+## Routes - Product - IapRoadblock
+
+subscription-iaperrorupgrade-title = We can’t upgrade you quite yet
+
+# The following are not terms because they are not used directly in messages,
+# but rather looked up in code and passed into the message as variables.
+
+brand-name-google-play = { -brand-name-google } Play Store
+# App Store here refers to Apple's App Store not the generic app store.
+brand-name-apple-app-store = App Store
+
+## Routes - Product - Subscription upgrade
+
+product-plan-change-heading = Review your change
+sub-change-failed = Plan change failed
+sub-update-copy =
+    Your plan will change immediately, and you’ll be charged an adjusted
+    amount for the rest of your billing cycle. Starting { $startingDate }
+    you’ll be charged the full amount.
+sub-change-submit = Confirm change
+sub-update-current-plan-label = Current plan
+sub-update-new-plan-label = New plan
+sub-update-total-label = New total
+
+## Routes - Subscriptions - Cancel
+
+sub-item-cancel-sub = Cancel Subscription
+sub-item-stay-sub = Stay Subscribed
+
+## $name (String) - The name of the subscribed product.
+## $period (Date) - The last day of product access
+sub-item-cancel-msg =
+    You will no longer be able to use { $name } after
+    { $period }, the last day of your billing cycle.
+sub-item-cancel-confirm =
+    Cancel my access and my saved information within
+    { $name } on { $period }
+
 ## Subscription billing details
 ## $amount (Number) - The amount billed. It will be formatted as currency.
 
@@ -257,17 +383,62 @@ sub-plan-price-year = { $intervalCount ->
   *[other] { $amount } every { $intervalCount } years
 }
 
+## Routes - Subscription
+
+sub-route-idx-reactivating = Reactivating subscription failed
+sub-route-idx-cancel-failed = Cancelling subscription failed
+sub-route-idx-contact = Contact Support
+sub-route-idx-cancel-msg-title = We’re sorry to see you go
+# $name (String) - The name of the subscribed product.
+# $date (Date) - Last day of product access
+sub-route-idx-cancel-msg =
+    Your { $name } subscription has been cancelled.
+          <br />
+          You will still have access to { $name } until { $date }.
+sub-route-idx-cancel-aside =
+    Have questions? Visit <a>{ -brand-name-mozilla } Support</a>.
+
+## Routes - Subscriptions - Errors
+
+sub-customer-error =
+  .title = Problem loading customer
+sub-invoice-error =
+  .title = Problem loading invoices
+sub-billing-update-success = Your billing information has been updated successfully
+
+## Routes - Subscription - ActionButton
+
+pay-update-change-btn = Change
+pay-update-manage-btn = Manage
+
+## Routes - Subscriptions - Cancel and IapItem
 ## $date (Date) - The date for the next time a charge will occur.
 
 sub-next-bill = Next billed on { $date }
 sub-expires-on = Expires on { $date }
 
-##
+## Routes - Subscription - PaymentUpdate
+# $expirationDate (Date) - The payment card's expiration date.
 
 pay-update-card-exp = Expires { $expirationDate }
-pay-update-change-btn = Change
+sub-route-idx-updating = Updating billing information…
+sub-route-payment-modal-heading = Invalid billing information
+sub-route-payment-modal-message = There seems to be an error with your { -brand-name-paypal } account, we need you to take the necessary steps to resolve this payment issue.
+sub-route-missing-billing-agreement-payment-alert = Invalid payment information; there is an error with your account. <div>Manage</div>
+sub-route-funding-source-payment-alert = Invalid payment information; there is an error with your account. This alert may take some time to clear after you successfully update your information. <div>Manage</div>
 
-## reactivate
+## Routes - Subscription - SubscriptionItem
+
+sub-item-no-such-plan = No such plan for this subscription.
+invoice-not-found = Subsequent invoice not found
+sub-item-no-such-subsequent-invoice = Subsequent invoice not found for this subscription.
+
+## Routes - Subscriptions - Pocket Subscription
+
+manage-pocket-title = Looking for your { -brand-name-pocket } premium subscription?
+manage-pocket-body-2 = To manage it, <linkExternal>click here</linkExternal>.
+
+## Routes - Subscriptions - Reactivate
 ## $name (String) - The name of the subscribed product.
 
 reactivate-confirm-dialog-header = Want to keep using { $name }?
@@ -289,179 +460,12 @@ reactivate-confirm-button = Resubscribe
 
 ## $date (Date) - Last day of product access
 
-reactivate-panel-date = You cancelled your subscription on { $date }.
 reactivate-panel-copy = You will lose access to { $name } on <strong>{ $date }</strong>.
 reactivate-success-copy = Thanks! You’re all set.
 reactivate-success-button = Close
 
-## Subscription item
-## $name (String) - The name of the subscribed product.
-## $period (Date) - The last day of product access
-
-sub-item-missing = Problem loading subscriptions
-sub-item-missing-msg = Please try again later.
-sub-item-no-such-plan = No such plan for this subscription.
-sub-item-cancel-sub = Cancel Subscription
-sub-item-stay-sub = Stay Subscribed
-sub-item-cancel-msg =
-    You will no longer be able to use { $name } after
-    { $period }, the last day of your billing cycle.
-sub-item-cancel-confirm =
-    Cancel my access and my saved information within
-    { $name } on { $period }
-invoice-not-found = Subsequent invoice not found
-sub-item-no-such-subsequent-invoice = Subsequent invoice not found for this subscription.
-
-## Subscription iap item
+## Routes - Subscriptions - Subscription iap item
 
 sub-iap-item-google-purchase = { -brand-name-google }: In-App purchase
 sub-iap-item-apple-purchase = { -brand-name-apple }: In-App purchase
 sub-iap-item-manage-button = Manage
-
-account-activated = Your account is activated, <userEl/>
-
-## Subscription route index
-
-sub-route-idx-updating = Updating billing information…
-sub-route-idx-reactivating = Reactivating subscription failed
-sub-route-idx-cancel-failed = Cancelling subscription failed
-sub-route-idx-contact = Contact Support
-sub-route-idx-cancel-msg-title = We’re sorry to see you go
-# $name (String) - The name of the subscribed product.
-# $date (Date) - Last day of product access
-sub-route-idx-cancel-msg =
-    Your { $name } subscription has been cancelled.
-          <br />
-          You will still have access to { $name } until { $date }.
-sub-route-idx-cancel-aside =
-    Have questions? Visit <a>{ -brand-name-mozilla } Support</a>.
-sub-subscription-error =
-  .title = Problem loading subscriptions
-sub-customer-error =
-  .title = Problem loading customer
-sub-invoice-error =
-  .title = Problem loading invoices
-sub-billing-update-success = Your billing information has been updated successfully
-sub-route-payment-modal-heading = Invalid billing information
-sub-route-payment-modal-message = There seems to be an error with your { -brand-name-paypal } account, we need you to take the necessary steps to resolve this payment issue.
-sub-route-missing-billing-agreement-payment-alert = Invalid payment information; there is an error with your account. <div>Manage</div>
-sub-route-funding-source-payment-alert = Invalid payment information; there is an error with your account. This alert may take some time to clear after you successfully update your information. <div>Manage</div>
-pay-update-manage-btn = Manage
-
-## Subscription create
-
-sub-guarantee = 30-day money-back guarantee
-pay-with-heading-other = Select payment option
-pay-with-heading-card-or = Or pay with card
-pay-with-heading-card-only = Pay with card
-
-## Plan details
-
-plan-details-header = Product details
-plan-details-show-button = Show details
-plan-details-hide-button = Hide details
-plan-details-total-label = Total
-plan-details-list-price = List Price
-plan-details-tax = Taxes and Fees
-
-## Coupons
-
-coupon-discount = Discount
-coupon-discount-applied = Discount Reward Applied
-# Title of container where a user can input a coupon code to get a discount on a subscription.
-coupon-promo-code = Promo Code
-# Title of container showing discount coupon code applied to a subscription.
-coupon-promo-code-applied = Promo Code Applied
-coupon-submit = Apply
-coupon-remove = Remove
-coupon-error = The code you entered is invalid or expired.
-coupon-error-generic = An error occurred processing the code. Please try again.
-coupon-error-expired = The code you entered has expired.
-coupon-error-limit-reached = The code you entered has reached its limit.
-coupon-error-invalid = The code you entered is invalid.
-coupon-success = Your plan will automatically renew at the list price.
-# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
-coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
-coupon-enter-code =
-  .placeholder = Enter Code
-
-## Payment processing
-
-payment-processing-message = Please wait while we process your payment…
-
-## Payment confirmation
-
-payment-confirmation-alert = Click here to download
-payment-confirmation-mobile-alert = Didn’t open app? <a>Click Here</a>
-payment-confirmation-thanks-heading = Thank you!
-
-## Payment confirmation details
-## $email (string) - The user's email.
-## $productName (String) - The name of the subscribed product.
-
-payment-confirmation-thanks-subheading = A confirmation email has been sent to { $email } with details on how to get started with { $product_name }.
-payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
-
-## $email (string) - The user's email.
-
-payment-confirmation-thanks-subheading-account-exists = You’ll receive an email at { $email } with instructions for setting up your account, as well as your payment details.
-payment-confirmation-order-heading = Order details
-payment-confirmation-invoice-number = Invoice #{ $invoiceNumber }
-payment-confirmation-billing-heading = Billed to
-payment-confirmation-details-heading-2 = Payment information
-payment-confirmation-amount = { $amount } per { $interval }
-
-## $amount (Number) - The amount billed. It will be formatted as currency.
-
-#  $intervalCount (Number) - The interval between payments, in days.
-payment-confirmation-amount-day = { $intervalCount ->
-  [one] { $amount } daily
-  *[other] { $amount } every { $intervalCount } days
-}
-#  $intervalCount (Number) - The interval between payments, in weeks.
-payment-confirmation-amount-week = { $intervalCount ->
-  [one] { $amount } weekly
-  *[other] { $amount } every { $intervalCount } weeks
-}
-#  $intervalCount (Number) - The interval between payments, in months.
-payment-confirmation-amount-month = { $intervalCount ->
-  [one] { $amount } monthly
-  *[other] { $amount } every { $intervalCount } months
-}
-#  $intervalCount (Number) - The interval between payments, in years.
-payment-confirmation-amount-year = { $intervalCount ->
-  [one] { $amount } yearly
-  *[other] { $amount } every { $intervalCount } years
-}
-
-payment-confirmation-download-button = Continue to download
-payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
-
-## New user email form
-
-new-user-sign-in-link = Already have a { -brand-name-firefox } account? <a>Sign in</a>
-new-user-step-1 = 1. Create a { -brand-name-firefox } account
-# "Required" to indicate that the user must use the checkbox below this text to
-# agree to a payment method's terms of service and privacy notice in order to
-# continue.
-new-user-email =
-  .label = Enter your email
-new-user-confirm-email =
-  .label = Confirm your email
-new-user-subscribe-product-updates = I’d like to receive product updates from { -brand-name-firefox }
-new-user-subscribe-product-assurance = We only use your email to create your account. We will never sell it to a third party.
-new-user-email-validate = Email is not valid
-new-user-email-validate-confirm = Emails do not match
-new-user-already-has-account-sign-in = You already have an account. <a>Sign in</a>
-# $domain (String) - the email domain provided by the user during sign up
-new-user-invalid-email-domain = Mistyped email? { $domain } does not offer email.
-new-user-card-title = Enter your card information
-new-user-submit = Subscribe Now
-
-manage-pocket-title = Looking for your { -brand-name-pocket } premium subscription?
-manage-pocket-body-2 = To manage it, <linkExternal>click here</linkExternal>.
-
-payment-method-header = Choose your payment method
-# This message is used to indicate the second step in a multi step process.
-payment-method-header-second-step = 2. { payment-method-header }
-payment-method-required = Required
diff --git a/locale/en_CA/main.ftl b/locale/en_CA/payments.ftl
similarity index 100%
rename from locale/en_CA/main.ftl
rename to locale/en_CA/payments.ftl
diff --git a/locale/en_GB/main.ftl b/locale/en_GB/payments.ftl
similarity index 100%
rename from locale/en_GB/main.ftl
rename to locale/en_GB/payments.ftl
diff --git a/locale/es/auth.ftl b/locale/es/auth.ftl
index 5649b619a6..0ad2c2c8f2 100644
--- a/locale/es/auth.ftl
+++ b/locale/es/auth.ftl
@@ -424,6 +424,7 @@ subscriptionCancellation-title = Lamentamos que te vayas
 #   $invoiceDateOnly (String) - The date of the invoice, e.g. 01/20/2016
 #   $serviceLastActiveDateOnly (String) - The date of last active service, e.g. 01/20/2016
 subscriptionCancellation-content = Hemos cancelado tu suscripción a { $productName }. Tu último pago de { $invoiceTotal } fue realizado el { $invoiceDateOnly }. Tu servicio continuará hasta el término del periodo de facturación actual, que es { $serviceLastActiveDateOnly }.
+subscriptionCancellation-outstanding-content = Hemos cancelado tu suscripción a { $productName }. Tu último pago de { $invoiceTotal } será efectuado el { $invoiceDateOnly }. Tu servicio continuará hasta el término del periodo de facturación actual, que es { $serviceLastActiveDateOnly }.
 # Variables:
 # $productName (String) - The name of the subscribed product, e.g. Mozilla VPN
 subscriptionDowngrade-subject = Has cambiado a { $productName }
diff --git a/locale/es/main.ftl b/locale/es/payments.ftl
similarity index 100%
rename from locale/es/main.ftl
rename to locale/es/payments.ftl
diff --git a/locale/es_AR/main.ftl b/locale/es_AR/payments.ftl
similarity index 100%
rename from locale/es_AR/main.ftl
rename to locale/es_AR/payments.ftl
diff --git a/locale/es_CL/main.ftl b/locale/es_CL/payments.ftl
similarity index 100%
rename from locale/es_CL/main.ftl
rename to locale/es_CL/payments.ftl
diff --git a/locale/es_ES/main.ftl b/locale/es_ES/payments.ftl
similarity index 100%
rename from locale/es_ES/main.ftl
rename to locale/es_ES/payments.ftl
diff --git a/locale/es_MX/main.ftl b/locale/es_MX/payments.ftl
similarity index 100%
rename from locale/es_MX/main.ftl
rename to locale/es_MX/payments.ftl
diff --git a/locale/et/main.ftl b/locale/et/payments.ftl
similarity index 100%
rename from locale/et/main.ftl
rename to locale/et/payments.ftl
diff --git a/locale/eu/main.ftl b/locale/eu/payments.ftl
similarity index 100%
rename from locale/eu/main.ftl
rename to locale/eu/payments.ftl
diff --git a/locale/fi/main.ftl b/locale/fi/payments.ftl
similarity index 100%
rename from locale/fi/main.ftl
rename to locale/fi/payments.ftl
diff --git a/locale/fr/main.ftl b/locale/fr/payments.ftl
similarity index 100%
rename from locale/fr/main.ftl
rename to locale/fr/payments.ftl
diff --git a/locale/fy/auth.ftl b/locale/fy/auth.ftl
index 35a18062f8..937c897f15 100644
--- a/locale/fy/auth.ftl
+++ b/locale/fy/auth.ftl
@@ -3,20 +3,33 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-### Localization for server-rendered Firefox accounts strings, from `fxa-auth-server`
+## Brands used in fxa-auth-server.
+##
+## Brands cannot be:
+## - Transliterated.
+## - Translated.
+##
+## Declension should be avoided where possible, leaving the original
+## brand unaltered in prominent UI positions.
+##
+## For further details, consult:
+## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
 
-# Firefox and Mozilla Brand
 -brand-mozilla = Mozilla
 -brand-firefox = Firefox
-# "Accounts" can be localized and should be lowercase, "Firefox" must be treated as a brand.
+# "accounts" can be localized, "Firefox" must be treated as a brand.
+# 'Firefox accounts' refers to the service
 -product-firefox-accounts = Firefox-accounts
-# "Account" can be localized and should be lowercase, "Firefox" must be treated as a brand.
+# "account" can be localized and should be lowercase, "Firefox" must be treated as a brand.
+# This is used to refer to a user's account, e.g. "update your Firefox account ..."
 -product-firefox-account = Firefox-account
-# "Firefox Cloud" should be treated as a brand.
+# This product should be treated as a brand.
 -product-firefox-cloud = Firefox Cloud
-# Other brands
+# Should should be treated as a brand.
 -brand-paypal = PayPal
+# Should should be treated as a brand.
 -app-store = App Store
+# Should should be treated as a brand.
 -google-play = Google Play
 
 ## Non-email strings
@@ -411,6 +424,7 @@ subscriptionCancellation-title = Spitich dat jo ôfsette
 #   $invoiceDateOnly (String) - The date of the invoice, e.g. 01/20/2016
 #   $serviceLastActiveDateOnly (String) - The date of last active service, e.g. 01/20/2016
 subscriptionCancellation-content = Wy hawwe jo abonnemint op { $productName } opsein. Jo lêste betelling fan { $invoiceTotal } is betelle op { $invoiceDateOnly }. Jo abonnemint rint troch oant it ein fan de aktuele fakturearringsperioade, te witten oant { $serviceLastActiveDateOnly }.
+subscriptionCancellation-outstanding-content = Wy hawwe jo abonnemint op { $productName } opsein. Jo lêste betelling fan { $invoiceTotal } wurdt betelle op { $invoiceDateOnly }. Jo abonnemint rint troch oant it ein fan de aktuele fakturearringsperioade, te witten oant { $serviceLastActiveDateOnly }.
 # Variables:
 # $productName (String) - The name of the subscribed product, e.g. Mozilla VPN
 subscriptionDowngrade-subject = Jo binne oerskeakele nei { $productName }
diff --git a/locale/fy_NL/main.ftl b/locale/fy/payments.ftl
similarity index 100%
rename from locale/fy_NL/main.ftl
rename to locale/fy/payments.ftl
diff --git a/locale/fy/main.ftl b/locale/fy_NL/payments.ftl
similarity index 95%
rename from locale/fy/main.ftl
rename to locale/fy_NL/payments.ftl
index 64b670cf49..fc08a5c6cb 100644
--- a/locale/fy/main.ftl
+++ b/locale/fy_NL/payments.ftl
@@ -53,6 +53,14 @@ fxa-account-signup-error-2 = Troch in systeemflater is jo registraasje by { $pro
 newsletter-signup-error = Jo binne net ynskreaun foar e-mailberjochten oer produktupdates. Jo kinne it opnij probearje yn jo accountynstellingen.
 fxa-post-passwordless-sub-error = Abonnemint befêstige, mar de befêstigingsside kin net laden wurde. Kontrolearje jo e-mail om jo account yn te stellen.
 
+## IAP upgrade errors
+
+# $productName (String) - The name of the subscribed product.
+iap-upgrade-already-subscribed = Jo hawwe al in abonnemint op { $productName } fia de appstore { -brand-name-google } of { -brand-name-apple }.
+iap-upgrade-no-bundle-support = Wy stypje gjin upwurdearringen foar dizze abonneminten, mar dat dogge wy ynkoarten wol.
+iap-upgrade-contact-support = Jo kinne dit produkt noch hieltyd krije – nim kontakt op mei de stipeôfdieling, sadat wy jo helpe kinne.
+iap-upgrade-get-help-button = Help krije
+
 ## Settings
 
 settings-home = Account-startside
@@ -72,6 +80,7 @@ subscription-processing-title = Abonnemint befêstigje…
 subscription-error-title = Flater by befêstigjen abonnemint…
 subscription-noplanchange-title = Dizze abonnemintswiziging wurdt net stipe
 subscription-iapsubscribed-title = Al abonnearre
+subscription-iaperrorupgrade-title = Wy kinne jo noch net opwurdearje
 
 ## $productName (String) - The name of the subscribed product.
 ## $amount (Number) - The amount billed. It will be formatted as currency.
@@ -335,11 +344,16 @@ plan-details-show-button = Details toane
 plan-details-hide-button = Details ferstopje
 plan-details-total-label = Totaal
 plan-details-list-price = Normale priis
+plan-details-tax = Belestingen en heffingen
 
 ## Coupons
 
 coupon-discount = Koarting
 coupon-discount-applied = Koartingsbeleaning tapast
+# Title of container where a user can input a coupon code to get a discount on a subscription.
+coupon-promo-code = Promoasjekoade
+# Title of container showing discount coupon code applied to a subscription.
+coupon-promo-code-applied = Promoasjekoade tapast
 coupon-submit = Tapasse
 coupon-remove = Fuortsmite
 coupon-error = De ynfierde koartingskoade is ûnjildich of ferrûn.
diff --git a/locale/gn/main.ftl b/locale/gn/payments.ftl
similarity index 100%
rename from locale/gn/main.ftl
rename to locale/gn/payments.ftl
diff --git a/locale/he/main.ftl b/locale/he/payments.ftl
similarity index 100%
rename from locale/he/main.ftl
rename to locale/he/payments.ftl
diff --git a/locale/hi/main.ftl b/locale/hi/payments.ftl
similarity index 100%
rename from locale/hi/main.ftl
rename to locale/hi/payments.ftl
diff --git a/locale/hi_IN/main.ftl b/locale/hi_IN/payments.ftl
similarity index 100%
rename from locale/hi_IN/main.ftl
rename to locale/hi_IN/payments.ftl
diff --git a/locale/hr/main.ftl b/locale/hr/payments.ftl
similarity index 100%
rename from locale/hr/main.ftl
rename to locale/hr/payments.ftl
diff --git a/locale/hsb/main.ftl b/locale/hsb/payments.ftl
similarity index 100%
rename from locale/hsb/main.ftl
rename to locale/hsb/payments.ftl
diff --git a/locale/hu/main.ftl b/locale/hu/payments.ftl
similarity index 100%
rename from locale/hu/main.ftl
rename to locale/hu/payments.ftl
diff --git a/locale/ia/main.ftl b/locale/ia/payments.ftl
similarity index 100%
rename from locale/ia/main.ftl
rename to locale/ia/payments.ftl
diff --git a/locale/id/main.ftl b/locale/id/payments.ftl
similarity index 100%
rename from locale/id/main.ftl
rename to locale/id/payments.ftl
diff --git a/locale/is/main.ftl b/locale/is/payments.ftl
similarity index 100%
rename from locale/is/main.ftl
rename to locale/is/payments.ftl
diff --git a/locale/it/main.ftl b/locale/it/payments.ftl
similarity index 100%
rename from locale/it/main.ftl
rename to locale/it/payments.ftl
diff --git a/locale/ja/main.ftl b/locale/ja/payments.ftl
similarity index 100%
rename from locale/ja/main.ftl
rename to locale/ja/payments.ftl
diff --git a/locale/ka/main.ftl b/locale/ka/payments.ftl
similarity index 100%
rename from locale/ka/main.ftl
rename to locale/ka/payments.ftl
diff --git a/locale/kab/main.ftl b/locale/kab/payments.ftl
similarity index 100%
rename from locale/kab/main.ftl
rename to locale/kab/payments.ftl
diff --git a/locale/ko/main.ftl b/locale/ko/payments.ftl
similarity index 100%
rename from locale/ko/main.ftl
rename to locale/ko/payments.ftl
diff --git a/locale/lt/main.ftl b/locale/lt/payments.ftl
similarity index 100%
rename from locale/lt/main.ftl
rename to locale/lt/payments.ftl
diff --git a/locale/mk/main.ftl b/locale/mk/payments.ftl
similarity index 100%
rename from locale/mk/main.ftl
rename to locale/mk/payments.ftl
diff --git a/locale/nb_NO/main.ftl b/locale/nb_NO/payments.ftl
similarity index 100%
rename from locale/nb_NO/main.ftl
rename to locale/nb_NO/payments.ftl
diff --git a/locale/nl/main.ftl b/locale/nl/payments.ftl
similarity index 100%
rename from locale/nl/main.ftl
rename to locale/nl/payments.ftl
diff --git a/locale/nn_NO/main.ftl b/locale/nn_NO/payments.ftl
similarity index 100%
rename from locale/nn_NO/main.ftl
rename to locale/nn_NO/payments.ftl
diff --git a/locale/pa_IN/main.ftl b/locale/pa_IN/payments.ftl
similarity index 100%
rename from locale/pa_IN/main.ftl
rename to locale/pa_IN/payments.ftl
diff --git a/locale/pl/main.ftl b/locale/pl/payments.ftl
similarity index 100%
rename from locale/pl/main.ftl
rename to locale/pl/payments.ftl
diff --git a/locale/pt/main.ftl b/locale/pt/payments.ftl
similarity index 100%
rename from locale/pt/main.ftl
rename to locale/pt/payments.ftl
diff --git a/locale/pt_BR/main.ftl b/locale/pt_BR/payments.ftl
similarity index 100%
rename from locale/pt_BR/main.ftl
rename to locale/pt_BR/payments.ftl
diff --git a/locale/pt_PT/main.ftl b/locale/pt_PT/payments.ftl
similarity index 100%
rename from locale/pt_PT/main.ftl
rename to locale/pt_PT/payments.ftl
diff --git a/locale/rm/main.ftl b/locale/rm/payments.ftl
similarity index 100%
rename from locale/rm/main.ftl
rename to locale/rm/payments.ftl
diff --git a/locale/ro/main.ftl b/locale/ro/payments.ftl
similarity index 100%
rename from locale/ro/main.ftl
rename to locale/ro/payments.ftl
diff --git a/locale/ru/main.ftl b/locale/ru/payments.ftl
similarity index 100%
rename from locale/ru/main.ftl
rename to locale/ru/payments.ftl
diff --git a/locale/sk/main.ftl b/locale/sk/payments.ftl
similarity index 100%
rename from locale/sk/main.ftl
rename to locale/sk/payments.ftl
diff --git a/locale/sl/main.ftl b/locale/sl/payments.ftl
similarity index 100%
rename from locale/sl/main.ftl
rename to locale/sl/payments.ftl
diff --git a/locale/sq/main.ftl b/locale/sq/payments.ftl
similarity index 100%
rename from locale/sq/main.ftl
rename to locale/sq/payments.ftl
diff --git a/locale/sr/main.ftl b/locale/sr/payments.ftl
similarity index 100%
rename from locale/sr/main.ftl
rename to locale/sr/payments.ftl
diff --git a/locale/su/main.ftl b/locale/su/payments.ftl
similarity index 100%
rename from locale/su/main.ftl
rename to locale/su/payments.ftl
diff --git a/locale/sv/auth.ftl b/locale/sv/auth.ftl
index 4b76cda89e..915214c16e 100644
--- a/locale/sv/auth.ftl
+++ b/locale/sv/auth.ftl
@@ -3,20 +3,33 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-### Localization for server-rendered Firefox accounts strings, from `fxa-auth-server`
+## Brands used in fxa-auth-server.
+##
+## Brands cannot be:
+## - Transliterated.
+## - Translated.
+##
+## Declension should be avoided where possible, leaving the original
+## brand unaltered in prominent UI positions.
+##
+## For further details, consult:
+## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
 
-# Firefox and Mozilla Brand
 -brand-mozilla = Mozilla
 -brand-firefox = Firefox
-# "Accounts" can be localized and should be lowercase, "Firefox" must be treated as a brand.
+# "accounts" can be localized, "Firefox" must be treated as a brand.
+# 'Firefox accounts' refers to the service
 -product-firefox-accounts = Firefox-konton
-# "Account" can be localized and should be lowercase, "Firefox" must be treated as a brand.
+# "account" can be localized and should be lowercase, "Firefox" must be treated as a brand.
+# This is used to refer to a user's account, e.g. "update your Firefox account ..."
 -product-firefox-account = Firefox-konto
-# "Firefox Cloud" should be treated as a brand.
+# This product should be treated as a brand.
 -product-firefox-cloud = Firefox Cloud
-# Other brands
+# Should should be treated as a brand.
 -brand-paypal = PayPal
+# Should should be treated as a brand.
 -app-store = App Store
+# Should should be treated as a brand.
 -google-play = Google Play
 
 ## Non-email strings
@@ -411,6 +424,7 @@ subscriptionCancellation-title = Ledsen att se dig sluta
 #   $invoiceDateOnly (String) - The date of the invoice, e.g. 01/20/2016
 #   $serviceLastActiveDateOnly (String) - The date of last active service, e.g. 01/20/2016
 subscriptionCancellation-content = Vi har sagt upp din prenumeration på { $productName }. Din sista betalning på { $invoiceTotal } betalades { $invoiceDateOnly }. Din tjänst kommer att fortsätta till slutet av din nuvarande faktureringsperiod, som är { $serviceLastActiveDateOnly }.
+subscriptionCancellation-outstanding-content = Vi har sagt upp din prenumeration på { $productName }. Din slutbetalning på { $invoiceTotal } kommer att betalas den { $invoiceDateOnly }. Din tjänst kommer att fortsätta till slutet av din nuvarande faktureringsperiod, som är { $serviceLastActiveDateOnly }.
 # Variables:
 # $productName (String) - The name of the subscribed product, e.g. Mozilla VPN
 subscriptionDowngrade-subject = Du har bytt till { $productName }
diff --git a/locale/sv/main.ftl b/locale/sv/payments.ftl
similarity index 100%
rename from locale/sv/main.ftl
rename to locale/sv/payments.ftl
diff --git a/locale/sv_SE/main.ftl b/locale/sv_SE/payments.ftl
similarity index 100%
rename from locale/sv_SE/main.ftl
rename to locale/sv_SE/payments.ftl
diff --git a/locale/ta/main.ftl b/locale/ta/payments.ftl
similarity index 100%
rename from locale/ta/main.ftl
rename to locale/ta/payments.ftl
diff --git a/locale/te/main.ftl b/locale/te/payments.ftl
similarity index 100%
rename from locale/te/main.ftl
rename to locale/te/payments.ftl
diff --git a/locale/templates/main.ftl b/locale/templates/payments.ftl
similarity index 84%
rename from locale/templates/main.ftl
rename to locale/templates/payments.ftl
index a9bbbfce3f..9a419c9aa9 100644
--- a/locale/templates/main.ftl
+++ b/locale/templates/payments.ftl
@@ -2,65 +2,136 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-## Branding
+### Terms and messages used in fxa-payments-server
+
+## Firefox and Mozilla must be treated as a brand.
+##
+## They cannot be:
+## - Transliterated.
+## - Translated.
+##
+## Declension should be avoided where possible, leaving the original
+## brand unaltered in prominent UI positions.
+##
+## For further details, consult:
+## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
 
-project-brand = Firefox Accounts
 -brand-name-mozilla = Mozilla
 -brand-name-firefox = Firefox
+
+# “Accounts” can be localized, “Firefox” must be treated as a brand.
+# 'Firefox Accounts' refers to the service
+project-brand = Firefox Accounts
+
+## Brands cannot be transliterated or translated. Decelension should be avoided where possible.
+
 -brand-name-paypal = PayPal
 -brand-name-stripe = Stripe
 -brand-name-google = Google
 -brand-name-apple = Apple
 -brand-name-pocket = Pocket
 
-# The following are not terms because they are not used directly in messages,
-# but rather looked up in code and passed into the message as variables.
-brand-name-google-play = { -brand-name-google } Play Store
-# App Store here refers to Apple's App Store not the generic app store.
-brand-name-apple-app-store = App Store
+## Component - AppLayout
 
-document =
-  .title = Firefox Accounts
+settings-home = Account Home
 
-## General aria-label
+## Component - CouponForm
 
-close-aria =
-  .aria-label = Close modal
+# Title of container showing discount coupon code applied to a subscription.
+coupon-promo-code-applied = Promo Code Applied
+coupon-submit = Apply
+coupon-remove = Remove
+coupon-error = The code you entered is invalid or expired.
+coupon-error-generic = An error occurred processing the code. Please try again.
+coupon-error-expired = The code you entered has expired.
+coupon-error-limit-reached = The code you entered has reached its limit.
+coupon-error-invalid = The code you entered is invalid.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+coupon-enter-code =
+  .placeholder = Enter Code
 
-## App error dialog
+## Component - Fields
 
-general-error-heading = General application error
+default-input-error = This field is required
+input-error-is-required = { $label } is required
+
+## Component - Header
+
+brand-name-firefox-logo = { -brand-name-firefox } logo
+
+## Component - NewUserEmailForm
+
+new-user-sign-in-link = Already have a { -brand-name-firefox } account? <a>Sign in</a>
+# "Required" to indicate that the user must use the checkbox below this text to
+# agree to a payment method's terms of service and privacy notice in order to
+# continue.
+new-user-email =
+  .label = Enter your email
+new-user-confirm-email =
+  .label = Confirm your email
+new-user-subscribe-product-updates = I’d like to receive product updates from { -brand-name-firefox }
+new-user-subscribe-product-assurance = We only use your email to create your account. We will never sell it to a third party.
+new-user-email-validate = Email is not valid
+new-user-email-validate-confirm = Emails do not match
+new-user-already-has-account-sign-in = You already have an account. <a>Sign in</a>
+# $domain (String) - the email domain provided by the user during sign up
+new-user-invalid-email-domain = Mistyped email? { $domain } does not offer email.
+
+## Component - PaymentConfirmation
+
+payment-confirmation-thanks-heading = Thank you!
+payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
+
+# $email (string) - The user's email.
+# $productName (String) - The name of the subscribed product.
+payment-confirmation-thanks-subheading = A confirmation email has been sent to { $email } with details on how to get started with { $product_name }.
+
+# $email (string) - The user's email.
+payment-confirmation-thanks-subheading-account-exists = You’ll receive an email at { $email } with instructions for setting up your account, as well as your payment details.
+
+payment-confirmation-order-heading = Order details
+payment-confirmation-invoice-number = Invoice #{ $invoiceNumber }
+payment-confirmation-details-heading-2 = Payment information
+
+payment-confirmation-amount = { $amount } per { $interval }
+
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in days.
+payment-confirmation-amount-day = { $intervalCount ->
+  [one] { $amount } daily
+  *[other] { $amount } every { $intervalCount } days
+}
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in weeks.
+payment-confirmation-amount-week = { $intervalCount ->
+  [one] { $amount } weekly
+  *[other] { $amount } every { $intervalCount } weeks
+}
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in months.
+payment-confirmation-amount-month = { $intervalCount ->
+  [one] { $amount } monthly
+  *[other] { $amount } every { $intervalCount } months
+}
+# $amount (Number) - The amount billed. It will be formatted as currency.
+# $intervalCount (Number) - The interval between payments, in years.
+payment-confirmation-amount-year = { $intervalCount ->
+  [one] { $amount } yearly
+  *[other] { $amount } every { $intervalCount } years
+}
+
+payment-confirmation-download-button = Continue to download
+
+## Component - PaymentConsentCheckbox
+
+payment-confirm-with-legal-links-static = I authorize { -brand-name-mozilla }, maker of { -brand-name-firefox } products, to charge my payment method for the amount shown, according to <termsOfServiceLink>Terms of Service</termsOfServiceLink> and <privacyNoticeLink>Privacy Notice</privacyNoticeLink>, until I cancel my subscription.
+
+## Component - PaymentErrorView
 
-basic-error-message = Something went wrong. Please try again later.
-payment-error-1 = Hmm. There was a problem authorizing your payment. Try again or get in touch with your card issuer.
-payment-error-2 = Hmm. There was a problem authorizing your payment. Get in touch with your card issuer.
-payment-error-3b = An unexpected error has occurred while processing your payment, please try again.
 payment-error-retry-button = Try again
 payment-error-manage-subscription-button = Manage my subscription
 
-country-currency-mismatch = The currency of this subscription is not valid for the country associated with your payment.
-currency-currency-mismatch = Sorry. You can’t switch between currencies.
-
-no-subscription-change = Sorry. You can’t change your subscription plan.
-
-# $mobileAppStore (String) - "Google Play Store" or "App Store", localized when the translation is available.
-iap-already-subscribed = You’re already subscribed through the { $mobileAppStore }.
-
-expired-card-error = It looks like your credit card has expired. Try another card.
-insufficient-funds-error = It looks like your card has insufficient funds. Try another card.
-withdrawal-count-limit-exceeded-error = It looks like this transaction will put you over your credit limit. Try another card.
-charge-exceeds-source-limit = It looks like this transaction will put you over your daily credit limit. Try another card or in 24 hours.
-instant-payouts-unsupported = It looks like your debit card isn’t setup for instant payments. Try another debit or credit card.
-duplicate-transaction = Hmm. Looks like an identical transaction was just sent. Check your payment history.
-coupon-expired = It looks like that promo code has expired.
-card-error = Your transaction could not be processed. Please verify your credit card information and try again.
-
-# $productName (String) - The name of the subscribed product.
-fxa-account-signup-error-2 = A system error caused your { $productName } sign-up to fail. Your payment method has not been charged. Please try again.
-newsletter-signup-error = You’re not signed up for product update emails. You can try again in your account settings.
-fxa-post-passwordless-sub-error = Subscription confirmed, but the confirmation page failed to load. Please check your email to set up your account.
-
-## IAP upgrade errors
+## Component - PaymentErrorView - IAP upgrade errors
 
 # $productName (String) - The name of the subscribed product.
 iap-upgrade-already-subscribed = You already have a { $productName } subscription via the { -brand-name-google } or { -brand-name-apple } app stores.
@@ -68,63 +139,22 @@ iap-upgrade-no-bundle-support = We don’t support upgrades for these subscripti
 iap-upgrade-contact-support = You can still get this product — please contact support so we can help you.
 iap-upgrade-get-help-button = Get help
 
-## Settings
+## Component - PaymentForm
 
-settings-home = Account Home
-settings-subscriptions-title = Subscriptions
+payment-name =
+  .placeholder = Full Name
+  .label = Name as it appears on your card
+payment-cc =
+  .label = Your card
 
-## Legal footer
+payment-cancel-btn = Cancel
+payment-update-btn = Update
+payment-pay-btn = Pay now
+payment-pay-with-paypal-btn = Pay with {-brand-name-paypal}
 
-terms = Terms of Service
-privacy = Privacy Notice
-terms-download = Download Terms
+payment-validate-name-error = Please enter your name
 
-## Subscription titles
-
-subscription-create-title = Set up your subscription
-subscription-success-title = Subscription confirmation
-subscription-processing-title = Confirming subscription…
-subscription-error-title = Error confirming subscription…
-subscription-noplanchange-title = This subscription plan change is not supported
-subscription-iapsubscribed-title = Already subscribed
-subscription-iaperrorupgrade-title = We can’t upgrade you quite yet
-
-## $productName (String) - The name of the subscribed product.
-## $amount (Number) - The amount billed. It will be formatted as currency.
-
-# $intervalCount (Number) - The interval between payments, in days.
-day-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } daily
-  *[other] { $productName } billed { $amount } every { $intervalCount } days
-}
-# $intervalCount (Number) - The interval between payments, in weeks.
-week-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } weekly
-  *[other] { $productName } billed { $amount } every { $intervalCount } weeks
-}
-# $intervalCount (Number) - The interval between payments, in months.
-month-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } monthly
-  *[other] { $productName } billed { $amount } every { $intervalCount } months
-}
-# $intervalCount (Number) - The interval between payments, in years.
-year-based-plan-details-amount = { $intervalCount ->
-  [one] { $productName } billed { $amount } yearly
-  *[other] { $productName } billed { $amount } every { $intervalCount } years
-}
-
-## Product route
-
-product-plan-error =
-  .title = Problem loading plans
-product-profile-error =
-  .title = Problem loading profile
-product-customer-error =
-  .title = Problem loading customer
-product-plan-not-found = Plan not found
-product-no-such-plan = No such plan for this product.
-
-## Payment legal blurb
+## Component - PaymentLegalBlurb
 
 payment-legal-copy-stripe-and-paypal-2 = { -brand-name-mozilla } uses { -brand-name-stripe } and { -brand-name-paypal } for secure payment processing.
 payment-legal-link-stripe-paypal = <stripePrivacyLink>{ -brand-name-stripe } privacy policy</stripePrivacyLink> &nbsp; <paypalPrivacyLink>{ -brand-name-paypal } privacy policy</paypalPrivacyLink>
@@ -135,65 +165,69 @@ payment-legal-link-paypal-2 = <paypalPrivacyLink>{ -brand-name-paypal } privacy
 payment-legal-copy-stripe-2 = { -brand-name-mozilla } uses { -brand-name-stripe } for secure payment processing.
 payment-legal-link-stripe-3 = <stripePrivacyLink>{ -brand-name-stripe } privacy policy</stripePrivacyLink>
 
-## Payment form
+## Component - PaymentMethodHeader
 
-payment-name =
-  .placeholder = Full Name
-  .label = Name as it appears on your card
-payment-cc =
-  .label = Your card
-payment-ccn =
-  .label = Card number
-payment-exp =
-  .label = Expiration
-payment-cvc =
-  .label = CVC
-payment-zip =
-  .label = ZIP code
+payment-method-header = Choose your payment method
+# This message is used to indicate the second step in a multi step process.
+payment-method-header-second-step = 2. { payment-method-header }
+payment-method-required = Required
 
-payment-confirm-with-legal-links-static = I authorize { -brand-name-mozilla }, maker of { -brand-name-firefox } products, to charge my payment method for the amount shown, according to <termsOfServiceLink>Terms of Service</termsOfServiceLink> and <privacyNoticeLink>Privacy Notice</privacyNoticeLink>, until I cancel my subscription.
+## Component - PaymentProcessing
 
-payment-cancel-btn = Cancel
-payment-update-btn = Update
-payment-pay-btn = Pay now
-payment-pay-with-paypal-btn = Pay with {-brand-name-paypal}
+payment-processing-message = Please wait while we process your payment…
 
-payment-validate-name-error = Please enter your name
-payment-validate-zip-required = Zip code is required
-payment-validate-zip-short = Zip code is too short
+## Component - PaymentProviderDetails
 
-## Subscription redirect
+payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
 
-sub-redirect-ready = Your subscription is ready
-sub-redirect-copy = Please take a moment to tell us about your experience.
-sub-redirect-skip-survey = No thanks, just take me to my product.
+## Component - PlanDetails
 
-## Fields
+plan-details-header = Product details
+plan-details-list-price = List Price
+plan-details-show-button = Show details
+plan-details-hide-button = Hide details
+plan-details-total-label = Total
+plan-details-tax = Taxes and Fees
 
-default-input-error = This field is required
-input-error-is-required = { $label } is required
+## Component - PlanErrorDialog
 
-## Subscription upgrade
+product-no-such-plan = No such plan for this product.
 
-product-plan-change-heading = Review your change
-sub-change-failed = Plan change failed
-sub-update-payment-title = Payment information
-sub-update-card-exp = Expires { $cardExpMonth }/{ $cardExpYear }
-sub-update-copy =
-    Your plan will change immediately, and you’ll be charged an adjusted
-    amount for the rest of your billing cycle. Starting { $startingDate }
-    you’ll be charged the full amount.
+## Component - SubscriptionTitle
 
-##
+subscription-create-title = Set up your subscription
+subscription-success-title = Subscription confirmation
+subscription-processing-title = Confirming subscription…
+subscription-error-title = Error confirming subscription…
+subscription-noplanchange-title = This subscription plan change is not supported
+subscription-iapsubscribed-title = Already subscribed
 
-sub-change-submit = Confirm change
-sub-change-indicator =
-  .aria-label = change indicator
-sub-update-current-plan-label = Current plan
-sub-update-new-plan-label = New plan
-sub-update-total-label = New total
+sub-guarantee = 30-day money-back guarantee
 
-## Subscription upgrade plan details
+## Component - TermsAndPrivacy
+
+terms = Terms of Service
+privacy = Privacy Notice
+terms-download = Download Terms
+
+## App-level string(s) and messages shared by multiple components or routes
+
+document =
+  .title = Firefox Accounts
+
+# General aria-label for closing modals
+close-aria =
+  .aria-label = Close modal
+
+# Aria label for spinner image indicating data is loading
+app-loading-spinner-aria-label-loading = Loading…
+
+settings-subscriptions-title = Subscriptions
+
+# Title of container where a user can input a coupon code to get a discount on a subscription.
+coupon-promo-code = Promo Code
+
+## Subscription upgrade plan details - shared by multiple components, including plan details and payment form
 ## $amount (Number) - The amount billed. It will be formatted as currency.
 
 # $intervalCount (Number) - The interval between payments, in days.
@@ -233,6 +267,98 @@ plan-price-year = { $intervalCount ->
     *[other] { $amount } every { $intervalCount } years
   }
 
+## Error messages
+
+# App error dialog
+general-error-heading = General application error
+
+basic-error-message = Something went wrong. Please try again later.
+payment-error-1 = Hmm. There was a problem authorizing your payment. Try again or get in touch with your card issuer.
+payment-error-2 = Hmm. There was a problem authorizing your payment. Get in touch with your card issuer.
+payment-error-3b = An unexpected error has occurred while processing your payment, please try again.
+expired-card-error = It looks like your credit card has expired. Try another card.
+insufficient-funds-error = It looks like your card has insufficient funds. Try another card.
+withdrawal-count-limit-exceeded-error = It looks like this transaction will put you over your credit limit. Try another card.
+charge-exceeds-source-limit = It looks like this transaction will put you over your daily credit limit. Try another card or in 24 hours.
+instant-payouts-unsupported = It looks like your debit card isn’t setup for instant payments. Try another debit or credit card.
+duplicate-transaction = Hmm. Looks like an identical transaction was just sent. Check your payment history.
+coupon-expired = It looks like that promo code has expired.
+card-error = Your transaction could not be processed. Please verify your credit card information and try again.
+country-currency-mismatch = The currency of this subscription is not valid for the country associated with your payment.
+currency-currency-mismatch = Sorry. You can’t switch between currencies.
+no-subscription-change = Sorry. You can’t change your subscription plan.
+# $mobileAppStore (String) - "Google Play Store" or "App Store", localized when the translation is available.
+iap-already-subscribed = You’re already subscribed through the { $mobileAppStore }.
+# $productName (String) - The name of the subscribed product.
+fxa-account-signup-error-2 = A system error caused your { $productName } sign-up to fail. Your payment method has not been charged. Please try again.
+fxa-post-passwordless-sub-error = Subscription confirmed, but the confirmation page failed to load. Please check your email to set up your account.
+newsletter-signup-error = You’re not signed up for product update emails. You can try again in your account settings.
+
+product-plan-error =
+  .title = Problem loading plans
+product-profile-error =
+  .title = Problem loading profile
+product-customer-error =
+  .title = Problem loading customer
+product-plan-not-found = Plan not found
+
+## Hooks - coupons
+
+coupon-success = Your plan will automatically renew at the list price.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
+
+## Routes - Checkout - New user
+
+new-user-step-1 = 1. Create a { -brand-name-firefox } account
+new-user-card-title = Enter your card information
+new-user-submit = Subscribe Now
+
+## Routes - Product and Subscriptions
+sub-update-payment-title = Payment information
+
+## Routes - Checkout and Product/Subscription create
+pay-with-heading-card-or = Or pay with card
+pay-with-heading-card-only = Pay with card
+
+## Routes - Product - IapRoadblock
+
+subscription-iaperrorupgrade-title = We can’t upgrade you quite yet
+
+# The following are not terms because they are not used directly in messages,
+# but rather looked up in code and passed into the message as variables.
+
+brand-name-google-play = { -brand-name-google } Play Store
+# App Store here refers to Apple's App Store not the generic app store.
+brand-name-apple-app-store = App Store
+
+## Routes - Product - Subscription upgrade
+
+product-plan-change-heading = Review your change
+sub-change-failed = Plan change failed
+sub-update-copy =
+    Your plan will change immediately, and you’ll be charged an adjusted
+    amount for the rest of your billing cycle. Starting { $startingDate }
+    you’ll be charged the full amount.
+sub-change-submit = Confirm change
+sub-update-current-plan-label = Current plan
+sub-update-new-plan-label = New plan
+sub-update-total-label = New total
+
+## Routes - Subscriptions - Cancel
+
+sub-item-cancel-sub = Cancel Subscription
+sub-item-stay-sub = Stay Subscribed
+
+## $name (String) - The name of the subscribed product.
+## $period (Date) - The last day of product access
+sub-item-cancel-msg =
+    You will no longer be able to use { $name } after
+    { $period }, the last day of your billing cycle.
+sub-item-cancel-confirm =
+    Cancel my access and my saved information within
+    { $name } on { $period }
+
 ## Subscription billing details
 ## $amount (Number) - The amount billed. It will be formatted as currency.
 
@@ -257,17 +383,62 @@ sub-plan-price-year = { $intervalCount ->
   *[other] { $amount } every { $intervalCount } years
 }
 
+## Routes - Subscription
+
+sub-route-idx-reactivating = Reactivating subscription failed
+sub-route-idx-cancel-failed = Cancelling subscription failed
+sub-route-idx-contact = Contact Support
+sub-route-idx-cancel-msg-title = We’re sorry to see you go
+# $name (String) - The name of the subscribed product.
+# $date (Date) - Last day of product access
+sub-route-idx-cancel-msg =
+    Your { $name } subscription has been cancelled.
+          <br />
+          You will still have access to { $name } until { $date }.
+sub-route-idx-cancel-aside =
+    Have questions? Visit <a>{ -brand-name-mozilla } Support</a>.
+
+## Routes - Subscriptions - Errors
+
+sub-customer-error =
+  .title = Problem loading customer
+sub-invoice-error =
+  .title = Problem loading invoices
+sub-billing-update-success = Your billing information has been updated successfully
+
+## Routes - Subscription - ActionButton
+
+pay-update-change-btn = Change
+pay-update-manage-btn = Manage
+
+## Routes - Subscriptions - Cancel and IapItem
 ## $date (Date) - The date for the next time a charge will occur.
 
 sub-next-bill = Next billed on { $date }
 sub-expires-on = Expires on { $date }
 
-##
+## Routes - Subscription - PaymentUpdate
+# $expirationDate (Date) - The payment card's expiration date.
 
 pay-update-card-exp = Expires { $expirationDate }
-pay-update-change-btn = Change
+sub-route-idx-updating = Updating billing information…
+sub-route-payment-modal-heading = Invalid billing information
+sub-route-payment-modal-message = There seems to be an error with your { -brand-name-paypal } account, we need you to take the necessary steps to resolve this payment issue.
+sub-route-missing-billing-agreement-payment-alert = Invalid payment information; there is an error with your account. <div>Manage</div>
+sub-route-funding-source-payment-alert = Invalid payment information; there is an error with your account. This alert may take some time to clear after you successfully update your information. <div>Manage</div>
 
-## reactivate
+## Routes - Subscription - SubscriptionItem
+
+sub-item-no-such-plan = No such plan for this subscription.
+invoice-not-found = Subsequent invoice not found
+sub-item-no-such-subsequent-invoice = Subsequent invoice not found for this subscription.
+
+## Routes - Subscriptions - Pocket Subscription
+
+manage-pocket-title = Looking for your { -brand-name-pocket } premium subscription?
+manage-pocket-body-2 = To manage it, <linkExternal>click here</linkExternal>.
+
+## Routes - Subscriptions - Reactivate
 ## $name (String) - The name of the subscribed product.
 
 reactivate-confirm-dialog-header = Want to keep using { $name }?
@@ -289,179 +460,12 @@ reactivate-confirm-button = Resubscribe
 
 ## $date (Date) - Last day of product access
 
-reactivate-panel-date = You cancelled your subscription on { $date }.
 reactivate-panel-copy = You will lose access to { $name } on <strong>{ $date }</strong>.
 reactivate-success-copy = Thanks! You’re all set.
 reactivate-success-button = Close
 
-## Subscription item
-## $name (String) - The name of the subscribed product.
-## $period (Date) - The last day of product access
-
-sub-item-missing = Problem loading subscriptions
-sub-item-missing-msg = Please try again later.
-sub-item-no-such-plan = No such plan for this subscription.
-sub-item-cancel-sub = Cancel Subscription
-sub-item-stay-sub = Stay Subscribed
-sub-item-cancel-msg =
-    You will no longer be able to use { $name } after
-    { $period }, the last day of your billing cycle.
-sub-item-cancel-confirm =
-    Cancel my access and my saved information within
-    { $name } on { $period }
-invoice-not-found = Subsequent invoice not found
-sub-item-no-such-subsequent-invoice = Subsequent invoice not found for this subscription.
-
-## Subscription iap item
+## Routes - Subscriptions - Subscription iap item
 
 sub-iap-item-google-purchase = { -brand-name-google }: In-App purchase
 sub-iap-item-apple-purchase = { -brand-name-apple }: In-App purchase
 sub-iap-item-manage-button = Manage
-
-account-activated = Your account is activated, <userEl/>
-
-## Subscription route index
-
-sub-route-idx-updating = Updating billing information…
-sub-route-idx-reactivating = Reactivating subscription failed
-sub-route-idx-cancel-failed = Cancelling subscription failed
-sub-route-idx-contact = Contact Support
-sub-route-idx-cancel-msg-title = We’re sorry to see you go
-# $name (String) - The name of the subscribed product.
-# $date (Date) - Last day of product access
-sub-route-idx-cancel-msg =
-    Your { $name } subscription has been cancelled.
-          <br />
-          You will still have access to { $name } until { $date }.
-sub-route-idx-cancel-aside =
-    Have questions? Visit <a>{ -brand-name-mozilla } Support</a>.
-sub-subscription-error =
-  .title = Problem loading subscriptions
-sub-customer-error =
-  .title = Problem loading customer
-sub-invoice-error =
-  .title = Problem loading invoices
-sub-billing-update-success = Your billing information has been updated successfully
-sub-route-payment-modal-heading = Invalid billing information
-sub-route-payment-modal-message = There seems to be an error with your { -brand-name-paypal } account, we need you to take the necessary steps to resolve this payment issue.
-sub-route-missing-billing-agreement-payment-alert = Invalid payment information; there is an error with your account. <div>Manage</div>
-sub-route-funding-source-payment-alert = Invalid payment information; there is an error with your account. This alert may take some time to clear after you successfully update your information. <div>Manage</div>
-pay-update-manage-btn = Manage
-
-## Subscription create
-
-sub-guarantee = 30-day money-back guarantee
-pay-with-heading-other = Select payment option
-pay-with-heading-card-or = Or pay with card
-pay-with-heading-card-only = Pay with card
-
-## Plan details
-
-plan-details-header = Product details
-plan-details-show-button = Show details
-plan-details-hide-button = Hide details
-plan-details-total-label = Total
-plan-details-list-price = List Price
-plan-details-tax = Taxes and Fees
-
-## Coupons
-
-coupon-discount = Discount
-coupon-discount-applied = Discount Reward Applied
-# Title of container where a user can input a coupon code to get a discount on a subscription.
-coupon-promo-code = Promo Code
-# Title of container showing discount coupon code applied to a subscription.
-coupon-promo-code-applied = Promo Code Applied
-coupon-submit = Apply
-coupon-remove = Remove
-coupon-error = The code you entered is invalid or expired.
-coupon-error-generic = An error occurred processing the code. Please try again.
-coupon-error-expired = The code you entered has expired.
-coupon-error-limit-reached = The code you entered has reached its limit.
-coupon-error-invalid = The code you entered is invalid.
-coupon-success = Your plan will automatically renew at the list price.
-# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
-coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
-coupon-enter-code =
-  .placeholder = Enter Code
-
-## Payment processing
-
-payment-processing-message = Please wait while we process your payment…
-
-## Payment confirmation
-
-payment-confirmation-alert = Click here to download
-payment-confirmation-mobile-alert = Didn’t open app? <a>Click Here</a>
-payment-confirmation-thanks-heading = Thank you!
-
-## Payment confirmation details
-## $email (string) - The user's email.
-## $productName (String) - The name of the subscribed product.
-
-payment-confirmation-thanks-subheading = A confirmation email has been sent to { $email } with details on how to get started with { $product_name }.
-payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
-
-## $email (string) - The user's email.
-
-payment-confirmation-thanks-subheading-account-exists = You’ll receive an email at { $email } with instructions for setting up your account, as well as your payment details.
-payment-confirmation-order-heading = Order details
-payment-confirmation-invoice-number = Invoice #{ $invoiceNumber }
-payment-confirmation-billing-heading = Billed to
-payment-confirmation-details-heading-2 = Payment information
-payment-confirmation-amount = { $amount } per { $interval }
-
-## $amount (Number) - The amount billed. It will be formatted as currency.
-
-#  $intervalCount (Number) - The interval between payments, in days.
-payment-confirmation-amount-day = { $intervalCount ->
-  [one] { $amount } daily
-  *[other] { $amount } every { $intervalCount } days
-}
-#  $intervalCount (Number) - The interval between payments, in weeks.
-payment-confirmation-amount-week = { $intervalCount ->
-  [one] { $amount } weekly
-  *[other] { $amount } every { $intervalCount } weeks
-}
-#  $intervalCount (Number) - The interval between payments, in months.
-payment-confirmation-amount-month = { $intervalCount ->
-  [one] { $amount } monthly
-  *[other] { $amount } every { $intervalCount } months
-}
-#  $intervalCount (Number) - The interval between payments, in years.
-payment-confirmation-amount-year = { $intervalCount ->
-  [one] { $amount } yearly
-  *[other] { $amount } every { $intervalCount } years
-}
-
-payment-confirmation-download-button = Continue to download
-payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
-
-## New user email form
-
-new-user-sign-in-link = Already have a { -brand-name-firefox } account? <a>Sign in</a>
-new-user-step-1 = 1. Create a { -brand-name-firefox } account
-# "Required" to indicate that the user must use the checkbox below this text to
-# agree to a payment method's terms of service and privacy notice in order to
-# continue.
-new-user-email =
-  .label = Enter your email
-new-user-confirm-email =
-  .label = Confirm your email
-new-user-subscribe-product-updates = I’d like to receive product updates from { -brand-name-firefox }
-new-user-subscribe-product-assurance = We only use your email to create your account. We will never sell it to a third party.
-new-user-email-validate = Email is not valid
-new-user-email-validate-confirm = Emails do not match
-new-user-already-has-account-sign-in = You already have an account. <a>Sign in</a>
-# $domain (String) - the email domain provided by the user during sign up
-new-user-invalid-email-domain = Mistyped email? { $domain } does not offer email.
-new-user-card-title = Enter your card information
-new-user-submit = Subscribe Now
-
-manage-pocket-title = Looking for your { -brand-name-pocket } premium subscription?
-manage-pocket-body-2 = To manage it, <linkExternal>click here</linkExternal>.
-
-payment-method-header = Choose your payment method
-# This message is used to indicate the second step in a multi step process.
-payment-method-header-second-step = 2. { payment-method-header }
-payment-method-required = Required
diff --git a/locale/th/main.ftl b/locale/th/payments.ftl
similarity index 100%
rename from locale/th/main.ftl
rename to locale/th/payments.ftl
diff --git a/locale/tr/main.ftl b/locale/tr/payments.ftl
similarity index 100%
rename from locale/tr/main.ftl
rename to locale/tr/payments.ftl
diff --git a/locale/tt/main.ftl b/locale/tt/payments.ftl
similarity index 100%
rename from locale/tt/main.ftl
rename to locale/tt/payments.ftl
diff --git a/locale/uk/main.ftl b/locale/uk/payments.ftl
similarity index 100%
rename from locale/uk/main.ftl
rename to locale/uk/payments.ftl
diff --git a/locale/ur/main.ftl b/locale/ur/payments.ftl
similarity index 100%
rename from locale/ur/main.ftl
rename to locale/ur/payments.ftl
diff --git a/locale/uz/main.ftl b/locale/uz/payments.ftl
similarity index 100%
rename from locale/uz/main.ftl
rename to locale/uz/payments.ftl
diff --git a/locale/vi/main.ftl b/locale/vi/payments.ftl
similarity index 100%
rename from locale/vi/main.ftl
rename to locale/vi/payments.ftl
diff --git a/locale/zh_CN/main.ftl b/locale/zh_CN/payments.ftl
similarity index 100%
rename from locale/zh_CN/main.ftl
rename to locale/zh_CN/payments.ftl
diff --git a/locale/zh_TW/main.ftl b/locale/zh_TW/payments.ftl
similarity index 100%
rename from locale/zh_TW/main.ftl
rename to locale/zh_TW/payments.ftl