summaryrefslogtreecommitdiff
path: root/billing/config/locales/en.yml
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-12-17 12:02:07 -0800
committerjessib <jessib@riseup.net>2013-12-17 12:02:07 -0800
commit98a247acb4d1be484c2982d48ec038eed3de3d55 (patch)
treef176092fa43145b9d8ce00a180fab70cf62da456 /billing/config/locales/en.yml
parent634db9875cc8f6f6b9a4a83dfc6b8d53728eb2b5 (diff)
parent83cd3d95b78b6df9ac33a8ee169e570f4d3e2eeb (diff)
Merge branch 'develop' into feature/billing-no-authenticated-payments
Conflicts: billing/config/locales/en.yml
Diffstat (limited to 'billing/config/locales/en.yml')
-rw-r--r--billing/config/locales/en.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/billing/config/locales/en.yml b/billing/config/locales/en.yml
index eda7da2..b418a17 100644
--- a/billing/config/locales/en.yml
+++ b/billing/config/locales/en.yml
@@ -3,4 +3,5 @@ en:
must_create_customer: "You must store a customer in braintree before subscribing to a plan"
subscribe: "Subscribe"
save_customer_info: "Save Customer Information"
- donation_not_payment: "Note: This is a donation, and will not be applied towards your account." \ No newline at end of file
+ donation_not_payment: "Note: This is a donation, and will not be applied towards your account."
+ no_relevant_subscription: "No subscription which is Active, Pending, or Past Due"