aboutsummaryrefslogtreecommitdiff
path: root/src/i18n
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2020-03-04 15:42:37 +0000
committerShpuld Shpludson <shp@cock.li>2020-03-04 15:42:37 +0000
commit83d8343777050f6ee5fad09832b3878885eda4dd (patch)
treea19ad2a67136fc21d7794848e811f092eb0e0706 /src/i18n
parent1b9805b550444403792db2304b5a6d5681e8f30d (diff)
parent147364b80cae7a0fac1ccf00b5669a20de1b7e67 (diff)
Merge branch 'develop' into 'master'
Update master with 2.0.0 See merge request pleroma/pleroma-fe!1080
Diffstat (limited to 'src/i18n')
-rw-r--r--src/i18n/en.json3
-rw-r--r--src/i18n/fi.json3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 82acc1ab..54d0608e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -615,7 +615,8 @@
"reply_to": "Reply to",
"replies_list": "Replies:",
"mute_conversation": "Mute conversation",
- "unmute_conversation": "Unmute conversation"
+ "unmute_conversation": "Unmute conversation",
+ "status_unavailable": "Status unavailable"
},
"user_card": {
"approve": "Approve",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index ac8b2ac9..926e6087 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -289,7 +289,8 @@
"reply_to": "Vastaus",
"replies_list": "Vastaukset:",
"mute_conversation": "Hiljennä keskustelu",
- "unmute_conversation": "Poista hiljennys"
+ "unmute_conversation": "Poista hiljennys",
+ "status_unavailable": "Viesti ei saatavissa"
},
"user_card": {
"approve": "Hyväksy",