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

2023-02-14 23:54:04 +00:00 · 2023-02-14 23:54:04 +00:00 · d8fa8c4ee4
commit d8fa8c4ee4
parent fb317f2907 6a9d169e24
58 changed files with 1319 additions and 440 deletions
--- a/.gitea/issue_template/bug.yml
+++ b/.gitea/issue_template/bug.yml
@ -0,0 +1,49 @@
+name: "Bug report"
+about: "Something isn't working as expected"
+title: "[bug] "
+body:
+  - type: markdown
+    attributes:
+      value: "Thanks for taking the time to file this bug report! Please try to be as specific and detailed as you can, so we can track down the issue and fix it as soon as possible."
+  - type: input
+    id: version
+    attributes:
+      label: "Version"
+      description: "Which version of pleroma-fe are you running? If running develop, specify the commit hash."
+      placeholder: "e.g. 2022.11, 40e86998e6"
+  - type: textarea
+    id: attempt
+    attributes:
+      label: "What were you trying to do?"
+      validations:
+        required: true
+  - type: textarea
+    id: expectation
+    attributes:
+      label: "What did you expect to happen?"
+      validations:
+        required: true
+  - type: textarea
+    id: reality
+    attributes:
+      label: "What actually happened?"
+      validations:
+        required: true
+  - type: dropdown
+    id: severity
+    attributes:
+      label: "Severity"
+      description: "Does this issue prevent you from using the software as normal?"
+      options:
+        - "I cannot use the software"
+        - "I cannot use it as easily as I'd like"
+        - "I can manage"
+      validations:
+        required: true
+  - type: checkboxes
+    id: searched
+    attributes:
+      label: "Have you searched for this issue?"
+      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev) or [the issue tracker](https://akkoma.dev/AkkomaGang/pleroma-fe/issues)."
+      options:
+        - label: "I have double-checked and have not found this issue mentioned anywhere."
--- a/.gitea/issue_template/feat.yml
+++ b/.gitea/issue_template/feat.yml
@ -0,0 +1,29 @@
+name: "Feature request"
+about: "I'd like something to be added to pleroma-fe"
+title: "[feat] "
+body:
+  - type: markdown
+    attributes:
+      value: "Thanks for taking the time to request a new feature! Please be as concise and clear as you can in your proposal, so we could understand what you're going for."
+  - type: textarea
+    id: idea
+    attributes:
+      label: "The idea"
+      description: "What do you think you should be able to do in pleroma-fe?"
+      validations:
+        required: true
+  - type: textarea
+    id: reason
+    attributes:
+      label: "The reasoning"
+      description: "Why would this be a worthwhile feature? Does it solve any problems? Have people talked about wanting it?"
+      validations:
+        required: true
+  - type: checkboxes
+    id: searched
+    attributes:
+      label: "Have you searched for this feature request?"
+      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev), [the issue tracker](https://akkoma.dev/AkkomaGang/pleroma-fe/issues), or the one for [the backend](https://akkoma.dev/AkkomaGang/akkoma/issues)."
+      options:
+        - label: "I have double-checked and have not found this feature request mentioned anywhere."
+        - label: "This feature is related to the pleroma-fe Akkoma frontend specifically, and not the backend."
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@ -1,25 +0,0 @@
---
-
-name: "Issue"
-about: "Something isn't working as expected"
-
---
-
-## Your setup
-
-Frontend version:
- [] stable 
- [] develop
- [] custom (please elaborate)
-
-## What were you trying to do?
-
-## What did you expect to happen?
-
-## What actually happened?
-
-## Relative severity (does this prevent you from using the software as normal?)
-
-[] I cannot use the software
-[] I cannot use it as easily as I'd like
-[] I can manage
--- a/README.md
+++ b/README.md
@ -1,22 +1,22 @@
-# Pleroma-FE 
+# Akkoma-FE 

 ![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)

-This is a fork of Pleroma-FE from the Pleroma project, with support for new Akkoma features such as:
+This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkoma features such as:
 - MFM support via [marked-mfm](https://akkoma.dev/sfr/marked-mfm)
 - Custom emoji reactions

 # For Translators

-The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Pleroma-FE. 
+The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE. 

 Alternatively, edit/create `src/i18n/$LANGUAGE_CODE.json` (where `$LANGUAGE_CODE` is the [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language), then add your language to [src/i18n/messages.js](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/i18n/messages.js) if it doesn't already exist there.

-Pleroma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js.
+Akkoma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js.

 # FOR ADMINS

-To use Pleroma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Pleroma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc.
+To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Akkoma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc.

 ## Build Setup

@ -52,4 +52,4 @@ Edit config.json for configuration.

 ### Login methods

-```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. 
--- a/index.html
+++ b/index.html
@ -31,6 +31,11 @@
      rel="stylesheet"
      href="/static/custom.css"
    />
+    <link
+      rel="stylesheet"
+      href="/static/theme-holder.css"
+      id="theme-holder"
+    />
    <!--server-generated-meta-->
    <link
      rel="icon"
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "pleroma_fe",
-  "version": "3.2.0",
+  "version": "3.5.0",
  "description": "A frontend for Akkoma instances",
  "author": "Roger Braun <roger@rogerbraun.net>",
  "private": true,
@ -18,19 +18,21 @@
  "dependencies": {
    "@babel/runtime": "7.17.8",
    "@chenfengyuan/vue-qrcode": "2.0.0",
+    "@floatingghost/pinch-zoom-element": "^1.3.1",
    "@fortawesome/fontawesome-svg-core": "1.3.0",
    "@fortawesome/free-regular-svg-icons": "^6.1.2",
    "@fortawesome/free-solid-svg-icons": "^6.2.0",
    "@fortawesome/vue-fontawesome": "3.0.1",
-    "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
    "@vuelidate/core": "^2.0.0",
    "@vuelidate/validators": "^2.0.0",
+    "blurhash": "^2.0.4",
    "body-scroll-lock": "2.7.1",
    "chromatism": "3.0.0",
    "click-outside-vue3": "4.0.1",
    "cropperjs": "1.5.12",
    "diff": "3.5.0",
    "escape-html": "1.0.3",
+    "iso-639-1": "^2.1.15",
    "js-cookie": "^3.0.1",
    "localforage": "1.10.0",
    "parse-link-header": "^2.0.0",
@ -84,7 +86,6 @@
    "html-webpack-plugin": "^5.5.0",
    "http-proxy-middleware": "0.21.0",
    "inject-loader": "2.0.1",
-    "iso-639-1": "2.1.15",
    "isparta-loader": "2.0.0",
    "json-loader": "0.5.7",
    "karma": "6.3.17",
--- a/src/App.scss
+++ b/src/App.scss
@ -1,6 +1,7 @@
 // stylelint-disable rscss/class-format
@import './_variables.scss';
-
+@import '@fortawesome/fontawesome-svg-core/styles.css';
+@import '@floatingghost/pinch-zoom-element/dist/pinch-zoom.css';
 :root {
  --navbar-height: 3.5rem;
  --post-line-height: 1.4;
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -7,6 +7,8 @@ import {
  FontAwesomeIcon,
  FontAwesomeLayers
 } from '@fortawesome/vue-fontawesome'
+import { config } from '@fortawesome/fontawesome-svg-core'
+config.autoAddCss = false

 import App from '../App.vue'
 import routes from './routes'
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@ -18,6 +18,7 @@ import {
  faPencilAlt,
  faAlignRight
 } from '@fortawesome/free-solid-svg-icons'
+import Blurhash from '../blurhash/Blurhash.vue'

 library.add(
  faFile,
@ -65,7 +66,8 @@ const Attachment = {
  components: {
    Flash,
    StillImage,
-    VideoAttachment
+    VideoAttachment,
+    Blurhash
  },
  computed: {
    classNames() {
@ -86,6 +88,9 @@ const Attachment = {
    useContainFit() {
      return this.$store.getters.mergedConfig.useContainFit
    },
+    useBlurhash() {
+      return this.$store.getters.mergedConfig.useBlurhash
+    },
    placeholderName() {
      if (this.attachment.description === '' || !this.attachment.description) {
        return this.type.toUpperCase()
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@ -69,7 +69,15 @@
        :title="attachment.description"
        @click.prevent.stop="toggleHidden"
      >
+        <Blurhash
+          v-if="useBlurhash && attachment.blurhash"
+          :height="512"
+          :width="1024"
+          :hash="attachment.blurhash"
+          :punch="1"
+        />
        <img
+          v-else
          :key="nsfwImage"
          class="nsfw"
          :src="nsfwImage"
--- a/src/components/blurhash/Blurhash.vue
+++ b/src/components/blurhash/Blurhash.vue
@ -0,0 +1,66 @@
+<template>
+  <canvas
+    ref="canvas"
+    class="blurhash"
+  />
+</template>
+
+<script>
+import { decode } from "blurhash";
+
+export default {
+  name: 'Blurhash',
+  props: {
+    hash: {
+      type: String,
+      required: true,
+    },
+    width: {
+      type: Number,
+      required: true,
+    },
+    height: {
+      type: Number,
+      required: true,
+    },
+    punch: {
+      type: Number,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      canvas: null,
+      ctx: null,
+    };
+  },
+  mounted() {
+    this.canvas = this.$refs.canvas;
+    this.ctx = this.canvas.getContext('2d');
+    this.canvas.width = 1024;
+    this.canvas.height = 512;
+    this.draw();
+  },
+  methods: {
+    draw() {
+      const pixels = decode(this.hash, this.width, this.height, this.punch);
+      const imageData = this.ctx.createImageData(this.width, this.height);
+      imageData.data.set(pixels);
+      this.ctx.putImageData(imageData, 0, 0);
+      fetch("/static/blurhash-overlay.png")
+        .then((response) => response.blob())
+        .then((blob) => {
+          const img = new Image();
+          img.src = URL.createObjectURL(blob);
+          img.onload = () => {
+            this.ctx.drawImage(img, 0, 0, this.width, this.height);
+          };
+        });
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/components/emoji_grid/emoji_grid.js
+++ b/src/components/emoji_grid/emoji_grid.js
@ -0,0 +1,133 @@
+const EMOJI_SIZE = 32 + 8
+const GROUP_TITLE_HEIGHT = 24
+const BUFFER_SIZE = 3 * EMOJI_SIZE
+
+const EmojiGrid = {
+  props: {
+    groups: {
+      required: true,
+      type: Array
+    }
+  },
+  data () {
+    return {
+      containerWidth: 0,
+      containerHeight: 0,
+      scrollPos: 0,
+      resizeObserver: null
+    }
+  },
+  mounted () {
+    const rect = this.$refs.container.getBoundingClientRect()
+    this.containerWidth = rect.width
+    this.containerHeight = rect.height
+    this.resizeObserver = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        this.containerWidth = entry.contentRect.width
+        this.containerHeight = entry.contentRect.height
+      }
+    })
+    this.resizeObserver.observe(this.$refs.container)
+  },
+  beforeUnmount () {
+    this.resizeObserver.disconnect()
+    this.resizeObserver = null
+  },
+  watch: {
+    groups () {
+      // Scroll to top when grid content changes
+      if (this.$refs.container) {
+        this.$refs.container.scrollTo(0, 0)
+      }
+    },
+    activeGroup (group) {
+      this.$emit('activeGroup', group)
+    }
+  },
+  methods: {
+    onScroll () {
+      this.scrollPos = this.$refs.container.scrollTop
+    },
+    onEmoji (emoji) {
+      this.$emit('emoji', emoji)
+    },
+    scrollToItem (itemId) {
+      const container = this.$refs.container
+      if (!container) return
+
+      for (const item of this.itemList) {
+        if (item.id === itemId) {
+          container.scrollTo(0, item.position.y)
+          return
+        }
+      }
+    }
+  },
+  computed: {
+    // Total height of scroller content
+    gridHeight () {
+      if (this.itemList.length === 0) return 0
+      const lastItem = this.itemList[this.itemList.length - 1]
+      return (
+        lastItem.position.y +
+        ('title' in lastItem ? GROUP_TITLE_HEIGHT : EMOJI_SIZE)
+      )
+    },
+    activeGroup () {
+      const items = this.itemList
+      for (let i = items.length - 1; i >= 0; i--) {
+        const item = items[i]
+        if ('title' in item && item.position.y <= this.scrollPos) {
+          return item.id
+        }
+      }
+      return null
+    },
+    itemList () {
+      const items = []
+      let x = 0
+      let y = 0
+      for (const group of this.groups) {
+        items.push({ position: { x, y }, id: group.id, title: group.text })
+        if (group.text.length) {
+          y += GROUP_TITLE_HEIGHT
+        }
+        for (const emoji of group.emojis) {
+          items.push({
+            position: { x, y },
+            id: `${group.id}-${emoji.displayText}`,
+            emoji
+          })
+          x += EMOJI_SIZE
+          if (x + EMOJI_SIZE > this.containerWidth) {
+            y += EMOJI_SIZE
+            x = 0
+          }
+        }
+        if (x > 0) {
+          y += EMOJI_SIZE
+          x = 0
+        }
+      }
+      return items
+    },
+    visibleItems () {
+      const startPos = this.scrollPos - BUFFER_SIZE
+      const endPos = this.scrollPos + this.containerHeight + BUFFER_SIZE
+      return this.itemList.filter((i) => {
+        return i.position.y >= startPos && i.position.y < endPos
+      })
+    },
+    scrolledClass () {
+      if (this.scrollPos <= 5) {
+        return 'scrolled-top'
+      } else if (this.scrollPos >= this.gridHeight - this.containerHeight - 5) {
+        return 'scrolled-bottom'
+      } else {
+        return 'scrolled-middle'
+      }
+    }
+  }
+}
+
+export default EmojiGrid
--- a/src/components/emoji_grid/emoji_grid.scss
+++ b/src/components/emoji_grid/emoji_grid.scss
@ -0,0 +1,60 @@
+.emoji {
+  &-grid {
+    flex: 1 1 1px;
+    position: relative;
+    overflow: auto;
+    user-select: none;
+    mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+          linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+          linear-gradient(to top, white, white);
+    transition: mask-size 150ms;
+    mask-size: 100% 20px, 100% 20px, auto;
+    // Autoprefixed seem to ignore this one, and also syntax is different
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;
+    &.scrolled {
+      &-top {
+        mask-size: 100% 20px, 100% 0, auto;
+      }
+      &-bottom {
+        mask-size: 100% 0, 100% 20px, auto;
+      }
+    }
+    margin-left: 5px;
+    min-height: 200px;
+  }
+
+  &-group-title {
+    position: absolute;
+    font-size: 0.85em;
+    width: 100%;
+    margin: 0;
+    height: 24px;
+    display: flex;
+    align-items: end;
+
+    &.disabled {
+        display: none;
+    }
+  }
+
+  &-item {
+    position: absolute;
+    width: 32px;
+    height: 32px;
+    box-sizing: border-box;
+    display: flex;
+    font-size: 32px;
+    align-items: center;
+    justify-content: center;
+    margin: 4px;
+
+    cursor: pointer;
+
+    img {
+      object-fit: contain;
+      max-width: 100%;
+      max-height: 100%;
+    }
+  }
+}
--- a/src/components/emoji_grid/emoji_grid.vue
+++ b/src/components/emoji_grid/emoji_grid.vue
@ -0,0 +1,48 @@
+<template>
+  <div
+    ref="container"
+    class="emoji-grid"
+    :class="scrolledClass"
+    @scroll.passive="onScroll"
+  >
+    <div
+      :style="{
+        height: `${gridHeight}px`,
+      }"
+    >
+      <template v-for="item in visibleItems">
+        <h6
+          v-if="'title' in item && item.title.length"
+          :key="'title-' + item.id"
+          class="emoji-group-title"
+          :style="{
+            top: item.position.y + 'px',
+            left: item.position.x + 'px'
+          }"
+        >
+          {{ item.title }}
+        </h6>
+        <span
+          v-else-if="'emoji' in item"
+          :key="'emoji-' + item.id"
+          class="emoji-item"
+          :title="item.emoji.displayText"
+          :style="{
+            top: item.position.y + 'px',
+            left: item.position.x + 'px'
+          }"
+          @click.stop.prevent="onEmoji(item.emoji)"
+        >
+          <span v-if="!item.emoji.imageUrl">{{ item.emoji.replacement }}</span>
+          <img
+            v-else
+            :src="item.emoji.imageUrl"
+          >
+        </span>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script src="./emoji_grid.js"></script>
+<style lang="scss" src="./emoji_grid.scss"></style>
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@ -207,7 +207,6 @@ const EmojiInput = {
    },
    triggerShowPicker() {
      this.showPicker = true
-      this.$refs.picker.startEmojiLoad()
      this.$nextTick(() => {
        this.scrollIntoView()
        this.focusPickerInput()
@ -225,7 +224,6 @@ const EmojiInput = {
      this.showPicker = !this.showPicker
      if (this.showPicker) {
        this.scrollIntoView()
-        this.$refs.picker.startEmojiLoad()
        this.$nextTick(this.focusPickerInput)
      }
    },
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -18,6 +18,7 @@
      <EmojiPicker
        v-if="enableEmojiPicker"
        ref="picker"
+        show-keep-open
        :class="{ hide: !showPicker }"
        :enable-sticker-picker="enableStickerPicker"
        class="emoji-picker-panel"
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@ -1,5 +1,6 @@
 import { defineAsyncComponent } from 'vue'
 import Checkbox from '../checkbox/checkbox.vue'
+import EmojiGrid from '../emoji_grid/emoji_grid.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faBoxOpen,
@ -10,19 +11,17 @@ import { trim, escapeRegExp, startCase } from 'lodash'

 library.add(faBoxOpen, faStickyNote, faSmileBeam)

-// At widest, approximately 20 emoji are visible in a row,
-// loading 3 rows, could be overkill for narrow picker
-const LOAD_EMOJI_BY = 60
-
-// When to start loading new batch emoji, in pixels
-const LOAD_EMOJI_MARGIN = 64
-
 const EmojiPicker = {
  props: {
    enableStickerPicker: {
      required: false,
      type: Boolean,
      default: false
+    },
+    showKeepOpen: {
+      required: false,
+      type: Boolean,
+      default: false
    }
  },
  data() {
@ -30,18 +29,13 @@ const EmojiPicker = {
      keyword: '',
      activeGroup: 'standard',
      showingStickers: false,
-      groupsScrolledClass: 'scrolled-top',
-      keepOpen: false,
-      customEmojiBufferSlice: LOAD_EMOJI_BY,
-      customEmojiTimeout: null,
-      customEmojiLoadAllConfirmed: false
+      keepOpen: false
    }
  },
  components: {
-    StickerPicker: defineAsyncComponent(() =>
-      import('../sticker_picker/sticker_picker.vue')
-    ),
-    Checkbox
+    StickerPicker: defineAsyncComponent(() => import('../sticker_picker/sticker_picker.vue')),
+    Checkbox,
+    EmojiGrid
  },
  methods: {
    onStickerUploaded(e) {
@ -56,6 +50,7 @@ const EmojiPicker = {
        : emoji.replacement
      this.$emit('emoji', { insertion: value, keepOpen: this.keepOpen })
    },
+<<<<<<< HEAD
    onScroll(e) {
      const target = (e && e.target) || this.$refs['emoji-groups']
      this.updateScrolledClass(target)
@ -63,12 +58,16 @@ const EmojiPicker = {
      this.triggerLoadMore(target)
    },
    onWheel(e) {
+=======
+    onWheel (e) {
+>>>>>>> upstream/develop
      e.preventDefault()
      this.$refs['emoji-tabs'].scrollBy(e.deltaY, 0)
    },
    highlight(key) {
      this.setShowStickers(false)
      this.activeGroup = key
+<<<<<<< HEAD
    },
    updateScrolledClass(target) {
      if (target.scrollTop <= 5) {
@ -133,6 +132,14 @@ const EmojiPicker = {
        return
      }
      this.customEmojiBufferSlice = LOAD_EMOJI_BY
+=======
+      if (this.keyword.length) {
+        this.$refs.emojiGrid.scrollToItem(key)
+      }
+    },
+    onActiveGroup (group) {
+      this.activeGroup = group
+>>>>>>> upstream/develop
    },
    toggleStickers() {
      this.showingStickers = !this.showingStickers
@ -151,6 +158,7 @@ const EmojiPicker = {
      })
    }
  },
+<<<<<<< HEAD
  watch: {
    keyword() {
      this.customEmojiLoadAllConfirmed = false
@ -158,6 +166,8 @@ const EmojiPicker = {
      this.startEmojiLoad(true)
    }
  },
+=======
+>>>>>>> upstream/develop
  computed: {
    activeGroupView() {
      return this.showingStickers ? '' : this.activeGroup
@ -171,10 +181,14 @@ const EmojiPicker = {
    filteredEmoji() {
      return this.filterByKeyword(this.$store.state.instance.customEmoji || [])
    },
+<<<<<<< HEAD
    customEmojiBuffer() {
      return this.filteredEmoji.slice(0, this.customEmojiBufferSlice)
    },
    emojis() {
+=======
+    emojis () {
+>>>>>>> upstream/develop
      const standardEmojis = this.$store.state.instance.emoji || []
      const customEmojis = this.sortedEmoji
      const emojiPacks = []
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@ -1,5 +1,23 @@
@import '../../_variables.scss';

+// The worst query selector ever
+// selects ONLY emojis pickers in replies in notifications
+// who thought this was a good idea?
+.notification
+  > .Status
+  > .status-container
+  > .post-status-form
+  > form
+  > .form-group
+  > .emoji-input
+  > .emoji-picker {
+  max-width: 100%;
+  left: 0;
+  @media (min-width: 1300px) {
+    left: -30px;
+  }
+}
+
 .Notification {
  .emoji-picker {
    min-width: 160%;
@ -7,7 +25,7 @@
    overflow: hidden;
    left: -70%;
    max-width: 100%;
-    @media (min-width: 800px) and (max-width: 1300px) {
+    @media (min-width: 800px) and (max-width: 1280px) {
      left: -50%;
      min-width: 50%;
      max-width: 130%;
@ -18,6 +36,10 @@
      min-width: 50%;
      max-width: 130%;
    }
+
+    .Status > .emoji-picker {
+      z-index: 1000;
+    }
  }
 }
 .emoji-picker {
@ -70,10 +92,6 @@
    flex-grow: 1;
  }

-  .emoji-groups {
-    min-height: 200px;
-  }
-
  .additional-tabs {
    border-left: 1px solid;
    border-left-color: $fallback--icon;
@ -152,14 +170,12 @@
    }
  }

-  .emoji {
-    &-search {
-      padding: 5px;
-      flex: 0 0 auto;
+  .emoji-search {
+    padding: 5px;
+    flex: 0 0 auto;

-      input {
-        width: 100%;
-      }
+    input {
+      width: 100%;
    }

    &-groups {
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@ -53,11 +53,15 @@
            @input="$event.target.composing = false"
          />
        </div>
+        <EmojiGrid
+          ref="emojiGrid"
+          :groups="emojisView"
+          @emoji="onEmoji"
+          @active-group="onActiveGroup"
+        />
        <div
-          ref="emoji-groups"
-          class="emoji-groups"
-          :class="groupsScrolledClass"
-          @scroll="onScroll"
+          v-if="showKeepOpen"
+          class="keep-open"
        >
          <div
            v-for="group in emojisView"
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@ -72,6 +72,11 @@
  justify-content: center;
  box-sizing: border-box;
  .reaction-emoji {
+<<<<<<< HEAD
+=======
+    width: 2.55em !important;
+    height: 2.55em !important;
+>>>>>>> upstream/develop
    margin-right: 0.25em;
  }
  img.reaction-emoji {
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@ -178,6 +178,7 @@ const ExtraButtons = {
            statusPoll: this.status.poll,
            statusFiles: [...this.status.attachments],
            statusScope: this.status.visibility,
+            statusLanguage: this.status.language,
            statusContentType: data.content_type
          })
        )
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@ -45,6 +45,7 @@ const FollowRequestCard = {
    doApprove() {
      this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
      this.$store.dispatch('removeFollowRequest', this.user)
+      this.$store.dispatch('decrementFollowRequestsCount')

      const notifId = this.findFollowRequestNotificationId()
      this.$store.dispatch('markSingleNotificationAsSeen', { id: notifId })
@ -69,6 +70,7 @@ const FollowRequestCard = {
        .denyUser({ id: this.user.id })
        .then(() => {
          this.$store.dispatch('dismissNotificationLocal', { id: notifId })
+          this.$store.dispatch('decrementFollowRequestsCount')
          this.$store.dispatch('removeFollowRequest', this.user)
        })
      this.hideDenyConfirmDialog()
@ -83,6 +85,11 @@ const FollowRequestCard = {
    },
    shouldConfirmDeny() {
      return this.mergedConfig.modalOnDenyFollow
+    },
+    show () {
+      const notifId = this.$store.state.api.followRequests.find(req => req.id === this.user.id)
+
+      return notifId !== undefined
    }
  }
 }
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@ -1,5 +1,5 @@
 <template>
-  <basic-user-card :user="user">
+  <basic-user-card :user="user" v-if="show">
    <div class="follow-request-card-content-container">
      <button
        class="btn button-default"
--- a/src/components/follow_requests/follow_requests.js
+++ b/src/components/follow_requests/follow_requests.js
@ -1,10 +1,28 @@
 import FollowRequestCard from '../follow_request_card/follow_request_card.vue'
+import withLoadMore from '../../hocs/with_load_more/with_load_more'
+import List from '../list/list.vue'
+import get from 'lodash/get'
+
+const FollowRequestList = withLoadMore({
+  fetch: (props, $store) => $store.dispatch('fetchFollowRequests'),
+  select: (props, $store) =>
+    get($store.state.api, 'followRequests', []).map((req) =>
+      $store.getters.findUser(req.id)
+    ),
+  destroy: (props, $store) => $store.dispatch('clearFollowRequests'),
+  childPropName: 'items',
+  additionalPropNames: ['userId']
+})(List)

 const FollowRequests = {
  components: {
-    FollowRequestCard
+    FollowRequestCard,
+    FollowRequestList
  },
  computed: {
+    userId() {
+      return this.$store.state.users.currentUser.id
+    },
    requests() {
      return this.$store.state.api.followRequests
    }
--- a/src/components/follow_requests/follow_requests.vue
+++ b/src/components/follow_requests/follow_requests.vue
@ -6,12 +6,11 @@
      </div>
    </div>
    <div class="panel-body">
-      <FollowRequestCard
-        v-for="request in requests"
-        :key="request.id"
-        :user="request"
-        class="list-item"
-      />
+      <FollowRequestList :user-id="userId">
+        <template #item="{item}">
+          <FollowRequestCard :user="item" />
+        </template>
+      </FollowRequestList>
    </div>
  </div>
 </template>
--- a/src/components/followed_tag_card/FollowedTagCard.vue
+++ b/src/components/followed_tag_card/FollowedTagCard.vue
@ -0,0 +1,77 @@
+<template>
+  <div class="followed-tag-card">
+    <span>
+      <router-link :to="{ name: 'tag-timeline', params: {tag: tag.name}}">
+        <span class="tag-link">#{{ tag.name }}</span>
+      </router-link>
+      <span class="unfollow-tag">
+        <button
+          v-if="isFollowing"
+          class="button-default unfollow-tag-button"
+          :title="$t('user_card.unfollow_tag')"
+          @click="unfollowTag(tag.name)"
+        >
+          {{ $t('user_card.unfollow_tag') }}
+        </button>
+        <button
+          v-else
+          class="button-default follow-tag-button"
+          :title="$t('user_card.follow_tag')"
+          @click="followTag(tag.name)"
+        >
+          {{ $t('user_card.follow_tag') }}
+        </button>
+      </span>
+    </span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FollowedTagCard',
+  props: {
+    tag: {
+      type: Object,
+      required: true
+    },
+  },
+  // this is a hack to update the state of the button
+  // for some reason, List does not update on changes to the tag object
+  data: () => ({
+    isFollowing: true
+  }),
+  mounted () {
+    this.isFollowing = this.tag.following
+  },
+  methods: {
+    unfollowTag (tag) {
+      this.$store.dispatch('unfollowTag', tag)
+      this.isFollowing = false
+    },
+    followTag (tag) {
+      this.$store.dispatch('followTag', tag)
+      this.isFollowing = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .followed-tag-card {
+    margin-left: 1rem;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+  }
+  .unfollow-tag {
+    position: absolute;
+    right: 1rem;
+  }
+
+  .tag-link {
+    font-size: large;
+  }
+
+  .unfollow-tag-button, .follow-tag-button {
+    font-size: medium;
+  }
+</style>
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@ -33,11 +33,6 @@ library.add(
 )

 const NavPanel = {
-  created() {
-    if (this.currentUser && this.currentUser.locked) {
-      this.$store.dispatch('startFetchingFollowRequests')
-    }
-  },
  components: {
    TimelineMenuContent
  },
@ -54,11 +49,13 @@ const NavPanel = {
  computed: {
    ...mapState({
      currentUser: (state) => state.users.currentUser,
-      followRequestCount: (state) => state.api.followRequests.length,
      privateMode: (state) => state.instance.private,
      federating: (state) => state.instance.federating
    }),
-    ...mapGetters(['unreadAnnouncementCount'])
+    ...mapGetters(['unreadAnnouncementCount']),
+    followRequestCount() {
+      return this.$store.state.users.currentUser.follow_requests_count
+    }
  }
 }

--- a/src/components/pinch_zoom/pinch_zoom.js
+++ b/src/components/pinch_zoom/pinch_zoom.js
@ -1,4 +1,4 @@
-import PinchZoom from '@kazvmoe-infra/pinch-zoom-element'
+import PinchZoom from '@floatingghost/pinch-zoom-element'

 export default {
  methods: {
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -13,6 +13,7 @@ import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
 import Select from '../select/select.vue'
+import iso6391 from 'iso-639-1'

 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@ -56,6 +57,7 @@ const PostStatusForm = {
    'statusMediaDescriptions',
    'statusScope',
    'statusContentType',
+    'statusLanguage',
    'replyTo',
    'quoteId',
    'repliedUser',
@ -122,7 +124,8 @@ const PostStatusForm = {
    const {
      postContentType: contentType,
      sensitiveByDefault,
-      sensitiveIfSubject
+      sensitiveIfSubject,
+      interfaceLanguage
    } = this.$store.getters.mergedConfig

    let statusParams = {
@ -134,6 +137,7 @@ const PostStatusForm = {
      poll: {},
      mediaDescriptions: {},
      visibility: this.suggestedVisibility(),
+      language: interfaceLanguage,
      contentType
    }

@ -151,6 +155,7 @@ const PostStatusForm = {
        poll: this.statusPoll || {},
        mediaDescriptions: this.statusMediaDescriptions || {},
        visibility: this.statusScope || this.suggestedVisibility(),
+        language: this.statusLanguage || interfaceLanguage,
        contentType: statusContentType
      }
    }
@ -269,7 +274,10 @@ const PostStatusForm = {
    ...mapGetters(['mergedConfig']),
    ...mapState({
      mobileLayout: (state) => state.interface.mobileLayout
-    })
+    }),
+    isoLanguages() {
+      return iso6391.getAllCodes()
+    }
  },
  watch: {
    newStatus: {
@ -292,6 +300,7 @@ const PostStatusForm = {
        files: [],
        visibility: newStatus.visibility,
        contentType: newStatus.contentType,
+        language: newStatus.language,
        poll: {},
        mediaDescriptions: {}
      }
@ -362,6 +371,7 @@ const PostStatusForm = {
        inReplyToStatusId: this.replyTo,
        quoteId: this.quoteId,
        contentType: newStatus.contentType,
+        language: newStatus.language,
        poll,
        idempotencyKey: this.idempotencyKey
      }
@ -399,6 +409,7 @@ const PostStatusForm = {
          inReplyToStatusId: this.replyTo,
          quoteId: this.quoteId,
          contentType: newStatus.contentType,
+          language: newStatus.language,
          poll: {},
          preview: true
        })
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -212,6 +212,23 @@
            :on-scope-change="changeVis"
          />

+          <div
+            class="language-selector"
+            >
+            <Select
+              id="post-language"
+              v-model="newStatus.language"
+              class="form-control"
+            >
+              <option
+                v-for="language in isoLanguages"
+                :key="language"
+                :value="language"
+              >
+                {{ language }}
+              </option>
+            </Select>
+          </div>
          <div
            v-if="postFormats.length > 1"
            class="text-format"
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -403,6 +403,15 @@
              {{ $t('settings.preload_images') }}
            </BooleanSetting>
          </li>
+          <li>
+            <BooleanSetting
+              path="useBlurhash"
+              expert="1"
+              :disabled="!hideNsfw"
+            >
+              {{ $t('settings.use_blurhash') }}
+            </BooleanSetting>
+          </li>
          <li>
            <BooleanSetting
              path="useOneClickNsfw"
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@ -2,7 +2,7 @@

 .user-card {
  position: relative;
-  z-index: 1;
+  z-index: 10;

  &:hover {
    --_still-image-img-visibility: visible;
@ -237,7 +237,8 @@
    flex-wrap: wrap;

    .following,
-    .requested_by {
+    .requested_by,
+    .blocking {
      flex: 1 0 auto;
      margin: 0;
      margin-bottom: 0.25em;
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -128,6 +128,12 @@
          </div>
        </div>
        <div class="user-meta">
+          <div
+            v-if="relationship.blocked_by && loggedIn && isOtherUser"
+            class="blocking"
+          >
+            {{ $t('user_card.blocks_you') }}
+          </div>
          <div
            v-if="relationship.followed_by && loggedIn && isOtherUser"
            class="following"
@ -188,6 +194,7 @@
            <FollowButton
              :relationship="relationship"
              :user="user"
+              :disabled="relationship.blocked_by"
            />
            <template v-if="relationship.following">
              <ProgressButton
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@ -9,9 +9,16 @@ import List from '../list/list.vue'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
 import { debounce } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+import {
+  faCircleNotch,
+  faCircleCheck
+} from '@fortawesome/free-solid-svg-icons'
+import FollowedTagCard from '../followed_tag_card/FollowedTagCard.vue'

-library.add(faCircleNotch)
+library.add(
+  faCircleNotch,
+  faCircleCheck
+)

 const FollowerList = withLoadMore({
  fetch: (props, $store) => $store.dispatch('fetchFollowers', props.userId),
@ -35,8 +42,15 @@ const FriendList = withLoadMore({
  additionalPropNames: ['userId']
 })(List)

-const isUserPage = ({ name }) =>
-  name === 'user-profile' || name === 'external-user-profile'
+const FollowedTagList = withLoadMore({
+  fetch: (props, $store) => $store.dispatch('fetchFollowedTags', props.userId),
+  select: (props, $store) => get($store.getters.findUser(props.userId), 'followedTagIds', []).map(id => $store.getters.findTag(id)),
+  destroy: (props, $store) => $store.dispatch('clearFollowedTags', props.userId),
+  childPropName: 'items',
+  additionalPropNames: ['userId']
+})(List)
+
+const isUserPage = ({ name }) => name === 'user-profile' || name === 'external-user-profile'

 const UserProfile = {
  data() {
@ -44,6 +58,7 @@ const UserProfile = {
      error: false,
      userId: null,
      tab: 'statuses',
+      followsTab: 'users',
      footerRef: null,
      note: null,
      noteLoading: false
@ -178,7 +193,14 @@ const UserProfile = {
      this.tab = tab
      this.$router.replace({ hash: `#${tab}` })
    },
+<<<<<<< HEAD
    linkClicked({ target }) {
+=======
+    onFollowsTabSwitch (tab) {
+      this.followsTab = tab
+    },
+    linkClicked ({ target }) {
+>>>>>>> upstream/develop
      if (target.tagName === 'SPAN') {
        target = target.parentNode
      }
@ -213,6 +235,7 @@ const UserProfile = {
    }
  },
  components: {
+    FollowedTagCard,
    UserCard,
    Timeline,
    FollowerList,
@ -220,7 +243,8 @@ const UserProfile = {
    FollowCard,
    TabSwitcher,
    Conversation,
-    RichContent
+    RichContent,
+    FollowedTagList
  }
 }

--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@ -37,6 +37,15 @@
              :html="field.value"
              :emoji="user.emoji"
            />
+            <span
+              v-if="field.verified_at"
+              class="user-profile-field-validated"
+            >
+              <FAIcon
+                icon="check-circle"
+                :title="$t('user_profile.field_validated')"
+              />
+            </span>
          </dd>
        </dl>
      </div>
@ -95,19 +104,45 @@
          v-if="followsTabVisible"
          key="followees"
          :label="$t('user_card.followees')"
-          :disabled="!user.friends_count"
        >
-          <FriendList :user-id="userId">
-            <template #item="{ item }">
-              <FollowCard :user="item" />
-            </template>
-          </FriendList>
+          <tab-switcher
+            :active-tab="followsTab"
+            :render-only-focused="true"
+            :on-switch="onFollowsTabSwitch"
+          >
+            <div
+              key="users"
+              :label="$t('user_card.followed_users')"
+            >
+              <FriendList :user-id="userId">
+                <template #item="{ item }">
+                  <FollowCard :user="item" />
+                </template>
+              </FriendList>
+            </div>
+            <div
+              key="tags"
+              v-if="isUs"
+              :label="$t('user_card.followed_tags')"
+            >
+              <FollowedTagList
+                :user-id="userId"
+                :get-key="(item) => item.name"
+              >
+                <template #item="{ item }">
+                  <FollowedTagCard :tag="item" />
+                </template>
+                <template #empty>
+                  {{ $t('user_card.not_following_any_hashtags') }}
+                </template>
+              </FollowedTagList>
+            </div>
+          </tab-switcher>
        </div>
        <div
          v-if="followersTabVisible"
          key="followers"
          :label="$t('user_card.followers')"
-          :disabled="!user.followers_count"
        >
          <FollowerList :user-id="userId">
            <template #item="{ item }">
@ -226,6 +261,11 @@
        padding: 0.5em 1.5em;
        box-sizing: border-box;
      }
+
+      .user-profile-field-validated {
+        margin-left: 1rem;
+        color: green;
+      }
    }
  }

