diff options
| author | shpuld <shp@cock.li> | 2019-01-26 17:50:41 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-01-26 17:50:41 +0200 |
| commit | 0ab828bb30e70e190c1b26eda658ea1d14cc129f (patch) | |
| tree | 5b6816dbc839a0cf821a6b4945fb0a81c109b0f2 /src/i18n | |
| parent | 3978aaef84cc023908155343af76983f2715cf90 (diff) | |
| parent | 8197c77f75929aad557c98a5f698159b1a6d0c90 (diff) | |
Merge develop and fix conflict
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 6008287f..2c6887bc 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -327,6 +327,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": "Запрашиваем…", |