diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-11-19 12:38:35 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-11-19 12:38:35 +0200 |
| commit | b1ab09b348014a8e70097158bda4d2e1226e4cb6 (patch) | |
| tree | 65740e91d81cbaaca444440a95713fdb2a46b849 /src/i18n | |
| parent | 419df9d44673bf1abe3cda7ba6cafee9dd6eaba4 (diff) | |
| parent | d770bab1b0e5d543547c59d86aef533f77ceafe2 (diff) | |
fix merge conflict
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index d3d57562..3f6ae372 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -130,6 +130,7 @@ }, "notifications": { "broken_favorite": "Unknown status, searching for it…", + "error": "Error fetching notifications: {0}", "favorited_you": "favorited your status", "followed_you": "followed you", "follow_request": "wants to follow you", @@ -634,7 +635,7 @@ "timeline": { "collapse": "Collapse", "conversation": "Conversation", - "error_fetching": "Error fetching updates", + "error": "Error fetching timeline: {0}", "load_older": "Load older statuses", "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated", "repeated": "repeated", |