summaryrefslogtreecommitdiff
path: root/billing
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
committerjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
commit7e0573f3347dca6323eae05127849431ecbceb77 (patch)
tree8a6ff58fdcc93493b5a8f332350b0a9292119906 /billing
parent3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff)
parentd578c07e196cd9758fbf1752a9bb8477c260bb30 (diff)
Merge branch 'develop' into feature/messages_api
Conflicts: users/config/locales/en.yml
Diffstat (limited to 'billing')
-rw-r--r--billing/config/locales/en.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/billing/config/locales/en.yml b/billing/config/locales/en.yml
index b418a17..1300958 100644
--- a/billing/config/locales/en.yml
+++ b/billing/config/locales/en.yml
@@ -5,3 +5,7 @@ en:
save_customer_info: "Save Customer Information"
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"
+ plan: "Plan"
+ description: "Description"
+ cost: "Cost"
+ free: "Free" \ No newline at end of file