Merge upstream

This commit is contained in:
Foxhkron 2018-08-19 01:23:03 +02:00
parent 5c3f6aebb9
commit 56ddeec8f3
No known key found for this signature in database
GPG key ID: 42C66A2EF2AA6608
3 changed files with 32 additions and 11 deletions

View file

@ -333,7 +333,10 @@ const en = {
changed_password: 'Password changed successfully!',
change_password_error: 'There was an issue changing your password.',
lock_account_description: 'Restrict your account to approved followers only',
default_vis: 'Default visibility scope'
default_vis: 'Default visibility scope',
profile_tab: 'Profile',
security_tab: 'Security',
data_import_export_tab: 'Data Import / Export'
},
notifications: {
notifications: 'Notifications',