Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2015-12-04 06:55:41 +01:00
commit 22711ff7f0

View file

@ -1384,7 +1384,7 @@ en:
mr_wiggles: "Mr Wiggles will be sad to see you go"
what_we_delete: "We will delete all of your posts and profile data as soon as possible. Your comments on other peoples posts will still appear, but they will be associated with your diaspora* ID rather than your name."
locked_out: "You will get signed out and locked out of your account until it has been deleted."
lock_username: "Your username will be locked. You will not be able create a new account on this pod with the same ID."
lock_username: "Your username will be locked. You will not be able to create a new account on this pod with the same ID."
no_turning_back: "There is no turning back! If youre really sure, enter your password below."
if_you_want_this: "If you really want this to happen, type in your password below and click “Close account”"