summaryrefslogtreecommitdiff
path: root/users/config/locales
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 /users/config/locales
parent3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff)
parentd578c07e196cd9758fbf1752a9bb8477c260bb30 (diff)
Merge branch 'develop' into feature/messages_api
Conflicts: users/config/locales/en.yml
Diffstat (limited to 'users/config/locales')
-rw-r--r--users/config/locales/en.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 0db63eb..ed6653a 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -37,8 +37,9 @@ en:
enable_description: "This will restore the account to full functionality"
deactivate_account: "Deactivate the account %{username}"
deactivate_description: "This will temporarily deactivate some account functionality." #todo detail exact functionality. can receive email but not send or renew client certificate?
-
payment_one_month_warning: "We hope you have been enjoying this service this past month. Please sign up to pay within the next month, by %{date_in_one_month}. Directions for payment are available at INSERT_URL"
+ bye: "Goodbye!"
+ bye_message: "So long and thanks for all the fish."
#
# overview