From 4db7f07421a6dc49f07dee9140a024ef5195a934 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 24 Nov 2022 23:26:31 -0500
Subject: [PATCH 01/40] Make autocomplete items buttons

---
 src/components/emoji_input/emoji_input.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index ccba0393..6df2cebe 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -53,6 +53,7 @@
             v-for="(suggestion, index) in suggestions"
             :key="index"
             class="autocomplete-item"
+            role="button"
             :class="{ highlighted: index === highlighted }"
             @click.stop.prevent="onClick($event, suggestion)"
           >

From 6235af4592c52a657415ffae772bd83ec106bc13 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 01:07:07 -0500
Subject: [PATCH 02/40] Make screenreaders read out autocomplete results

---
 src/components/emoji_input/emoji_input.js     | 53 ++++++++++++-------
 src/components/emoji_input/emoji_input.vue    | 19 ++++++-
 .../post_status_form/post_status_form.vue     | 53 +++++++++++--------
 .../screen_reader_notice.js                   | 21 ++++++++
 .../screen_reader_notice.vue                  | 21 ++++++++
 src/i18n/en.json                              |  3 +-
 6 files changed, 126 insertions(+), 44 deletions(-)
 create mode 100644 src/components/screen_reader_notice/screen_reader_notice.js
 create mode 100644 src/components/screen_reader_notice/screen_reader_notice.vue

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index ba5f7552..020e9fde 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -1,6 +1,7 @@
 import Completion from '../../services/completion/completion.js'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import Popover from 'src/components/popover/popover.vue'
+import ScreenReaderNotice from 'src/components/screen_reader_notice/screen_reader_notice.vue'
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 import { take } from 'lodash'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
@@ -109,9 +110,10 @@ const EmojiInput = {
   },
   data () {
     return {
+      randomSeed: `${Math.random()}`.replace('.', '-'),
       input: undefined,
       caretEl: undefined,
-      highlighted: 0,
+      highlighted: -1,
       caret: 0,
       focused: false,
       blurTimeout: null,
@@ -125,7 +127,8 @@ const EmojiInput = {
   components: {
     Popover,
     EmojiPicker,
-    UnicodeDomainIndicator
+    UnicodeDomainIndicator,
+    ScreenReaderNotice
   },
   computed: {
     padEmoji () {
@@ -203,6 +206,12 @@ const EmojiInput = {
         top: this.input.scrollTop,
         left: this.input.scrollLeft
       })
+    },
+    suggestionListId () {
+      return `suggestions-${this.randomSeed}`
+    },
+    suggestionItemId () {
+      return (index) => `suggestion-item-${index}-${this.randomSeed}`
     }
   },
   mounted () {
@@ -278,6 +287,10 @@ const EmojiInput = {
           ...rest,
           img: imageUrl || ''
         }))
+      this.$refs.screenReaderNotice.announce(
+        this.$tc('tool_tip.autocomplete_available',
+          this.suggestions.length,
+          { number: this.suggestions.length }))
     }
   },
   methods: {
@@ -374,27 +387,24 @@ const EmojiInput = {
     },
     cycleBackward (e) {
       const len = this.suggestions.length || 0
-      if (len > 1) {
-        this.highlighted -= 1
-        if (this.highlighted < 0) {
-          this.highlighted = this.suggestions.length - 1
-        }
-        e.preventDefault()
-      } else {
-        this.highlighted = 0
+
+      this.highlighted -= 1
+      if (this.highlighted === -1) {
+        this.input.focus()
+      } else if (this.highlighted < -1) {
+        this.highlighted = len - 1
       }
+      e.preventDefault()
     },
     cycleForward (e) {
       const len = this.suggestions.length || 0
-      if (len > 1) {
-        this.highlighted += 1
-        if (this.highlighted >= len) {
-          this.highlighted = 0
-        }
-        e.preventDefault()
-      } else {
-        this.highlighted = 0
+
+      this.highlighted += 1
+      if (this.highlighted >= len) {
+        this.highlighted = -1
+        this.input.focus()
       }
+      e.preventDefault()
     },
     scrollIntoView () {
       const rootRef = this.$refs.picker.$el
@@ -540,6 +550,13 @@ const EmojiInput = {
       })
     },
     resize () {
+    },
+    autoCompleteItemLabel (suggestion) {
+      if (suggestion.user) {
+        return suggestion.displayText + ' ' + suggestion.detailText
+      } else {
+        return this.maybeLocalizedEmojiName(suggestion)
+      }
     }
   }
 }
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 6df2cebe..4a7b0fa8 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -4,7 +4,13 @@
     class="emoji-input"
     :class="{ 'with-picker': !hideEmojiButton }"
   >
-    <slot />
+    <slot
+      :id="'textbox-' + randomSeed"
+      :aria-owns="suggestionListId"
+      aria-autocomplete="both"
+      :aria-expanded="showSuggestions"
+      :aria-activedescendant="(!showSuggestions || highlighted === -1) ? '' : suggestionItemId(highlighted)"
+    />
     <!-- TODO: make the 'x' disappear if at the end maybe? -->
     <div
       ref="hiddenOverlay"
@@ -18,6 +24,10 @@
       >x</span>
       <span>{{ postText }}</span>
     </div>
+    <screen-reader-notice
+      ref="screenReaderNotice"
+      aria-live="assertive"
+    />
     <template v-if="enableEmojiPicker">
       <button
         v-if="!hideEmojiButton"
@@ -46,15 +56,20 @@
     >
       <template #content>
         <div
+          :id="suggestionListId"
           ref="panel-body"
           class="autocomplete-panel-body"
+          role="listbox"
         >
           <div
             v-for="(suggestion, index) in suggestions"
+            :id="suggestionItemId(index)"
             :key="index"
             class="autocomplete-item"
-            role="button"
+            role="option"
             :class="{ highlighted: index === highlighted }"
+            :aria-label="autoCompleteItemLabel(suggestion)"
+            :aria-selected="index === highlighted"
             @click.stop.prevent="onClick($event, suggestion)"
           >
             <span class="image">
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index c51639db..26a5acc4 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -148,29 +148,36 @@
           @sticker-upload-failed="uploadFailed"
           @shown="handleEmojiInputShow"
         >
-          <textarea
-            ref="textarea"
-            v-model="newStatus.status"
-            :placeholder="placeholder || $t('post_status.default')"
-            rows="1"
-            cols="1"
-            :disabled="posting && !optimisticPosting"
-            class="form-post-body"
-            :class="{ 'scrollable-form': !!maxHeight }"
-            @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
-            @keydown.meta.enter="postStatus($event, newStatus)"
-            @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
-            @input="resize"
-            @compositionupdate="resize"
-            @paste="paste"
-          />
-          <p
-            v-if="hasStatusLengthLimit"
-            class="character-counter faint"
-            :class="{ error: isOverLengthLimit }"
-          >
-            {{ charactersLeft }}
-          </p>
+          <template #default="inputProps">
+            <textarea
+              ref="textarea"
+              v-model="newStatus.status"
+              :placeholder="placeholder || $t('post_status.default')"
+              rows="1"
+              cols="1"
+              :disabled="posting && !optimisticPosting"
+              class="form-post-body"
+              :class="{ 'scrollable-form': !!maxHeight }"
+              v-bind="inputProps"
+              :aria-owns="inputProps.ariaOwns"
+              :aria-autocomplete="inputProps.ariaAutocomplete"
+              :aria-activedescendant="inputProps.ariaActiveDescendant"
+              :aria-expanded="inputProps.ariaExpanded"
+              @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
+              @keydown.meta.enter="postStatus($event, newStatus)"
+              @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
+              @input="resize"
+              @compositionupdate="resize"
+              @paste="paste"
+            />
+            <p
+              v-if="hasStatusLengthLimit"
+              class="character-counter faint"
+              :class="{ error: isOverLengthLimit }"
+            >
+              {{ charactersLeft }}
+            </p>
+          </template>
         </EmojiInput>
         <div
           v-if="!disableScopeSelector"
diff --git a/src/components/screen_reader_notice/screen_reader_notice.js b/src/components/screen_reader_notice/screen_reader_notice.js
new file mode 100644
index 00000000..3b8eaf37
--- /dev/null
+++ b/src/components/screen_reader_notice/screen_reader_notice.js
@@ -0,0 +1,21 @@
+const ScreenReaderNotice = {
+  props: {
+    ariaLive: {
+      type: String,
+      defualt: 'assertive'
+    }
+  },
+  data () {
+    return {
+      currentText: ''
+    }
+  },
+  methods: {
+    announce (text) {
+      this.currentText = text
+      setTimeout(() => { this.currentText = '' }, 1000)
+    }
+  }
+}
+
+export default ScreenReaderNotice
diff --git a/src/components/screen_reader_notice/screen_reader_notice.vue b/src/components/screen_reader_notice/screen_reader_notice.vue
new file mode 100644
index 00000000..5098b94f
--- /dev/null
+++ b/src/components/screen_reader_notice/screen_reader_notice.vue
@@ -0,0 +1,21 @@
+<template>
+  <div
+    class="screen-reader-text"
+    :aria-live="ariaLive"
+  >
+    {{ currentText }}
+  </div>
+</template>
+
+<script src="./screen_reader_notice.js"></script>
+
+<style lang="scss">
+.screen-reader-text {
+  display: block;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  visibility: visible;
+}
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1ee1147a..6166a510 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -996,7 +996,8 @@
     "reject_follow_request": "Reject follow request",
     "bookmark": "Bookmark",
     "toggle_expand": "Expand or collapse notification to show post in full",
-    "toggle_mute": "Expand or collapse notification to reveal muted content"
+    "toggle_mute": "Expand or collapse notification to reveal muted content",
+    "autocomplete_available": "{number} result is available | {number} results are available"
   },
   "upload": {
     "error": {

From 72cb9e8bdbd41b66f72f8dd0dcd52cc04c7a2245 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 01:28:43 -0500
Subject: [PATCH 03/40] Make all emoji inputs screen-reader-friendly

---
 src/components/emoji_input/emoji_input.js     |  1 +
 .../post_status_form/post_status_form.js      |  4 ++
 .../post_status_form/post_status_form.vue     | 25 +++++-----
 .../settings_modal/tabs/profile_tab.js        |  4 ++
 .../settings_modal/tabs/profile_tab.vue       | 46 ++++++++++++-------
 .../attributes_helper.service.js              |  8 ++++
 6 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 src/services/attributes_helper/attributes_helper.service.js

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 020e9fde..3b0db786 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -287,6 +287,7 @@ const EmojiInput = {
           ...rest,
           img: imageUrl || ''
         }))