--- a/src/hocs/with_load_more/with_load_more.jsx
+++ b/src/hocs/with_load_more/with_load_more.jsx
@ -59,7 +59,8 @@ const withLoadMore =
                this.loading = false
                this.bottomedOut = isEmpty(newEntries)
              })
-              .catch(() => {
+              .catch((e) => {
+                console.error(e)
                this.loading = false
                this.error = true
              })
@ -68,15 +69,9 @@ const withLoadMore =
              })
          }
        },
-        scrollLoad(e) {
-          const bodyBRect = document.body.getBoundingClientRect()
-          const height = Math.max(bodyBRect.height, -bodyBRect.y)
-          if (
-            this.loading === false &&
-            this.bottomedOut === false &&
-            this.$el.offsetHeight > 0 &&
-            window.innerHeight + window.pageYOffset >= height - 750
-          ) {
+        created() {
+          window.addEventListener('scroll', this.scrollLoad)
+          if (this.entries.length === 0) {
            this.fetchEntries()
          }
        }
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@ -135,7 +135,7 @@
        },
        "scope_in_timeline": {
            "direct": "Direkt",
-            "local": "Lokal - nur deine eigene Instanz kann diesen Beitrag sehen",
+            "local": "Lokal - nur deine eigene Instanz kann diese Nachricht sehen",
            "private": "Nur an Folgende",
            "public": "Öffentlich",
            "unlisted": "Nicht gelistet"
@ -345,10 +345,10 @@
        },
        "content_warning": "Inhaltswarnung (optional)",
        "default": "Sitze gerade im Hofbräuhaus",
-        "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
-        "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
+        "direct_warning_to_all": "Diese Nachricht wird für alle erwähnten Benutzer sichtbar sein.",
+        "direct_warning_to_first_only": "Diese Nachricht wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
        "edit_remote_warning": "Änderungen könnten auf manchen Instanzen nicht sichtbar sein!",
-        "edit_status": "Beitrag ändern",
+        "edit_status": "Nachricht bearbeiten",
        "edit_unsupported_warning": "Umfragen und Erwähnungen werden durch die Bearbeitung nicht geändert.",
        "empty_status_error": "Eine Nachricht ohne Text und ohne Anhänge kann nicht gesendet werden",
        "media_description": "Medienbeschreibung",
@ -360,17 +360,17 @@
        "preview": "Vorschau",
        "preview_empty": "Leer",
        "scope": {
-            "direct": "Direkt - Beitrag nur an erwähnte Profile",
-            "local": "Lokal - diesen Beitrag nicht föderieren",
-            "private": "Nur Follower - Beitrag nur für Follower sichtbar",
-            "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
+            "direct": "Direkt - Nachricht nur an erwähnte Profile",
+            "local": "Lokal - diese Nachricht nicht föderieren",
+            "private": "Nur Follower - Nachricht nur für Follower sichtbar",
+            "public": "Öffentlich - Nachricht an öffentliche Zeitleisten",
            "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
        },
        "scope_notice": {
            "local": "Dieser Bericht ist auf anderen Instanzen nicht sichbar",
-            "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein",
-            "public": "Dieser Beitrag wird für alle sichtbar sein",
-            "unlisted": "Dieser Beitrag wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
+            "private": "Diese Nachricht wird nur für deine Follower sichtbar sein",
+            "public": "Diese Nachricht wird für alle sichtbar sein",
+            "unlisted": "Diese Nachricht wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
        }
    },
    "registration": {
@ -465,10 +465,10 @@
        "confirm_dialogs": "Bestätigung erforderlich für:",
        "confirm_dialogs_approve_follow": "Annehmen einer Followanfrage",
        "confirm_dialogs_block": "Jemanden blockieren",
-        "confirm_dialogs_delete": "Löschen eines Beitrages",
+        "confirm_dialogs_delete": "Löschen einer Nachricht",
        "confirm_dialogs_deny_follow": "Ablehnen einer Followanfrage",
        "confirm_dialogs_mute": "Jemanden stummschalten",
-        "confirm_dialogs_repeat": "Wiederholen eines Beitrages",
+        "confirm_dialogs_repeat": "Wiederholen einer Nachricht",
        "confirm_dialogs_unfollow": "Folgen beenden",
        "confirm_new_password": "Neues Passwort bestätigen",
        "confirmation_dialogs": "Bestätigungs-Einstellungen",
@ -535,7 +535,7 @@
        "hide_media_previews": "Verstecke Vorschau von Medien",
        "hide_muted_posts": "Verberge Beiträge stummgeschalteter Nutzer",
        "hide_muted_threads": "Stummgeschaltete Unterhaltungen ausblenden",
-        "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
+        "hide_post_stats": "Nachrichtenstatistiken verbergen (z.B. die Anzahl der Favoriten)",
        "hide_shoutbox": "Shoutbox der Instanz verbergen",
        "hide_site_favicon": "Favicon der Instanz im Top-Panel nicht anzeigen",
        "hide_site_name": "Instanznamen im Top-Panel nicht anzeigen",
@ -562,7 +562,7 @@
        "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
        "mascot": "Mastodon-FE-Maskottchen",
        "max_depth_in_thread": "Maximale Tiefe, bis zu der Unterhaltungen standardmäßig angezeigt werden",
-        "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Beitrag",
+        "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Nachricht (leer = keine Beschränkung)",
        "mention_link_bolden_you": "eigene Erwähnungen hervorheben",
        "mention_link_display": "Erwähungs-Links anzeigen",
        "mention_link_display_full": "immer als vollständige Namen (z. B. {'@'}foo{'@'}example.org)",
@ -638,7 +638,7 @@
        "panelRadius": "Panel",
        "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
        "play_videos_in_modal": "Videos in größerem Medienfenster abspielen",
-        "post_status_content_type": "Standard-Beitragsart",
+        "post_status_content_type": "Standard-Format für Nachrichten",
        "posts": "Beiträge",
        "preload_images": "Bilder vorausladen",
        "presets": "Voreinstellungen",
@ -656,7 +656,7 @@
        "remove_alias": "Dieses Pseudonym entfernen",
        "remove_backup": "Entfernen",
        "render_mfm": "Misskey-Markdown darstellen",
-        "render_mfm_on_hover": "MFM-Animationen pausieren, solange sich der Mauszeiger nicht über dem Beitrag befindet",
+        "render_mfm_on_hover": "MFM-Animationen pausieren, solange sich der Mauszeiger nicht über der Nachricht befindet",
        "replies_in_timeline": "Antworten in der Zeitleiste",
        "reply_visibility_all": "Alle Antworten zeigen",
        "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
@ -680,7 +680,7 @@
        "security": "Sicherheit",
        "security_tab": "Sicherheit",
        "sensitive_by_default": "Alle Beiträge standardmäßig als heikel markieren",
-        "sensitive_if_subject": "Bilder automatisch als heikel markieren, wenn der Beitrag eine Inhaltswarnung hat",
+        "sensitive_if_subject": "Bilder automatisch als heikel markieren, wenn die Nachricht eine Inhaltswarnung hat",
        "set_new_avatar": "Setze einen neuen Avatar",
        "set_new_mascot": "Neues Maskottchen einstellen",
        "set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil",
@ -758,8 +758,8 @@
                "components": {
                    "input": "Eingabefelder",
                    "interface": "Oberfläche",
-                    "post": "Beitragstext",
-                    "postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
+                    "post": "Nachrichtentext",
+                    "postCode": "nichtproportionaler Text in einer Nachricht (Rich-Text)"
                },
                "custom": "Benutzerdefiniert",
                "family": "Schriftname",
@ -790,7 +790,7 @@
                "component": "Komponente",
                "components": {
                    "avatar": "Benutzer-Avatar (in der Profilansicht)",
-                    "avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
+                    "avatarStatus": "Benutzer-Avatar (in der Nachrichtenanzeige)",
                    "button": "Schaltfläche",
                    "buttonHover": "Schaltfläche (hover)",
                    "buttonPressed": "Schaltfläche (gedrückt)",
@ -861,7 +861,7 @@
        "tooltipRadius": "Tooltips/Warnungen",
        "translation_language": "Sprache für automatische Übersetzungen",
        "tree_advanced": "Weitere Knöpfe zum Öffnen und Schließen von Antworten anzeigen",
-        "tree_fade_ancestors": "Vorgänger des aktuellen Beitrags schwach darstellen",
+        "tree_fade_ancestors": "Vorgänger der aktuellen Nachricht schwach darstellen",
        "type_domains_to_mute": "Tippe die Domains ein, die du stummschalten willst",
        "upload_a_photo": "Lade ein Foto hoch",
        "useStreamingApi": "Empfange Posts und Benachrichtigungen in Echtzeit",
@ -888,14 +888,14 @@
        "wordfilter": "Wortfilter"
    },
    "status": {
-        "ancestor_follow": "Zeige {numReplies} andere Antwort unter diesem Beitrag | Zeige {numReplies} andere Antworten unter diesem Beitrag",
+        "ancestor_follow": "Zeige {numReplies} andere Antwort unter dieser Nachricht | Zeige {numReplies} andere Antworten unter dieser Nachricht",
        "ancestor_follow_with_icon": "{icon} {text}",
        "attachment_stop_flash": "Flash-Player stoppen",
        "bookmark": "Lesezeichen setzen",
        "collapse_attachments": "Anhänge einklappen",
-        "copy_link": "Beitragslink kopieren",
-        "delete": "Lösche Beitrag",
-        "delete_confirm": "Möchtest du diese Beitrag wirklich löschen?",
+        "copy_link": "Link zur Nachricht kopieren",
+        "delete": "Lösche Nachricht",
+        "delete_confirm": "Möchtest du diese Nachricht wirklich löschen?",
        "delete_confirm_accept_button": "Ja, löschen",
        "delete_confirm_cancel_button": "Nein, behalten",
        "delete_confirm_title": "Löschen bestätigen",
@ -909,7 +909,7 @@
        "hide_attachment": "Anhänge verbergen",
        "hide_content": "Inhalt verbergen",
        "hide_full_subject": "Vollständige Inhaltswarnung verbergen",
-        "many_attachments": "Beitrag hat {number} Anhang | Beitrag hat {number} Anhänge",
+        "many_attachments": "Nachricht hat {number} Anhang | Nachricht hat {number} Anhänge",
        "mentions": "Erwähnungen",
        "move_down": "Anhang nach rechts verschieben",
        "move_up": "Anhang nach links verschieben",
@ -921,7 +921,7 @@
        "pinned": "Angeheftet",
        "plus_more": "+{number} mehr",
        "remove_attachment": "Anhang entfernen",
-        "repeat_confirm": "Beitrag wirklich wiederholen?",
+        "repeat_confirm": "Nachricht wirklich wiederholen?",
        "repeat_confirm_accept_button": "Ja, wiederholen",
        "repeat_confirm_cancel_button": "Nein, nicht wiederholen",
        "repeat_confirm_title": "Wiederholen bestätigen",
@ -930,15 +930,15 @@
        "replies_list_with_others": "Zeige noch {numReplies} Antwort | Zeige noch {numReplies} Antworten",
        "reply_to": "Antworten auf",
        "show_all_attachments": "Alle Anhänge anzeigen",
-        "show_all_conversation": "Ganzes Gespräch anzeigen (noch {numStatus} Beitrag) | Ganzes Gespräch anzeigen (noch {numStatus} Beiträge)",
+        "show_all_conversation": "Ganzes Gespräch anzeigen (noch {numStatus} Nachricht) | Ganzes Gespräch anzeigen (noch {numStatus} Nachrichten)",
        "show_all_conversation_with_icon": "{icon} {text}",
        "show_attachment_description": "Vorschau-Beschreibung (Anhang öffnen für vollständige Beschreibung)",
        "show_attachment_in_modal": "Anhang in einem Fenster anzeigen",
        "show_content": "Inhalt anzeigen",
        "show_full_subject": "Vollständige Inhaltswarnung anzeigen",
        "show_only_conversation_under_this": "Nur Antworten auf diesen Bericht anzeigen",
-        "status_deleted": "Dieser Beitrag wurde gelöscht",
-        "status_unavailable": "Beitrag nicht verfügbar",
+        "status_deleted": "Diese Nachricht wurde gelöscht",
+        "status_unavailable": "Nachricht nicht verfügbar",
        "thread_follow": "Zeige noch {numStatus} Antwort | Zeige noch {numStatus} Antworten",
        "thread_follow_with_icon": "{icon} {text}",
        "thread_hide": "Diese Unterhaltung stummschalten",
@ -979,10 +979,10 @@
        "collapse": "Einklappen",
        "conversation": "Unterhaltung",
        "error": "Fehler beim Lesen der Timeline: {0}",
-        "load_older": "Lade ältere Beiträge",
-        "no_more_statuses": "Keine weiteren Beiträge",
-        "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder Direktnachricht markiert und kann nicht wiederholt oder zitiert werden",
-        "no_statuses": "Keine Beiträge",
+        "load_older": "Lade ältere Nachrichten",
+        "no_more_statuses": "Keine weiteren Nachrichten",
+        "no_retweet_hint": "Die Nachricht ist als nur-für-Follower oder Direktnachricht markiert und kann nicht wiederholt oder zitiert werden",
+        "no_statuses": "Keine Nachrichten",
        "reload": "Neu laden",
        "repeated": "wiederholte",
        "show_new": "Zeige Neuere",
@ -1094,7 +1094,7 @@
        "replies": "Mit Antworten",
        "report": "Melden",
        "show_repeats": "Geteilte Beiträge anzeigen",
-        "statuses": "Beiträge",
+        "statuses": "Nachrichten",
        "subscribe": "Folgen",
        "unblock": "Entblocken",
        "unblock_progress": "Entblocken…",
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -165,72 +165,72 @@
        "moves": "User migrates"
    },
    "languages": {
-        "bg": "Bulgarian",
-        "en": "English",
        "ar": "Arabic",
        "az": "Azerbaijani",
-        "zh": "Chinese",
+        "bg": "Bulgarian",
        "cs": "Czech",
        "da": "Danish",
-        "nl": "Dutch",
-        "eo": "Esperanto",
-        "fi": "Finnish",
-        "fr": "French",
        "de": "German",
        "el": "Greek",
+        "en": "English",
+        "eo": "Esperanto",
+        "es": "Spanish",
+        "fa": "Persian",
+        "fi": "Finnish",
+        "fr": "French",
+        "ga": "Irish",
        "he": "Hebrew",
        "hi": "Hindi",
        "hu": "Hungarian",
        "id": "Indonesian",
-        "ga": "Irish",
        "it": "Italian",
        "ja": "Japanese",
        "ko": "Korean",
-        "fa": "Persian",
+        "lt": "Lithuanian",
+        "lv": "Latvian",
+        "nl": "Dutch",
        "pl": "Polish",
        "pt": "Portuguese",
        "ru": "Russian",
        "sk": "Slovak",
-        "es": "Spanish",
        "sv": "Swedish",
        "tr": "Turkish",
-        "uk": "Ukrainian",
-        "lt": "Lithuanian",
-        "lv": "Latvian",
        "translated_from": {
-            "bg": "Translated from @:languages.bg",
-            "en": "Translated from @:languages.en",
            "ar": "Translated from @:languages.ar",
            "az": "Translated from @:languages.az",
-            "zh": "Translated from @:languages.zh",
+            "bg": "Translated from @:languages.bg",
            "cs": "Translated from @:languages.cs",
            "da": "Translated from @:languages.da",
-            "nl": "Translated from @:languages.nl",
-            "eo": "Translated from @:languages.eo",
-            "fi": "Translated from @:languages.fi",
-            "fr": "Translated from @:languages.fr",
            "de": "Translated from @:languages.de",
            "el": "Translated from @:languages.el",
+            "en": "Translated from @:languages.en",
+            "eo": "Translated from @:languages.eo",
+            "es": "Translated from @:languages.es",
+            "fa": "Translated from @:languages.fa",
+            "fi": "Translated from @:languages.fi",
+            "fr": "Translated from @:languages.fr",
+            "ga": "Translated from @:languages.ga",
            "he": "Translated from @:languages.he",
            "hi": "Translated from @:languages.hi",
            "hu": "Translated from @:languages.hu",
            "id": "Translated from @:languages.id",
-            "ga": "Translated from @:languages.ga",
            "it": "Translated from @:languages.it",
            "ja": "Translated from @:languages.ja",
            "ko": "Translated from @:languages.ko",
-            "fa": "Translated from @:languages.fa",
+            "lt": "Translated from @:languages.lt",
+            "lv": "Translated from @:languages.lv",
+            "nl": "Translated from @:languages.nl",
            "pl": "Translated from @:languages.pl",
            "pt": "Translated from @:languages.pt",
            "ru": "Translated from @:languages.ru",
            "sk": "Translated from @:languages.sk",
-            "es": "Translated from @:languages.es",
            "sv": "Translated from @:languages.sv",
            "tr": "Translated from @:languages.tr",
            "uk": "Translated from @:languages.uk",
-            "lt": "Translated from @:languages.lt",
-            "lv": "Translated from @:languages.lv"
-        }
+            "zh": "Translated from @:languages.zh"
+        },
+        "uk": "Ukrainian",
+        "zh": "Chinese"
    },
    "lists": {
        "create": "Create",
@ -254,15 +254,15 @@
        "hint": "Log in to join the discussion",
        "login": "Log in",
        "logout": "Log out",
+        "logout_confirm": "Are you sure you want to log out?",
+        "logout_confirm_accept_button": "Log out",
+        "logout_confirm_cancel_button": "Cancel",
+        "logout_confirm_title": "Log out",
        "password": "Password",
        "placeholder": "myusername",
        "recovery_code": "Recovery code",
        "register": "Register",
-        "username": "Username",
-        "logout_confirm_cancel_button": "Cancel",
-        "logout_confirm_accept_button": "Log out",
-        "logout_confirm": "Are you sure you want to log out?",
-        "logout_confirm_title": "Log out"
+        "username": "Username"
    },
    "media_modal": {
        "counter": "{current} / {total}",
@ -271,30 +271,30 @@
        "previous": "Previous"
    },
    "moderation": {
-      "moderation": "Moderation",
-      "reports": {
-        "no_reports": "No reports to show",
-        "add_note": "Add note",
-        "close": "Close",
-        "delete_note": "Delete",
-        "delete_note_accept": "Yes, delete it",
-        "delete_note_cancel": "No, keep it",
-        "delete_note_confirm": "Are you sure you want to delete this note?",
-        "delete_note_title": "Confirm deletion",
-        "no_content": "No description given",
-        "note_placeholder": "Leave a note...",
-        "notes": "{ count } note | { count } notes",
-        "reopen": "Reopen",
-        "report": "Report on",
-        "reports": "Reports",
-        "resolve": "Resolve",
-        "show_closed": "Show closed",
-        "statuses": "{ count } status | { count } statuses",
-        "tag_policy_notice": "Enable the TagPolicy MRF to set post restrictions",
-        "tags": "Set post restrictions"
-      },
-      "statuses": "Statuses",
-      "users": "Users"
+        "moderation": "Moderation",
+        "reports": {
+            "add_note": "Add note",
+            "close": "Close",
+            "delete_note": "Delete",
+            "delete_note_accept": "Yes, delete it",
+            "delete_note_cancel": "No, keep it",
+            "delete_note_confirm": "Are you sure you want to delete this note?",
+            "delete_note_title": "Confirm deletion",
+            "no_content": "No description given",
+            "no_reports": "No reports to show",
+            "note_placeholder": "Leave a note",
+            "notes": "{ count } note | { count } notes",
+            "reopen": "Reopen",
+            "report": "Report on",
+            "reports": "Reports",
+            "resolve": "Resolve",
+            "show_closed": "Show closed",
+            "statuses": "{ count } post| { count } posts",
+            "tag_policy_notice": "Enable the TagPolicy MRF to set post restrictions",
+            "tags": "Set post restrictions"
+        },
+        "statuses": "Posts",
+        "users": "Users"
    },
    "nav": {
        "about": "About",
@ -409,8 +409,8 @@
        }
    },
    "registration": {
-        "awaiting_email_confirmation_title": "Awaiting email confirmation",
        "awaiting_email_confirmation": "Your account has been registered and an email has been sent to your address. Please check the email to complete registration.",
+        "awaiting_email_confirmation_title": "Awaiting email confirmation",
        "bio": "Bio",
        "bio_placeholder": "e.g.\nHi! Welcome to my bio.\nI love watching anime and playing games. I hope we can be friends!",
        "captcha": "CAPTCHA",
@ -535,9 +535,9 @@
        "enable_web_push_notifications": "Enable web push notifications",
        "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
        "expert_mode": "Show advanced",
-        "export_theme": "Save preset",
        "expire_posts_enabled": "Delete posts after a set amount of days",
        "expire_posts_input_placeholder": "Number of days",
+        "export_theme": "Save preset",
        "file_export_import": {
            "backup_restore": "Settings backup",
            "backup_settings": "Backup settings to file",
@ -731,18 +731,18 @@
        "setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
        "settings": "Settings",
        "settings_profile": "Settings Profiles",
-        "settings_profile_currently": "Currently using {name} (version: {version})",
-        "settings_profiles_show": "Show all settings profiles",
-        "settings_profiles_unshow": "Hide all settings profiles",
-        "settings_profile_in_use": "In use",
        "settings_profile_creation": "Create new profile",
-        "settings_profile_creation_submit": "Create",
        "settings_profile_creation_new_name_label": "Name",
-        "settings_profile_use": "Use",
+        "settings_profile_creation_submit": "Create",
+        "settings_profile_currently": "Currently using {name} (version: {version})",
        "settings_profile_delete": "Delete",
        "settings_profile_delete_confirm": "Do you really want to delete this profile?",
        "settings_profile_force_sync": "Synchronize",
+        "settings_profile_in_use": "In use",
+        "settings_profile_use": "Use",
        "settings_profiles_refresh": "Reload settings profiles",
+        "settings_profiles_show": "Show all settings profiles",
+        "settings_profiles_unshow": "Hide all settings profiles",
        "show_admin_badge": "Show \"Admin\" badge in my profile",
        "show_moderator_badge": "Show \"Moderator\" badge in my profile",
        "show_nav_shortcuts": "Show extra navigation shortcuts in top panel",
@ -939,14 +939,15 @@
            "title": "Version"
        },
        "virtual_scrolling": "Optimize timeline rendering",
+        "use_blurhash": "Use blurhashes for NSFW thumbnails",
        "word_filter": "Word filter",
        "wordfilter": "Wordfilter"
    },
    "settings_profile": {
-      "synchronizing": "Synchronizing setting profile \"{profile}\"...",
-      "synchronized": "Synchronized settings!",
-      "synchronization_error": "Could not synchronize settings: {err}",
-      "creating": "Creating new setting profile \"{profile}\"..."
+        "creating": "Creating new setting profile \"{profile}\"...",
+        "synchronization_error": "Could not synchronize settings: {err}",
+        "synchronized": "Synchronized settings!",
+        "synchronizing": "Synchronizing setting profile \"{profile}\"..."
    },
    "status": {
        "ancestor_follow": "See {numReplies} other reply under this post | See {numReplies} other replies under this post",
@ -1046,6 +1047,7 @@
        "collapse": "Collapse",
        "conversation": "Conversation",
        "error": "Error fetching timeline: {0}",
+        "follow_tag": "Follow hashtag",
        "load_older": "Load older posts",
        "no_more_statuses": "No more posts",
        "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated or quoted",
@ -1055,9 +1057,9 @@
        "show_new": "Show new",
        "socket_broke": "Realtime connection lost: CloseEvent code {0}",
        "socket_reconnected": "Realtime connection established",
-        "up_to_date": "Up-to-date",
        "follow_tag": "Follow hashtag",
-        "unfollow_tag": "Unfollow hashtag"
+        "unfollow_tag": "Unfollow hashtag",
+        "up_to_date": "Up-to-date"
    },
    "toast": {
        "no_translation_target_set": "No translation target language set - this may fail. Please set a target language in your settings."
@ -1121,6 +1123,7 @@
        "block_confirm_title": "Block user",
        "block_progress": "Blocking…",
        "blocked": "Blocked!",
+        "blocks_you": "Blocks you!",
        "bot": "Bot",
        "deactivated": "Deactivated",
        "deny": "Deny",
@ -1138,9 +1141,10 @@
        "follow_unfollow": "Unfollow",
        "followees": "Following",
        "followers": "Followers",
+        "followed_tags": "Followed hashtags",
+        "followed_users": "Followed users",
        "following": "Following!",
        "follows_you": "Follows you!",
-        "requested_by": "Has requested to follow you",
        "hidden": "Hidden",
        "hide_repeats": "Hide repeats",
        "highlight": {
@ -1167,6 +1171,7 @@
        "remove_follower": "Remove follower",
        "replies": "With Replies",
        "report": "Report",
+        "requested_by": "Has requested to follow you",
        "show_repeats": "Show repeats",
        "statuses": "Posts",
        "subscribe": "Subscribe",
@ -1176,6 +1181,9 @@
        "unfollow_confirm_accept_button": "Yes, unfollow",
        "unfollow_confirm_cancel_button": "No, don't unfollow",
        "unfollow_confirm_title": "Unfollow user",
+        "not_following_any_hashtags": "You are not following any hashtags",
+        "follow_tag": "Follow hashtag",
+        "unfollow_tag": "Unfollow hashtag",
        "unmute": "Unmute",
        "unmute_progress": "Unmuting…",
        "unsubscribe": "Unsubscribe"
@ -1183,7 +1191,8 @@
    "user_profile": {
        "profile_does_not_exist": "Sorry, this profile does not exist.",
        "profile_loading_error": "Sorry, there was an error loading this profile.",
-        "timeline_title": "User timeline"
+        "timeline_title": "User timeline",
+        "field_validated": "Link Verified"
    },
    "user_reporting": {
        "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@ -409,6 +409,8 @@
        }
    },
    "registration": {
+        "awaiting_email_confirmation": "Su cuenta ha sido registrada y se ha enviado un correo electrónico a su dirección. Por favor revise el correo electrónico para completar el registro.",
+        "awaiting_email_confirmation_title": "En espera de confirmación por correo electrónico",
        "bio": "Biografía",
        "bio_placeholder": "p. ej.\nHola, soy un ejemplo.\nAquí puedes poner algo representativo tuyo... o no.",
        "captcha": "CAPTCHA",
@ -422,6 +424,8 @@
        "reason_placeholder": "Los registros de esta instancia son aprobados manualmente.\nComéntanos por qué quieres registrarte aquí.",
        "register": "Registrarse",
        "registration": "Registro",
+        "request_sent": "Su solicitud de registro ha sido enviada para su aprobación. Recibirá un correo electrónico cuando se apruebe su cuenta.",
+        "request_sent_title": "Solicitud de registro enviada",
        "token": "Token de invitación",
        "username_placeholder": "p. ej. akko",
        "validations": {
@ -664,6 +668,7 @@
        "notification_visibility_likes": "Favoritos",
        "notification_visibility_mentions": "Menciones",
        "notification_visibility_moves": "Usuario Migrado",
+        "notification_visibility_polls": "Encuestas finalizadas en las que has participado",
        "notification_visibility_repeats": "Repeticiones (Repeats)",
        "notifications": "Notificaciones",
        "nsfw_clickthrough": "Habilitar la ocultación de la imagen de vista previa del enlace y el adjunto para los estados NSFW por defecto",
@ -672,7 +677,9 @@
        "panelRadius": "Paneles",
        "pause_on_unfocused": "Parar la transmisión cuando no estés en foco",
        "play_videos_in_modal": "Reproducir los vídeos en un marco emergente",
-        "post_status_content_type": "Formato de publicación",
+        "post_look_feel": "Aspecto de las publicaciones",
+        "post_status_content_type": "Formato predeterminado de publicación",
+        "posts": "Publicaciones",
        "preload_images": "Precargar las imágenes",
        "presets": "Por defecto",
        "profile_background": "Imagen de fondo del perfil",
@ -686,6 +693,9 @@
        "profile_tab": "Perfil",
        "radii_help": "Establezca el redondeo de las esquinas de la interfaz (en píxeles)",
        "refresh_token": "Actualizar el token",
+        "remove_alias": "Eliminar este alias",
+        "remove_backup": "Eliminar",
+        "render_mfm": "Renderizar Markdown de Misskey",
        "replies_in_timeline": "Réplicas en la línea temporal",
        "reply_visibility_all": "Mostrar todas las réplicas",
        "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
@ -710,10 +720,24 @@
        "security_tab": "Seguridad",
        "sensitive_by_default": "Identificar las publicaciones como sensibles de forma predeterminada",
        "set_new_avatar": "Cambiar avatar",
+        "set_new_mascot": "Fijar nueva mascota",
        "set_new_profile_background": "Cambiar el fondo del perfil",
        "set_new_profile_banner": "Cambiar la cabecera del perfil",
        "setting_changed": "La configuración es diferente a la predeterminada",
+        "setting_server_side": "Esta configuración está vinculada a su perfil y afecta a todas las sesiones y clientes",
        "settings": "Ajustes",
+        "settings_profile": "Ajustes de Perfiles",
+        "settings_profile_creation": "Crear nuevo perfil",
+        "settings_profile_creation_new_name_label": "Nombre",
+        "settings_profile_creation_submit": "Crear",
+        "settings_profile_currently": "Actualmente usando {nombre} (versión: {version})",
+        "settings_profile_delete": "Eliminar",
+        "settings_profile_delete_confirm": "¿Realmente quieres eliminar este perfil?",
+        "settings_profile_force_sync": "Sincronizar",
+        "settings_profile_in_use": "En uso",
+        "settings_profile_use": "Usar",
+        "settings_profiles_show": "Mostrar todos los perfiles de configuración",
+        "settings_profiles_unshow": "Ocultar todos los perfiles de configuración",
        "show_admin_badge": "Mostrar la insignia de \"Administrador/a\" en mi perfil",
        "show_moderator_badge": "Mostrar la insignia de \"Moderador/a\" en mi perfil",
        "stop_gifs": "Iniciar GIFs al pasar el ratón",
--- a/src/i18n/id.json
+++ b/src/i18n/id.json
@ -3,6 +3,7 @@
        "mrf": {
            "federation": "Federasi",
            "keyword": {
+                "ftl_removal": "Penghapusan dari Linimasa \"Jaringan Yang Dikenal\"",
                "is_replaced_by": "→",
                "reject": "Tolak"
            },
@ -10,28 +11,57 @@
            "simple": {
                "accept": "Terima",
                "accept_desc": "Instansi ini hanya menerima pesan dari instansi-instansi berikut:",
+                "ftl_removal": "Penghapusan dari Linimasa \"Jaringan Yang Dikenal\"",
+                "ftl_removal_desc": "Instansi ini menghapus instansi berikut dari linimasa \"Jaringan Yang Dikenal\":",
+                "instance": "Instansi",
+                "media_nsfw": "Media diatur sebagai sensitif secara paksa",
+                "media_nsfw_desc": "Instansi ini secara paksa menandai media pada postingan dari instansi berikut sebagai sensitif:",
                "media_removal": "Penghapusan Media",
                "media_removal_desc": "Instansi ini menghapus media dari postingan yang berasal dari instansi-instansi berikut:",
+                "not_applicable": "Tidak berlaku",
                "quarantine": "Karantina",
-                "quarantine_desc": "Instansi ini hanya akan mengirim postingan publik ke instansi-instansi berikut:",
+                "quarantine_desc": "Instansi ini tidak akan mengirim postingan publik ke instansi berikut:",
+                "reason": "Alasan",
                "reject": "Tolak",
-                "reject_desc": "Instansi ini tidak akan menerima pesan dari instansi-instansi berikut:"
+                "reject_desc": "Instansi ini tidak akan menerima pesan dari instansi-instansi berikut:",
+                "simple_policies": "Kebijakan khusus instansi"
            }
        },
        "staff": "Staf"
    },
+    "announcements": {
+        "all_day_prompt": "Ini adalah acara sepanjang hari",
+        "cancel_edit_action": "Batal",
+        "close_error": "Tutup",
+        "delete_action": "Hapus",
+        "edit_action": "Sunting",
+        "end_time_display": "Berakhir pada {time}",
+        "end_time_prompt": "Waktu berakhir: ",
+        "inactive_message": "Pengumuman ini nonaktif",
+        "mark_as_read_action": "Tandai sebagai dibaca",
+        "page_header": "Pengumuman",
+        "post_action": "Posting",
+        "post_error": "Kesalahan: {error}",
+        "post_form_header": "Posting pengumuman",
+        "post_placeholder": "Isi pengumuman",
+        "published_time_display": "Diterbitkan pada {time}",
+        "start_time_display": "Dimulai pada {time}",
+        "start_time_prompt": "Waktu mulai: ",
+        "submit_edit_action": "Kirim",
+        "title": "Pengumuman"
+    },
    "chats": {
        "chats": "Obrolan",
        "delete": "Hapus",
-        "delete_confirm": "Apakah Anda benar-benar ingin menghapus pesan ini?",
-        "empty_chat_list_placeholder": "Anda belum memiliki obrolan. Buat sbeuah obrolan baru!",
+        "delete_confirm": "Apakah kamu benar-benar ingin menghapus pesan ini?",
+        "empty_chat_list_placeholder": "Kamu belum memiliki obrolan. Mulai obrolan baru!",
        "empty_message_error": "Tidak dapat memposting pesan yang kosong",
        "error_loading_chat": "Sesuatu yang salah terjadi ketika memuat obrolan.",
        "error_sending_message": "Sesuatu yang salah terjadi ketika mengirim pesan.",
        "message_user": "Kirim Pesan ke {nickname}",
        "more": "Lebih banyak",
        "new": "Obrolan Baru",
-        "you": "Anda:"
+        "you": "Kamu:"
    },
    "display_date": {
        "today": "Hari Ini"
@ -40,7 +70,7 @@
        "mute": "Bisukan",
        "mute_progress": "Membisukan…",
        "unmute": "Berhenti membisukan",
-        "unmute_progress": "Memberhentikan pembisuan…"
+        "unmute_progress": "Menghentikan pembisuan…"
    },
    "emoji": {
        "add_emoji": "Sisipkan emoji",
@ -51,16 +81,17 @@
        "load_all_hint": "Memuat {saneAmount} emoji pertama, memuat semua emoji dapat menyebabkan masalah performa.",
        "search_emoji": "Cari emoji",
        "stickers": "Stiker",
-        "unicode": "Emoji unicode"
+        "unicode": "Emoji Unicode"
    },
    "errors": {
-        "storage_unavailable": "Pleroma tidak dapat mengakses penyimpanan browser. Login Anda atau pengaturan lokal Anda tidak akan tersimpan dan masalah yang tidak terduga dapat terjadi. Coba mengaktifkan kuki."
+        "storage_unavailable": "Pleroma tidak dapat mengakses penyimpanan browser. Login kamu atau pengaturan lokal kamu tidak akan tersimpan dan masalah yang tidak terduga dapat terjadi. Coba aktifkan kuki."
    },
    "exporter": {
        "export": "Ekspor",
-        "processing": "Memproses, Anda akan segera diminta untuk mengunduh berkas Anda"
+        "processing": "Memproses, kamu akan segera diminta untuk mengunduh berkas kamu"
    },
    "features_panel": {
+        "media_proxy": "Proxy media",
        "text_limit": "Batas teks",
        "title": "Fitur-fitur",
        "upload_limit": "Batas unggahan"
@ -96,6 +127,12 @@
            "admin": "Admin",
            "moderator": "Moderator"
        },
+        "scope_in_timeline": {
+            "direct": "Langsung",
+            "local": "Lokal - hanya instansi kamu yang dapat melihat postingan ini",
+            "private": "Hanya pengikut",
+            "public": "Publik"
+        },
        "show_less": "Tampilkan lebih sedikit",
        "show_more": "Tampilkan lebih banyak",
        "submit": "Kirim",
@ -118,68 +155,154 @@
        "load_older": "Muat interaksi yang lebih tua",
        "moves": "Pengguna yang bermigrasi"
    },
+    "languages": {
+        "ar": "Arab",
+        "az": "Azerbaijan",
+        "bg": "Bulgaria",
+        "cs": "Ceko",
+        "da": "Denmark",
+        "de": "Jerman",
+        "el": "Yunani",
+        "en": "Inggris",
+        "eo": "Esperanto",
+        "es": "Spanyol",
+        "fa": "Persia",
+        "fi": "Finlandia",
+        "fr": "Prancis",
+        "ga": "Irlandia",
+        "he": "Ibrani",
+        "hi": "Hindi",
+        "hu": "Hongaria",
+        "id": "Indonesia",
+        "it": "Italia",
+        "ja": "Jepang",
+        "ko": "Korea",
+        "lt": "Lithuania",
+        "lv": "Latvia",
+        "nl": "Belanda",
+        "pl": "Polandia",
+        "pt": "Portugal",
+        "ru": "Rusia",
+        "sk": "Slovakia",
+        "sv": "Swedia",
+        "tr": "Turki",
+        "translated_from": {
+            "ar": "Diterjemahkan dari @:languages.ar",
+            "bg": "Diterjemahkan dari @:languages.bg",
+            "en": "Diterjemahkan dari @:languages.en"
+        },
+        "uk": "Ukraina",
+        "zh": "Tionghoa"
+    },
+    "lists": {
+        "create": "Buat",
+        "delete": "Hapus daftar",
+        "lists": "Daftar",
+        "new": "Buat Daftar",
+        "save": "Simpan perubahan",
+        "search": "Telusuri pengguna",
+        "title": "Judul daftar"
+    },
    "login": {
        "authentication_code": "Kode otentikasi",
        "description": "Masuk dengan OAuth",
        "enter_recovery_code": "Masukkan kode pemulihan",
        "enter_two_factor_code": "Masukkan kode dua-faktor",
        "heading": {
+            "recovery": "Pemulihan dua-faktor",
            "totp": "Otentikasi dua-faktor"
        },
        "hint": "Masuk untuk ikut berdiskusi",
        "login": "Masuk",
        "logout": "Keluar",
+        "logout_confirm": "Apa kamu yakin ingin keluar?",
+        "logout_confirm_accept_button": "Keluar",
+        "logout_confirm_cancel_button": "Batal",
+        "logout_confirm_title": "Keluar",
        "password": "Kata sandi",
-        "placeholder": "contoh: lain",
+        "placeholder": "namapenggunaku",
        "recovery_code": "Kode pemulihan",
        "register": "Daftar",
        "username": "Nama pengguna"
    },
    "media_modal": {
-        "next": "Selanjutnya",
-        "previous": "Sebelum"
+        "counter": "{current} / {total}",
+        "hide": "Tutup penampil media",
+        "next": "Berikutnya",
+        "previous": "Sebelumnya"
+    },
+    "moderation": {
+        "moderation": "Moderasi",
+        "reports": {
+            "add_note": "Tambahkan catatan",
+            "close": "Tutup",
+            "delete_note": "Hapus",
+            "delete_note_accept": "Ya, hapus",
+            "delete_note_cancel": "Tidak, kembalikan",
+            "delete_note_confirm": "Apa kamu yakin ingin menghapus catatan ini?",
+            "delete_note_title": "Konfirmasi penghapusan",
+            "no_content": "Tak diberikan keterangan",
+            "no_reports": "Tak ada laporan",
+            "note_placeholder": "Tinggalkan catatan...",
+            "reopen": "Buka kembali",
+            "reports": "Laporan",
+            "resolve": "Selesaikan",
+            "show_closed": "Tampilkan yang telah ditutup"
+        },
+        "statuses": "Status",
+        "users": "Pengguna"
    },
    "nav": {
        "about": "Tentang",
        "administration": "Administrasi",
+        "announcements": "Pengumuman",
        "back": "Kembali",
+        "bubble_timeline_description": "Postingan dari instansi yang dekat dengan instansimu, yang direkomendasikan oleh admin kamu",
        "chats": "Obrolan",
        "dms": "Pesan langsung",
        "friend_requests": "Ingin mengikuti",
        "home_timeline": "Linimasa beranda",
+        "home_timeline_description": "Postingan dari orang yang kamu ikuti",
        "interactions": "Interaksi",
+        "lists": "Daftar",
        "mentions": "Sebutan",
+        "moderation": "Moderasi",
        "preferences": "Preferensi",
+        "public_timeline_description": "Postingan publik dari instansi ini",
        "public_tl": "Linimasa publik",
-        "search": "Cari",
+        "search": "Penelusuran",
        "timeline": "Linimasa",
        "timelines": "Linimasa",
-        "user_search": "Pencarian Pengguna"
+        "twkn": "Jaringan Yang Dikenal",
+        "twkn_timeline_description": "Postingan dari seluruh jaringan",
+        "user_search": "Penelusuran Pengguna"
    },
    "notifications": {
-        "broken_favorite": "Status tak diketahui, mencarinya…",
+        "broken_favorite": "Postingan tak dikenal, mencarinya…",
        "error": "Terjadi kesalahan ketika memuat notifikasi: {0}",
-        "favorited_you": "memfavoritkan status Anda",
-        "follow_request": "ingin mengikuti Anda",
-        "followed_you": "mengikuti Anda",
+        "favorited_you": "memfavoritkan postinganmu",
+        "follow_request": "ingin mengikuti kamu",
+        "followed_you": "mengikuti kamu",
        "load_older": "Muat notifikasi yang lebih lama",
        "migrated_to": "bermigrasi ke",
        "no_more_notifications": "Tidak ada notifikasi lagi",
        "notifications": "Notifikasi",
+        "poll_ended": "japat telah berakhir",
        "reacted_with": "bereaksi dengan {0}",
        "read": "Dibaca!",
-        "repeated_you": "mengulangi status Anda"
+        "repeated_you": "mengulangi postinganmu"
    },
    "password_reset": {
+        "check_email": "Periksa surelmu untuk mendapatkan tautan yang digunakan untuk mengatur ulang kata sandimu.",
        "forgot_password": "Lupa kata sandi?",
-        "instruction": "Masukkan surel atau nama pengguna Anda. Kami akan mengirimkan Anda tautan untuk mengatur ulang kata sandi.",
-        "password_reset": "Pengatur-ulangan kata sandi",
-        "password_reset_disabled": "Pengatur-ulangan kata sandi dinonaktifkan. Hubungi administrator instansi Anda.",
-        "password_reset_required": "Anda harus mengatur ulang kata sandi Anda untuk masuk.",
-        "password_reset_required_but_mailer_is_disabled": "Anda harus mengatur ulang kata sandi, tetapi pengatur-ulangan kata sandi dinonaktifkan. Silakan hubungi administrator instansi Anda.",
-        "placeholder": "Surel atau nama pengguna Anda",
+        "instruction": "Masukkan surel atau nama pengguna kamu. Kami akan mengirimkan kamu tautan untuk mengatur ulang kata sandi.",
+        "password_reset": "Pengatur ulangan kata sandi",
+        "password_reset_disabled": "Pengatur-ulangan kata sandi dinonaktifkan. Silakan hubungi administrator instansi kamu.",
+        "password_reset_required": "Kamu harus mengatur ulang kata sandi kamu untuk masuk.",
+        "password_reset_required_but_mailer_is_disabled": "Kamu harus mengatur ulang kata sandi, tetapi pengatur-ulangan kata sandi dinonaktifkan. Silakan hubungi administrator instansimu.",
+        "placeholder": "Surel atau nama pengguna kamu",
        "return_home": "Kembali ke halaman beranda",
-        "too_many_requests": "Anda telah mencapai batas percobaan, coba lagi nanti."
+        "too_many_requests": "Kamu telah mencapai batas percobaan, coba lagi nanti."
    },
    "polls": {
        "add_option": "Tambahkan opsi",
@ -190,67 +313,83 @@
        "not_enough_options": "Terlalu sedikit opsi yang unik pada japat",
        "option": "Opsi",
        "people_voted_count": "{count} orang memilih | {count} orang memilih",
+        "single_choice": "",
        "type": "Jenis japat",
        "vote": "Pilih",
        "votes": "suara",
        "votes_count": "{count} suara | {count} suara"
    },
    "post_status": {
-        "account_not_locked_warning": "Akun Anda tidak {0}. Siapapun dapat mengikuti Anda untuk melihat postingan hanya-pengikut Anda.",
+        "account_not_locked_warning": "Akun kamu tidak {0}. Siapapun dapat mengikuti kamu untuk melihat postingan hanya-pengikut kamu.",
        "account_not_locked_warning_link": "terkunci",
        "attachments_sensitive": "Tandai lampiran sebagai sensitif",
        "content_type": {
            "text/bbcode": "BBCode",
            "text/html": "HTML",
            "text/markdown": "Markdown",
-            "text/plain": "Teks biasa"
+            "text/plain": "Teks biasa",
+            "text/x.misskeymarkdown": "MFM"
        },
-        "content_warning": "Subyek (opsional)",
-        "default": "Baru saja mendarat di L.A.",
+        "content_warning": "Peringatan Konten (opsional)",
+        "default": "Baru saja tiba di Luna Nova Academy",
        "direct_warning_to_all": "Postingan ini akan terlihat oleh pengguna yang disebutkan.",
        "direct_warning_to_first_only": "Postingan ini akan terlihat oleh pengguna yang disebutkan di awal pesan.",
-        "empty_status_error": "Tidak dapat memposting status kosong tanpa berkas",
+        "edit_remote_warning": "Perubahan yang dibuat pada postingan ini mungkin tidak terlihat pada beberapa instansi!",
+        "edit_status": "Sunting Status",
+        "edit_unsupported_warning": "Japat dan sebutan tidak bisa diubah dengan menyunting.",
+        "empty_status_error": "Tidak dapat memposting tanpa isi atau berkas",
        "media_description": "Keterangan media",
        "media_description_error": "Gagal memperbarui media, coba lagi",
-        "new_status": "Posting status baru",
+        "media_not_sensitive_warning": "Kamu memasang Peringatan Konten, namun lampirannya tidak ditandai sebagai sensitif!",
+        "new_status": "Posting",
        "post": "Posting",
        "posting": "Memposting",
        "preview": "Pratinjau",
        "preview_empty": "Kosong",
        "scope": {
            "direct": "Langsung - posting hanya kepada pengguna yang disebut",
+            "local": "Lokal - postingan tidak akan difederasi",
            "private": "Hanya-pengikut - posting hanya kepada pengikut",
            "public": "Publik - posting ke linimasa publik"
        },
        "scope_notice": {
-            "private": "Postingan ini akan terlihat hanya oleh pengikut Anda",
-            "public": "Postingan ini akan terlihat oleh siapa saja"
+            "local": "Postingan ini tidak akan terlihat di instansi lain",
+            "private": "Postingan ini akan terlihat hanya oleh pengikut kamu",
+            "public": "Postingan ini akan terlihat oleh siapa saja",
+            "unlisted": "Postingan ini tidak akan terlihat di Linimasa Publik dan Jaringan Yang Dikenal"
        }
    },
    "registration": {
+        "awaiting_email_confirmation": "Akunmu telah terdaftar dan sebuah surel telah dikirimkan ke alamat kamu. Harap periksa surel untuk menyelesaikan pendaftaran.",
+        "awaiting_email_confirmation_title": "Menunggu konfirmasi surel",
        "bio": "Bio",
-        "bio_placeholder": "contoh.\nHai, aku Lain.\nAku seorang putri anime yang tinggal di pinggiran kota Jepang. Kamu mungkin mengenal aku dari Wired.",
+        "bio_placeholder": "cth.\nHai! Selamat datang di bioku.\nAku suka menonton anime dan bermain game. Semoga kita bisa berteman!",
        "captcha": "CAPTCHA",
        "email": "Surel",
-        "fullname_placeholder": "contoh. Lain Iwakura",
+        "email_language": "Dalam bahasa apa kamu ingin menerima surel dari server ini?",
+        "fullname_placeholder": "cth. Atsuko Kagari",
        "new_captcha": "Klik gambarnya untuk mendapatkan captcha baru",
        "password_confirm": "Konfirmasi kata sandi",
        "reason": "Alasan mendaftar",
-        "reason_placeholder": "Instansi ini menerima pendaftaran secara manual.\nBeritahu administrasinya mengapa Anda ingin mendaftar.",
+        "reason_placeholder": "Instansi ini menerima pendaftaran secara manual.\nBeritahu administrasinya mengapa kamu ingin mendaftar.",
        "register": "Daftar",
        "registration": "Pendaftaran",
+        "request_sent": "Permintaan pendaftaran kamu telah dikirim untuk diperiksa. Kamu akan menerima surel saat akunmu diterima.",
+        "request_sent_title": "Permintaan pendaftaran dikirim",
        "token": "Token undangan",
-        "username_placeholder": "contoh. lain",
+        "username_placeholder": "cth. akko",
        "validations": {
            "email_required": "tidak boleh kosong",
            "fullname_required": "tidak boleh kosong",
+            "password_confirmation_match": "harus sama dengan kata sandi",
            "password_confirmation_required": "tidak boleh kosong",
            "password_required": "tidak boleh kosong",
            "username_required": "tidak boleh kosong"
        }
    },
    "remote_user_resolver": {
-        "error": "Tidak ditemukan."
+        "error": "Tidak ditemukan.",
+        "searching_for": "Mencari"
    },
    "search": {
        "hashtags": "Tagar",
@ -263,6 +402,12 @@
        "select_all": "Pilih semua"
    },
    "settings": {
+        "account_backup": "Pencadangan akun",
+        "account_backup_description": "Ini memungkinkan kamu untuk mengunduh arsip yang berisi informasi tentang akun dan postingan kamu, namun belum bisa diimpor ke akun Pleroma.",
+        "account_privacy": "Privasi",
+        "add_backup": "Buat cadangan baru",
+        "added_backup": "Cadangan baru ditambahkan.",
+        "allow_following_move": "Ikuti otomatis apabila akun yang diikuti pindah",
        "app_name": "Nama aplikasi",
        "attachmentRadius": "Lampiran",
        "attachments": "Lampiran",
@ -271,9 +416,10 @@
        "avatarRadius": "Avatar",
        "avatar_size_instruction": "Ukuran minimum gambar avatar yang disarankan adalah 150x150 piksel.",
        "background": "Latar belakang",
+        "backup_not_ready": "Cadangan ini belum siap.",
        "bio": "Bio",
        "block_export": "Ekspor blokiran",
-        "block_export_button": "Ekspor blokiran Anda menjadi berkas csv",
+        "block_export_button": "Ekspor blokiranmu menjadi berkas csv",
        "block_import": "Impor blokiran",
        "block_import_error": "Terjadi kesalahan ketika mengimpor blokiran",
        "blocks_imported": "Blokiran diimpor! Pemrosesannya mungkin memakan sedikit waktu.",
@ -285,24 +431,47 @@
        "cOrange": "Jingga (Favorit)",
        "cRed": "Merah (Batal)",
        "change_email": "Ubah surel",
-        "change_email_error": "Ada masalah ketika mengubah surel Anda.",
+        "change_email_error": "Ada masalah ketika mengubah surel kamu.",
        "change_password": "Ubah kata sandi",
-        "change_password_error": "Ada masalah ketika mengubah kata sandi Anda.",
+        "change_password_error": "Ada masalah ketika mengubah kata sandi kamu.",
        "changed_email": "Surel berhasil diubah!",
        "changed_password": "Kata sandi berhasil diubah!",
        "chatMessageRadius": "Pesan obrolan",
+        "checkboxRadius": "Kotak centang",
        "composing": "Menulis",
+        "confirm_dialogs": "Perlukan konfirmasi sebelum:",
+        "confirm_dialogs_approve_follow": "Menerima permintaan mengikuti",
+        "confirm_dialogs_block": "Memblokir seseorang",
+        "confirm_dialogs_delete": "Menghapus postingan",
+        "confirm_dialogs_deny_follow": "Menolak permintaan mengikuti",
+        "confirm_dialogs_mute": "Membisukan seseorang",
+        "confirm_dialogs_repeat": "Mengulangi postingan",
+        "confirm_dialogs_unfollow": "Berhenti mengikuti seseorang",
        "confirm_new_password": "Konfirmasi kata sandi baru",
+        "conversation_display": "Gaya tampilan obrolan",
        "current_password": "Kata sandi saat ini",
        "data_import_export_tab": "Impor / ekspor data",
        "delete_account": "Hapus akun",
-        "delete_account_description": "Hapus data Anda secara permanen dan menonaktifkan akun Anda.",
-        "delete_account_error": "Ada masalah ketika menghapus akun Anda. Jika ini terus terjadi harap hubungi adminstrator instansi Anda.",
-        "delete_account_instructions": "Ketik kata sandi Anda pada input di bawah untuk mengkonfirmasi penghapusan akun.",
+        "delete_account_description": "Hapus data kamu secara permanen dan nonaktifkan akunmu.",
+        "delete_account_error": "Ada masalah ketika menghapus akun kamu. Jika ini terus terjadi harap hubungi adminstrator instansi kamu.",
+        "delete_account_instructions": "Ketik kata sandi kamu pada input di bawah untuk mengonfirmasi penghapusan akun.",
+        "discoverable": "Izinkan penelusuran akun ini pada hasil pencarian dan layanan lainnya",
        "domain_mutes": "Domain",
+        "download_backup": "Unduh",
+        "email_language": "Bahasa yang digunakan untuk menerima surel dari server ini",
        "emoji_reactions_on_timeline": "Tampilkan reaksi emoji pada linimasa",
        "enable_web_push_notifications": "Aktifkan notifikasi push web",
-        "enter_current_password_to_confirm": "Masukkan kata sandi Anda saat ini untuk mengkonfirmasi identitas Anda",
+        "enter_current_password_to_confirm": "Masukkan kata sandi kamu saat ini untuk mengonfirmasi identitas kamu",
+        "expire_posts_enabled": "Hapus postingan setelah jumlah hari yang ditentukan",
+        "expire_posts_input_placeholder": "Jumlah hari",
+        "file_export_import": {
+            "backup_restore": "Pencadangan pengaturan",
+            "backup_settings": "Cadangkan pengaturan ke berkas",
+            "backup_settings_theme": "Cadangkan pengaturan dan tema ke berkas",
+            "errors": {
+                "file_slightly_new": "Versi minor berkas berbeda, beberapa pengaturan mungkin tidak termuat"
+            }
+        },
        "filtering": "Penyaringan",
        "follow_import_error": "Terjadi kesalahan ketika mengimpor pengikut",
        "fun": "Seru",
@ -312,17 +481,17 @@
        "hide_follows_count_description": "Jangan tampilkan jumlah mengikuti",
        "hide_follows_description": "Jangan tampilkan siapa yang saya ikuti",
        "hide_muted_posts": "Sembunyikan postingan-postingan dari pengguna yang dibisukan",
-        "hide_post_stats": "Sembunyikan statistik postingan (contoh. jumlah favorit)",
+        "hide_post_stats": "Sembunyikan statistik postingan (seperti jumlah favorit)",
        "hide_shoutbox": "Sembunyikan kotak suara instansi",
-        "hide_user_stats": "Sembunyikan statistik pengguna (contoh. jumlah pengikut)",
+        "hide_user_stats": "Sembunyikan statistik pengguna (seperti jumlah pengikut)",
        "hide_wallpaper": "Sembunyikan latar belakang instansi",
        "import_blocks_from_a_csv_file": "Impor blokiran dari berkas csv",
        "instance_default": "(bawaan: {value})",
        "instance_default_simple": "(bawaan)",
        "interface": "Antarmuka",
        "interfaceLanguage": "Bahasa antarmuka",
-        "invalid_theme_imported": "Berkas yang dipilih bukan sebuah tema yang didukung Pleroma. Tidak ada perbuahan yang dibuat pada tema Anda.",
-        "limited_availability": "Tidak tersedia di browser Anda",
+        "invalid_theme_imported": "Berkas yang dipilih bukan sebuah tema yang didukung Pleroma. Tidak ada perubahan yang dibuat pada tema kamu.",
+        "limited_availability": "Tidak tersedia di browser kamu",
        "links": "Tautan",
        "loop_video": "Ulang-ulang video",
        "loop_video_silent_only": "Ulang-ulang video tanpa suara (seperti \"gif\" Mastodon)",
@ -333,17 +502,17 @@
            "generate_new_recovery_codes": "Hasilkan kode pemulihan baru",
            "otp": "OTP",
            "recovery_codes": "Kode pemulihan.",
-            "recovery_codes_warning": "Tulis kode-kode nya atau simpan mereka di tempat yang aman - jika tidak Anda tidak akan melihat mereka lagi. Jika Anda tidak dapat mengakses aplikasi 2FA Anda dan kode pemulihan Anda hilang Anda tidak akan bisa mengakses akun Anda.",
+            "recovery_codes_warning": "Tulis kodenya atau simpan mereka di tempat yang aman - jika tidak kamu tidak akan melihat mereka lagi. Jika kamu tidak dapat mengakses aplikasi 2FA kamu dan kode pemulihanmu hilang, kamu tidak akan bisa mengakses akun kamu.",
            "scan": {
                "title": "Pindai"
            },
            "setup_otp": "Siapkan OTP",
            "title": "Otentikasi Dua-faktor",
            "verify": {
-                "desc": "Untuk mengaktifkan otentikasi dua-faktor, masukkan kode dari aplikasi dua-faktor Anda:"
+                "desc": "Untuk mengaktifkan otentikasi dua-faktor, masukkan kode dari aplikasi dua-faktor kamu:"
            },
            "waiting_a_recovery_codes": "Menerima kode cadangan…",
-            "warning_of_generate_new_codes": "Ketika Anda menghasilkan kode pemulihan baru, kode lama Anda berhenti bekerja."
+            "warning_of_generate_new_codes": "Ketika kamu menghasilkan kode pemulihan baru, kode lama kamu berhenti bekerja."
        },
        "more_settings": "Lebih banyak pengaturan",
        "mutes_and_blocks": "Bisuan dan Blokiran",
@ -378,8 +547,8 @@
        "save": "Simpan perubahan",
        "saving_err": "Terjadi kesalahan ketika menyimpan pengaturan",
        "saving_ok": "Pengaturan disimpan",
-        "search_user_to_block": "Cari siapa yang Anda ingin blokir",
-        "search_user_to_mute": "Cari siapa yang ingin Anda bisukan",
+        "search_user_to_block": "Cari siapa yang ingin kamu blokir",
+        "search_user_to_mute": "Cari siapa yang ingin kamu bisukan",
        "security": "Keamanan",
        "security_tab": "Keamanan",
        "set_new_avatar": "Tetapkan avatar baru",
@ -447,9 +616,9 @@
            "switcher": {
                "help": {
                    "fe_upgraded": "Mesin tema PleromaFE diperbarui setelah pembaruan versi.",
-                    "future_version_imported": "Berkas yang Anda impor dibuat pada versi FE yang lebih baru.",
-                    "older_version_imported": "Berkas yang Anda impor dibuat pada versi FE yang lebih lama.",
-                    "upgraded_from_v2": "PleromaFE telah diperbarui, tema dapat terlihat sedikit berbeda dari apa yang Anda ingat."
+                    "future_version_imported": "Berkas yang kamu impor dibuat pada versi FE yang lebih baru.",
+                    "older_version_imported": "Berkas yang kamu impor dibuat pada versi FE yang lebih lama.",
+                    "upgraded_from_v2": "PleromaFE telah diperbarui, tema dapat terlihat sedikit berbeda dari apa yang kamu ingat."
                },
                "load_theme": "Muat tema",
                "use_snapshot": "Versi lama",
@ -481,7 +650,7 @@
    },
    "status": {
        "delete": "Hapus status",
-        "delete_confirm": "Apakah Anda benar-benar ingin menghapus status ini?",
+        "delete_confirm": "Apakah kamu benar-benar ingin menghapus postingan ini?",
        "favorites": "Favorit",
        "hide_content": "",
        "mute_conversation": "Bisukan percakapan",
@ -524,7 +693,7 @@
        "conversation": "Percakapan",
        "error": "Terjadi kesalahan memuat linimasa: {0}",
        "no_more_statuses": "Tidak ada status lagi",
-        "no_retweet_hint": "Postingan ditandai sebagai hanya-pengikut atau langsung dan tidak dapat diulang",
+        "no_retweet_hint": "Postingan ditandai sebagai hanya-pengikut atau langsung dan tidak dapat diulang atau dikutip",
        "no_statuses": "Tidak ada status",
        "reload": "Muat ulang",
        "repeated": "diulangi"
@ -576,10 +745,10 @@
        "followees": "Mengikuti",
        "followers": "Pengikut",
        "following": "Diikuti!",
-        "follows_you": "Mengikuti Anda!",
+        "follows_you": "Mengikuti kamu!",
        "hidden": "Disembunyikan",
        "hide_repeats": "Sembunyikan ulangan",
-        "its_you": "Ini Anda!",
+        "its_you": "Ini kamu!",
        "media": "Media",
        "mention": "Sebut",
        "message": "Kirimkan pesan",
@ -599,14 +768,14 @@
        "timeline_title": "Linimasa pengguna"
    },
    "user_reporting": {
-        "add_comment_description": "Laporan ini akan dikirim ke moderator instansi Anda. Anda dapat menyediakan penjelasan mengapa Anda melaporkan akun ini di bawah:",
+        "add_comment_description": "Laporan ini akan dikirim ke moderator instansi kamu. Kamu dapat menyediakan penjelasan mengapa kamu melaporkan akun ini di bawah:",
        "additional_comments": "Komentar tambahan",
        "forward_description": "Akun ini berada di server lain. Kirim salinan dari laporannya juga?",
-        "generic_error": "Sebuah kesalahan terjadi ketika memproses permintaan Anda.",
+        "generic_error": "Sebuah kesalahan terjadi ketika memproses permintaan kamu.",
        "submit": "Kirim",
        "title": "Melaporkan {0}"
    },
    "who_to_follow": {
        "more": "Lebih banyak"
    }
-}
+}
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@ -283,13 +283,18 @@
            "no_content": "説明なし",
            "no_reports": "通報なし",
            "note_placeholder": "メモ",
