summaryrefslogtreecommitdiff
path: root/users/config/locales/en.yml
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-06-20 12:25:59 +0200
committerAzul <azul@leap.se>2013-06-20 12:25:59 +0200
commit3a89159d249c76ed7dbde3e51541ffc82b74ccdb (patch)
tree5813f43e1514d97c83db8d8a37319e57f4e63b31 /users/config/locales/en.yml
parentf1d53b81bfcd9803d73b26ee025160b60f1965c6 (diff)
parent11c4155aff42fe3f8bbce858bc87cdb6a91f67a2 (diff)
Merge remote-tracking branch 'origin/js_cookie_warning' into master
Diffstat (limited to 'users/config/locales/en.yml')
-rw-r--r--users/config/locales/en.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 2077858..dded88c 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -22,6 +22,8 @@ en:
use_ascii_key: "Use ASCII-armored PGP key"
can_retype_old_password: "Retype your old password if you would like to keep that"
associated_email: "The associated email address is"
+ cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies."
+ js_required: "We are sorry, but this doesn't work without javascript enabled. This is for security reasons."
activemodel:
models: