aboutsummaryrefslogtreecommitdiff
path: root/src/i18n
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-11-18 11:49:54 +0000
committerShpuld Shpludson <shp@cock.li>2020-11-18 11:49:54 +0000
commitd770bab1b0e5d543547c59d86aef533f77ceafe2 (patch)
treeb8e34c857f3acf526f2f5422a995803ef85cd51a /src/i18n
parentcd784396e72dafc8442ac48635ea23f8365d83bd (diff)
parentfb5d3d32927cd9ad625203c84e8826a3544fda3e (diff)
Merge branch 'fix/timeline-error-handling-fixes' into 'develop'
Various timeline fixes See merge request pleroma/pleroma-fe!1283
Diffstat (limited to 'src/i18n')
-rw-r--r--src/i18n/en.json3
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",