Merge remote-tracking branch 'upstream/develop' into neckbeard

2020-10-16 17:19:43 -05:00 · 2020-10-16 17:19:43 -05:00 · b168663732
parent 97a4c6807c 4df033a3ba
commit b168663732
2 changed files with 7 additions and 1 deletions
--- 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",
--- 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": "Обрезать картинку"
  }
 }