consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges with master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-10-20 16:28:22 +02:00
parent 58728102a6 0ff9429b52
commit 3ab579999e
26 changed files with 176 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@@ -283,6 +283,7 @@ en:
change_credentials_link: "Change my credentials"
email_on_comment_label: "Receive email when someone comments on my debates or proposals"
email_on_comment_reply_label: "Receive email when someone replies to my comments"
erase_account_link: "Erase my account"
personal: "Personal data"
username_label: "Username"
phone_number_label: "Phone number"