diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-11-08 02:21:19 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-11-08 02:21:19 +0000 |
| commit | e0a1b14eaba7699f47b4f76fc6482a28b3b63d7d (patch) | |
| tree | 64c6fcd0b29f494f17fff314ea2b771f6868eb10 /src/i18n | |
| parent | 326b2416a0779957e2336a117d26aee9bde89bc4 (diff) | |
| parent | e3381cdef1b410aafce15f2d2f1caeccbfae7c87 (diff) | |
Merge branch 'feature/change-email' into 'develop'
Add ability to change user's email
Closes pleroma#1297
See merge request pleroma/pleroma-fe!983
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 4 | ||||
| -rw-r--r-- | src/i18n/ru.json | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index d11b2d14..7afe7857 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -217,6 +217,9 @@ "cGreen": "Green (Retweet)", "cOrange": "Orange (Favorite)", "cRed": "Red (Cancel)", + "change_email": "Change Email", + "change_email_error": "There was an issue changing your email.", + "changed_email": "Email changed successfully!", "change_password": "Change Password", "change_password_error": "There was an issue changing your password.", "changed_password": "Password changed successfully!", @@ -275,6 +278,7 @@ "use_contain_fit": "Don't crop the attachment in thumbnails", "name": "Name", "name_bio": "Name & Bio", + "new_email": "New Email", "new_password": "New password", "notification_visibility": "Types of notifications to show", "notification_visibility_follows": "Follows", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 16268425..f8bcd996 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -127,6 +127,9 @@ "cGreen": "Повторить", "cOrange": "Нравится", "cRed": "Отменить", + "change_email": "Сменить email", + "change_email_error": "Произошла ошибка при попытке изменить email.", + "changed_email": "Email изменён успешно.", "change_password": "Сменить пароль", "change_password_error": "Произошла ошибка при попытке изменить пароль.", "changed_password": "Пароль изменён успешно.", @@ -169,6 +172,7 @@ "loop_video_silent_only": "Зацикливать только беззвучные видео (т.е. \"гифки\" с Mastodon)", "name": "Имя", "name_bio": "Имя и описание", + "new_email": "Новый email", "new_password": "Новый пароль", "notification_visibility": "Показывать уведомления", "notification_visibility_follows": "Подписки", |