Merge remote-tracking branch 'origin/develop' into settings-changed

* origin/develop:
  fix fontello
  Translated using Weblate (Russian)
  Translated using Weblate (Italian)
  lint fix
  fixed copy-pasting leftovers
  improved algorithm, possibly speed too
  fix 8x spaces inside this paren
  feat/reorder-emojis-by-position-of-keyword
  rename to gravestone
  Apply 1 suggestion(s) to 1 file(s)
  change i18n phrasing
  separate reply button to its own component, add changelog entry
  add basic deletes support that works with masto WS

4 files changed, 11 insertions, 3 deletions

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 01f89503..d3d57562 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -665,7 +665,8 @@
     "show_full_subject": "Show full subject",
     "hide_full_subject": "Hide full subject",
     "show_content": "Show content",
-    "hide_content": "Hide content"
+    "hide_content": "Hide content",
+    "status_deleted": "This post was deleted"
   },
   "user_card": {
     "approve": "Approve",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 3832dcaa..2524f278 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -578,7 +578,8 @@
     "show_full_subject": "Näytä koko otsikko",
     "hide_full_subject": "Piilota koko otsikko",
     "show_content": "Näytä sisältö",
-    "hide_content": "Piilota sisältö"
+    "hide_content": "Piilota sisältö",
+    "status_deleted": "Poistettu viesti"
   },
   "user_card": {
     "approve": "Hyväksy",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 4d096004..ce508630 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -702,7 +702,8 @@
     "reply_to": "Rispondi a",
     "delete_confirm": "Vuoi veramente eliminare questo messaggio?",
     "unbookmark": "Rimuovi segnalibro",
-    "bookmark": "Aggiungi segnalibro"
+    "bookmark": "Aggiungi segnalibro",
+    "status_deleted": "Questo messagio è stato cancellato"
   },
   "time": {
     "years_short": "{0}a",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 3444a26d..8f421b50 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -473,5 +473,10 @@
   "tool_tip": {
     "accept_follow_request": "Принять запрос на чтение",
     "reject_follow_request": "Отклонить запрос на чтение"
+  },
+  "image_cropper": {
+    "save_without_cropping": "Сохранить не обрезая",
+    "save": "Сохранить",
+    "crop_picture": "Обрезать картинку"
   }
 }