+      this.highlighted = -1
       this.$refs.screenReaderNotice.announce(
         this.$tc('tool_tip.autocomplete_available',
           this.suggestions.length,
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index eb55cfcc..b75fee69 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -8,6 +8,7 @@ import Gallery from 'src/components/gallery/gallery.vue'
 import StatusContent from '../status_content/status_content.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
+import { propsToNative } from '../../services/attributes_helper/attributes_helper.service.js'
 import { reject, map, uniqBy, debounce } from 'lodash'
 import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
@@ -629,6 +630,9 @@ const PostStatusForm = {
     },
     openProfileTab () {
       this.$store.dispatch('openSettingsModalTab', 'profile')
+    },
+    propsToNative (props) {
+      return propsToNative(props)
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 26a5acc4..328e145f 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -124,14 +124,17 @@
           :suggest="emojiSuggestor"
           class="form-control"
         >
-          <input
-            v-model="newStatus.spoilerText"
-            type="text"
-            :placeholder="$t('post_status.content_warning')"
-            :disabled="posting && !optimisticPosting"
-            size="1"
-            class="form-post-subject"
-          >
+          <template #default="inputProps">
+            <input
+              v-model="newStatus.spoilerText"
+              type="text"
+              :placeholder="$t('post_status.content_warning')"
+              :disabled="posting && !optimisticPosting"
+              v-bind="propsToNative(inputProps)"
+              size="1"
+              class="form-post-subject"
+            >
+          </template>
         </EmojiInput>
         <EmojiInput
           ref="emoji-input"
@@ -158,11 +161,7 @@
               :disabled="posting && !optimisticPosting"
               class="form-post-body"
               :class="{ 'scrollable-form': !!maxHeight }"
-              v-bind="inputProps"
-              :aria-owns="inputProps.ariaOwns"
-              :aria-autocomplete="inputProps.ariaAutocomplete"
-              :aria-activedescendant="inputProps.ariaActiveDescendant"
-              :aria-expanded="inputProps.ariaExpanded"
+              v-bind="propsToNative(inputProps)"
               @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
               @keydown.meta.enter="postStatus($event, newStatus)"
               @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index ff2ccef2..50de733e 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -12,6 +12,7 @@ import InterfaceLanguageSwitcher from 'src/components/interface_language_switche
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import localeService from 'src/services/locale/locale.service.js'
+import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -257,6 +258,9 @@ const ProfileTab = {
         messageArgs: [error.message],
         level: 'error'
       })
+    },
+    propsToNative (props) {
+      return propsToNative(props)
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 642d54ca..54704dad 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -8,11 +8,14 @@
         enable-emoji-picker
         :suggest="emojiSuggestor"
       >
-        <input
-          id="username"
-          v-model="newName"
-          class="name-changer"
-        >
+        <template #default="inputProps">
+          <input
+            id="username"
+            v-model="newName"
+            class="name-changer"
+            v-bind="propsToNative(inputProps)"
+          >
+        </template>
       </EmojiInput>
       <p>{{ $t('settings.bio') }}</p>
       <EmojiInput
@@ -20,10 +23,13 @@
         enable-emoji-picker
         :suggest="emojiUserSuggestor"
       >
-        <textarea
-          v-model="newBio"
-          class="bio resize-height"
-        />
+        <template #default="inputProps">
+          <textarea
+            v-model="newBio"
+            class="bio resize-height"
+            v-bind="propsToNative(inputProps)"
+          />
+        </template>
       </EmojiInput>
       <p v-if="role === 'admin' || role === 'moderator'">
         <Checkbox v-model="showRole">
@@ -48,10 +54,13 @@
             hide-emoji-button
             :suggest="userSuggestor"
           >
-            <input
-              v-model="newFields[i].name"
-              :placeholder="$t('settings.profile_fields.name')"
-            >
+            <template #default="inputProps">
+              <input
+                v-model="newFields[i].name"
+                :placeholder="$t('settings.profile_fields.name')"
+                v-bind="propsToNative(inputProps)"
+              >
+            </template>
           </EmojiInput>
           <EmojiInput
             v-model="newFields[i].value"
@@ -59,10 +68,13 @@
             hide-emoji-button
             :suggest="userSuggestor"
           >
-            <input
-              v-model="newFields[i].value"
-              :placeholder="$t('settings.profile_fields.value')"
-            >
+            <template #default="inputProps">
+              <input
+                v-model="newFields[i].value"
+                :placeholder="$t('settings.profile_fields.value')"
+                v-bind="propsToNative(inputProps)"
+              >
+            </template>
           </EmojiInput>
           <button
             class="delete-field button-unstyled -hover-highlight"
diff --git a/src/services/attributes_helper/attributes_helper.service.js b/src/services/attributes_helper/attributes_helper.service.js
new file mode 100644
index 00000000..74d3323c
--- /dev/null
+++ b/src/services/attributes_helper/attributes_helper.service.js
@@ -0,0 +1,8 @@
+import { kebabCase } from 'lodash'
+
+const propsToNative = props => Object.keys(props).reduce((acc, cur) => {
+  acc[kebabCase(cur)] = props[cur]
+  return acc
+}, {})
+
+export { propsToNative }

From 246593970b739138f518e1aa9545fd2f5168eb2a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 01:30:44 -0500
Subject: [PATCH 04/40] Make autocomplete prompt more user-friendly

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 6166a510..ebd7d0af 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -997,7 +997,7 @@
     "bookmark": "Bookmark",
     "toggle_expand": "Expand or collapse notification to show post in full",
     "toggle_mute": "Expand or collapse notification to reveal muted content",
-    "autocomplete_available": "{number} result is available | {number} results are available"
+    "autocomplete_available": "{number} result is available. Use up and down keys to navigate through them. | {number} results are available. Use up and down keys to navigate through them."
   },
   "upload": {
     "error": {

From 5478192e2074fc4c4f2d9ef1a751618c89fb3582 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 14:50:57 -0500
Subject: [PATCH 05/40] Make keys work as intended when there is no suggestions

---
 src/components/emoji_input/emoji_input.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 3b0db786..8a8d098d 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -395,7 +395,9 @@ const EmojiInput = {
       } else if (this.highlighted < -1) {
         this.highlighted = len - 1
       }
-      e.preventDefault()
+      if (len > 0) {
+        e.preventDefault()
+      }
     },
     cycleForward (e) {
       const len = this.suggestions.length || 0
@@ -405,7 +407,9 @@ const EmojiInput = {
         this.highlighted = -1
         this.input.focus()
       }
-      e.preventDefault()
+      if (len > 0) {
+        e.preventDefault()
+      }
     },
     scrollIntoView () {
       const rootRef = this.$refs.picker.$el

From 524363267811ce34ab82786ccf392ceb2708ac16 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 15:08:17 -0500
Subject: [PATCH 06/40] Label buttons in top bar

---
 src/components/desktop_nav/desktop_nav.vue | 7 ++++---
 src/components/search_bar/search_bar.vue   | 4 ++++
 src/i18n/en.json                           | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 07bf8005..e0ee39c3 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -20,6 +20,7 @@
         class="logo"
         :to="{ name: 'root' }"
         :style="logoBgStyle"
+        :title="sitename"
       >
         <div
           class="mask"
@@ -38,13 +39,13 @@
         />
         <button
           class="button-unstyled nav-icon"
+          :title="$t('nav.preferences')"
           @click.stop="openSettingsModal"
         >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="cog"
-            :title="$t('nav.preferences')"
           />
         </button>
         <a
@@ -52,26 +53,26 @@
           href="/pleroma/admin/#/login-pleroma"
           class="nav-icon"
           target="_blank"
+          :title="$t('nav.administration')"
           @click.stop
         >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="tachometer-alt"
-            :title="$t('nav.administration')"
           />
         </a>
         <span class="spacer" />
         <button
           v-if="currentUser"
           class="button-unstyled nav-icon"
+          :title="$t('login.logout')"
           @click.stop.prevent="logout"
         >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="sign-out-alt"
-            :title="$t('login.logout')"
           />
         </button>
       </div>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 3969d8de..9da2b272 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -8,6 +8,7 @@
       class="button-unstyled nav-icon"
       :title="$t('nav.search')"
       type="button"
+      :aria-expanded="!hidden"
       @click.prevent.stop="toggleHidden"
     >
       <FAIcon
@@ -29,6 +30,7 @@
       <button
         class="button-default search-button"
         type="submit"
+        :title="$t('nav.search')"
         @click="find(searchTerm)"
       >
         <FAIcon
@@ -39,6 +41,8 @@
       <button
         class="button-unstyled cancel-search"
         type="button"
+        :title="$t('nav.search_close')"
+        :aria-expanded="!hidden"
         @click.prevent.stop="toggleHidden"
       >
         <FAIcon
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1ee1147a..5b97bdcd 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -172,6 +172,7 @@
     "bookmarks": "Bookmarks",
     "user_search": "User Search",
     "search": "Search",
+    "search_close": "Close search bar",
     "who_to_follow": "Who to follow",
     "preferences": "Preferences",
     "timelines": "Timelines",

From 1ab958ba6b0ad1e1449fd8fe6b0bc8729520ce12 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 15:30:23 -0500
Subject: [PATCH 07/40] Make quick settings menus more accessible

---
 .../quick_filter_settings.vue                 | 29 ++++++++-
 .../quick_view_settings.vue                   | 65 +++++++++++++------
 2 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/src/components/quick_filter_settings/quick_filter_settings.vue b/src/components/quick_filter_settings/quick_filter_settings.vue
index f2aa61ee..b81215a1 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.vue
+++ b/src/components/quick_filter_settings/quick_filter_settings.vue
@@ -6,36 +6,51 @@
     :trigger-attrs="{ title: $t('timeline.quick_filter_settings') }"
   >
     <template #content>
-      <div class="dropdown-menu">
-        <div v-if="loggedIn">
+      <div
+        class="dropdown-menu"
+        role="menu"
+      >
+        <div
+          v-if="loggedIn"
+          role="group"
+        >
           <button
             v-if="!conversation"
             class="button-default dropdown-item"
+            :aria-checked="replyVisibilityAll"
+            role="menuitemradio"
             @click="replyVisibilityAll = true"
           >
             <span
               class="menu-checkbox -radio"
               :class="{ 'menu-checkbox-checked': replyVisibilityAll }"
+              :aria-hidden="true"
             />{{ $t('settings.reply_visibility_all') }}
           </button>
           <button
             v-if="!conversation"
             class="button-default dropdown-item"
+            :aria-checked="replyVisibilityFollowing"
+            role="menuitemradio"
             @click="replyVisibilityFollowing = true"
           >
             <span
               class="menu-checkbox -radio"
               :class="{ 'menu-checkbox-checked': replyVisibilityFollowing }"
+              :aria-hidden="true"
             />{{ $t('settings.reply_visibility_following_short') }}
           </button>
           <button
             v-if="!conversation"
             class="button-default dropdown-item"
+            :aria-checked="replyVisibilitySelf"
+            role="menuitemradio"
             @click="replyVisibilitySelf = true"
           >
             <span
               class="menu-checkbox -radio"
               :class="{ 'menu-checkbox-checked': replyVisibilitySelf }"
+              :aria-hidden="true"
             />{{ $t('settings.reply_visibility_self_short') }}
           </button>
           <div
@@ -46,33 +61,43 @@
         </div>
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="muteBotStatuses"
           @click="muteBotStatuses = !muteBotStatuses"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': muteBotStatuses }"
+            :aria-hidden="true"
           />{{ $t('settings.mute_bot_posts') }}
         </button>
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="hideMedia"
           @click="hideMedia = !hideMedia"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': hideMedia }"
+            :aria-hidden="true"
           />{{ $t('settings.hide_media_previews') }}
         </button>
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="hideMutedPosts"
           @click="hideMutedPosts = !hideMutedPosts"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': hideMutedPosts }"
+            :aria-hidden="true"
           />{{ $t('settings.hide_all_muted_posts') }}
         </button>
         <button
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click="openTab('filtering')"
         >
           <FAIcon icon="font" />{{ $t('settings.word_filter_and_more') }}
diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue
index 4bd81c5b..9f5cdabc 100644
--- a/src/components/quick_view_settings/quick_view_settings.vue
+++ b/src/components/quick_view_settings/quick_view_settings.vue
@@ -6,60 +6,87 @@
     :trigger-attrs="{ title: $t('timeline.quick_view_settings') }"
   >
     <template #content>
-      <div class="dropdown-menu">
-        <button
-          class="button-default dropdown-item"
-          @click="conversationDisplay = 'tree'"
-        >
-          <span
-            class="menu-checkbox -radio"
-            :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
-          /><FAIcon icon="folder-tree" /> {{ $t('settings.conversation_display_tree_quick') }}
-        </button>
-        <button
-          class="button-default dropdown-item"
-          @click="conversationDisplay = 'linear'"
-        >
-          <span
-            class="menu-checkbox -radio"
-            :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
-          /><FAIcon icon="list" /> {{ $t('settings.conversation_display_linear_quick') }}
-        </button>
+      <div
+        class="dropdown-menu"
+        role="menu"
+      >
+        <div role="group">
+          <button
+            class="button-default dropdown-item"
+            :aria-checked="conversationDisplay === 'tree'"
+            role="menuitemradio"
+            @click="conversationDisplay = 'tree'"
+          >
+            <span
+              class="menu-checkbox -radio"
+              :aria-hidden="true"
+              :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
+            /><FAIcon
+              icon="folder-tree"
+              :aria-hidden="true"
+            /> {{ $t('settings.conversation_display_tree_quick') }}
+          </button>
+          <button
+            class="button-default dropdown-item"
+            :aria-checked="conversationDisplay === 'linear'"
+            role="menuitemradio"
+            @click="conversationDisplay = 'linear'"
+          >
+            <span
+              class="menu-checkbox -radio"
+              :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
+              :aria-hidden="true"
+            /><FAIcon
+              icon="list"
+              :aria-hidden="true"
+            /> {{ $t('settings.conversation_display_linear_quick') }}
+          </button>
+        </div>
         <div
           role="separator"
           class="dropdown-divider"
         />
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="showUserAvatars"
           @click="showUserAvatars = !showUserAvatars"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': showUserAvatars }"
+            :aria-hidden="true"
           />{{ $t('settings.mention_link_show_avatar_quick') }}
         </button>
         <button
           v-if="!conversation"
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="autoUpdate"
           @click="autoUpdate = !autoUpdate"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': autoUpdate }"
+            :aria-hidden="true"
           />{{ $t('settings.auto_update') }}
         </button>
         <button
           v-if="!conversation"
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="collapseWithSubjects"
           @click="collapseWithSubjects = !collapseWithSubjects"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': collapseWithSubjects }"
+            :aria-hidden="true"
           />{{ $t('settings.collapse_subject') }}
         </button>
         <button
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click="openTab('general')"
         >
           <FAIcon icon="wrench" />{{ $t('settings.more_settings') }}

From 68110ce8251610888348defc2e971c9c6af6a55b Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sun, 16 Jan 2022 01:19:52 -0500
Subject: [PATCH 08/40] Make interact buttons accessible for anonymous users

---
 .../favorite_button/favorite_button.vue        | 17 ++++++++++++-----
 src/components/reply_button/reply_button.vue   | 18 +++++++++++++-----
 .../retweet_button/retweet_button.vue          | 17 ++++++++++++-----
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index 58d14945..8c883c13 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -38,13 +38,20 @@
       class="button-unstyled interactive"
       target="_blank"
       role="button"
+      :title="$t('tool_tip.favorite')"
       :href="remoteInteractionLink"
     >
-      <FAIcon
-        class="fa-scale-110 fa-old-padding"
-        :title="$t('tool_tip.favorite')"
-        :icon="['far', 'star']"
-      />
+      <FALayers class="fa-scale-110 fa-old-padding-layer">
+        <FAIcon
+          class="fa-scale-110"
+          :icon="['far', 'star']"
+        />
+        <FAIcon
+          class="focus-marker"
+          transform="shrink-6 up-9 right-12"
+          icon="plus"
+        />
+      </FALayers>
     </a>
     <span
       v-if="!mergedConfig.hidePostStats && status.fave_num > 0"
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index 6e3964b7..60a40a08 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -32,12 +32,20 @@
       target="_blank"
       role="button"
       :href="remoteInteractionLink"
+      :title="$t('tool_tip.reply')"
     >
-      <FAIcon
-        icon="reply"
-        class="fa-scale-110 fa-old-padding"
-        :title="$t('tool_tip.reply')"
-      />
+      <FALayers class="fa-old-padding-layer">
+        <FAIcon
+          class="fa-scale-110"
+          icon="reply"
+        />
+        <FAIcon
+          v-if="!replying"
+          class="focus-marker"
+          transform="shrink-6 up-8 right-16"
+          icon="plus"
+        />
+      </FALayers>
     </a>
     <span
       v-if="status.replies_count > 0"
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 7700ee0d..8804cc6b 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -45,13 +45,20 @@
       class="button-unstyled interactive"
       target="_blank"
       role="button"
+      :title="$t('tool_tip.repeat')"
       :href="remoteInteractionLink"
     >
-      <FAIcon
-        class="fa-scale-110 fa-old-padding"
-        icon="retweet"
-        :title="$t('tool_tip.repeat')"
-      />
+      <FALayers class="fa-old-padding-layer">
+        <FAIcon
+          class="fa-scale-110"
+          icon="retweet"
+        />
+        <FAIcon
+          class="focus-marker"
+          transform="shrink-6 up-9 right-12"
+          icon="plus"
+        />
+      </FALayers>
     </a>
     <span
       v-if="!mergedConfig.hidePostStats && status.repeat_num > 0"

From d1590311211cbf1036c870eef8c7e9e80fab7a3e Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 16:28:33 -0500
Subject: [PATCH 09/40] Add some aria to post status form

---
 src/components/emoji_input/emoji_input.vue           |  3 +++
 src/components/emoji_picker/emoji_picker.vue         |  1 +
 src/components/post_status_form/post_status_form.vue | 10 ++++++++++
 src/components/select/select.js                      |  3 ++-
 src/components/select/select.vue                     |  1 +
 src/i18n/en.json                                     |  2 ++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 4a7b0fa8..7f9ecc99 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -16,6 +16,7 @@
       ref="hiddenOverlay"
       class="hidden-overlay"
       :style="overlayStyle"
+      :aria-hidden="true"
     >
       <span>{{ preText }}</span>
       <span
@@ -33,6 +34,7 @@
         v-if="!hideEmojiButton"
         class="button-unstyled emoji-picker-icon"
         type="button"
+        :title="$t('emoji.add_emoji')"
         @click.prevent="togglePicker"
       >
         <FAIcon :icon="['far', 'smile-beam']" />
@@ -53,6 +55,7 @@
       ref="suggestorPopover"
       class="autocomplete-panel"
       placement="bottom"
+      :trigger-attrs="{ 'aria-hidden': true }"
     >
       <template #content>
         <div
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index ca90bf26..6972164b 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -3,6 +3,7 @@
     ref="popover"
     trigger="click"
     popover-class="emoji-picker popover-default"
+    :trigger-attrs="{ 'aria-hidden': true }"
     @show="onPopoverShown"
     @close="onPopoverClosed"
   >
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 328e145f..64a8887c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -30,6 +30,9 @@
           <span>{{ $t('post_status.scope_notice.public') }}</span>
           <a
             class="fa-scale-110 fa-old-padding dismiss"
+            :title="$t('post_status.scope_notice_dismiss')"
+            role="button"
+            tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -42,6 +45,9 @@
           <span>{{ $t('post_status.scope_notice.unlisted') }}</span>
           <a
             class="fa-scale-110 fa-old-padding dismiss"
+            :title="$t('post_status.scope_notice_dismiss')"
+            role="button"
+            tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -54,6 +60,9 @@
           <span>{{ $t('post_status.scope_notice.private') }}</span>
           <a
             class="fa-scale-110 fa-old-padding dismiss"
+            :title="$t('post_status.scope_notice_dismiss')"
+            role="button"
+            tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -199,6 +208,7 @@
               id="post-content-type"
               v-model="newStatus.contentType"
               class="form-control"
+              :attrs="{ 'aria-label': $t('post_status.content_type_selection') }"
             >
               <option
                 v-for="postFormat in postFormats"
diff --git a/src/components/select/select.js b/src/components/select/select.js
index ec571a14..34d64fd2 100644
--- a/src/components/select/select.js
+++ b/src/components/select/select.js
@@ -13,6 +13,7 @@ export default {
     'modelValue',
     'disabled',
     'unstyled',
-    'kind'
+    'kind',
+    'attrs'
   ]
 }
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 0ce4ea82..1797afc8 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -6,6 +6,7 @@
     <select
       :disabled="disabled"
       :value="modelValue"
+      v-bind="attrs"
       @change="$emit('update:modelValue', $event.target.value)"
     >
       <slot />
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ebd7d0af..d0965f84 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -266,6 +266,7 @@
       "text/markdown": "Markdown",
       "text/bbcode": "BBCode"
     },
+    "content_type_selection": "Post format",
     "content_warning": "Subject (optional)",
     "default": "Just landed in L.A.",
     "direct_warning_to_all": "This post will be visible to all the mentioned users.",
@@ -283,6 +284,7 @@
       "private": "This post will be visible to your followers only",
       "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
     },
+    "scope_notice_dismiss": "Close this notice",
     "scope": {
       "direct": "Direct - post to mentioned users only",
       "private": "Followers-only - post to followers only",

From 5f12c3ae76b82afd2040f2bcc83bf2eda5c4ff91 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 22:42:53 -0500
Subject: [PATCH 10/40] Fix unit tests

---
 test/unit/specs/components/emoji_input.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/unit/specs/components/emoji_input.spec.js b/test/unit/specs/components/emoji_input.spec.js
index 752111ef..03deece3 100644
--- a/test/unit/specs/components/emoji_input.spec.js
+++ b/test/unit/specs/components/emoji_input.spec.js
@@ -14,7 +14,8 @@ const generateInput = (value, padEmoji = true) => {
               padEmoji
             }
           }
-        }
+        },
+        $t: (msg) => msg
       },
       stubs: {
         FAIcon: true

From 31c9b6885bf42993e328ed54be8dce95cccdcc91 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Fri, 27 Jan 2023 09:08:38 +0000
Subject: [PATCH 11/40] Update dependency babel-loader to v9.1.2

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 557672ea..82b6f6f1 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "@vue/compiler-sfc": "3.2.45",
     "@vue/test-utils": "2.2.7",
     "autoprefixer": "10.4.13",
-    "babel-loader": "9.1.0",
+    "babel-loader": "9.1.2",
     "babel-plugin-lodash": "3.3.4",
     "chai": "4.3.7",
     "chalk": "1.1.3",
diff --git a/yarn.lock b/yarn.lock
index 85a8155f..803556e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2603,10 +2603,10 @@ axios@^1.1.3:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
-babel-loader@9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.0.tgz#839e9ae88aea930864ef9ec0f356dfca96ecf238"
-  integrity sha512-Antt61KJPinUMwHwIIz9T5zfMgevnfZkEVWYDWlG888fgdvRRGD0JTuf/fFozQnfT+uq64sk1bmdHDy/mOEWnA==
+babel-loader@9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.2.tgz#a16a080de52d08854ee14570469905a5fc00d39c"
+  integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==
   dependencies:
     find-cache-dir "^3.3.2"
     schema-utils "^4.0.0"

From ec0b239496801bf03391c1ad181545ae738cc40b Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Fri, 27 Jan 2023 09:09:34 +0000
Subject: [PATCH 12/40] Update dependency punycode.js to v2.3.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 557672ea..008db4ce 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "localforage": "1.10.0",
     "parse-link-header": "2.0.0",
     "phoenix": "1.6.2",
-    "punycode.js": "2.1.0",
+    "punycode.js": "2.3.0",
     "qrcode": "1.5.0",
     "querystring-es3": "0.2.1",
     "url": "0.11.0",
diff --git a/yarn.lock b/yarn.lock
index 85a8155f..cd729dc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7322,10 +7322,10 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode.js@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.1.0.tgz#f3937f7a914152c2dc17e9c280a2cf86a26b7cda"
-  integrity sha512-LvGUJ9QHiESLM4yn8JuJWicstRcJKRmP46psQw1HvCZ9puLFwYMKJWvkAkP3OHBVzNzZGx/D53EYJrIaKd9gZQ==
+punycode.js@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.0.tgz#6aaa35964ffecc676545995ecb65980bd8302f61"
+  integrity sha512-AM9kSplQQCRlRkRZzx2EcqW2AQ9HuYoUzzl/tjJDNJEUeYHFGJ/rGE0a9cE1b41iuFz94pAwcEekC137Dd9Eyw==
 
 punycode@1.3.2:
   version "1.3.2"

From 6158b8667e6c76c5a5a09b480b82d6f04b8e4885 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 28 Jan 2023 22:10:06 -0500
Subject: [PATCH 13/40] Make checkbox settings accessible

---
 src/_mixins.scss                                     | 12 ++++++++++++
 src/components/checkbox/checkbox.vue                 |  8 ++++++--
 .../screen_reader_notice/screen_reader_notice.vue    |  9 +++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/_mixins.scss b/src/_mixins.scss
index e99fe26f..677bc210 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -16,3 +16,15 @@
     @content;
   }
 }
+
+@mixin visible-for-screenreader-only {
+  display: block;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  visibility: visible;
+  clip: rect(0 0 0 0);
+  padding: 0;
+  position: absolute;
+}
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 7139d4fc..ac7acd52 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -10,7 +10,10 @@
       :indeterminate="indeterminate"
       @change="$emit('update:modelValue', $event.target.checked)"
     >
-    <i class="checkbox-indicator" />
+    <i
+      class="checkbox-indicator"
+      :aria-hidden="true"
+    />
     <span
       v-if="!!$slots.default"
       class="label"
@@ -33,6 +36,7 @@ export default {
 
 <style lang="scss">
 @import "../../variables";
+@import "../../mixins";
 
 .checkbox {
   position: relative;
@@ -81,7 +85,7 @@ export default {
   }
 
   input[type="checkbox"] {
-    display: none;
+    @include visible-for-screenreader-only;
 
     &:checked + .checkbox-indicator::before {
       color: $fallback--text;
diff --git a/src/components/screen_reader_notice/screen_reader_notice.vue b/src/components/screen_reader_notice/screen_reader_notice.vue
index 5098b94f..1cd908ae 100644
--- a/src/components/screen_reader_notice/screen_reader_notice.vue
+++ b/src/components/screen_reader_notice/screen_reader_notice.vue
@@ -10,12 +10,9 @@
 <script src="./screen_reader_notice.js"></script>
 
 <style lang="scss">
+@import "../../mixins";
+
 .screen-reader-text {
-  display: block;
-  width: 1px;
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  visibility: visible;
+  @include visible-for-screenreader-only;
 }
 </style>

From d2716341cba55c1b40793239501213d00f5b6281 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Sun, 29 Jan 2023 09:07:16 +0000
Subject: [PATCH 14/40] Update dependency @vue/test-utils to v2.2.8

---
 package.json |  2 +-
 yarn.lock    | 96 +++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index df15f577..651887c4 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
     "@vue/babel-plugin-jsx": "1.1.1",
     "@vue/compiler-sfc": "3.2.45",
-    "@vue/test-utils": "2.2.7",
+    "@vue/test-utils": "2.2.8",
     "autoprefixer": "10.4.13",
     "babel-loader": "9.1.2",
     "babel-plugin-lodash": "3.3.4",
diff --git a/yarn.lock b/yarn.lock
index 5693c2ae..bce48465 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2172,10 +2172,12 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.45.tgz#a3fffa7489eafff38d984e23d0236e230c818bc2"
   integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==
 
-"@vue/test-utils@2.2.7":
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.7.tgz#0d93d635031a4cca2de70b825aef3fe20a41e702"
-  integrity sha512-BMuoruUFTEqhLoOgsMcgNVMiByYbfHCKGr2C4CPdGtz/affUtDVX5zr1RnPuq0tYSiaqq+Enw5voUpG6JY8Q7g==
+"@vue/test-utils@2.2.8":
+  version "2.2.8"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.8.tgz#2002a2b2c90309f66c5c175b735621438832a610"
+  integrity sha512-/R8DKzp41Ip/RqTt1jvOVi5gxby3EwNWiYHNYsG9FAjEvt0gzDvYN55lCKzX7IdnI5zVIOo5tHtts0SLT+JrWw==
+  dependencies:
+    js-beautify "1.14.6"
 
 "@vuelidate/core@2.0.0":
   version "2.0.0"
@@ -2325,6 +2327,11 @@ abab@^2.0.5, abab@^2.0.6:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
+abbrev@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 accepts@~1.3.4:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -3135,7 +3142,7 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0:
+commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3168,6 +3175,14 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
+config-chain@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 connect-history-api-fallback@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
@@ -3731,6 +3746,16 @@ dotenv@10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+editorconfig@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+  dependencies:
+    commander "^2.19.0"
+    lru-cache "^4.1.5"
+    semver "^5.6.0"
+    sigmund "^1.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -4661,6 +4686,17 @@ glob@^7.2.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.3:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -5077,6 +5113,11 @@ inherits@2.0.4, inherits@^2.0.4:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
 ini@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -5475,6 +5516,16 @@ jest-worker@^29.1.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+js-beautify@1.14.6:
+  version "1.14.6"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz#b23ca5d74a462c282c7711bb51150bcc97f2b507"
+  integrity sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw==
+  dependencies:
+    config-chain "^1.1.13"
+    editorconfig "^0.15.3"
+    glob "^8.0.3"
+    nopt "^6.0.0"
+
 js-cookie@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
@@ -6110,6 +6161,14 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+lru-cache@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -6541,6 +6600,13 @@ node-releases@^2.0.5, node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -7293,6 +7359,11 @@ process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -7310,6 +7381,11 @@ prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
 
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
+
 psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
@@ -7881,6 +7957,11 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==
+
 signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -9043,6 +9124,11 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"

From 8351e73bd72986ded6c121abef0adf5360df0431 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Mon, 30 Jan 2023 09:11:40 +0000
Subject: [PATCH 15/40] Update dependency eslint to v8.33.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 651887c4..493ad44a 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "css-loader": "6.7.3",
     "css-minimizer-webpack-plugin": "4.2.2",
     "custom-event-polyfill": "1.0.7",
-    "eslint": "8.32.0",
+    "eslint": "8.33.0",
     "eslint-config-standard": "17.0.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.27.5",
diff --git a/yarn.lock b/yarn.lock
index bce48465..960c8abc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4148,10 +4148,10 @@ eslint-webpack-plugin@3.2.0:
     normalize-path "^3.0.0"
     schema-utils "^4.0.0"
 
-eslint@8.32.0:
-  version "8.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861"
-  integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==
+eslint@8.33.0:
+  version "8.33.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7"
+  integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==
   dependencies:
     "@eslint/eslintrc" "^1.4.1"
     "@humanwhocodes/config-array" "^0.11.8"

From c1249ffaf36a89ebc704f34359fe4ba258799145 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Tue, 31 Jan 2023 09:09:59 +0000
Subject: [PATCH 16/40] Update dependency nightwatch to v2.6.11

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 493ad44a..b2a61b95 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "lodash": "4.17.21",
     "mini-css-extract-plugin": "2.7.2",
     "mocha": "10.2.0",
-    "nightwatch": "2.6.10",
+    "nightwatch": "2.6.11",
     "opn": "5.5.0",
     "ora": "0.4.1",
     "postcss": "8.4.20",
diff --git a/yarn.lock b/yarn.lock
index 960c8abc..25970f78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6537,10 +6537,10 @@ nightwatch-axe-verbose@^2.1.0:
   dependencies:
     axe-core "^4.6.1"
 
-nightwatch@2.6.10:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-2.6.10.tgz#eda82a6a0ff0002fdbeb9d160938d3c53a92dd88"
-  integrity sha512-nn5HVEtETLQ8qgu7APAZKg/yXTBkMflwdmzhfywP8mZUfKk0/dRQbeDqY2RawHr/sYsFmZV6eMirlJaaQoQ7Yw==
+nightwatch@2.6.11:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-2.6.11.tgz#ba36d13855b003b488b74f64b4ffd8d13a5d1807"
+  integrity sha512-HLi9gTgcxqlDWfgZ/jT1QP8g3SzjBMZlFNdiDm065dopXR95jvyIpjA0Js8MsWRYzSTkRLGZvPVk28dwGaGXcQ==
   dependencies:
     "@nightwatch/chai" "5.0.2"
     "@nightwatch/html-reporter-template" "0.1.4"

From 621242f5a1a5d4d61a936b6aa2ea0e1d47b35611 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Wed, 8 Feb 2023 09:07:57 +0000
Subject: [PATCH 17/40] Update Font Awesome

---
 package.json |  8 ++++----
 yarn.lock    | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index b2a61b95..9c6b6318 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,10 @@
   "dependencies": {
     "@babel/runtime": "7.20.7",
     "@chenfengyuan/vue-qrcode": "2.0.0",
-    "@fortawesome/fontawesome-svg-core": "6.2.1",
-    "@fortawesome/free-regular-svg-icons": "6.2.1",
-    "@fortawesome/free-solid-svg-icons": "6.2.1",
-    "@fortawesome/vue-fontawesome": "3.0.2",
+    "@fortawesome/fontawesome-svg-core": "6.3.0",
+    "@fortawesome/free-regular-svg-icons": "6.3.0",
+    "@fortawesome/free-solid-svg-icons": "6.3.0",
+    "@fortawesome/vue-fontawesome": "3.0.3",
     "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
     "@kazvmoe-infra/unicode-emoji-json": "0.4.0",
     "@ruffle-rs/ruffle": "0.1.0-nightly.2022.7.12",
diff --git a/yarn.lock b/yarn.lock
index 25970f78..e5f8d149 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1548,36 +1548,36 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@fortawesome/fontawesome-common-types@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073"
-  integrity sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==
+"@fortawesome/fontawesome-common-types@6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b"
+  integrity sha512-4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg==
 
-"@fortawesome/fontawesome-svg-core@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz#e87e905e444b5e7b715af09b64d27b53d4c8f9d9"
-  integrity sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==
+"@fortawesome/fontawesome-svg-core@6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz#b6a17d48d231ac1fad93e43fca7271676bf316cf"
+  integrity sha512-uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.1"
+    "@fortawesome/fontawesome-common-types" "6.3.0"
 
-"@fortawesome/free-regular-svg-icons@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz#650e56d937755a8341f2eef258ecb6f95458820f"
-  integrity sha512-wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA==
+"@fortawesome/free-regular-svg-icons@6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.3.0.tgz#286f87f777e6c96af59151e86647c81083029ee2"
+  integrity sha512-cZnwiVHZ51SVzWHOaNCIA+u9wevZjCuAGSvSYpNlm6A4H4Vhwh8481Bf/5rwheIC3fFKlgXxLKaw8Xeroz8Ntg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.1"
+    "@fortawesome/fontawesome-common-types" "6.3.0"
 
-"@fortawesome/free-solid-svg-icons@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz#2290ea5adcf1537cbd0c43de6feb38af02141d27"
-  integrity sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==
+"@fortawesome/free-solid-svg-icons@6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz#d3bd33ae18bb15fdfc3ca136e2fea05f32768a65"
+  integrity sha512-x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.1"
+    "@fortawesome/fontawesome-common-types" "6.3.0"
 
-"@fortawesome/vue-fontawesome@3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.2.tgz#1b2ec546caab790c38d3dcb38407485a70703dd2"
-  integrity sha512-xHVtVY8ASUeEvgcA/7vULUesENhD+pi/EirRHdMBqooHlXBqK+yrV6d8tUye1m5UKQKVgYAHMhUBfOnoiwvc8Q==
+"@fortawesome/vue-fontawesome@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.3.tgz#633e2998d11f7d4ed41f0d5ea461a22ec9b9d034"
+  integrity sha512-KCPHi9QemVXGMrfuwf3nNnNo129resAIQWut9QTAMXmXqL2ErABC6ohd2yY5Ipq0CLWNbKHk8TMdTXL/Zf3ZhA==
 
 "@humanwhocodes/config-array@^0.11.8":
   version "0.11.8"

From 902954b29825647eaf5435c89e379ef4babe7931 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 9 Feb 2023 21:35:56 -0500
Subject: [PATCH 18/40] Use class to style screenreader-only text

---
 src/App.scss                                       | 14 ++++++++++++--
 src/_mixins.scss                                   | 12 ------------
 src/components/checkbox/checkbox.vue               |  3 +--
 .../screen_reader_notice/screen_reader_notice.vue  | 10 +---------
 .../settings_modal/helpers/modified_indicator.vue  |  2 +-
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 1c4c8941..3f352e8d 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -580,8 +580,6 @@ textarea,
   }
 
   &[type="checkbox"] {
-    display: none;
-
     &:checked + label::before {
       color: $fallback--text;
       color: var(--inputText, $fallback--text);
@@ -887,3 +885,15 @@ option {
   opacity: 0;
 }
 /* stylelint-enable no-descending-specificity */
+
+.visible-for-screenreader-only {
+  display: block;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  visibility: visible;
+  clip: rect(0 0 0 0);
+  padding: 0;
+  position: absolute;
+}
diff --git a/src/_mixins.scss b/src/_mixins.scss
index 677bc210..e99fe26f 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -16,15 +16,3 @@
     @content;
   }
 }
-
-@mixin visible-for-screenreader-only {
-  display: block;
-  width: 1px;
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  visibility: visible;
-  clip: rect(0 0 0 0);
-  padding: 0;
-  position: absolute;
-}
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index ac7acd52..42f89be9 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -5,6 +5,7 @@
   >
     <input
       type="checkbox"
+      class="visible-for-screenreader-only"
       :disabled="disabled"
       :checked="modelValue"
       :indeterminate="indeterminate"
@@ -85,8 +86,6 @@ export default {
   }
 
   input[type="checkbox"] {
-    @include visible-for-screenreader-only;
-
     &:checked + .checkbox-indicator::before {
       color: $fallback--text;
       color: var(--inputText, $fallback--text);
diff --git a/src/components/screen_reader_notice/screen_reader_notice.vue b/src/components/screen_reader_notice/screen_reader_notice.vue
index 1cd908ae..8384ae6b 100644
--- a/src/components/screen_reader_notice/screen_reader_notice.vue
+++ b/src/components/screen_reader_notice/screen_reader_notice.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="screen-reader-text"
+    class="visible-for-screenreader-only"
     :aria-live="ariaLive"
   >
     {{ currentText }}
@@ -8,11 +8,3 @@
 </template>
 
 <script src="./screen_reader_notice.js"></script>
-
-<style lang="scss">
-@import "../../mixins";
-
-.screen-reader-text {
-  @include visible-for-screenreader-only;
-}
-</style>
diff --git a/src/components/settings_modal/helpers/modified_indicator.vue b/src/components/settings_modal/helpers/modified_indicator.vue
index 8311533a..45db3fc2 100644
--- a/src/components/settings_modal/helpers/modified_indicator.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@@ -5,12 +5,12 @@
   >
     <Popover
       trigger="hover"
+      :trigger-attrs="{ 'aria-label': $t('settings.setting_changed') }"
     >
       <template #trigger>
         &nbsp;
         <FAIcon
           icon="wrench"
-          :aria-label="$t('settings.setting_changed')"
         />
       </template>
       <template #content>

From 79f1d79c4e8b55c23c88fe4def30afd34d103428 Mon Sep 17 00:00:00 2001
From: Ryan Chiang <her.mine@outlook.com>
Date: Sun, 22 Jan 2023 13:52:01 +0000
Subject: [PATCH 19/40] Translated using Weblate (Chinese (Simplified))

Currently translated at 89.0% (824 of 925 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 8f0b04bd..00bd2ac9 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -59,7 +59,9 @@
     "never_show_again": "不再显示",
     "undo": "撤销",
     "yes": "是",
-    "no": "否"
+    "no": "否",
+    "unpin": "取消固定该项",
+    "pin": "固定该项"
   },
   "image_cropper": {
     "crop_picture": "裁剪图片",
@@ -120,7 +122,10 @@
     "edit_finish": "完成编辑",
     "mobile_notifications": "打开通知（有未读的）",
     "mobile_notifications_close": "关闭通知",
-    "announcements": "公告"
+    "announcements": "公告",
+    "edit_nav_mobile": "自定义导航栏",
+    "edit_pinned": "编辑固定的项目",
+    "mobile_sidebar": "切换移动设备侧栏"
   },
   "notifications": {
     "broken_favorite": "未知的状态，正在搜索中…",
@@ -135,7 +140,8 @@
     "migrated_to": "迁移到了",
     "follow_request": "想要关注你",
     "error": "取得通知时发生错误：{0}",
-    "poll_ended": "投票结束了"
+    "poll_ended": "投票结束了",
+    "submitted_report": "提交举报"
   },
   "polls": {
     "add_poll": "增加投票",
@@ -194,7 +200,10 @@
     "media_description": "媒体描述",
     "media_description_error": "更新媒体失败，请重试",
     "empty_status_error": "不能发布没有内容、没有附件的发文",
-    "post": "发送"
+    "post": "发送",
+    "edit_remote_warning": "其他远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
+    "edit_unsupported_warning": "Pleroma 不支持对提及或投票进行编辑。",
+    "edit_status": "编辑状态"
   },
   "registration": {
     "bio": "简介",
@@ -219,7 +228,9 @@
     "reason_placeholder": "此实例的注册需要手动批准。\n请让管理员知道您为什么想要注册。",
     "reason": "注册理由",
     "register": "注册",
-    "email_language": "你想从服务器收到什么语言的邮件？"
+    "email_language": "你想从服务器收到什么语言的邮件？",
+    "bio_optional": "介绍（可选）",
+    "email_optional": "电子邮件（可选）"
   },
   "selectable_list": {
     "select_all": "选择全部"
@@ -642,7 +653,11 @@
     "move_account_notes": "如果你想把账号移动到别的地方，你必须去目标账号，然后加一个指向这里的别名。",
     "wordfilter": "词语过滤器",
     "user_profiles": "用户资料",
-    "third_column_mode_notifications": "消息栏"
+    "third_column_mode_notifications": "消息栏",
+    "backup_running": "此备份正在进行，已处理 {number} 条记录。 |此备份正在进行，已处理 {number} 条记录。",
+    "lists_navigation": "在导航中显示列表",
+    "word_filter_and_more": "词过滤器及其他...",
+    "backup_failed": "此备份已失败。"
   },
   "time": {
     "day": "{0} 天",
@@ -1001,5 +1016,15 @@
     "submit_edit_action": "提交",
     "cancel_edit_action": "取消",
     "inactive_message": "这个公告不活跃"
+  },
+  "report": {
+    "reported_user": "被举报者：",
+    "state_closed": "已关闭",
+    "state_resolved": "已解决",
+    "reporter": "举报者：",
+    "state_open": "开启"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "此域名包含非 ascii 字符。"
   }
 }

From 6dc683f6025e94764d8ae65ae3eaf9ee1c4d1dd9 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Thu, 26 Jan 2023 07:04:08 +0000
Subject: [PATCH 20/40] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (979 of 982 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 214 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 189 insertions(+), 25 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 00bd2ac9..86181689 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -90,7 +90,11 @@
     "heading": {
       "totp": "双重因素验证",
       "recovery": "双重因素恢复"
-    }
+    },
+    "logout_confirm_cancel_button": "不要登出",
+    "logout_confirm_title": "确认登出",
+    "logout_confirm_accept_button": "登出",
+    "logout_confirm": "您确定要登出吗？"
   },
   "media_modal": {
     "previous": "往前",
@@ -166,7 +170,9 @@
     "favs_repeats": "转发和喜欢",
     "follows": "新的关注者",
     "load_older": "加载更早的互动",
-    "moves": "用户迁移"
+    "moves": "用户迁移",
+    "reports": "举报",
+    "emoji_reactions": "表情回应"
   },
   "post_status": {
     "new_status": "发布新状态",
@@ -201,7 +207,7 @@
     "media_description_error": "更新媒体失败，请重试",
     "empty_status_error": "不能发布没有内容、没有附件的发文",
     "post": "发送",
-    "edit_remote_warning": "其他远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
+    "edit_remote_warning": "其它远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
     "edit_unsupported_warning": "Pleroma 不支持对提及或投票进行编辑。",
     "edit_status": "编辑状态"
   },
@@ -223,14 +229,18 @@
       "email_required": "不能留空",
       "password_required": "不能留空",
       "password_confirmation_required": "不能留空",
-      "password_confirmation_match": "密码不一致"
+      "password_confirmation_match": "密码不一致",
+      "birthday_required": "不能为空",
+      "birthday_min_age": "必须在 {date} 或之前"
     },
     "reason_placeholder": "此实例的注册需要手动批准。\n请让管理员知道您为什么想要注册。",
     "reason": "注册理由",
     "register": "注册",
     "email_language": "你想从服务器收到什么语言的邮件？",
     "bio_optional": "介绍（可选）",
-    "email_optional": "电子邮件（可选）"
+    "email_optional": "电子邮件（可选）",
+    "birthday": "生日：",
+    "birthday_optional": "生日（可选）："
   },
   "selectable_list": {
     "select_all": "选择全部"
@@ -621,7 +631,7 @@
       "backup_settings": "备份设置到文件",
       "backup_restore": "设置备份"
     },
-    "right_sidebar": "在右侧显示侧边栏",
+    "right_sidebar": "反转分栏的顺序",
     "hide_shoutbox": "隐藏实例留言板",
     "expert_mode": "显示高级",
     "download_backup": "下载",
@@ -653,11 +663,78 @@
     "move_account_notes": "如果你想把账号移动到别的地方，你必须去目标账号，然后加一个指向这里的别名。",
     "wordfilter": "词语过滤器",
     "user_profiles": "用户资料",
-    "third_column_mode_notifications": "消息栏",
+    "third_column_mode_notifications": "通知栏",
     "backup_running": "此备份正在进行，已处理 {number} 条记录。 |此备份正在进行，已处理 {number} 条记录。",
     "lists_navigation": "在导航中显示列表",
-    "word_filter_and_more": "词过滤器及其他...",
-    "backup_failed": "此备份已失败。"
+    "word_filter_and_more": "词过滤器及其它...",
+    "backup_failed": "此备份已失败。",
+    "birthday": {
+      "label": "生日",
+      "show_birthday": "展示我的生日"
+    },
+    "hide_favorites_description": "不显示我的喜欢列表（人们仍然会收到通知）",
+    "third_column_mode": "当有足够的空间时，显示第三栏包含",
+    "third_column_mode_postform": "主要的发文形式和导航",
+    "columns": "分栏",
+    "user_popover_avatar_overlay": "在用户头像上显示用户弹出窗口",
+    "navbar_column_stretch": "延伸导航栏至分栏宽度",
+    "posts": "帖子",
+    "conversation_display_linear_quick": "线性视图",
+    "conversation_other_replies_button": "显示 “其它回复” 按钮",
+    "confirm_dialogs_delete": "删除状态",
+    "confirm_dialogs_mute": "隐藏用户",
+    "column_sizes": "分栏大小",
+    "column_sizes_sidebar": "侧栏",
+    "column_sizes_content": "內容",
+    "column_sizes_notifs": "通知",
+    "conversation_other_replies_button_below": "在状态下方",
+    "conversation_other_replies_button_inside": "在状态中",
+    "auto_update": "自动显示新的帖子",
+    "use_websockets": "使用 websockets（实时更新）",
+    "max_depth_in_thread": "默认显示同主题帖子中的最大层数",
+    "hide_wordfiltered_statuses": "隐藏经过词语过滤的状态",
+    "hide_muted_threads": "不显示已隐藏的同主题帖子",
+    "notification_visibility_polls": "你所投的投票的结束于",
+    "tree_advanced": "允许在树状视图中进行更灵活的导航",
+    "tree_fade_ancestors": "以模糊的文字显示当前状态的原型",
+    "conversation_display_linear": "线性样式",
+    "mention_link_fade_domain": "淡化域名（例如：{'@'}example.org 中的 {'@'}foo{'@'}example.org）",
+    "mention_link_bolden_you": "当你被提及时突出显示提及你",
+    "user_popover_avatar_action": "弹出式头像点击动作",
+    "user_popover_avatar_action_zoom": "缩放头像",
+    "user_popover_avatar_action_close": "关闭弹出窗口",
+    "show_yous": "显示 (You)s",
+    "add_language": "添加备用语言",
+    "remove_language": "移除",
+    "primary_language": "主要语言：",
+    "fallback_language": "备用语言 {index}：",
+    "account_privacy": "隐私",
+    "conversation_display": "对话显示样式",
+    "conversation_display_tree": "树状样式",
+    "conversation_display_tree_quick": "树状视图",
+    "disable_sticky_headers": "不要把分栏的顶栏固定在屏幕的顶部",
+    "confirm_dialogs": "请求确认于",
+    "confirm_dialogs_logout": "登出",
+    "confirm_dialogs_deny_follow": "拒绝关注请求",
+    "confirm_dialogs_approve_follow": "批准关注请求",
+    "confirm_dialogs_block": "屏蔽用户",
+    "confirm_dialogs_unfollow": "取消关注用户",
+    "confirm_dialogs_repeat": "转发状态",
+    "confirm_dialogs_remove_follower": "移除关注者",
+    "mute_bot_posts": "隐藏机器人的帖子",
+    "hide_bot_indication": "隐藏帖子中的机器人提示",
+    "always_show_post_button": "始终显示浮动的新帖子按钮",
+    "show_scrollbars": "显示侧栏的滚动条",
+    "third_column_mode_none": "完全不显示第三栏",
+    "use_at_icon": "将 {'@'} 符号显示为图标而不是文本",
+    "mention_link_display": "显示提及链接",
+    "mention_link_display_short": "始终以简称的形式出现（例如：{'@'}foo）",
+    "mention_link_display_full_for_remote": "仅远程实例用户以全名的形式出现（例如：{'@'}foo{'@'}example.org）",
+    "mention_link_display_full": "始终以全名的形式出现（例如：{'@'}foo{'@'}example.org）",
+    "mention_link_use_tooltip": "点击提及链接时显示用户卡片",
+    "mention_link_show_avatar": "在链接旁边显示用户头像",
+    "mention_link_show_avatar_quick": "在提及内容旁边显示用户头像",
+    "user_popover_avatar_action_open": "打开个人资料"
   },
   "time": {
     "day": "{0} 天",
@@ -723,7 +800,9 @@
     "reload": "重新载入",
     "error": "取得时间轴时发生错误：{0}",
     "socket_broke": "丢失实时连接：CloseEvent code {0}",
-    "socket_reconnected": "已建立实时连接"
+    "socket_reconnected": "已建立实时连接",
+    "quick_view_settings": "快速视图设置",
+    "quick_filter_settings": "快速过滤设置"
   },
   "status": {
     "favorites": "喜欢",
@@ -732,7 +811,7 @@
     "pin": "在个人资料置顶",
     "unpin": "取消在个人资料置顶",
     "pinned": "置顶",
-    "delete_confirm": "你真的想要删除这条状态吗？",
+    "delete_confirm": "您确定要删除这条状态吗？",
     "reply_to": "回复",
     "replies_list": "回复：",
     "mute_conversation": "隐藏对话",
@@ -741,7 +820,7 @@
     "show_content": "显示内容",
     "hide_full_subject": "隐藏此部分标题",
     "show_full_subject": "显示全部标题",
-    "thread_muted": "此系列消息已被隐藏",
+    "thread_muted": "同主题帖子已被隐藏",
     "copy_link": "复制状态链接",
     "status_unavailable": "状态不可取得",
     "unbookmark": "取消书签",
@@ -762,10 +841,10 @@
     "attachment_stop_flash": "停止 Flash 播放器",
     "move_up": "把附件左移",
     "open_gallery": "打开图库",
-    "thread_hide": "隐藏这个线索",
-    "thread_show": "显示这个线索",
+    "thread_hide": "隐藏这个同主题帖子",
+    "thread_show": "显示这个同主题帖子",
     "thread_show_full_with_icon": "{icon} {text}",
-    "thread_follow": "查看这个线索的剩余部分（一共有 {numStatus} 个状态）",
+    "thread_follow": "查看这个同主题帖子的剩余部分（一共有 {numStatus} 个状态）",
     "thread_follow_with_icon": "{icon} {text}",
     "ancestor_follow": "查看这个状态下的别的 {numReplies} 个回复",
     "ancestor_follow_with_icon": "{icon} {text}",
@@ -774,8 +853,19 @@
     "mentions": "提及",
     "replies_list_with_others": "回复（另外 +{numReplies} 个）：",
     "move_down": "把附件右移",
-    "thread_show_full": "显示这个线索下的所有东西（一共有 {numStatus} 个状态，最大深度 {depth}）",
-    "show_only_conversation_under_this": "只显示这个状态的回复"
+    "thread_show_full": "显示这个同主题帖子下的所有东西（一共有 {numStatus} 个状态，最大深度 {depth}）",
+    "show_only_conversation_under_this": "只显示这个状态的回复",
+    "repeat_confirm": "您确定要转发这条状态吗？",
+    "repeat_confirm_title": "确认转发",
+    "repeat_confirm_accept_button": "转发",
+    "repeat_confirm_cancel_button": "不要转发",
+    "edit": "编辑状态",
+    "edited_at": "（最后编辑于 {time}）",
+    "delete_confirm_title": "确认删除",
+    "delete_confirm_accept_button": "删除",
+    "delete_confirm_cancel_button": "保留",
+    "show_attachment_in_modal": "在媒体模式中显示",
+    "status_history": "状态历史"
   },
   "user_card": {
     "approve": "核准",
@@ -823,7 +913,8 @@
       "disable_remote_subscription": "禁止从远程实例关注用户",
       "disable_any_subscription": "完全禁止关注用户",
       "quarantine": "从联合实例中禁止用户帖子",
-      "delete_user": "删除用户"
+      "delete_user": "删除用户",
+      "delete_user_data_and_deactivate_confirmation": "这将永久删除该账户的数据并停用该账户。你完全确定吗？"
     },
     "hidden": "已隐藏",
     "show_repeats": "显示转发",
@@ -837,7 +928,41 @@
       "solid": "单一颜色背景",
       "disabled": "不突出显示"
     },
-    "edit_profile": "编辑个人资料"
+    "edit_profile": "编辑个人资料",
+    "approve_confirm_title": "确认批准",
+    "approve_confirm_accept_button": "批准",
+    "block_confirm_accept_button": "屏蔽",
+    "block_confirm_cancel_button": "不要屏蔽",
+    "deactivated": "已停用",
+    "deny_confirm_title": "确认拒绝",
+    "deny_confirm_accept_button": "拒绝",
+    "deny_confirm_cancel_button": "不要拒绝",
+    "deny_confirm": "您是否要拒绝 {user} 的关注请求？",
+    "follow_cancel": "取消请求",
+    "unfollow_confirm_title": "确认取消关注",
+    "unfollow_confirm": "您确定要取消关注 {user} 吗？",
+    "unfollow_confirm_accept_button": "取消关注",
+    "unfollow_confirm_cancel_button": "不要取消关注",
+    "mute_confirm_title": "确认隐藏",
+    "mute_confirm_accept_button": "隐藏",
+    "mute_confirm_cancel_button": "不要隐藏",
+    "mute_duration_prompt": "让这个用户隐藏（0表示无限期）：",
+    "remove_follower": "移除关注者",
+    "remove_follower_confirm_title": "确认移除关注者",
+    "remove_follower_confirm_cancel_button": "保留",
+    "remove_follower_confirm": "您确定要将 {user} 从您的关注者里移除吗？",
+    "birthday": "生于 {birthday}",
+    "note": "备注",
+    "approve_confirm_cancel_button": "不要批准",
+    "approve_confirm": "您是否要批准 {user} 的关注请求？",
+    "block_confirm_title": "确认屏蔽",
+    "block_confirm": "您确定要屏蔽 {user} 吗？",
+    "mute_confirm": "您确定要隐藏 {user} 吗？",
+    "remove_follower_confirm_accept_button": "移除",
+    "note_blank": "（空）",
+    "edit_note": "编辑备注",
+    "edit_note_apply": "应用",
+    "edit_note_cancel": "取消"
   },
   "user_profile": {
     "timeline_title": "用户时间线",
@@ -866,7 +991,9 @@
     "reject_follow_request": "拒绝关注请求",
     "add_reaction": "添加互动",
     "bookmark": "书签",
-    "accept_follow_request": "接受关注请求"
+    "accept_follow_request": "接受关注请求",
+    "toggle_expand": "展开或折叠通知以显示帖子全文",
+    "toggle_mute": "展开或折叠通知以显示已隐藏的内容"
   },
   "upload": {
     "error": {
@@ -888,7 +1015,9 @@
     "hashtags": "话题标签",
     "person_talking": "{count} 人正在讨论",
     "people_talking": "{count} 人正在讨论",
-    "no_results": "没有搜索结果"
+    "no_results": "没有搜索结果",
+    "no_more_results": "没有更多结果",
+    "load_more": "加载更多结果"
   },
   "password_reset": {
     "forgot_password": "忘记密码了？",
@@ -925,9 +1054,11 @@
       "symbols": "符号",
       "travel-and-places": "旅行和地点",
       "activities": "活动",
-      "animals-and-nature": "动物和自然"
+      "animals-and-nature": "动物和自然",
+      "smileys-and-emotion": "表情与情感"
     },
-    "regional_indicator": "地区指示符 {letter}"
+    "regional_indicator": "地区指示符 {letter}",
+    "unpacked": "拆分的表情符号"
   },
   "about": {
     "mrf": {
@@ -987,7 +1118,7 @@
     "empty_chat_list_placeholder": "您还没有任何聊天记录。开始聊天吧！",
     "error_sending_message": "发送消息时出了点问题。",
     "error_loading_chat": "加载聊天时出了点问题。",
-    "delete_confirm": "您确实要删除此消息吗？",
+    "delete_confirm": "您确定要删除此消息吗？",
     "more": "更多",
     "empty_message_error": "无法发布空消息",
     "new": "新聊天",
@@ -1022,9 +1153,42 @@
     "state_closed": "已关闭",
     "state_resolved": "已解决",
     "reporter": "举报者：",
-    "state_open": "开启"
+    "state_open": "开启",
+    "reported_statuses": "已举报的状态：",
+    "notes": "备注：",
+    "state": "状态："
   },
   "unicode_domain_indicator": {
     "tooltip": "此域名包含非 ascii 字符。"
+  },
+  "update": {
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "update_changelog": "关于变化的更多细节，请参见 {theFullChangelog} 。",
+    "update_changelog_here": "完整的更新日志",
+    "big_update_title": "请忍耐一下",
+    "big_update_content": "我们已经有一段时间没有发布发行版，所以事情的外观和感觉可能与你习惯的不一样。",
+    "update_bugs": "请在 {pleromaGitlab} 上报告任何问题和bug，因为我们已经改变了很多，虽然我们进行了彻底的测试，并且自己使用了开发版本，但我们可能错过了一些东西。我们欢迎你对你可能遇到的问题或如何改进Pleroma和Pleroma-FE提出反馈和建议。",
+    "art_by": "Art by {linkToArtist}"
+  },
+  "lists": {
+    "search": "搜索用户",
+    "create": "创建",
+    "save": "保存更改",
+    "delete": "删除列表",
+    "following_only": "限制于正在关注",
+    "manage_lists": "管理列表",
+    "manage_members": "管理列表成员",
+    "add_members": "搜索更多用户",
+    "remove_from_list": "从列表中移除",
+    "add_to_list": "添加到列表",
+    "is_in_list": "已在列表中",
+    "editing_list": "正在编辑列表 {listTitle}",
+    "creating_list": "正在创建新的列表",
+    "update_title": "保存标题",
+    "really_delete": "真的要删除列表吗？",
+    "error": "操作列表时出错：{0}",
+    "lists": "列表",
+    "new": "新的列表",
+    "title": "列表标题"
   }
 }

From cb18497902c0a1b02c6d41871aa466685e1c60de Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Sun, 29 Jan 2023 06:22:43 +0000
Subject: [PATCH 21/40] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (983 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 86181689..90f840a7 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -129,7 +129,8 @@
     "announcements": "公告",
     "edit_nav_mobile": "自定义导航栏",
     "edit_pinned": "编辑固定的项目",
-    "mobile_sidebar": "切换移动设备侧栏"
+    "mobile_sidebar": "切换移动设备侧栏",
+    "search_close": "关闭搜索栏"
   },
   "notifications": {
     "broken_favorite": "未知的状态，正在搜索中…",
@@ -209,7 +210,9 @@
     "post": "发送",
     "edit_remote_warning": "其它远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
     "edit_unsupported_warning": "Pleroma 不支持对提及或投票进行编辑。",
-    "edit_status": "编辑状态"
+    "edit_status": "编辑状态",
+    "content_type_selection": "发帖格式",
+    "scope_notice_dismiss": "关闭此提示"
   },
   "registration": {
     "bio": "简介",
@@ -993,7 +996,8 @@
     "bookmark": "书签",
     "accept_follow_request": "接受关注请求",
     "toggle_expand": "展开或折叠通知以显示帖子全文",
-    "toggle_mute": "展开或折叠通知以显示已隐藏的内容"
+    "toggle_mute": "展开或折叠通知以显示已隐藏的内容",
+    "autocomplete_available": "共有 {number} 个结果可用。使用向上和向下键浏览它们。"
   },
   "upload": {
     "error": {

From 2e9014abd72352bf9994834e5341373805236a10 Mon Sep 17 00:00:00 2001
From: nixe neko <nixeneko.info@gmail.com>
Date: Sat, 4 Feb 2023 02:35:07 +0000
Subject: [PATCH 22/40] Translated using Weblate (Japanese (ja_EASY))

Currently translated at 99.6% (983 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_EASY/
---
 src/i18n/ja_easy.json | 588 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 555 insertions(+), 33 deletions(-)

diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index abca262b..21b27d12 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -17,7 +17,17 @@
         "media_removal": "メディアをのぞく",
         "media_removal_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、とりのぞきます:",
         "media_nsfw": "メディアをすべてセンシティブにする",
-        "media_nsfw_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、すべて、センシティブにマークします:"
+        "media_nsfw_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、すべて、センシティブにマークします:",
+        "reason": "りゆう",
+        "instance": "インスタンス",
+        "not_applicable": "なし"
+      },
+      "keyword": {
+        "keyword_policies": "キーワードポリシー",
+        "reject": "おことわり",
+        "replace": "おきかえ",
+        "ftl_removal": "「つながっているすべてのネットワーク」タイムラインからのぞく",
+        "is_replaced_by": "→"
       }
     },
     "staff": "スタッフ"
@@ -36,7 +46,10 @@
     "scope_options": "こうかいはんいせんたく",
     "text_limit": "もじのかず",
     "title": "ゆうこうなきのう",
-    "who_to_follow": "おすすめユーザー"
+    "who_to_follow": "おすすめユーザー",
+    "pleroma_chat_messages": "Pleroma チャット",
+    "upload_limit": "アップロードできるファイルのおおきさ",
+    "shout": "Shoutbox"
   },
   "finder": {
     "error_fetching_user": "ユーザーけんさくがエラーになりました",
@@ -54,7 +67,34 @@
     "disable": "なし",
     "enable": "あり",
     "confirm": "たしかめる",
-    "verify": "たしかめる"
+    "verify": "たしかめる",
+    "retry": "もういちど、ためしてください",
+    "loading": "よみこんでいます…",
+    "undo": "もとにもどす",
+    "yes": "はい",
+    "no": "いいえ",
+    "unpin": "ピンどめするのをやめる",
+    "scroll_to_top": "いちばんうえにもどる",
+    "role": {
+      "moderator": "モデレーター",
+      "admin": "かんりするひと"
+    },
+    "flash_security": "Flash コンテンツはどんなコードでもじっこうできるので、あぶないかもしれません。",
+    "flash_fail": "Flash コンテンツをよみこむことに、しっぱいしました。コンソールで、くわしいないようを、よむことができます。",
+    "scope_in_timeline": {
+      "private": "フォロワーげんてい",
+      "public": "パブリック",
+      "unlisted": "アンリステッド",
+      "direct": "ダイレクト"
+    },
+    "pin": "ピンどめする",
+    "flash_content": "Flash コンテンツを、 Ruffle をつかってひょうじする (うごかないかもしれません)。",
+    "generic_error_message": "エラーになりました: {0}",
+    "error_retry": "もういちど、ためしてください",
+    "never_show_again": "にどとひょうじしない",
+    "close": "とじる",
+    "dismiss": "むしする",
+    "peek": "かくす"
   },
   "image_cropper": {
     "crop_picture": "がぞうをきりぬく",
@@ -83,11 +123,17 @@
     "heading": {
       "totp": "2-ファクターにんしょう",
       "recovery": "2-ファクターリカバリー"
-    }
+    },
+    "logout_confirm_title": "ログアウトのかくにん",
+    "logout_confirm": "ほんとうに、ログアウトしますか？",
+    "logout_confirm_accept_button": "ログアウトする",
+    "logout_confirm_cancel_button": "ログアウトしない"
   },
   "media_modal": {
     "previous": "まえ",
-    "next": "つぎ"
+    "next": "つぎ",
+    "counter": "{current} / {total}",
+    "hide": "メディアビューアーをとじる"
   },
   "nav": {
     "about": "これはなに？",
@@ -104,7 +150,20 @@
     "user_search": "ユーザーをさがす",
     "search": "さがす",
     "who_to_follow": "おすすめユーザー",
-    "preferences": "せってい"
+    "preferences": "せってい",
+    "home_timeline": "ホームタイムライン",
+    "bookmarks": "ブックマーク",
+    "timelines": "タイムライン",
+    "chats": "チャット",
+    "lists": "リスト",
+    "mobile_notifications": "つうちをひらく (よんでないものがあります)",
+    "mobile_notifications_close": "つうちをとじる",
+    "announcements": "おしらせ",
+    "edit_pinned": "ピンどめをへんしゅう",
+    "search_close": "けんさくバーをとじる",
+    "edit_nav_mobile": "ナビゲーションバーのせっていをかえる",
+    "mobile_sidebar": "モバイルのサイドバーをきりかえる",
+    "edit_finish": "へんしゅうをおわりにする"
   },
   "notifications": {
     "broken_favorite": "ステータスがみつかりません。さがしています…",
@@ -114,21 +173,29 @@
     "notifications": "つうち",
     "read": "よんだ！",
     "repeated_you": "あなたのステータスがリピートされました",
-    "no_more_notifications": "つうちはありません"
+    "no_more_notifications": "つうちはありません",
+    "error": "つうちをとりにいくことに、しっぱいしました: {0}",
+    "follow_request": "あなたをフォローしたいです",
+    "migrated_to": "インスタンスを、ひっこしました",
+    "reacted_with": "{0} でリアクションしました",
+    "poll_ended": "とうひょうが、おわりました",
+    "submitted_report": "つうほうしました"
   },
   "polls": {
-    "add_poll": "いれふだをはじめる",
+    "add_poll": "とうひょうをはじめる",
     "add_option": "オプションをふやす",
     "option": "オプション",
-    "votes": "いれふだ",
-    "vote": "ふだをいれる",
-    "type": "いれふだのかた",
+    "votes": "ひょう",
+    "vote": "とうひょうする",
+    "type": "とうひょうのけいしき",
     "single_choice": "ひとつえらぶ",
     "multiple_choices": "いくつでもえらべる",
-    "expiry": "いれふだのながさ",
-    "expires_in": "いれふだは {0} で、おわります",
-    "expired": "いれふだは {0} まえに、おわりました",
-    "not_enough_options": "ユニークなオプションが、たりません"
+    "expiry": "とうひょうのながさ",
+    "expires_in": "とうひょうは {0} で、おわります",
+    "expired": "とうひょうは {0} まえに、おわりました",
+    "not_enough_options": "ユニークなオプションが、たりません",
+    "people_voted_count": "{count} にんが、とうひょうしました",
+    "votes_count": "{count} ひょう"
   },
   "emoji": {
     "stickers": "ステッカー",
@@ -139,7 +206,19 @@
     "custom": "カスタムえもじ",
     "unicode": "ユニコードえもじ",
     "load_all_hint": "はじめの {saneAmount} このえもじだけがロードされています。すべてのえもじをロードすると、パフォーマンスがわるくなるかもしれません。",
-    "load_all": "すべてのえもじをロード ({emojiAmount} こあります)"
+    "load_all": "すべてのえもじをロード ({emojiAmount} こあります)",
+    "unicode_groups": {
+      "flags": "はた",
+      "activities": "かつどう",
+      "animals-and-nature": "どうぶつ・しぜん",
+      "food-and-drink": "たべもの・のみもの",
+      "objects": "もの",
+      "people-and-body": "ひと・からだ",
+      "smileys-and-emotion": "えがお・きもち",
+      "symbols": "きごう",
+      "travel-and-places": "りょこう・ばしょ"
+    },
+    "regional_indicator": "ばしょをしめすきごう {letter}"
   },
   "stickers": {
     "add_sticker": "ステッカーをふやす"
@@ -147,7 +226,10 @@
   "interactions": {
     "favs_repeats": "リピートとおきにいり",
     "follows": "あたらしいフォロー",
-    "load_older": "ふるいやりとりをみる"
+    "load_older": "ふるいやりとりをみる",
+    "emoji_reactions": "えもじリアクション",
+    "moves": "ユーザーのひっこし",
+    "reports": "つうほう"
   },
   "post_status": {
     "new_status": "とうこうする",
@@ -176,7 +258,18 @@
       "private": "フォロワーげんてい: フォロワーのみにとどきます",
       "public": "パブリック: パブリックタイムラインにとどきます",
       "unlisted": "アンリステッド: パブリックタイムラインにとどきません"
-    }
+    },
+    "media_description_error": "メディアのアップロードにしっぱいしました。もういちどためしてください",
+    "edit_status": "ステータスをへんしゅうする",
+    "media_description": "メディアのせつめい",
+    "content_type_selection": "とうこうのけいしき",
+    "edit_remote_warning": "ほかのリモートインスタンスは、へんしゅうをサポートしていないかもしれません。そして、へんしゅうされたとうこうをうけとることができないかもしれません。",
+    "post": "とうこう",
+    "edit_unsupported_warning": "Pleroma は、メンションやとうひょうのへんしゅうを、サポートしていません。",
+    "preview": "プレビュー",
+    "preview_empty": "なにもありません",
+    "empty_status_error": "とうこうないようを、にゅうりょくしてください",
+    "scope_notice_dismiss": "このつうちをとじる"
   },
   "registration": {
     "bio": "プロフィール",
@@ -196,8 +289,18 @@
       "email_required": "なにかかいてください",
       "password_required": "なにかかいてください",
       "password_confirmation_required": "なにかかいてください",
-      "password_confirmation_match": "パスワードがちがいます"
-    }
+      "password_confirmation_match": "パスワードがちがいます",
+      "birthday_required": "なにかかいてください",
+      "birthday_min_age": "{date} か、それよりまえにしてください"
+    },
+    "reason_placeholder": "このインスタンスでは、ひとがかくにんして、とうろくをうけいれています。\nなぜあなたがとうろくしたいのかを、かんりしているひとに、おしえてください。",
+    "bio_optional": "プロフィール (かかなくてもよい)",
+    "reason": "とうろくするりゆう",
+    "email_optional": "Eメール (かかなくてもよい)",
+    "register": "とうろくする",
+    "email_language": "サーバーからのメールは、なにご(どのことば)がいいですか？",
+    "birthday": "たんじょうび:",
+    "birthday_optional": "たんじょうび (かかなくてもよい):"
   },
   "remote_user_resolver": {
     "remote_user_resolver": "リモートユーザーリゾルバー",
@@ -393,7 +496,24 @@
         "save_load_hint": "「のこす」オプションをONにすると、テーマをえらんだときとロードしたとき、いまのせっていをのこします。また、テーマをエクスポートするとき、これらのオプションをストアします。すべてのチェックボックスをOFFにすると、テーマをエクスポートしたとき、すべてのせっていをセーブします。",
         "reset": "リセット",
         "clear_all": "すべてクリア",
-        "clear_opacity": "とうめいどをクリア"
+        "clear_opacity": "とうめいどをクリア",
+        "help": {
+          "older_version_imported": "ふるいバージョンのフロントエンドでつくられたファイルをインポートしました。",
+          "snapshot_missing": "ファイルにはテーマのスナップショットがありません。おもっていたみためと、ちがうかもしれません。",
+          "migration_snapshot_ok": "あんぜんのため、テーマのスナップショットがよみこまれました。テーマのデータをよみこむことができます。",
+          "snapshot_source_mismatch": "バージョンがただしくないです。フロントエンドのバージョンをもとにもどしたあと、あたらしくしたことが、りゆうかもしれません。ふるいフロントエンドでテーマをへんこうしていたばあい、ふるいバージョンをつかうのがいいです。そうでないばあい、あたらしいバージョンをつかってください。",
+          "snapshot_present": "テーマのスナップショットをよみこみました。せっていはうわがきされました。かわりに、テーマのじっさいのデータをよみこむことができます。",
+          "fe_upgraded": "フロントエンドといっしょに、テーマエンジンもあたらしくなりました。",
+          "fe_downgraded": "フロントエンドが、まえのバージョンにもどりました。",
+          "migration_napshot_gone": "スナップショットがありません。おぼえているみためと、ちがうかもしれません。",
+          "upgraded_from_v2": "PleromaFEがあたらしくなったので、いままでのみためとすこしちがうかもしれません。",
+          "v2_imported": "ふるいフロントエンドのためのファイルをインポートしました。せっていしたのとは、すこしちがうかもしれません。",
+          "future_version_imported": "あたらしいフロントエンドでつくられたファイルをインポートしました。"
+        },
+        "load_theme": "テーマをよみこむ",
+        "keep_as_is": "そのままにする",
+        "use_snapshot": "ふるいバージョン",
+        "use_source": "あたらしいバージョン"
       },
       "common": {
         "color": "いろ",
@@ -429,7 +549,26 @@
         "borders": "さかいめ",
         "buttons": "ボタン",
         "inputs": "インプットフィールド",
-        "faint_text": "うすいテキスト"
+        "faint_text": "うすいテキスト",
+        "post": "とうこう / プロフィール",
+        "wallpaper": "かべがみ",
+        "icons": "アイコン",
+        "highlight": "よくみえるようにした、ようそ",
+        "pressed": "おしたとき",
+        "chat": {
+          "border": "さかいめ",
+          "incoming": "うけとったもの",
+          "outgoing": "おくったもの"
+        },
+        "underlay": "アンダーレイ",
+        "alert_neutral": "それいがい",
+        "popover": "ツールチップ、メニュー、ポップオーバー",
+        "poll": "とうひょうのグラフ",
+        "selectedPost": "えらんだとうこう",
+        "selectedMenu": "えらんだメニューアイテム",
+        "disabled": "つかえないとき",
+        "toggled": "きりかえたとき",
+        "tabs": "タブ"
       },
       "radii": {
         "_tab_label": "まるさ"
@@ -462,7 +601,8 @@
           "buttonPressed": "ボタン (おされているとき)",
           "buttonPressedHover": "ボタン (ホバー、かつ、おされているとき)",
           "input": "インプットフィールド"
-        }
+        },
+        "hintV3": "かげのばあいは、 {0} というかきかたをつかうことができます。そうすると、ほかのいろのスロットをつかうことができます。"
       },
       "fonts": {
         "_tab_label": "フォント",
@@ -497,7 +637,167 @@
       "title": "バージョン",
       "backend_version": "バックエンドのバージョン",
       "frontend_version": "フロントエンドのバージョン"
-    }
+    },
+    "notification_visibility_polls": "あなたがさんかしたとうひょうが、おわりました",
+    "setting_server_side": "このせっていは、あなたのプロフィールについてのものです。へんこうすると、すべてのセッションとクライアントにえいきょうします",
+    "mute_import_error": "ミュートのインポートが、エラーになりました",
+    "account_backup_description": "あなたのアカウントじょうほうや、とうこうのアーカイブを、ダウンロードすることができます。しかし、 Pleroma アカウントにインポートすることはまだできません。",
+    "list_backups_error": "バックアップリストをとりにいくことが、エラーになりました: {error}",
+    "list_aliases_error": "エイリアスをとりにいくときに、エラーになりました: {error}",
+    "added_alias": "エイリアスをつくりました。",
+    "move_account_notes": "もしあなたがアカウントをほかのインスタンスにひっこしたいのなら、ひっこすさきのアカウントからここへのエイリアスをつくってください。",
+    "file_export_import": {
+      "backup_settings_theme": "せっていとテーマをファイルにバックアップする",
+      "restore_settings": "ファイルからせっていをもとにもどす",
+      "errors": {
+        "file_too_new": "メジャーバージョン({fileMajor})がちがいます。この PleromaFE (せっていのバージョン {feMajor}) はふるいので、つかうことができません",
+        "file_slightly_new": "ファイルのマイナーバージョンがちがっています。いくつかのせっていは、よみこまれないかもしれません",
+        "invalid_file": "これは Pleroma のせっていをバックアップしたファイルではありません。",
+        "file_too_old": "メジャーバージョン({fileMajor})がちがいます。ファイルのバージョンが古いので、使うことができません(バージョン {feMajor} いじょうのせっていバージョンをつかってください)"
+      },
+      "backup_settings": "せっていをファイルにバックアップする",
+      "backup_restore": "せっていのバックアップ"
+    },
+    "hide_wallpaper": "このインスタンスのバックグラウンドをかくす",
+    "reply_visibility_following_short": "わたしのフォローしているひとにあてられたリプライをみる",
+    "reply_visibility_self_short": "じぶんにあてられたリプライだけをみる",
+    "save": "へんこうをほぞんする",
+    "reset_banner_confirm": "ほんとうに、バナーをリセットしますか？",
+    "tree_advanced": "ツリービューで、ナビゲーションをもっとじゅうなんにする",
+    "third_column_mode": "じゅうぶんなくうかんがあれば、3ばんめのれつをひょうじする",
+    "conversation_other_replies_button": "「ほかのリプライ」ボタンをひょうじするばしょ",
+    "user_popover_avatar_action_open": "プロフィールをひらく",
+    "notification_setting_filters": "フィルター",
+    "notification_setting_hide_notification_contents": "おくったひとと、ないようを、プッシュつうちにひょうじしない",
+    "backup_running": "バックアップしています。{number}このデータをしょりしました。",
+    "word_filter_and_more": "ことばのフィルターと、そのほか…",
+    "account_privacy": "プライバシー",
+    "posts": "とうこう",
+    "move_account": "アカウントをひっこす",
+    "move_account_target": "ひっこしさきのアカウント (れい: {example})",
+    "mute_bot_posts": "Bot のとうこうをミュートする",
+    "hide_bot_indication": "Bot によるとうこうであることを、とうこうにひょうじしない",
+    "hide_all_muted_posts": "ミュートしたとうこうをかくす",
+    "hide_shoutbox": "Shoutbox をかくす",
+    "conversation_display_tree": "ツリーけいしき",
+    "mention_link_display_full_for_remote": "リモートユーザーだけ、ながいなまえでひょうじする (れい: {'@'}hoge{'@'}example.org)",
+    "mention_link_bolden_you": "あなたがメンションされたとき、あなたへのメンションを、よくみえるようにする",
+    "user_popover_avatar_action": "ポップオーバーのアバターをクリックしたとき",
+    "user_popover_avatar_action_zoom": "アバターをおおきくする",
+    "user_popover_avatar_action_close": "ポップオーバーをとじる",
+    "always_show_post_button": "とうこうボタンをいつもひょうじする",
+    "auto_update": "あたらしいとうこうを、じどうてきにみせる",
+    "user_mutes": "ユーザー",
+    "useStreamingApi": "とうこうとつうちを、リアルタイムにうけとる",
+    "use_websockets": "Websockets をつかう (リアルタイムアップデート)",
+    "mutes_and_blocks": "ミュートとブロック",
+    "emoji_reactions_on_timeline": "えもじリアクションをタイムラインにひょうじする",
+    "accent": "アクセント",
+    "domain_mutes": "ドメイン",
+    "import_mutes_from_a_csv_file": "CSVファイルからミュートをインポートする",
+    "reset_avatar": "アバターをリセットする",
+    "remove_language": "とりのぞく",
+    "primary_language": "いちばんわかることば:",
+    "add_language": "よびとしてつかうことばを、ついかする",
+    "fallback_language": "よびとしてつかうことば {index}:",
+    "lists_navigation": "ナビゲーションにリストをひょうじする",
+    "account_alias": "アカウントのエイリアス",
+    "mention_link_display_full": "いつも、ながいなまえをひょうじする (れい: {'@'}hoge{'@'}example.org)",
+    "setting_changed": "せっていは、デフォルトとちがっています",
+    "email_language": "サーバーからうけとるEメールのことば",
+    "mute_export": "ミュートのエクスポート",
+    "mute_export_button": "あなたのミュートを、 CSV ファイルにエクスポートします",
+    "mute_import": "ミュートのインポート",
+    "mutes_imported": "ミュートをインポートしました！すこしじかんがかかるかもしれません。",
+    "account_backup": "アカウントのバックアップ",
+    "account_backup_table_head": "バックアップ",
+    "download_backup": "ダウンロード",
+    "backup_not_ready": "バックアップのじゅんびが、まだできていません。",
+    "backup_failed": "バックアップにしっぱいしました。",
+    "remove_backup": "とりのぞく",
+    "add_backup": "あたらしいバックアップをつくる",
+    "added_backup": "あたらしいバックアップをつくりました。",
+    "add_backup_error": "あたらしいバックアップをつくるときに、エラーになりました: {error}",
+    "bot": "これは bot アカウントです",
+    "account_alias_table_head": "エイリアス",
+    "hide_list_aliases_error_action": "とじる",
+    "remove_alias": "このエイリアスをけす",
+    "add_alias_error": "エイリアスをつくるときに、エラーになりました: {error}",
+    "new_alias_target": "あたらしいエイリアスをつくる (れい: {example})",
+    "moved_account": "アカウントをひっこしました。",
+    "move_account_error": "アカウントをひっこしているときに、エラーになりました: {error}",
+    "wordfilter": "ことばのフィルター",
+    "hide_media_previews": "メディアのプレビューをかくす",
+    "right_sidebar": "サイドバーをみぎにひょうじする",
+    "hide_wordfiltered_statuses": "ことばのフィルターでフィルターされたステータスをかくす",
+    "hide_muted_threads": "ミュートされたスレッドをかくす",
+    "navbar_column_stretch": "ナビゲーションバーをれつのはばまでのばす",
+    "birthday": {
+      "label": "たんじょうび",
+      "show_birthday": "たんじょうびを、ひょうじする"
+    },
+    "profile_fields": {
+      "label": "プロフィールのメタデータ",
+      "add_field": "フィールドをふやす",
+      "name": "ラベル",
+      "value": "ないよう"
+    },
+    "user_profiles": "ユーザープロフィール",
+    "notification_visibility_moves": "ユーザーのひっこし",
+    "notification_visibility_emoji_reactions": "リアクション",
+    "hide_favorites_description": "おきにいりのリストをみせない (つうちはおくられます)",
+    "reset_profile_background": "プロフィールバックグラウンドをリセットする",
+    "reset_profile_banner": "プロフィールバナーをリセットする",
+    "reset_avatar_confirm": "ほんとうに、アバターをリセットしますか？",
+    "reset_background_confirm": "ほんとうに、バックグラウンドをリセットしますか？",
+    "column_sizes_sidebar": "サイドバー",
+    "column_sizes_notifs": "つうち",
+    "columns": "れつ",
+    "column_sizes": "れつのおおきさ",
+    "column_sizes_content": "コンテンツ",
+    "conversation_display": "スレッドのひょうじけいしき",
+    "conversation_display_linear": "リニアけいしき",
+    "conversation_display_linear_quick": "リニアビュー",
+    "show_scrollbars": "よこのれつにスクロールバーをひょうじする",
+    "third_column_mode_none": "3ばんめのれつをひょうじしない",
+    "third_column_mode_postform": "とうこうフォームとナビゲーション",
+    "third_column_mode_notifications": "つうちのれつをひょうじする",
+    "tree_fade_ancestors": "げんざいのステータスのおやを、うすいいろのもじでひょうじする",
+    "conversation_other_replies_button_below": "ステータスのした",
+    "conversation_other_replies_button_inside": "ステータスのなか",
+    "max_depth_in_thread": "デフォルトでひょうじするスレッドのふかさ",
+    "sensitive_by_default": "デフォルトで、とうこうをNSFWにする",
+    "type_domains_to_mute": "ミュートしたいドメインを、ここでけんさくできます",
+    "mention_link_use_tooltip": "メンションのリンクをクリックしたとき、ユーザーカードをみせる",
+    "mention_link_show_avatar": "ユーザーのアバターをリンクのよこにひょうじする",
+    "mention_link_show_avatar_quick": "ユーザーのアバターをメンションのとなりにひょうじする",
+    "mention_link_fade_domain": "ドメイン(れい: {'@'}hoge{'@'}example.org のなかの {'@'}example.org)を、うすいいろにする",
+    "user_popover_avatar_overlay": "ユーザーのポップオーバーを、ユーザーのアバターのうえにひょうじする",
+    "show_yous": "(あなた)をひょうじする",
+    "notification_setting_block_from_strangers": "フォローしていないユーザーからのつうちをブロックする",
+    "notification_setting_privacy": "プライバシー",
+    "more_settings": "そのたのせってい",
+    "expert_mode": "くわしいせっていを、ひょうじする",
+    "mention_links": "メンションのリンク",
+    "post_look_feel": "とうこうのみためとかんかく",
+    "allow_following_move": "フォローしているアカウントがインスタンスをひっこしたばあい、じどうでフォローしてもよい",
+    "chatMessageRadius": "チャットメッセージ",
+    "confirm_dialogs": "つぎのばあいに、かくにんをする",
+    "confirm_dialogs_repeat": "ステータスをリピートするとき",
+    "confirm_dialogs_unfollow": "ユーザーのフォローをはずすとき",
+    "confirm_dialogs_block": "ユーザーをブロックするとき",
+    "confirm_dialogs_mute": "ユーザーをミュートするとき",
+    "confirm_dialogs_delete": "ステータスをけすとき",
+    "confirm_dialogs_logout": "ログアウトするとき",
+    "confirm_dialogs_approve_follow": "フォローをうけいれるとき",
+    "confirm_dialogs_deny_follow": "フォローをことわるとき",
+    "confirm_dialogs_remove_follower": "フォロワーをとりのぞくとき",
+    "conversation_display_tree_quick": "ツリービュー",
+    "disable_sticky_headers": "れつのヘッダーを、がめんのいちばんうえにこていしない",
+    "virtual_scrolling": "タイムラインのレンダリングをよくする",
+    "use_at_icon": "{'@'} きごうを、もじのかわりに、アイコンでひょうじする",
+    "mention_link_display_short": "いつも、みじかいなまえにする (れい: {'@'}hoge)",
+    "mention_link_display": "メンションのリンクをひょうじするけいしき"
   },
   "time": {
     "day": "{0}日",
@@ -531,7 +831,23 @@
     "year": "{0}年",
     "years": "{0}年",
     "year_short": "{0}年",
-    "years_short": "{0}年"
+    "years_short": "{0}年",
+    "unit": {
+      "minutes": "{0}ふん",
+      "seconds_short": "{0}びょう",
+      "weeks": "{0}しゅうかん",
+      "weeks_short": "{0}しゅう",
+      "years": "{0}ねん",
+      "years_short": "{0}ねん",
+      "days": "{0}にち",
+      "days_short": "{0}にち",
+      "hours": "{0}じかん",
+      "hours_short": "{0}じかん",
+      "minutes_short": "{0}ふん",
+      "months": "{0}かげつ",
+      "months_short": "{0}かげつ",
+      "seconds": "{0}びょう"
+    }
   },
   "timeline": {
     "collapse": "たたむ",
@@ -543,7 +859,11 @@
     "show_new": "よみこみ",
     "up_to_date": "さいしん",
     "no_more_statuses": "これでおわりです",
-    "no_statuses": "ありません"
+    "no_statuses": "ありません",
+    "socket_broke": "コード{0}により、リアルタイムでつながることがなくなりました",
+    "socket_reconnected": "リアルタイムでつながることを、つくりました",
+    "reload": "もういちど、よみこむ",
+    "error": "タイムラインをとりにいくときに、エラーになりました: {0}"
   },
   "status": {
     "favorites": "おきにいり",
@@ -556,7 +876,57 @@
     "reply_to": "へんしん:",
     "replies_list": "へんしん:",
     "mute_conversation": "スレッドをミュートする",
-    "unmute_conversation": "スレッドをミュートするのをやめる"
+    "unmute_conversation": "スレッドをミュートするのをやめる",
+    "repeat_confirm_title": "リピートのかくにん",
+    "mentions": "メンション",
+    "thread_muted": "ミュートされたスレッド",
+    "collapse_attachments": "ファイルをかくす",
+    "remove_attachment": "ファイルをとりのぞく",
+    "thread_show_full": "このスレッドのすべてのとうこうをみる (ぜんぶで{numStatus}このステータス、ふかさ{depth})",
+    "show_all_attachments": "すべてのファイルをみる",
+    "hide_full_subject": "かくす",
+    "nsfw": "NSFW",
+    "hide_content": "かくす",
+    "status_deleted": "このとうこうは、けされました",
+    "you": "(あなた)",
+    "expand": "ひろげる",
+    "repeat_confirm_accept_button": "リピートする",
+    "repeat_confirm_cancel_button": "リピートしない",
+    "edited_at": "({time} まえにへんしゅう)",
+    "delete_confirm_title": "けすことのかくにん",
+    "delete_confirm_accept_button": "けす",
+    "delete_confirm_cancel_button": "のこす",
+    "edit": "ステータスをへんしゅうする",
+    "bookmark": "ブックマークする",
+    "unbookmark": "ブックマークをはずす",
+    "replies_list_with_others": "へんしん (ほかに +{numReplies}こ):",
+    "status_unavailable": "ステータスがありません",
+    "copy_link": "リンクをコピー",
+    "external_source": "そとにあるソース",
+    "thread_muted_and_words": "つぎのことばをふくむので:",
+    "show_content": "みる",
+    "plus_more": "あと {number}こ",
+    "many_attachments": "とうこうには、{number}このファイルがついています",
+    "show_attachment_in_modal": "メディアモーダルでみる",
+    "show_attachment_description": "せつめいのプレビュー (ぜんぶみるには、ファイルをひらいてください)",
+    "hide_attachment": "ファイルをかくす",
+    "attachment_stop_flash": "Flash プレーヤーをとめる",
+    "move_up": "ファイルをひだりにうごかす",
+    "move_down": "ファイルをみぎにうごかす",
+    "open_gallery": "ギャラリーをひらく",
+    "thread_hide": "スレッドをかくす",
+    "thread_show": "スレッドをみる",
+    "show_full_subject": "すべてをみる",
+    "repeat_confirm": "ほんとうに、このステータスをリピートしますか？",
+    "show_all_conversation": "このスレッドをぜんぶみる (あと {numStatus}このステータス)",
+    "show_only_conversation_under_this": "このステータスへのへんしんだけをみる",
+    "status_history": "ステータスのれきし",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "thread_follow": "のこりのとうこうをみる (ぜんぶで {numStatus}このステータス)",
+    "thread_follow_with_icon": "{icon} {text}",
+    "ancestor_follow": "このステータスよりしたの、{numReplies}このへんしんをみる",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}"
   },
   "user_card": {
     "approve": "うけいれ",
@@ -577,7 +947,7 @@
     "media": "メディア",
     "mention": "メンション",
     "mute": "ミュート",
-    "muted": "ミュートしています！",
+    "muted": "ミュートしています",
     "per_day": "/日",
     "remote_follow": "リモートフォロー",
     "report": "つうほう",
@@ -608,8 +978,52 @@
       "disable_remote_subscription": "ほかのインスタンスからフォローされないようにする",
       "disable_any_subscription": "フォローされないようにする",
       "quarantine": "ほかのインスタンスのユーザーのとうこうをとめる",
-      "delete_user": "ユーザーをけす"
-    }
+      "delete_user": "ユーザーをけす",
+      "delete_user_data_and_deactivate_confirmation": "これをすると、このアカウントのデータがきえて、にどとつかえなくなります。ほんとうに、していいですか？"
+    },
+    "mute_confirm_accept_button": "ミュートする",
+    "unfollow_confirm_title": "フォローをやめることのかくにん",
+    "mute_confirm": "ほんとうに、 {user} をミュートしますか？",
+    "mute_duration_prompt": "このユーザーをつぎのじかんだけミュートする (0にすると、おわりがありません):",
+    "edit_note_apply": "てきよう",
+    "block_confirm": "ほんとうに、 {user} をブロックしますか？",
+    "deactivated": "つかえない",
+    "remove_follower": "フォロワーをとりのぞく",
+    "highlight": {
+      "solid": "バッググラウンドをひとつのいろにする",
+      "striped": "しまもようのバックグラウンドにする",
+      "side": "はじにせんをつける",
+      "disabled": "めだたせない"
+    },
+    "mute_confirm_cancel_button": "ミュートしない",
+    "unfollow_confirm_accept_button": "フォローをやめる",
+    "unfollow_confirm": "ほんとうに、 {user} のフォローをやめますか？",
+    "unfollow_confirm_cancel_button": "フォローしたままにする",
+    "mute_confirm_title": "ミュートのかくにん",
+    "block_confirm_accept_button": "ブロックする",
+    "block_confirm_cancel_button": "ブロックしない",
+    "deny_confirm_title": "おことわりのかくにん",
+    "deny_confirm_accept_button": "ことわる",
+    "deny_confirm_cancel_button": "ことわらない",
+    "deny_confirm": "{user} のフォローリクエストをことわりますか？",
+    "follow_cancel": "リクエストをキャンセル",
+    "birthday": "{birthday} に、うまれました",
+    "remove_follower_confirm_title": "フォロワーをとりのぞくことのかくにん",
+    "remove_follower_confirm_accept_button": "とりのぞく",
+    "remove_follower_confirm_cancel_button": "のこす",
+    "remove_follower_confirm": "ほんとうに、 {user} をあなたのフォロワーからとりのぞきますか？",
+    "edit_note": "メモをへんしゅうする",
+    "edit_note_cancel": "キャンセル",
+    "message": "メッセージ",
+    "bot": "bot",
+    "approve_confirm_title": "うけいれのかくにん",
+    "approve_confirm_accept_button": "うけいれる",
+    "approve_confirm_cancel_button": "うけいれない",
+    "approve_confirm": "{user} のフォローリクエストをうけいれますか？",
+    "edit_profile": "プロフィールをへんしゅう",
+    "block_confirm_title": "ブロックのかくにん",
+    "note_blank": "(なし)",
+    "note": "メモ"
   },
   "user_profile": {
     "timeline_title": "ユーザータイムライン",
@@ -634,13 +1048,21 @@
     "repeat": "リピート",
     "reply": "リプライ",
     "favorite": "おきにいり",
-    "user_settings": "ユーザーせってい"
+    "user_settings": "ユーザーせってい",
+    "accept_follow_request": "フォローのおねがいを、うけいれる",
+    "toggle_mute": "ミュートされたないようをみるために、つうちをひらくか、とじる",
+    "autocomplete_available": "{number}このけっかが、あります。うえとしたのキーをつかって、けっかをみることができます。",
+    "add_reaction": "リアクションをつける",
+    "reject_follow_request": "フォローのおねがいを、ことわる",
+    "bookmark": "ブックマーク",
+    "toggle_expand": "とうこうをすべてみるために、つうちをひらくか、とじる"
   },
   "upload": {
     "error": {
       "base": "アップロードにしっぱいしました。",
       "file_too_big": "ファイルがおおきすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
-      "default": "しばらくしてから、ためしてください"
+      "default": "しばらくしてから、ためしてください",
+      "message": "アップロードにしっぱいしました: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -655,7 +1077,9 @@
     "hashtags": "ハッシュタグ",
     "person_talking": "{count} にんが、はなしています",
     "people_talking": "{count} にんが、はなしています",
-    "no_results": "みつかりませんでした"
+    "no_results": "みつかりませんでした",
+    "no_more_results": "これでおわりです",
+    "load_more": "もっとみる"
   },
   "password_reset": {
     "forgot_password": "パスワードを、わすれましたか？",
@@ -668,5 +1092,103 @@
     "password_reset_disabled": "このインスタンスでは、パスワードリセットは、できません。インスタンスのアドミニストレーターに、おといあわせください。",
     "password_reset_required": "ログインするには、パスワードをリセットしてください。",
     "password_reset_required_but_mailer_is_disabled": "あなたはパスワードのリセットがひつようです。しかし、まずいことに、このインスタンスでは、パスワードのリセットができなくなっています。このインスタンスのアドミニストレーターに、おといあわせください。"
+  },
+  "announcements": {
+    "post_placeholder": "おしらせのないようを、にゅうりょくしてください。",
+    "end_time_prompt": "おわるじかん: ",
+    "inactive_message": "このおしらせは、つかわれていません",
+    "page_header": "おしらせ",
+    "title": "おしらせ",
+    "post_action": "とうこう",
+    "post_form_header": "おしらせをとうこう",
+    "mark_as_read_action": "よんだことにする",
+    "post_error": "エラー: {error}",
+    "close_error": "とじる",
+    "delete_action": "けす",
+    "start_time_display": "{time}にはじまります",
+    "end_time_display": "{time}におわります",
+    "edit_action": "へんしゅう",
+    "start_time_prompt": "はじまるじかん: ",
+    "all_day_prompt": "このイベントはいちにちじゅうやります",
+    "published_time_display": "{time}にこうかいされました",
+    "submit_edit_action": "そうしん",
+    "cancel_edit_action": "キャンセル"
+  },
+  "report": {
+    "reported_statuses": "つうほうされたステータス:",
+    "reporter": "つうほうしたひと:",
+    "state_closed": "クローズ",
+    "state_resolved": "かいけつしました",
+    "reported_user": "つうほうされたユーザー:",
+    "notes": "メモ:",
+    "state": "じょうたい:",
+    "state_open": "オープン"
+  },
+  "update": {
+    "update_bugs": "もんだいや、バグがあれば、 {pleromaGitlab} でおしえてください。ちゃんとテストはしているのですが、たくさんのことをかえているので、そしてかいはつバージョンをつかっているので、もんだいやバグに、きづかないことがあります。あなたがきづいたもんだいについての、フィードバックやていあんを、まっています。 Pleroma や Pleroma-FE をよくするやりかたについても、おしえてください。",
+    "update_changelog_here": "すべてのかわったことのきろく",
+    "art_by": "{linkToArtist}によるさくひん",
+    "big_update_title": "すこし、まってください",
+    "big_update_content": "しばらくリリースがありませんでした。おもっていたみためと、ちがうかもしれません。",
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "update_changelog": "かわったことをすべてみるには、{theFullChangelog}をみてください。"
+  },
+  "chats": {
+    "new": "あたらしいチャット",
+    "chats": "チャット",
+    "you": "あなた:",
+    "message_user": "{nickname} にメッセージ",
+    "delete": "けす",
+    "empty_message_error": "なにかかいてください",
+    "more": "もっとみる",
+    "delete_confirm": "ほんとうに、このメッセージをけしますか？",
+    "error_loading_chat": "チャットをよみこむことに、しっぱいしました。",
+    "error_sending_message": "メッセージをおくることに、しっぱいしました。",
+    "empty_chat_list_placeholder": "チャットがありません。あたらしいチャットボタンをおして、はじめてください！"
+  },
+  "shoutbox": {
+    "title": "Shoutbox"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma はブラウザーのストレージにアクセスすることができません。あなたがログインしたことと、あなたのローカルのせっていは、ほぞんされません。ほかにももんだいがおきるかもしれません。 Cookie をゆうこうにしてください。"
+  },
+  "lists": {
+    "lists": "リスト",
+    "new": "あたらしいリスト",
+    "search": "ユーザーをさがす",
+    "title": "リストのなまえ",
+    "create": "つくる",
+    "save": "へんこうをほぞんする",
+    "delete": "リストをけす",
+    "following_only": "フォローしているひとげんていにする",
+    "manage_lists": "リストをかんりする",
+    "manage_members": "リストにふくまれるひとを、かんりする",
+    "add_members": "もっとユーザーをさがす",
+    "remove_from_list": "リストからとりのぞく",
+    "add_to_list": "リストにいれる",
+    "editing_list": "リスト {listTitle} をへんしゅうしています",
+    "creating_list": "あたらしいリストをつくっています",
+    "update_title": "なまえをほぞんする",
+    "really_delete": "ほんとうに、リストをけしますか？",
+    "is_in_list": "すでにリストのなかにあります",
+    "error": "リストをへんしゅうするときに、エラーになりました: {0}"
+  },
+  "file_type": {
+    "audio": "オーディオ",
+    "video": "ビデオ",
+    "image": "がぞう",
+    "file": "ファイル"
+  },
+  "display_date": {
+    "today": "きょう"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "このドメインは、ASCIIいがいのもじをふくんでいます。"
+  },
+  "domain_mute_card": {
+    "mute": "ミュート",
+    "mute_progress": "ミュートしています…",
+    "unmute": "ミュートをやめる",
+    "unmute_progress": "ミュートをやめています…"
   }
 }

From 30f1502df6194216af1f34b6e3ba9f072c319349 Mon Sep 17 00:00:00 2001
From: Dmytro Poltavchenko <xinit.info@gmail.com>
Date: Tue, 7 Feb 2023 16:56:03 +0000
Subject: [PATCH 23/40] Translated using Weblate (Ukrainian)

Currently translated at 84.9% (838 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c781b1f6..cbb1a21f 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -118,7 +118,10 @@
       "totp": "Двофакторна автентифікація"
     },
     "enter_two_factor_code": "Введіть двофакторний код автентифікації",
-    "placeholder": "напр. stepan"
+    "placeholder": "напр. stepan",
+    "logout_confirm": "Ви дійсно хочете вийти?",
+    "logout_confirm_accept_button": "Вийти",
+    "logout_confirm_cancel_button": "Ні, хочу назад!"
   },
   "importer": {
     "error": "Під час імпортування файлу сталася помилка.",
@@ -189,7 +192,8 @@
     "mobile_notifications": "Відкрити сповіщення (є непрочитані)",
     "mobile_notifications_close": "Закрити сповіщення",
     "edit_nav_mobile": "Редагувати панель навігації",
-    "announcements": "Анонси"
+    "announcements": "Анонси",
+    "search_close": "Закрити панель пошуку"
   },
   "media_modal": {
     "next": "Наступна",

From 597c069e3630eeb198735ba31ccc56b6bdb7ad43 Mon Sep 17 00:00:00 2001
From: Pacific Coast Highway <fedi@pchxyz.anonaddy.com>
Date: Tue, 7 Feb 2023 08:14:33 +0000
Subject: [PATCH 24/40] Translated using Weblate (Chinese (Traditional))

Currently translated at 72.4% (714 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 46 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index 6f0f63b5..96c75215 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -113,12 +113,23 @@
     "submit": "提交",
     "apply": "應用",
     "role": {
-      "moderator": "主持人",
+      "moderator": "審查者",
       "admin": "管理員"
     },
     "flash_content": "點擊以使用 Ruffle 顯示 Flash 內容（實驗性，可能無效）。",
     "flash_security": "請注意，這可能有潜在的危險，因為Flash內容仍然是武斷的程式碼。",
-    "flash_fail": "無法加載flash內容，請參閱控制台瞭解詳細資訊。"
+    "flash_fail": "無法加載flash內容，請參閱控制台瞭解詳細資訊。",
+    "no": "否",
+    "generic_error_message": "發生了一個錯誤： {0}",
+    "never_show_again": "不再顯示",
+    "yes": "是",
+    "undo": "復原",
+    "scroll_to_top": "滾動至頂部",
+    "pin": "置頂",
+    "scope_in_timeline": {
+      "private": "僅關注者"
+    },
+    "unpin": "停止置頂"
   },
   "finder": {
     "find_user": "尋找用戶",
@@ -133,7 +144,8 @@
     "pleroma_chat_messages": "Pleroma 聊天",
     "chat": "聊天",
     "gopher": "Gopher",
-    "upload_limit": "上傳限制"
+    "upload_limit": "上傳限制",
+    "shout": "留言板"
   },
   "exporter": {
     "processing": "正在處理，稍後會提示您下載文件",
@@ -164,11 +176,14 @@
         "reject": "拒絕",
         "accept_desc": "本實例只接收來自下列實例的消息：",
         "simple_policies": "站規",
-        "accept": "接受"
+        "accept": "接受",
+        "instance": "實例",
+        "reason": "原因",
+        "not_applicable": "N/A"
       },
       "mrf_policies_desc": "MRF 策略會影響本實例的互通行為。以下策略已啟用：",
       "keyword": {
-        "ftl_removal": "從“全部已知網絡”時間線上移除",
+        "ftl_removal": "從「全部已知網絡」時間線上移除",
         "replace": "取代",
         "reject": "拒絕",
         "is_replaced_by": "→",
@@ -865,5 +880,26 @@
     "password_reset_disabled": "密碼重置已經被禁用。請聯繫你的實例管理員。",
     "password_reset_required": "您必須重置密碼才能登陸。",
     "password_reset_required_but_mailer_is_disabled": "您必須重置密碼，但是密碼重置被禁用了。請聯繫您所在實例的管理員。"
+  },
+  "announcements": {
+    "post_error": "錯誤： {error}",
+    "close_error": "關閉",
+    "delete_action": "刪除",
+    "start_time_prompt": "開始時間： ",
+    "end_time_prompt": "結束時間： ",
+    "all_day_prompt": "這是全日活動",
+    "start_time_display": "{time} 開始",
+    "end_time_display": "{time} 結束",
+    "published_time_display": "{time} 發布",
+    "edit_action": "編輯",
+    "submit_edit_action": "送出",
+    "cancel_edit_action": "取消",
+    "inactive_message": "此公告無效",
+    "page_header": "公告",
+    "title": "公告",
+    "mark_as_read_action": "標示為以閱讀",
+    "post_placeholder": "在此輸入您的公告內容……",
+    "post_form_header": "發布公告",
+    "post_action": "發布"
   }
 }

From 423d1e0433dced9a3d83854abc391077ad111d70 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 10 Feb 2023 23:58:38 -0500
Subject: [PATCH 25/40] Add changelog for 2.5.1

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed1c186..3fb72931 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,34 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.5.1
+### Fixed
+- Checkboxes in settings can now work with screenreaders
+- Autocomplete in edit boxes can now work with screenreaders
+- Status interact buttons now have focus indicator for anonymous users
+- Top bar buttons now correctly have text labels
+- It is now possible to register if the site admin requires birthday to register
+- User cards from search results will correctly popup
+- Fix notification attachment icon overflow
+- Editing mute words is less laggy
+- Repeater's name will no longer mess up with the directionality of the text sitting on the same line
+- Unauthenticated access will give better error messages
+- It is now easier to close the media viewer with a mouse when there is only one image
+- Deleting profile fields can work properly
+- Clicking the react button will correctly focus the search box
+- Clicking buttons on the top-bar will no longer bring you to the top of the page
+- Emoji picker is much faster to load
+- `blockquote`s have a better display style
+- Announcements posting and editing are now available to everyone with such a privilege, not just admins
+- Adding or removing list members will actually work
+- Emojis without a pack are now correctly displayed in emoji picker
+- Changing notification settings will actually work
+
+### Added
+- You can now set and see birthdays
+- Optional confirmation dialogs when performing various actions
+- You can now set fallback languages
+
 ## 2.5.0 - 23.12.2022
 ### Fixed
 - UI no longer lags when switching between mobile and desktop mode

From 65d78ced93aab31217a74624cb313be6ff7114f9 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 12 Feb 2023 15:38:36 -0500
Subject: [PATCH 26/40] Fix registration error with email language selected

---
 src/components/registration/registration.js  | 4 ++--
 src/components/registration/registration.vue | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 22ca6ad6..b88bdeec 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -16,7 +16,7 @@ const registration = {
       confirm: '',
       birthday: '',
       reason: '',
-      language: ''
+      language: ['']
     },
     captcha: {}
   }),
@@ -100,7 +100,7 @@ const registration = {
       this.user.captcha_token = this.captcha.token
       this.user.captcha_answer_data = this.captcha.answer_data
       if (this.user.language) {
-        this.user.language = localeService.internalToBackendLocale(this.user.language)
+        this.user.language = localeService.internalToBackendLocaleMulti(this.user.language.filter(k => k))
       }
 
       this.v$.$touch()
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 5701b05e..7438a5f4 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -210,6 +210,7 @@
                 :prompt-text="$t('registration.email_language')"
                 :language="v$.user.language.$model"
                 :set-language="val => v$.user.language.$model = val"
+                @click.stop.prevent
               />
             </div>
 

From 2316bcc842052a1b656acd00c1a270913741228f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 18 Feb 2023 13:40:42 -0500
Subject: [PATCH 27/40] Fix poll interaction

---
 src/components/poll/poll.js  |  3 +-
 src/components/poll/poll.vue | 92 +++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index eda1733a..e4d6869a 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -12,7 +12,8 @@ export default {
   data () {
     return {
       loading: false,
-      choices: []
+      choices: [],
+      randomSeed: `${Math.random()}`.replace('.', '-')
     }
   },
   created () {
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index cacc3298..b3a74c49 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -4,53 +4,63 @@
     :class="containerClass"
   >
     <div
-      v-for="(option, index) in options"
-      :key="index"
-      class="poll-option"
+      :role="showResults ? 'section' : (poll.multiple ? 'group' : 'radiogroup')"
     >
       <div
-        v-if="showResults"
-        :title="resultTitle(option)"
-        class="option-result"
+        v-for="(option, index) in options"
+        :key="index"
+        class="poll-option"
       >
-        <div class="option-result-label">
-          <span class="result-percentage">
-            {{ percentageForOption(option.votes_count) }}%
-          </span>
-          <RichContent
-            :html="option.title_html"
-            :handle-links="false"
-            :emoji="emoji"
+        <div
+          v-if="showResults"
+          :title="resultTitle(option)"
+          class="option-result"
+        >
+          <div class="option-result-label">
+            <span class="result-percentage">
+              {{ percentageForOption(option.votes_count) }}%
+            </span>
+            <RichContent
+              :html="option.title_html"
+              :handle-links="false"
+              :emoji="emoji"
+            />
+          </div>
+          <div
+            class="result-fill"
+            :style="{ 'width': `${percentageForOption(option.votes_count)}%` }"
           />
         </div>
         <div
-          class="result-fill"
-          :style="{ 'width': `${percentageForOption(option.votes_count)}%` }"
-        />
-      </div>
-      <div
-        v-else
-        @click="activateOption(index)"
-      >
-        <input
-          v-if="poll.multiple"
-          type="checkbox"
-          :disabled="loading"
-          :value="index"
-        >
-        <input
           v-else
-          type="radio"
-          :disabled="loading"
-          :value="index"
+          tabindex="0"
+          :role="poll.multiple ? 'checkbox' : 'radio'"
+          :aria-labelledby="`option-vote-${randomSeed}-${index}`"
+          :aria-checked="choices[index]"
+          @click="activateOption(index)"
         >
-        <label class="option-vote">
-          <RichContent
-            :html="option.title_html"
-            :handle-links="false"
-            :emoji="emoji"
-          />
-        </label>
+          <input
+            v-if="poll.multiple"
+            type="checkbox"
+            class="poll-checkbox"
+            :disabled="loading"
+            :value="index"
+          >
+          <input
+            v-else
+            type="radio"
+            :disabled="loading"
+            :value="index"
+          >
+          <label class="option-vote">
+            <RichContent
+              :id="`option-vote-${randomSeed}-${index}`"
+              :html="option.title_html"
+              :handle-links="false"
+              :emoji="emoji"
+            />
+          </label>
+        </div>
       </div>
     </div>
     <div class="footer faint">
@@ -161,5 +171,9 @@
     padding: 0 0.5em;
     margin-right: 0.5em;
   }
+
+  .poll-checkbox {
+    display: none;
+  }
 }
 </style>

From 5468309f6aefbc61467338d2a96f29d6c416cc54 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 20 Feb 2023 23:49:34 -0500
Subject: [PATCH 28/40] Make it possible to auto-select the first candidate in
 autocomplete

---
 src/components/emoji_input/emoji_input.js          | 5 ++++-
 src/components/settings_modal/tabs/general_tab.vue | 8 ++++++++
 src/i18n/en.json                                   | 1 +
 src/modules/config.js                              | 3 ++-
 src/modules/instance.js                            | 1 +
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 8a8d098d..68654f69 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -134,6 +134,9 @@ const EmojiInput = {
     padEmoji () {
       return this.$store.getters.mergedConfig.padEmoji
     },
+    defaultCandidateIndex () {
+      return this.$store.getters.mergedConfig.autocompleteSelect ? 0 : -1
+    },
     preText () {
       return this.modelValue.slice(0, this.caret)
     },
@@ -287,7 +290,7 @@ const EmojiInput = {
           ...rest,
           img: imageUrl || ''
         }))
