Merge branch 'from/develop/tusooa/user-note' into 'develop'

User note See merge request pleroma/pleroma-fe!1612
2022-12-22 13:14:30 +00:00 · 2022-12-22 13:14:30 +00:00 · e009510c52
commit e009510c52
parent 515dcfd339 2e25120192
9 changed files with 182 additions and 3 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -957,7 +957,12 @@
      "solid": "Solid bg",
      "striped": "Striped bg",
      "side": "Side stripe"
-    }
+    },
+    "note": "Note",
+    "note_blank": "(None)",
+    "edit_note": "Edit note",
+    "edit_note_apply": "Apply",
+    "edit_note_cancel": "Cancel"
  },
  "user_profile": {
    "timeline_title": "User timeline",