-            "notes": "メモ",
+            "notes": "{count}件",
            "reopen": "再開",
            "report": "通報：",
            "reports": "通報",
            "resolve": "完了",
-            "show_closed": "完了した通報を表示"
-        }
+            "show_closed": "完了した通報を表示",
+            "statuses": "{count}件",
+            "tag_policy_notice": "TagPolicyのMRFをONにしてください",
+            "tags": "ポスト制限を付ける"
+        },
+        "statuses": "ポスト",
+        "users": "ユーザー"
    },
    "nav": {
        "about": "このインスタンスについて",
@ -404,6 +409,8 @@
        }
    },
    "registration": {
+        "awaiting_email_confirmation": "あなたにメールが送られました。メールをご覧くださって、リンクをクリックしてください",
+        "awaiting_email_confirmation_title": "メール確認中",
        "bio": "プロフィール",
        "bio_placeholder": "例:\nこんにちは。私は玲音。\n私はアニメのキャラクターで、日本の郊外に住んでいます。私をWiredで見たことがあるかもしれません。",
        "captcha": "CAPTCHA",
@ -417,6 +424,8 @@
        "reason_placeholder": "このインスタンスは、新規登録を手動で受け付けています。\n登録したい理由を、インスタンスの管理者に教えてください。",
        "register": "登録",
        "registration": "登録",
+        "request_sent": "登録リクエストを送りました。登録受け入れたらメールが届きます。",
+        "request_sent_title": "登録リクエストを送りました",
        "token": "招待トークン",
        "username_placeholder": "例: lain",
        "validations": {
@ -526,6 +535,8 @@
        "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
        "enter_current_password_to_confirm": "あなたのアイデンティティを証明するため、現在のパスワードを入力してください",
        "expert_mode": "詳細設定を表示",
+        "expire_posts_enabled": "自動削除",
+        "expire_posts_input_placeholder": "日数",
        "export_theme": "保存",
        "file_export_import": {
            "backup_restore": "設定をバックアップ",
@ -1035,6 +1046,7 @@
        "collapse": "たたむ",
        "conversation": "スレッド",
        "error": "タイムラインの読み込みに失敗しました: {0}",
+        "follow_tag": "タグをフォロー",
        "load_older": "古い投稿",
        "no_more_statuses": "これで終わりです",
        "no_retweet_hint": "投稿を「フォロワーのみ」または「ダイレクト」にすると、リピートできなくなります",
@ -1044,6 +1056,7 @@
        "show_new": "読み込み",
        "socket_broke": "コード{0}によりリアルタイム接続が切断されました",
        "socket_reconnected": "リアルタイム接続が確立されました",
+        "unfollow_tag": "タグのフォローを解除",
        "up_to_date": "最新"
    },
    "toast": {
--- a/src/modules/api.js
+++ b/src/modules/api.js
@ -1,5 +1,6 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import { WSConnectionStatus } from '../services/api/api.service.js'
+import { map } from 'lodash'

 const retryTimeout = (multiplier) => 1000 * multiplier

@ -40,9 +41,6 @@ const api = {
    setSocket(state, socket) {
      state.socket = socket
    },
-    setFollowRequests(state, value) {
-      state.followRequests = value
-    },
    setMastoUserSocketStatus(state, value) {
      state.mastoUserSocketStatus = value
    },
@ -51,6 +49,15 @@ const api = {
    },
    resetRetryMultiplier(state) {
      state.retryMultiplier = 1
+    },
+    setFollowRequests(state, value) {
+      state.followRequests = [...value]
+    },
+    saveFollowRequests(state, requests) {
+      state.followRequests = [...state.followRequests, ...requests]
+    },
+    saveFollowRequestPagination(state, pagination) {
+      state.followRequestsPagination = pagination
    }
  },
  actions: {
@ -269,26 +276,25 @@ const api = {
        ...rest
      })
    },
-
-    // Follow requests
-    startFetchingFollowRequests(store) {
-      if (store.state.fetchers['followRequests']) return
-      const fetcher = store.state.backendInteractor.startFetchingFollowRequests(
-        { store }
-      )
-
-      store.commit('addFetcher', { fetcherName: 'followRequests', fetcher })
-    },
-    stopFetchingFollowRequests(store) {
-      const fetcher = store.state.fetchers.followRequests
-      if (!fetcher) return
-      store.commit('removeFetcher', { fetcherName: 'followRequests', fetcher })
-    },
    removeFollowRequest(store, request) {
-      let requests = store.state.followRequests.filter((it) => it !== request)
+      let requests = [...store.state.followRequests].filter(
+        (it) => it.id !== request.id
+      )
      store.commit('setFollowRequests', requests)
    },
-
+    fetchFollowRequests({ rootState, commit }) {
+      const pagination = rootState.api.followRequestsPagination
+      return rootState.api.backendInteractor
+        .getFollowRequests({ pagination })
+        .then((requests) => {
+          if (requests.data.length > 0) {
+            commit('addNewUsers', requests.data)
+            commit('saveFollowRequests', requests.data)
+            commit('saveFollowRequestPagination', requests.pagination)
+          }
+          return requests
+        })
+    },
    // Lists
    startFetchingLists(store) {
      if (store.state.fetchers['lists']) return
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -117,7 +117,8 @@ export const defaultState = {
  maxDepthInThread: undefined, // instance default
  translationLanguage: undefined, // instance default,
  supportedTranslationLanguages: {}, // instance default
-  userProfileDefaultTab: 'statuses'
+  userProfileDefaultTab: 'statuses',
+  useBlurhash: true,
 }

 // caching the instance default properties
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -182,7 +182,7 @@ const instance = {

    async getCustomEmoji({ commit, state }) {
      try {
-        const res = await window.fetch('/api/pleroma/emoji.json')
+        const res = await window.fetch('/api/v1/pleroma/emoji')
        if (res.ok) {
          const result = await res.json()
          const values = Array.isArray(result)
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@ -189,7 +189,7 @@ const interfaceMod = {
      if (thirdColumnMode === 'none' || !rootState.users.currentUser) {
        commit('setLayoutType', normalOrMobile)
      } else {
-        const wideLayout = width >= 1300
+        const wideLayout = width >= 1280
        commit('setLayoutType', wideLayout ? 'wide' : normalOrMobile)
      }
    },
--- a/src/modules/tags.js
+++ b/src/modules/tags.js
@ -2,9 +2,15 @@ import { merge } from 'lodash'

 const tags = {
  state: {
-    // Contains key = id, value = number of trackers for this poll
+    // Contains key = name, value = tag json
    tags: {}
  },
+  getters: {
+    findTag: (state) => (query) => {
+      const result = state.tags[query]
+      return result
+    }
+  },
  mutations: {
    setTag(state, { name, data }) {
      state.tags[name] = data
@ -19,19 +25,19 @@ const tags = {
          return tag
        })
    },
-    followTag(store, tagName) {
-      return store.rootState.api.backendInteractor
+    followTag({ rootState, commit }, tagName) {
+      return rootState.api.backendInteractor
        .followHashtag({ tag: tagName })
        .then((resp) => {
-          store.commit('setTag', { name: tagName, data: resp })
+          commit('setTag', { name: tagName, data: resp })
          return resp
        })
    },
-    unfollowTag({ rootState, commit }, tag) {
+    unfollowTag({ rootState, commit }, tagName) {
      return rootState.api.backendInteractor
-        .unfollowHashtag({ tag })
+        .unfollowHashtag({ tag: tagName })
        .then((resp) => {
-          commit('setTag', { name: tag, data: resp })
+          commit('setTag', { name: tagName, data: resp })
          return resp
        })
    }
--- a/src/modules/users.js
+++ b/src/modules/users.js
@ -20,11 +20,11 @@ import {
 } from '../services/push/push.js'

 // TODO: Unify with mergeOrAdd in statuses.js
-export const mergeOrAdd = (arr, obj, item) => {
+export const mergeOrAdd = (arr, obj, item, key = 'id') => {
  if (!item) {
    return false
  }
-  const oldItem = obj[item.id]
+  const oldItem = obj[item[key]]
  if (oldItem) {
    // We already have this, so only merge the new info.
    mergeWith(oldItem, item, mergeArrayLength)
@ -32,7 +32,7 @@ export const mergeOrAdd = (arr, obj, item) => {
  } else {
    // This is a new item, prepare it
    arr.push(item)
-    obj[item.id] = item
+    obj[item[key]] = item
    if (item.screen_name && !item.screen_name.includes('@')) {
      obj[item.screen_name.toLowerCase()] = item
    }
@ -203,6 +203,16 @@ export const mutations = {
    const user = state.usersObject[id]
    user.followerIds = uniq(concat(user.followerIds || [], followerIds))
  },
+  saveFollowedTagIds(state, { id, followedTagIds }) {
+    const user = state.usersObject[id]
+    user.followedTagIds = uniq(
+      concat(user.followedTagIds || [], followedTagIds)
+    )
+  },
+  saveFollowedTagPagination(state, { id, pagination }) {
+    const user = state.usersObject[id]
+    user.followedTagPagination = pagination
+  },
  // Because frontend doesn't have a reason to keep these stuff in memory
  // outside of viewing someones user profile.
  clearFriends(state, userId) {
@ -217,6 +227,12 @@ export const mutations = {
      user['followerIds'] = []
    }
  },
+  clearFollowedTags(state, userId) {
+    const user = state.usersObject[userId]
+    if (user) {
+      user['followedTagIds'] = []
+    }
+  },
  addNewUsers(state, users) {
    each(users, (user) => {
      if (user.relationship) {
@ -297,6 +313,12 @@ export const mutations = {
  signUpFailure(state, errors) {
    state.signUpPending = false
    state.signUpErrors = errors
+  },
+  decrementFollowRequestsCount(store) {
+    store.currentUser.follow_requests_count--
+  },
+  incrementFollowRequestsCount(store) {
+    store.currentUser.follow_requests_count++
  }
 }

@ -330,7 +352,9 @@ export const defaultState = {
  usersObject: {},
  signUpPending: false,
  signUpErrors: [],
-  relationships: {}
+  relationships: {},
+  tags: [],
+  tagsObject: {}
 }

 const users = {
@ -459,12 +483,31 @@ const users = {
          return followers
        })
    },
+    fetchFollowedTags({ rootState, commit }, id) {
+      const user = rootState.users.usersObject[id]
+      const pagination = user.followedTagPagination
+
+      return rootState.api.backendInteractor
+        .getFollowedHashtags({ pagination })
+        .then(({ data: tags, pagination }) => {
+          each(tags, (tag) => commit('setTag', { name: tag.name, data: tag }))
+          commit('saveFollowedTagIds', {
+            id,
+            followedTagIds: tags.map((tag) => tag.name)
+          })
+          commit('saveFollowedTagPagination', { id, pagination })
+          return tags
+        })
+    },
    clearFriends({ commit }, userId) {
      commit('clearFriends', userId)
    },
    clearFollowers({ commit }, userId) {
      commit('clearFollowers', userId)
    },
+    clearFollowedTags({ commit }, userId) {
+      commit('clearFollowedTags', userId)
+    },
    subscribeUser({ rootState, commit }, id) {
      return rootState.api.backendInteractor
        .subscribeUser({ id })
@ -546,6 +589,12 @@ const users = {
        store.commit('setUserForNotification', notification)
      })
    },
+    decrementFollowRequestsCount(store) {
+      store.commit('decrementFollowRequestsCount')
+    },
+    incrementFollowRequestsCount(store) {
+      store.commit('incrementFollowRequestsCount')
+    },
    searchUsers({ rootState, commit }, { query }) {
      return rootState.api.backendInteractor
        .searchUsers({ query })
@ -617,7 +666,6 @@ const users = {
            backendInteractorService(store.getters.getToken())
          )
          store.dispatch('stopFetchingNotifications')
-          store.dispatch('stopFetchingFollowRequests')
          store.dispatch('stopFetchingConfig')
          store.commit('clearNotifications')
          store.commit('resetStatuses')
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -9,6 +9,7 @@ import {
  parseLinkHeaderPagination
 } from '../entity_normalizer/entity_normalizer.service.js'
 import { RegistrationError, StatusCodeError } from '../errors/errors'
+import { Url } from 'url'

 /* eslint-env browser */
 const MUTES_IMPORT_URL = '/api/pleroma/mutes_import'
@ -19,12 +20,12 @@ const CHANGE_EMAIL_URL = '/api/pleroma/change_email'
 const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
 const MOVE_ACCOUNT_URL = '/api/pleroma/move_account'
 const ALIASES_URL = '/api/pleroma/aliases'
-const TAG_USER_URL = '/api/pleroma/admin/users/tag'
+const TAG_USER_URL = '/api/v1/pleroma/admin/users/tag'
 const PERMISSION_GROUP_URL = (screenName, right) =>
-  `/api/pleroma/admin/users/${screenName}/permission_group/${right}`
-const ACTIVATE_USER_URL = '/api/pleroma/admin/users/activate'
-const DEACTIVATE_USER_URL = '/api/pleroma/admin/users/deactivate'
-const ADMIN_USERS_URL = '/api/pleroma/admin/users'
+  `/api/v1/pleroma/admin/users/${screenName}/permission_group/${right}`
+const ACTIVATE_USER_URL = '/api/v1/pleroma/admin/users/activate'
+const DEACTIVATE_USER_URL = '/api/v1/pleroma/admin/users/deactivate'
+const ADMIN_USERS_URL = '/api/v1/pleroma/admin/users'
 const SUGGESTIONS_URL = '/api/v1/suggestions'
 const NOTIFICATION_SETTINGS_URL = '/api/pleroma/notification_settings'
 const NOTIFICATION_READ_URL = '/api/v1/pleroma/notifications/read'
@ -139,6 +140,7 @@ const AKKOMA_SETTING_PROFILE_LIST = `/api/v1/akkoma/frontend_settings/pleroma-fe
 const MASTODON_TAG_URL = (name) => `/api/v1/tags/${name}`
 const MASTODON_FOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/follow`
 const MASTODON_UNFOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/unfollow`
+const MASTODON_FOLLOWED_TAGS_URL = '/api/v1/followed_tags'

 const oldfetch = window.fetch

@ -309,7 +311,7 @@ const register = ({ params, credentials }) => {
 }

 const getCaptcha = () =>
-  fetch('/api/pleroma/captcha').then((resp) => resp.json())
+  fetch('/api/v1/pleroma/captcha').then((resp) => resp.json())

 const authHeaders = (accessToken) => {
  if (accessToken) {
@ -484,14 +486,6 @@ const fetchFollowers = ({ id, maxId, sinceId, limit = 20, credentials }) => {
    .then((data) => data.json())
    .then((data) => data.map(parseUser))
 }
-
-const fetchFollowRequests = ({ credentials }) => {
-  const url = MASTODON_FOLLOW_REQUESTS_URL
-  return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => data.json())
-    .then((data) => data.map(parseUser))
-}
-
 const fetchLists = ({ credentials }) => {
  const url = MASTODON_LISTS_URL
  return fetch(url, { headers: authHeaders(credentials) }).then((data) =>
@ -982,7 +976,8 @@ const postStatus = ({
  quoteId,
  contentType,
  preview,
-  idempotencyKey
+  idempotencyKey,
+  language
 }) => {
  const form = new FormData()
  const pollOptions = poll.options || []
@ -993,6 +988,7 @@ const postStatus = ({
  if (visibility) form.append('visibility', visibility)
  if (sensitive) form.append('sensitive', sensitive)
  if (contentType) form.append('content_type', contentType)
+  if (language) form.append('language', language)
  mediaIds.forEach((val) => {
    form.append('media_ids[]', val)
  })
@ -1456,7 +1452,7 @@ const fetchEmojiReactions = ({ id, credentials }) => {

 const reactWithEmoji = ({ id, emoji, credentials }) => {
  return promisedRequest({
-    url: PLEROMA_EMOJI_REACT_URL(id, emoji),
+    url: PLEROMA_EMOJI_REACT_URL(id, encodeURIComponent(emoji)),
    method: 'PUT',
    credentials
  }).then(parseStatus)
@ -1464,7 +1460,7 @@ const reactWithEmoji = ({ id, emoji, credentials }) => {

 const unreactWithEmoji = ({ id, emoji, credentials }) => {
  return promisedRequest({
-    url: PLEROMA_EMOJI_UNREACT_URL(id, emoji),
+    url: PLEROMA_EMOJI_UNREACT_URL(id, encodeURIComponent(emoji)),
    method: 'DELETE',
    credentials
  }).then(parseStatus)
@ -1723,6 +1719,54 @@ const unfollowHashtag = ({ tag, credentials }) => {
  })
 }

+const getFollowedHashtags = ({ credentials, pagination: savedPagination }) => {
+  const queryParams = new URLSearchParams()
+  if (savedPagination?.maxId) {
+    queryParams.append('max_id', savedPagination.maxId)
+  }
+  const url = `${MASTODON_FOLLOWED_TAGS_URL}?${queryParams.toString()}`
+  let pagination = {}
+  return fetch(url, {
+    credentials
+  })
+    .then((data) => {
+      pagination = parseLinkHeaderPagination(data.headers.get('Link'), {
+        flakeId: false
+      })
+      return data.json()
+    })
+    .then((data) => {
+      return {
+        pagination,
+        data
+      }
+    })
+}
+
+const getFollowRequests = ({ credentials, pagination: savedPagination }) => {
+  const queryParams = new URLSearchParams()
+  if (savedPagination?.maxId) {
+    queryParams.append('max_id', savedPagination.maxId)
+  }
+  const url = `${MASTODON_FOLLOW_REQUESTS_URL}?${queryParams.toString()}`
+  let pagination = {}
+  return fetch(url, {
+    credentials
+  })
+    .then((data) => {
+      pagination = parseLinkHeaderPagination(data.headers.get('Link'), {
+        flakeId: true
+      })
+      return data.json()
+    })
+    .then((data) => {
+      return {
+        pagination,
+        data: data.map(parseUser)
+      }
+    })
+}
+
 export const getMastodonSocketURI = ({ credentials, stream, args = {} }) => {
  return Object.entries({
    ...(credentials ? { access_token: credentials } : {}),
@ -1912,7 +1956,6 @@ const apiService = {
  mfaConfirmOTP,
  addBackup,
  listBackups,
-  fetchFollowRequests,
  fetchLists,
  createList,
  getList,
@ -1961,7 +2004,9 @@ const apiService = {
  deleteNoteFromReport,
  getHashtag,
  followHashtag,
-  unfollowHashtag
+  unfollowHashtag,
+  getFollowedHashtags,
+  getFollowRequests
 }

 export default apiService
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@ -4,7 +4,6 @@ import apiService, {
 } from '../api/api.service.js'
 import timelineFetcher from '../timeline_fetcher/timeline_fetcher.service.js'
 import notificationsFetcher from '../notifications_fetcher/notifications_fetcher.service.js'
-import followRequestFetcher from '../../services/follow_request_fetcher/follow_request_fetcher.service'
 import listsFetcher from '../../services/lists_fetcher/lists_fetcher.service.js'
 import announcementsFetcher from '../../services/announcements_fetcher/announcements_fetcher.service.js'
 import configFetcher from '../config_fetcher/config_fetcher.service.js'
@ -44,10 +43,6 @@ const backendInteractorService = (credentials) => ({
    return notificationsFetcher.fetchAndUpdate({ ...args, credentials })
  },

-  startFetchingFollowRequests({ store }) {
-    return followRequestFetcher.startFetching({ store, credentials })
-  },
-
  startFetchingLists({ store }) {
    return listsFetcher.startFetching({ store, credentials })
  },
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -77,13 +77,15 @@ export const parseUser = (data) => {
    output.fields_html = data.fields.map((field) => {
      return {
        name: escape(field.name),
-        value: field.value
+        value: field.value,
+        verified_at: field.verified_at
      }
    })
    output.fields_text = data.fields.map((field) => {
      return {
        name: unescape(field.name.replace(/<[^>]*>/g, '')),
-        value: unescape(field.value.replace(/<[^>]*>/g, ''))
+        value: unescape(field.value.replace(/<[^>]*>/g, '')),
+        verified_at: field.verified_at
      }
    })

@ -97,6 +99,7 @@ export const parseUser = (data) => {
    output.friends_count = data.following_count

    output.bot = data.bot
+    output.follow_requests_count = data.follow_requests_count
    if (data.akkoma) {
      output.instance = data.akkoma.instance
      output.status_ttl_days = data.akkoma.status_ttl_days
@ -242,13 +245,14 @@ export const parseAttachment = (data) => {
  if (masto) {
    // Not exactly same...
    output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type
-    output.meta = data.meta // not present in BE yet
+    output.meta = data.meta
    output.id = data.id
  } else {
    output.mimetype = data.mimetype
    // output.meta = ??? missing
  }

+  output.blurhash = data.blurhash
  output.url = data.url
  output.large_thumb_url = data.preview_url
  output.description = data.description
@ -426,10 +430,12 @@ export const parseNotification = (data) => {
  if (masto) {
    output.type = mastoDict[data.type] || data.type
    output.seen = data.pleroma.is_seen
-    output.status = isStatusNotification(output.type)
-      ? parseStatus(data.status)
-      : null
-    output.action = output.status // TODO: Refactor, this is unneeded
+    if (data.status) {
+      output.status = isStatusNotification(output.type)
+        ? parseStatus(data.status)
+        : null
+      output.action = output.status // TODO: Refactor, this is unneeded
+    }
    output.target = output.type !== 'move' ? null : parseUser(data.target)
    output.from_profile = parseUser(data.account)
    output.emoji = data.emoji
--- a/src/services/follow_request_fetcher/follow_request_fetcher.service.js
+++ b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
@ -1,27 +0,0 @@
-import apiService from '../api/api.service.js'
-import { promiseInterval } from '../promise_interval/promise_interval.js'
-
-const fetchAndUpdate = ({ store, credentials }) => {
-  return apiService
-    .fetchFollowRequests({ credentials })
-    .then(
-      (requests) => {
-        store.commit('setFollowRequests', requests)
-        store.commit('addNewUsers', requests)
-      },
-      () => {}
-    )
-    .catch(() => {})
-}
-
-const startFetching = ({ credentials, store }) => {
-  const boundFetchAndUpdate = () => fetchAndUpdate({ credentials, store })
-  boundFetchAndUpdate()
-  return promiseInterval(boundFetchAndUpdate, 240000)
-}
-
-const followRequestFetcher = {
-  startFetching
-}
-
-export default followRequestFetcher
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@ -13,7 +13,8 @@ const postStatus = ({
  quoteId = undefined,
  contentType = 'text/plain',
  preview = false,
-  idempotencyKey = ''
+  idempotencyKey = '',
+  language
 }) => {
  const mediaIds = map(media, 'id')

@ -30,7 +31,8 @@ const postStatus = ({
      contentType,
      poll,
      preview,
-      idempotencyKey
+      idempotencyKey,
+      language
    })
    .then((data) => {
      if (!data.error && !preview) {
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@ -14,12 +14,10 @@ import {

 export const applyTheme = (input) => {
  const { rules } = generatePreset(input)
-  const head = document.head
  const body = document.body
  body.classList.add('hidden')

-  const styleEl = document.createElement('style')
-  head.appendChild(styleEl)
+  const styleEl = document.getElementById('theme-holder')
  const styleSheet = styleEl.sheet

  styleSheet.toString()
--- a/static/.tos
+++ b/static/.tos
@ -1,45 +0,0 @@
-<h4>Terms of Service</h4>
-
-<p>It's mainly "be nice"</p>
-
-<ol>
-    <li>
-        <h3>Don't be a big meanie</h4>
-        <p>Arguments are cool and all but don't make them into flamewars. Try to act in good faith - we want to be at least on good terms with people. Please act with understanding towards others on this instance. Most people here are probably struggling with a lot, be mindful of that.</p>
-    </li>
-    <li>
-        <h3>Mark your lewds!</h3>
-	<p>Reminder that lewd is bad and nobody wants to be forced to see that. Just mark it sensitive, and post unlisted. That is to say, anything suggestive/ecchi upwards should be marked. If you wouldn't look at it with your parents/boss in the room, mark it. It goes without saying that if you're <em>going</em> to post lewd stuff, keep it sensible. Obviously nothing underaged or otherwise questionable. Or you could just not post lewd stuff. Either/or.</p>
-    </li>
-    <li>
-	    <h3>This is a <b>Kink Shame Zone</b></h3>
-	    <p>Being a lewdie will be met with many anime girl reaction images shaming you for your lewdness. Go think about icky things on someone else's webzone™</p>
-    </li>
-    <li>
-	   <h3>Keep it legal!</h3>
-	   <p>Server is hosted in france, keep content legal for there (+ wherever you're browsing from)</p>
-    </li>
-    <li>
-	    <h3>No ads/spambots</h3>
-	    <p>I didn't think I'd have to specify this, but please do not set up bots solely for trying to advertise.</h3>
-    </li>
-    <li>
-	    <h3>Non-TOS recommendations</h3>
-	    <p>This is stuff that'd I'd <em>like</em> you to do, but I won't outright ban you if you don't follow them</p>
-	    <ul>
-		    <li>If someone is sadposting, don't antagonise them - they probably just want to vent</li>
-		    <li>Put walls of text behind a subject (CW) - helps the timeline not get flooded with text</li>
-	    </ul>
-    </li>
-
-    <li>
-	    <h3>Other</h3>
-	    <p>If you're here and you happen to play minecraft, feel free to message me with your username and come play with us sometime!</p>
-   </li>
-
-</ol>
-
-<p>So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.</p>
-
-<br>
-<img src="/static/logo.png" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />
--- a/static/blurhash-overlay.png
+++ b/static/blurhash-overlay.png
--- a/static/logo.png
+++ b/static/logo.png
--- a/static/theme-holder.css
+++ b/static/theme-holder.css
@ -0,0 +1 @@
+// This file intentionally left blank
--- a/yarn.lock
+++ b/yarn.lock
@ -1350,6 +1350,13 @@
    minimatch "^3.0.4"
    strip-json-comments "^3.1.1"

+"@floatingghost/pinch-zoom-element@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@floatingghost/pinch-zoom-element/-/pinch-zoom-element-1.3.1.tgz#5f327ad17ddf1f56777098aca088fdbf99cbd049"
+  integrity sha512-KnE7aBQdd/Fj1TzU5uzgwD9YAQ58DTMUks/PoTEBFW4zi0lBM9cN/j45wzcnzsT2VXG1S6qM7NMmq7NGm2//Fg==
+  dependencies:
+    pointer-tracker "^2.0.3"
+
 "@fortawesome/fontawesome-common-types@6.2.0":
  version "6.2.0"
  resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"
@ -1516,13 +1523,6 @@
    "@jridgewell/resolve-uri" "^3.0.3"
    "@jridgewell/sourcemap-codec" "^1.4.10"

-"@kazvmoe-infra/pinch-zoom-element@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/@kazvmoe-infra/pinch-zoom-element/-/pinch-zoom-element-1.2.0.tgz"
-  integrity sha512-HBrhH5O/Fsp2bB7EGTXzCsBAVcMjknSagKC5pBdGpKsF8meHISR0kjDIdw4YoE0S+0oNMwJ6ZUZyIBrdywxPPw==
-  dependencies:
-    pointer-tracker "^2.0.3"
-
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
  version "5.1.1-v1"
  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
@ -2494,6 +2494,11 @@ binary-extensions@^2.0.0:
  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==

+blurhash@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.4.tgz#60642a823b50acaaf3732ddb6c7dfd721bdfef2a"
+  integrity sha512-r/As72u2FbucLoK5NTegM/GucxJc3d8GvHc4ngo13IO/nt2HU4gONxNLq1XPN6EM/V8Y9URIa7PcSz2RZu553A==
+
 body-parser@1.19.2:
  version "1.19.2"
  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"
@ -5048,9 +5053,9 @@ isexe@^2.0.0:
  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==

-iso-639-1@2.1.15:
+iso-639-1@^2.1.15:
  version "2.1.15"
-  resolved "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz"
+  resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.15.tgz#20cf78a4f691aeb802c16f17a6bad7d99271e85d"
  integrity sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==

 isobject@^3.0.1: