diff options
| author | HJ <spam@hjkos.com> | 2019-01-22 17:46:08 +0000 |
|---|---|---|
| committer | HJ <spam@hjkos.com> | 2019-01-22 17:46:08 +0000 |
| commit | 3a3cf1d48a67c82bb2c94cafb0150b1fa8e4de1a (patch) | |
| tree | 5e39bb41c1e73191b2ff6222eee8720420f13dfd /src/i18n | |
| parent | 7651290e2be72ed35d7582757251eb151fdce953 (diff) | |
| parent | 92dedcd53e56562205e704eea2754f159eb9707d (diff) | |
Merge branch 'favorites' into 'develop'
Add Favorites TL to user profile, add some initial support for MastoAPI
Closes #265 and #262
See merge request pleroma/pleroma-fe!462
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 1 | ||||
| -rw-r--r-- | src/i18n/ru.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index 1dd3462b..3c29a17e 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -324,6 +324,7 @@ "block": "Block", "blocked": "Blocked!", "deny": "Deny", + "favorites": "Favorites", "follow": "Follow", "follow_sent": "Request sent!", "follow_progress": "Requesting…", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 249eab69..0887bb59 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -279,6 +279,7 @@ "user_card": { "block": "Заблокировать", "blocked": "Заблокирован", + "favorites": "Понравившиеся", "follow": "Читать", "follow_sent": "Запрос отправлен!", "follow_progress": "Запрашиваем…", |