-      this.highlighted = -1
+      this.highlighted = this.defaultCandidateIndex
       this.$refs.screenReaderNotice.announce(
         this.$tc('tool_tip.autocomplete_available',
           this.suggestions.length,
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 703e94a0..65248ac1 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -501,6 +501,14 @@
             {{ $t('settings.pad_emoji') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="autocompleteSelect"
+            expert="1"
+          >
+            {{ $t('settings.autocomplete_select_first') }}
+          </BooleanSetting>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index dba8a13f..6c9bc8e2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -465,6 +465,7 @@
     "domain_mutes": "Domains",
     "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
     "pad_emoji": "Pad emoji with spaces when adding from picker",
+    "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
     "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
     "export_theme": "Save preset",
     "filtering": "Filtering",
diff --git a/src/modules/config.js b/src/modules/config.js
index eb33f95f..3d9cf591 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -115,7 +115,8 @@ export const defaultState = {
   conversationTreeAdvanced: undefined, // instance default
   conversationOtherRepliesButton: undefined, // instance default
   conversationTreeFadeAncestors: undefined, // instance default
-  maxDepthInThread: undefined // instance default
+  maxDepthInThread: undefined, // instance default
+  autocompleteSelect: undefined // instance default
 }
 
 // caching the instance default properties
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 16f72583..938ca64d 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -104,6 +104,7 @@ const defaultState = {
   conversationOtherRepliesButton: 'below',
   conversationTreeFadeAncestors: false,
   maxDepthInThread: 6,
+  autocompleteSelect: false,
 
   // Nasty stuff
   customEmoji: [],

From 355f0fd35c5d34d4db608eb1b9cd84dd69def65e Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Tue, 21 Feb 2023 09:07:47 +0000
Subject: [PATCH 29/40] Update babel monorepo to v7.21.0

---
 package.json |   8 +--
 yarn.lock    | 165 +++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 137 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index b2a61b95..be63db0f 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
   },
   "dependencies": {
-    "@babel/runtime": "7.20.7",
+    "@babel/runtime": "7.21.0",
     "@chenfengyuan/vue-qrcode": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "6.2.1",
     "@fortawesome/free-regular-svg-icons": "6.2.1",
@@ -49,11 +49,11 @@
     "vuex": "4.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.20.7",
+    "@babel/core": "7.21.0",
     "@babel/eslint-parser": "7.19.1",
-    "@babel/plugin-transform-runtime": "7.19.6",
+    "@babel/plugin-transform-runtime": "7.21.0",
     "@babel/preset-env": "7.20.2",
-    "@babel/register": "7.18.9",
+    "@babel/register": "7.21.0",
     "@intlify/vue-i18n-loader": "5.0.0",
     "@ungap/event-target": "0.2.3",
     "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 25970f78..04dd03c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,6 +9,14 @@
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.0"
 
+"@ampproject/remapping@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@babel/code-frame@7.0.0", "@babel/code-frame@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
@@ -45,25 +53,25 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
   integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/core@7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f"
-  integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==
+"@babel/core@7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.0.tgz#1341aefdcc14ccc7553fcc688dd8986a2daffc13"
+  integrity sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==
   dependencies:
-    "@ampproject/remapping" "^2.1.0"
+    "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
+    "@babel/generator" "^7.21.0"
     "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-transforms" "^7.20.7"
-    "@babel/helpers" "^7.20.7"
-    "@babel/parser" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.21.0"
+    "@babel/helpers" "^7.21.0"
+    "@babel/parser" "^7.21.0"
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
+    json5 "^2.2.2"
     semver "^6.3.0"
 
 "@babel/core@^7.12.3":
@@ -150,6 +158,16 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.21.0":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
+  integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==
+  dependencies:
+    "@babel/types" "^7.21.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -299,6 +317,14 @@
     "@babel/template" "^7.18.10"
     "@babel/types" "^7.19.0"
 
+"@babel/helper-function-name@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
+  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
+  dependencies:
+    "@babel/template" "^7.20.7"
+    "@babel/types" "^7.21.0"
+
 "@babel/helper-get-function-arity@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
@@ -410,6 +436,20 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
+"@babel/helper-module-transforms@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.0.tgz#89a8f86ad748870e3d024e470b2e8405e869db67"
+  integrity sha512-eD/JQ21IG2i1FraJnTMbUarAUkA7G988ofehG5MDCRXaUU91rEBJuCeSoou2Sk1y4RbLYXzqEg1QLwEmRU4qcQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -591,14 +631,14 @@
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helpers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce"
-  integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==
+"@babel/helpers@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
+  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
   dependencies:
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -666,6 +706,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
   integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
 
+"@babel/parser@^7.21.0":
+  version "7.21.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.1.tgz#a8f81ee2fe872af23faea4b17a08fcc869de7bcc"
+  integrity sha512-JzhBFpkuhBNYUY7qs+wTzNmyCWUHEaAFpQQD2YfU1rPL38/L43Wvid0fFkiOCnHvsGncRZgEPyGnltABLcVDTg==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -1138,13 +1183,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-runtime@7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
-  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
+"@babel/plugin-transform-runtime@7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz#2a884f29556d0a68cd3d152dcc9e6c71dfb6eee8"
+  integrity sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     babel-plugin-polyfill-corejs2 "^0.3.3"
     babel-plugin-polyfill-corejs3 "^0.6.0"
     babel-plugin-polyfill-regenerator "^0.4.1"
@@ -1293,10 +1338,10 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/register@7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.18.9.tgz#1888b24bc28d5cc41c412feb015e9ff6b96e439c"
-  integrity sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw==
+"@babel/register@7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz#c97bf56c2472e063774f31d344c592ebdcefa132"
+  integrity sha512-9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -1304,10 +1349,10 @@
     pirates "^4.0.5"
     source-map-support "^0.5.16"
 
-"@babel/runtime@7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
-  integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
+"@babel/runtime@7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
+  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
   dependencies:
     regenerator-runtime "^0.13.11"
 
@@ -1450,6 +1495,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.0.tgz#0e1807abd5db98e6a19c204b80ed1e3f5bca0edc"
+  integrity sha512-Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.21.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.21.0"
+    "@babel/types" "^7.21.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e"
@@ -1509,6 +1570,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.0.tgz#1da00d89c2f18b226c9207d96edbeb79316a1819"
+  integrity sha512-uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
@@ -1695,6 +1765,14 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
@@ -1704,12 +1782,17 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
   integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
 
-"@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
@@ -1722,6 +1805,11 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/sourcemap-codec@1.4.14":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
 "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.11"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
@@ -1743,6 +1831,14 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.17":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
@@ -5639,6 +5735,11 @@ json5@^2.2.0, json5@^2.2.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
+json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonc-eslint-parser@^1.0.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-1.4.1.tgz#8cbe99f6f5199acbc5a823c4c0b6135411027fa6"

From 763ae182b8ec321647beef25e9d954abaf2303e7 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 28 Feb 2023 22:39:53 -0500
Subject: [PATCH 30/40] Remove @touchstart in post status button

---
 src/components/post_status_form/post_status_form.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 64a8887c..86c1f907 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -281,12 +281,10 @@
         >
           {{ $t('post_status.post') }}
         </button>
-        <!-- touchstart is used to keep the OSK at the same position after a message send -->
         <button
           v-else
           :disabled="uploadingFiles || disableSubmit"
           class="btn button-default"
-          @touchstart.stop.prevent="postStatus($event, newStatus)"
           @click.stop.prevent="postStatus($event, newStatus)"
         >
           {{ $t('post_status.post') }}

From 1a852b96eff060c8eaab9477c85eb4a3bd91c748 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 2 Mar 2023 21:15:43 -0500
Subject: [PATCH 31/40] Give tab switcher a role

---
 src/components/tab_switcher/tab_switcher.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index c8d390bc..a7ef8560 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -117,6 +117,7 @@ export default {
                 onClick={this.clickTab(index)}
                 class={classesTab.join(' ')}
                 type="button"
+                role="tab"
               >
                 <img src={props.image} title={props['image-tooltip']}/>
                 {props.label ? '' : props.label}
@@ -131,6 +132,7 @@ export default {
               onClick={this.clickTab(index)}
               class={classesTab.join(' ')}
               type="button"
+              role="tab"
             >
               {!props.icon ? '' : (<FAIcon class="tab-icon" size="2x" fixed-width icon={props.icon}/>)}
               <span class="text">
@@ -167,11 +169,15 @@ export default {
 
     return (
       <div class={'tab-switcher ' + (this.sideTabBar ? 'side-tabs' : 'top-tabs')}>
-        <div class="tabs">
+        <div
+          class="tabs"
+          role="tablist"
+        >
           {tabs}
         </div>
         <div
           ref="contents"
+          role="tabpanel"
           class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')}
           v-body-scroll-lock={this.bodyScrollLock}
         >

From 88db5571417a269df459b243dd96053bf8a9c852 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 2 Mar 2023 23:47:55 -0500
Subject: [PATCH 32/40] Make suggestor ignore users without valid names

Otherwise it might have undefined issues.
Resolves https://git.pleroma.social/pleroma/pleroma-fe/-/issues/1249
---
 src/components/emoji_input/suggestor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index adaa879e..e746dcd7 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -94,8 +94,9 @@ export const suggestUsers = ({ dispatch, state }) => {
 
     const newSuggestions = state.users.users.filter(
       user =>
-        user.screen_name.toLowerCase().startsWith(noPrefix) ||
-        user.name.toLowerCase().startsWith(noPrefix)
+        user.screen_name && user.name && (
+          user.screen_name.toLowerCase().startsWith(noPrefix) ||
+            user.name.toLowerCase().startsWith(noPrefix))
     ).slice(0, 20).sort((a, b) => {
       let aScore = 0
       let bScore = 0

From da46c30893a4ae5e3aaf2de2213e73281e87aaf2 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 3 Mar 2023 23:38:56 -0500
Subject: [PATCH 33/40] Fix display of theme checkboxes

---
 src/components/font_control/font_control.vue     | 5 ++++-
 src/components/range_input/range_input.vue       | 8 ++++++--
 src/components/shadow_control/shadow_control.vue | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index bb7e64bc..e2ba74d1 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -4,6 +4,7 @@
     :class="{ custom: isCustom }"
   >
     <label
+      :id="name + '-label'"
       :for="preset === 'custom' ? name : name + '-font-switcher'"
       class="label"
     >
@@ -12,7 +13,8 @@
     <input
       v-if="typeof fallback !== 'undefined'"
       :id="name + '-o'"
-      class="opt exlcude-disabled"
+      :aria-labelledby="name + '-label'"
+      class="opt exlcude-disabled visible-for-screenreader-only"
       type="checkbox"
       :checked="present"
       @change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
@@ -21,6 +23,7 @@
       v-if="typeof fallback !== 'undefined'"
       class="opt-l"
       :for="name + '-o'"
+      :aria-hidden="true"
     />
     {{ ' ' }}
     <Select
diff --git a/src/components/range_input/range_input.vue b/src/components/range_input/range_input.vue
index 1e7e42d5..1e720105 100644
--- a/src/components/range_input/range_input.vue
+++ b/src/components/range_input/range_input.vue
@@ -4,6 +4,7 @@
     :class="{ disabled: !present || disabled }"
   >
     <label
+      :id="name + '-label'"
       :for="name"
       class="label"
     >
@@ -12,7 +13,8 @@
     <input
       v-if="typeof fallback !== 'undefined'"
       :id="name + '-o'"
-      class="opt"
+      :aria-labelledby="name + '-label'"
+      class="opt visible-for-screenreader-only"
       type="checkbox"
       :checked="present"
       @change="$emit('update:modelValue', !present ? fallback : undefined)"
@@ -21,6 +23,7 @@
       v-if="typeof fallback !== 'undefined'"
       class="opt-l"
       :for="name + '-o'"
+      :aria-hidden="true"
     />
     <input
       :id="name"
@@ -34,9 +37,10 @@
       @input="$emit('update:modelValue', $event.target.value)"
     >
     <input
-      :id="name"
+      :id="name + '-numeric'"
       class="input-number"
       type="number"
+      :aria-labelledby="name + '-label'"
       :value="modelValue || fallback"
       :disabled="!present || disabled"
       :max="hardMax"
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index 7546535d..1f3c26aa 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -129,12 +129,13 @@
           v-model="selected.inset"
           :disabled="!present"
           name="inset"
-          class="input-inset"
+          class="input-inset visible-for-screenreader-only"
           type="checkbox"
         >
         <label
           class="checkbox-label"
           for="inset"
+          :aria-hidden="true"
         />
       </div>
       <div

From 998aa8f732bbf9d074abeb5916ceb5effd8afe5c Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Sun, 18 Dec 2022 22:04:58 +0300
Subject: [PATCH 34/40] Allow custom emoji reactions

---
 .../emoji_reactions/emoji_reactions.vue       |  27 ++++-
 src/components/notification/notification.vue  |  15 ++-
 .../notifications/notifications.scss          |   7 ++
 src/components/react_button/react_button.js   |  92 ++-------------
 src/components/react_button/react_button.vue  | 108 ++++++------------
 .../entity_normalizer.service.js              |   1 +
 6 files changed, 89 insertions(+), 161 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index a63daa97..12783114 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -2,7 +2,7 @@
   <div class="EmojiReactions">
     <UserListPopover
       v-for="(reaction) in emojiReactions"
-      :key="reaction.name"
+      :key="reaction.url || reaction.name"
       :users="accountsForEmoji[reaction.name]"
     >
       <button
@@ -11,7 +11,21 @@
         @click="emojiOnClick(reaction.name, $event)"
         @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
-        <span class="reaction-emoji">{{ reaction.name }}</span>
+        <span
+          v-if="reaction.url"
+          class="reaction-emoji"
+        >
+          <img
+            :src="reaction.url"
+            :title="reaction.name"
+            class="reaction-emoji-content"
+            width="1em"
+          >
+        </span>
+        <span
+          v-else
+          class="reaction-emoji reaction-emoji-content"
+        >{{ reaction.name }}</span>
         <span>{{ reaction.count }}</span>
       </button>
     </UserListPopover>
@@ -46,9 +60,18 @@
 
     .reaction-emoji {
       width: 1.25em;
+      height: 1.25em;
       margin-right: 0.25em;
     }
 
+    .reaction-emoji-content {
+      max-width: 1.25em;
+      max-height: 1.25em;
+      width: auto;
+      height: auto;
+      overflow: hidden;
+    }
+
     &:focus {
       outline: none;
     }
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index e1ea42ad..4d801c5e 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -121,7 +121,16 @@
                   scope="global"
                   keypath="notifications.reacted_with"
                 >
-                  <span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
+                  <img
+                    v-if="notification.emoji_url"
+                    class="emoji-reaction-emoji emoji-reaction-emoji-image"
+                    :src="notification.emoji_url"
+                    :name="notification.emoji"
+                  >
+                  <span
+                    v-else
+                    class="emoji-reaction-emoji"
+                  >{{ notification.emoji }}</span>
                 </i18n-t>
               </small>
             </span>
@@ -153,9 +162,9 @@
             </router-link>
             <button
               class="button-unstyled expand-icon"
-              @click.prevent="toggleStatusExpanded"
-              :title="$t('tool_tip.toggle_expand')"
               :aria-expanded="statusExpanded"
+              :title="$t('tool_tip.toggle_expand')"
+              @click.prevent="toggleStatusExpanded"
             >
               <FAIcon
                 class="fa-scale-110"
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 41cfcef0..61f7317e 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -129,6 +129,13 @@
 
   .emoji-reaction-emoji {
     font-size: 1.3em;
+    max-width: 1.25em;
+    height: 1.25em;
+    width: auto;
+  }
+
+  .emoji-reaction-emoji-image {
+    vertical-align: middle;
   }
 
   .notification-details {
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 47a48623..11bee8b0 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -1,9 +1,8 @@
 import Popover from '../popover/popover.vue'
-import { ensureFinalFallback } from '../../i18n/languages.js'
+import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPlus, faTimes } from '@fortawesome/free-solid-svg-icons'
 import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
-import { trim } from 'lodash'
 
 library.add(
   faPlus,
@@ -20,103 +19,32 @@ const ReactButton = {
     }
   },
   components: {
-    Popover
+    Popover,
+    EmojiPicker
   },
   methods: {
-    addReaction (event, emoji, close) {
+    addReaction (event) {
+      const emoji = event.insertion
       const existingReaction = this.status.emoji_reactions.find(r => r.name === emoji)
       if (existingReaction && existingReaction.me) {
         this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
       } else {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
-      close()
+    },
+    show () {
+      if (!this.expanded) {
+        this.$refs.picker.showPicker()
+      }
     },
     onShow () {
       this.expanded = true
-      this.focusInput()
     },
     onClose () {
       this.expanded = false
-    },
-    focusInput () {
-      this.$nextTick(() => {
-        const input = document.querySelector('.reaction-picker-filter > input')
-        if (input) input.focus()
-      })
-    },
-    // Vaguely adjusted copypaste from emoji_input and emoji_picker!
-    maybeLocalizedEmojiNamesAndKeywords (emoji) {
-      const names = [emoji.displayText]
-      const keywords = []
-
-      if (emoji.displayTextI18n) {
-        names.push(this.$t(emoji.displayTextI18n.key, emoji.displayTextI18n.args))
-      }
-
-      if (emoji.annotations) {
-        this.languages.forEach(lang => {
-          names.push(emoji.annotations[lang]?.name)
-
-          keywords.push(...(emoji.annotations[lang]?.keywords || []))
-        })
-      }
-
-      return {
-        names: names.filter(k => k),
-        keywords: keywords.filter(k => k)
-      }
-    },
-    maybeLocalizedEmojiName (emoji) {
-      if (!emoji.annotations) {
-        return emoji.displayText
-      }
-
-      if (emoji.displayTextI18n) {
-        return this.$t(emoji.displayTextI18n.key, emoji.displayTextI18n.args)
-      }
-
-      for (const lang of this.languages) {
-        if (emoji.annotations[lang]?.name) {
-          return emoji.annotations[lang].name
-        }
-      }
-
-      return emoji.displayText
     }
   },
   computed: {
-    commonEmojis () {
-      const hardcodedSet = new Set(['👍', '😠', '👀', '😂', '🔥'])
-      return this.$store.getters.standardEmojiList.filter(emoji => hardcodedSet.has(emoji.replacement))
-    },
-    languages () {
-      return ensureFinalFallback(this.$store.getters.mergedConfig.interfaceLanguage)
-    },
-    emojis () {
-      if (this.filterWord !== '') {
-        const keywordLowercase = trim(this.filterWord.toLowerCase())
-
-        const orderedEmojiList = []
-        for (const emoji of this.$store.getters.standardEmojiList) {
-          const indices = this.maybeLocalizedEmojiNamesAndKeywords(emoji)
-            .keywords
-            .map(k => k.toLowerCase().indexOf(keywordLowercase))
-            .filter(k => k > -1)
-
-          const indexOfKeyword = indices.length ? Math.min(...indices) : -1
-
-          if (indexOfKeyword > -1) {
-            if (!Array.isArray(orderedEmojiList[indexOfKeyword])) {
-              orderedEmojiList[indexOfKeyword] = []
-            }
-            orderedEmojiList[indexOfKeyword].push(emoji)
-          }
-        }
-        return orderedEmojiList.flat()
-      }
-      return this.$store.getters.standardEmojiList || []
-    },
     mergedConfig () {
       return this.$store.getters.mergedConfig
     }
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index a813b6fd..de08dd4c 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -1,73 +1,38 @@
 <template>
-  <Popover
-    trigger="click"
-    class="ReactButton"
-    placement="top"
-    :offset="{ y: 5 }"
-    :bound-to="{ x: 'container' }"
-    remove-padding
-    popover-class="ReactButton popover-default"
-    @show="onShow"
-    @close="onClose"
-  >
-    <template #content="{close}">
-      <div class="reaction-picker-filter">
-        <input
-          v-model="filterWord"
-          size="1"
-          :placeholder="$t('emoji.search_emoji')"
-          @input="$event.target.composing = false"
-        >
-      </div>
-      <div class="reaction-picker">
-        <span
-          v-for="emoji in commonEmojis"
-          :key="emoji.replacement"
-          class="emoji-button"
-          :title="maybeLocalizedEmojiName(emoji)"
-          @click="addReaction($event, emoji.replacement, close)"
-        >
-          {{ emoji.replacement }}
-        </span>
-        <div class="reaction-picker-divider" />
-        <span
-          v-for="(emoji, key) in emojis"
-          :key="key"
-          class="emoji-button"
-          :title="maybeLocalizedEmojiName(emoji)"
-          @click="addReaction($event, emoji.replacement, close)"
-        >
-          {{ emoji.replacement }}
-        </span>
-        <div class="reaction-bottom-fader" />
-      </div>
-    </template>
-    <template #trigger>
-      <span
-        class="button-unstyled popover-trigger"
-        :title="$t('tool_tip.add_reaction')"
-      >
-        <FALayers>
-          <FAIcon
-            class="fa-scale-110 fa-old-padding"
-            :icon="['far', 'smile-beam']"
-          />
-          <FAIcon
-            v-show="!expanded"
-            class="focus-marker"
-            transform="shrink-6 up-9 right-17"
-            icon="plus"
-          />
-          <FAIcon
-            v-show="expanded"
-            class="focus-marker"
-            transform="shrink-6 up-9 right-17"
-            icon="times"
-          />
-        </FALayers>
-      </span>
-    </template>
-  </Popover>
+  <span class="ReactButton">
+    <EmojiPicker
+      ref="picker"
+      :enable-sticker-picker="enableStickerPicker"
+      class="emoji-picker-panel"
+      @emoji="addReaction"
+      @show="onShow"
+      @close="onClose"
+    />
+    <span
+      class="button-unstyled popover-trigger"
+      :title="$t('tool_tip.add_reaction')"
+      @click.stop.prevent="show"
+    >
+      <FALayers>
+        <FAIcon
+          class="fa-scale-110 fa-old-padding"
+          :icon="['far', 'smile-beam']"
+        />
+        <FAIcon
+          v-show="!expanded"
+          class="focus-marker"
+          transform="shrink-6 up-9 right-17"
+          icon="plus"
+        />
+        <FAIcon
+          v-show="expanded"
+          class="focus-marker"
+          transform="shrink-6 up-9 right-17"
+          icon="times"
+        />
+      </FALayers>
+    </span>
+  </span>
 </template>
 
 <script src="./react_button.js"></script>
@@ -135,11 +100,6 @@
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
-  }
-
-  .popover-trigger-button {
-    /* override of popover internal stuff */
-    width: auto;
 
     @include unfocused-style {
       .focus-marker {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 53c3108c..adefc5a5 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -441,6 +441,7 @@ export const parseNotification = (data) => {
       : parseUser(data.target)
     output.from_profile = parseUser(data.account)
     output.emoji = data.emoji
+    output.emoji_url = data.emoji_url
     if (data.report) {
       output.report = data.report
       output.report.content = data.report.content

From 832019b2c26f7b219db75e47060ab95251c14c26 Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Thu, 2 Mar 2023 11:13:05 +0300
Subject: [PATCH 35/40] Hide custom emoji in reaction picker when BE does not
 advertise pleroma_custom_emoji_reactions

---
 src/boot/after_store.js                      | 1 +
 src/components/emoji_picker/emoji_picker.js  | 8 ++++++++
 src/components/react_button/react_button.js  | 4 ++--
 src/components/react_button/react_button.vue | 1 +
 src/modules/instance.js                      | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index d2e7f488..9c1f007b 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -253,6 +253,7 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
       store.dispatch('setInstanceOption', { name: 'shoutAvailable', value: features.includes('chat') })
       store.dispatch('setInstanceOption', { name: 'pleromaChatMessagesAvailable', value: features.includes('pleroma_chat_messages') })
+      store.dispatch('setInstanceOption', { name: 'pleromaCustomEmojiReactionsAvailable', value: features.includes('pleroma_custom_emoji_reactions') })
       store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
       store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
       store.dispatch('setInstanceOption', { name: 'editingAvailable', value: features.includes('editing') })
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 0d7ca812..349b043d 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -98,6 +98,11 @@ const EmojiPicker = {
       required: false,
       type: Boolean,
       default: false
+    },
+    hideCustomEmoji: {
+      required: false,
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -280,6 +285,9 @@ const EmojiPicker = {
       return 0
     },
     allCustomGroups () {
+      if (this.hideCustomEmoji) {
+        return {}
+      }
       const emojis = this.$store.getters.groupedCustomEmojis
       if (emojis.unpacked) {
         emojis.unpacked.text = this.$t('emoji.unpacked')
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 11bee8b0..8eed4b60 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -45,8 +45,8 @@ const ReactButton = {
     }
   },
   computed: {
-    mergedConfig () {
-      return this.$store.getters.mergedConfig
+    hideCustomEmoji () {
+      return !this.$store.state.instance.pleromaChatMessagesAvailable
     }
   }
 }
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index de08dd4c..947536a1 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -3,6 +3,7 @@
     <EmojiPicker
       ref="picker"
       :enable-sticker-picker="enableStickerPicker"
+      :hide-custom-emoji="hideCustomEmoji"
       class="emoji-picker-panel"
       @emoji="addReaction"
       @show="onShow"
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 938ca64d..bb0292da 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -123,6 +123,7 @@ const defaultState = {
   // Feature-set, apparently, not everything here is reported...
   shoutAvailable: false,
   pleromaChatMessagesAvailable: false,
+  pleromaCustomEmojiReactionsAvailable: false,
   gopherAvailable: false,
   mediaProxyAvailable: false,
   suggestionsEnabled: false,

From 306e254c15c7cb7a19b680a5666695f429445729 Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Fri, 17 Mar 2023 22:24:22 +0300
Subject: [PATCH 36/40] Fix user-profile route crash on pinned favorites route

---
 src/components/navigation/navigation.js       | 18 ++++++++++++++++++
 src/components/navigation/navigation_entry.js | 14 ++------------
 src/components/navigation/navigation_pins.js  | 11 ++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index 7f096316..face430e 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -80,3 +80,21 @@ export const ROOT_ITEMS = {
     criteria: ['announcements']
   }
 }
+
+export function routeTo (item, currentUser) {
+  if (!item.route && !item.routeObject) return null
+
+  let route
+
+  if (item.routeObject) {
+    route = item.routeObject
+  } else {
+    route = { name: (item.anon || currentUser) ? item.route : item.anonRoute }
+  }
+
+  if (USERNAME_ROUTES.has(route.name)) {
+    route.params = { username: currentUser.screen_name, name: currentUser.screen_name }
+  }
+
+  return route
+}
diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js
index 81cc936a..22ed77d9 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -1,5 +1,5 @@
 import { mapState } from 'vuex'
-import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
+import { routeTo } from 'src/components/navigation/navigation.js'
 import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faThumbtack } from '@fortawesome/free-solid-svg-icons'
@@ -26,17 +26,7 @@ const NavigationEntry = {
   },
   computed: {
     routeTo () {
-      if (!this.item.route && !this.item.routeObject) return null
-      let route
-      if (this.item.routeObject) {
-        route = this.item.routeObject
-      } else {
-        route = { name: (this.item.anon || this.currentUser) ? this.item.route : this.item.anonRoute }
-      }
-      if (USERNAME_ROUTES.has(route.name)) {
-        route.params = { username: this.currentUser.screen_name, name: this.currentUser.screen_name }
-      }
-      return route
+      return routeTo(this.item, this.currentUser)
     },
     getters () {
       return this.$store.getters
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index 9dd795aa..ef78e44c 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -1,5 +1,5 @@
 import { mapState } from 'vuex'
-import { TIMELINES, ROOT_ITEMS, USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
+import { TIMELINES, ROOT_ITEMS, routeTo } from 'src/components/navigation/navigation.js'
 import { getListEntries, filterNavigation } from 'src/components/navigation/filter.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -31,14 +31,7 @@ const NavPanel = {
   props: ['limit'],
   methods: {
     getRouteTo (item) {
-      if (item.routeObject) {
-        return item.routeObject
-      }
-      const route = { name: (item.anon || this.currentUser) ? item.route : item.anonRoute }
-      if (USERNAME_ROUTES.has(route.name)) {
-        route.params = { username: this.currentUser.screen_name }
-      }
-      return route
+      return routeTo(item, this.currentUser)
     }
   },
   computed: {

From 3403f6a1ed5388291244487ae7eb3190d7c4353e Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Fri, 17 Mar 2023 23:30:46 +0300
Subject: [PATCH 37/40] Allow custom emoji reactions: add option to scale
 reaction buttons

---
 .../emoji_reactions/emoji_reactions.vue       | 27 ++++++++++++-------
 .../settings_modal/tabs/general_tab.vue       |  9 +++++++
 src/i18n/en.json                              |  1 +
 src/modules/config.js                         |  2 ++
 src/services/style_setter/style_setter.js     |  4 +--
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 12783114..eb46018e 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -12,20 +12,20 @@
         @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
         <span
-          v-if="reaction.url"
           class="reaction-emoji"
         >
           <img
+            v-if="reaction.url"
             :src="reaction.url"
             :title="reaction.name"
             class="reaction-emoji-content"
             width="1em"
           >
+          <span
+            v-else
+            class="reaction-emoji reaction-emoji-content"
+          >{{ reaction.name }}</span>
         </span>
-        <span
-          v-else
-          class="reaction-emoji reaction-emoji-content"
-        >{{ reaction.name }}</span>
         <span>{{ reaction.count }}</span>
       </button>
     </UserListPopover>
@@ -49,6 +49,8 @@
   margin-top: 0.25em;
   flex-wrap: wrap;
 
+  --emoji-size: calc(1.25em * var(--emojiReactionsScale, 1));
+
   .emoji-reaction {
     padding: 0 0.5em;
     margin-right: 0.5em;
@@ -59,17 +61,24 @@
     box-sizing: border-box;
 
     .reaction-emoji {
-      width: 1.25em;
-      height: 1.25em;
+      width: var(--emoji-size);
+      height: var(--emoji-size);
       margin-right: 0.25em;
+      line-height: var(--emoji-size);
+      display: flex;
+      justify-content: center;
+      align-items: center;
     }
 
     .reaction-emoji-content {
-      max-width: 1.25em;
-      max-height: 1.25em;
+      max-width: 100%;
+      max-height: 100%;
       width: auto;
       height: auto;
+      line-height: inherit;
       overflow: hidden;
+      font-size: calc(var(--emoji-size) * 0.8);
+      margin: 0;
     }
 
     &:focus {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 65248ac1..17afc5ba 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -271,6 +271,15 @@
             {{ $t('settings.no_rich_text_description') }}
           </BooleanSetting>
         </li>
+        <li>
+          <IntegerSetting
+            v-if="user"
+            path="emojiReactionsScale"
+            expert="1"
+          >
+            {{ $t('settings.emoji_reactions_scale') }}
+          </IntegerSetting>
+        </li>
         <h3>{{ $t('settings.attachments') }}</h3>
         <li>
           <BooleanSetting
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 6c9bc8e2..10ba2ef8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -467,6 +467,7 @@
     "pad_emoji": "Pad emoji with spaces when adding from picker",
     "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
     "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
+    "emoji_reactions_scale": "Reactions scale factor",
     "export_theme": "Save preset",
     "filtering": "Filtering",
     "wordfilter": "Wordfilter",
diff --git a/src/modules/config.js b/src/modules/config.js
index 3d9cf591..7597886e 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -97,6 +97,7 @@ export const defaultState = {
   sidebarColumnWidth: '25rem',
   contentColumnWidth: '45rem',
   notifsColumnWidth: '25rem',
+  emojiReactionsScale: 1.0,
   navbarColumnStretch: false,
   greentext: undefined, // instance default
   useAtIcon: undefined, // instance default
@@ -185,6 +186,7 @@ const config = {
         case 'sidebarColumnWidth':
         case 'contentColumnWidth':
         case 'notifsColumnWidth':
+        case 'emojiReactionsScale':
           applyConfig(state)
           break
         case 'customTheme':
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index d6e973a1..43fe3c73 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -21,8 +21,8 @@ export const applyTheme = (input) => {
   body.classList.remove('hidden')
 }
 
-const configColumns = ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth }) =>
-  ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth })
+const configColumns = ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth, emojiReactionsScale }) =>
+  ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth, emojiReactionsScale })
 
 const defaultConfigColumns = configColumns(defaultState)
 

From 493120b5456282756d05d9afaf66b11a2f87d8fc Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Sat, 18 Mar 2023 20:48:36 +0300
Subject: [PATCH 38/40] Generalize IntegerSetting into NumberSetting, add
 Integer/Float wrappers

---
 .../settings_modal/helpers/float_setting.vue  | 16 +++++++++
 .../helpers/integer_setting.vue               | 36 +++++++------------
 .../{integer_setting.js => number_setting.js} | 22 +++++++++---
 .../settings_modal/helpers/number_setting.vue | 27 ++++++++++++++
 .../settings_modal/tabs/general_tab.js        |  2 ++
 .../settings_modal/tabs/general_tab.vue       |  4 +--
 6 files changed, 77 insertions(+), 30 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/float_setting.vue
 rename src/components/settings_modal/helpers/{integer_setting.js => number_setting.js} (58%)
 create mode 100644 src/components/settings_modal/helpers/number_setting.vue

diff --git a/src/components/settings_modal/helpers/float_setting.vue b/src/components/settings_modal/helpers/float_setting.vue
new file mode 100644
index 00000000..15edb3c3
--- /dev/null
+++ b/src/components/settings_modal/helpers/float_setting.vue
@@ -0,0 +1,16 @@
+<template>
+  <NumberSetting
+    v-bind="$attrs"
+  >
+    <slot />
+  </NumberSetting>
+</template>
+
+<script>
+import NumberSetting from './number_setting.vue'
+export default {
+  components: {
+    NumberSetting
+  }
+}
+</script>
diff --git a/src/components/settings_modal/helpers/integer_setting.vue b/src/components/settings_modal/helpers/integer_setting.vue
index 695e2673..43fa7e1a 100644
--- a/src/components/settings_modal/helpers/integer_setting.vue
+++ b/src/components/settings_modal/helpers/integer_setting.vue
@@ -1,27 +1,17 @@
 <template>
-  <span
-    v-if="matchesExpertLevel"
-    class="IntegerSetting"
+  <NumberSetting
+    v-bind="$attrs"
+    truncate="1"
   >
-    <label :for="path">
-      <slot />
-    </label>
-    <input
-      :id="path"
-      class="number-input"
-      type="number"
-      step="1"
-      :disabled="disabled"
-      :min="min || 0"
-      :value="state"
-      @change="update"
-    >
-    {{ ' ' }}
-    <ModifiedIndicator
-      :changed="isChanged"
-      :onclick="reset"
-    />
-  </span>
+    <slot />
+  </NumberSetting>
 </template>
 
-<script src="./integer_setting.js"></script>
+<script>
+import NumberSetting from './number_setting.vue'
+export default {
+  components: {
+    NumberSetting
+  }
+}
+</script>
diff --git a/src/components/settings_modal/helpers/integer_setting.js b/src/components/settings_modal/helpers/number_setting.js
similarity index 58%
rename from src/components/settings_modal/helpers/integer_setting.js
rename to src/components/settings_modal/helpers/number_setting.js
index e64d0cee..73c39948 100644
--- a/src/components/settings_modal/helpers/integer_setting.js
+++ b/src/components/settings_modal/helpers/number_setting.js
@@ -8,6 +8,8 @@ export default {
     path: String,
     disabled: Boolean,
     min: Number,
+    step: Number,
+    truncate: Number,
     expert: [Number, String]
   },
   computed: {
@@ -15,8 +17,11 @@ export default {
       const [firstSegment, ...rest] = this.path.split('.')
       return [firstSegment + 'DefaultValue', ...rest].join('.')
     },
+    parent () {
+      return this.$parent.$parent
+    },
     state () {
-      const value = get(this.$parent, this.path)
+      const value = get(this.parent, this.path)
       if (value === undefined) {
         return this.defaultState
       } else {
@@ -24,21 +29,28 @@ export default {
       }
     },
     defaultState () {
-      return get(this.$parent, this.pathDefault)
+      return get(this.parent, this.pathDefault)
     },
     isChanged () {
       return this.state !== this.defaultState
     },
     matchesExpertLevel () {
-      return (this.expert || 0) <= this.$parent.expertLevel
+      return (this.expert || 0) <= this.parent.expertLevel
     }
   },
   methods: {
+    truncateValue (value) {
+      if (!this.truncate) {
+        return value
+      }
+
+      return Math.trunc(value / this.truncate) * this.truncate
+    },
     update (e) {
-      set(this.$parent, this.path, parseInt(e.target.value))
+      set(this.parent, this.path, this.truncateValue(parseFloat(e.target.value)))
     },
     reset () {
-      set(this.$parent, this.path, this.defaultState)
+      set(this.parent, this.path, this.defaultState)
     }
   }
 }
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
new file mode 100644
index 00000000..3eab5178
--- /dev/null
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -0,0 +1,27 @@
+<template>
+  <span
+    v-if="matchesExpertLevel"
+    class="NumberSetting"
+  >
+    <label :for="path">
+      <slot />
+    </label>
+    <input
+      :id="path"
+      class="number-input"
+      type="number"
+      :step="step || 1"
+      :disabled="disabled"
+      :min="min || 0"
+      :value="state"
+      @change="update"
+    >
+    {{ ' ' }}
+    <ModifiedIndicator
+      :changed="isChanged"
+      :onclick="reset"
+    />
+  </span>
+</template>
+
+<script src="./number_setting.js"></script>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index ea24d6ad..be97710f 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -2,6 +2,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
+import FloatSetting from '../helpers/float_setting.vue'
 import SizeSetting, { defaultHorizontalUnits } from '../helpers/size_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
@@ -62,6 +63,7 @@ const GeneralTab = {
     BooleanSetting,
     ChoiceSetting,
     IntegerSetting,
+    FloatSetting,
     SizeSetting,
     InterfaceLanguageSwitcher,
     ScopeSelector,
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 17afc5ba..21e2d855 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -272,13 +272,13 @@
           </BooleanSetting>
         </li>
         <li>
-          <IntegerSetting
+          <FloatSetting
             v-if="user"
             path="emojiReactionsScale"
             expert="1"
           >
             {{ $t('settings.emoji_reactions_scale') }}
-          </IntegerSetting>
+          </FloatSetting>
         </li>
         <h3>{{ $t('settings.attachments') }}</h3>
         <li>

From 624da7240e72bacb3476d512691c17bafdb4dfed Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Wed, 8 Mar 2023 14:07:46 +0000
Subject: [PATCH 39/40] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (984 of 987 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 90f840a7..8ea4c1e0 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -295,7 +295,7 @@
     "change_password_error": "修改密码的时候出了点问题。",
     "changed_password": "成功修改了密码！",
     "collapse_subject": "折叠带主题的内容",
-    "composing": "写作",
+    "composing": "撰写",
     "confirm_new_password": "确认新密码",
     "current_avatar": "当前头像",
     "current_password": "当前密码",
@@ -737,7 +737,8 @@
     "mention_link_use_tooltip": "点击提及链接时显示用户卡片",
     "mention_link_show_avatar": "在链接旁边显示用户头像",
     "mention_link_show_avatar_quick": "在提及内容旁边显示用户头像",
-    "user_popover_avatar_action_open": "打开个人资料"
+    "user_popover_avatar_action_open": "打开个人资料",
+    "autocomplete_select_first": "当有自动完成的结果时，自动选择第一个候选项"
   },
   "time": {
     "day": "{0} 天",

From c9072ddb0b5ab1daef1f461982a6c57460a75dfe Mon Sep 17 00:00:00 2001
From: jonossa <hello@jonossaseuraava.net>
Date: Tue, 21 Mar 2023 16:43:16 +0200
Subject: [PATCH 40/40] add parseInt in poll expires_in to make sure FE sends
 integers in all cases

---
 src/services/api/api.service.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b8c10b21..259e5b30 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -840,7 +840,7 @@ const postStatus = ({
   })
   if (pollOptions.some(option => option !== '')) {
     const normalizedPoll = {
-      expires_in: poll.expiresIn,
+      expires_in: parseInt(poll.expiresIn, 10),
       multiple: poll.multiple
     }
     Object.keys(normalizedPoll).forEach(key => {
@@ -897,7 +897,7 @@ const editStatus = ({
 
   if (pollOptions.some(option => option !== '')) {
     const normalizedPoll = {
-      expires_in: poll.expiresIn,
+      expires_in: parseInt(poll.expiresIn, 10),
       multiple: poll.multiple
     }
     Object.keys(normalizedPoll).forEach(key => {