From a463959a365a5d618a79c96a26f6506e700d6ea3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 1 Oct 2020 01:43:07 +0300
Subject: [PATCH 001/119] Initial work on highlighting changed settings. Some
 refactoring to simplify addition of new settings

---
 .../helpers/boolean_setting.vue               |  57 +++++++++
 .../helpers/shared_computed_object.js         |  23 +---
 .../settings_modal/tabs/filtering_tab.js      |   4 +-
 .../settings_modal/tabs/filtering_tab.vue     |  42 +++----
 .../settings_modal/tabs/general_tab.js        |   4 +-
 .../settings_modal/tabs/general_tab.vue       | 118 +++++++++---------
 src/modules/config.js                         |  24 ++--
 7 files changed, 161 insertions(+), 111 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/boolean_setting.vue

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
new file mode 100644
index 0000000000..11b354edba
--- /dev/null
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -0,0 +1,57 @@
+<template>
+  <label
+    class="BooleanSetting"
+  >
+    <Checkbox
+      :checked="state"
+      @change="update"
+      :disabled="disabled"
+      >
+      <span
+        v-if="!!$slots.default"
+        class="label"
+        >
+        <slot />
+      </span>
+    </Checkbox>
+    <span v-if="isChanged">
+      <strong>CHANGED</strong>
+    </span>
+  </label>
+</template>
+
+<script>
+import { get, set } from 'lodash'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+export default {
+  props: [
+    'path',
+    'disabled'
+  ],
+  components: {
+    Checkbox
+  },
+  computed: {
+    pathDefault () {
+      const [firstSegment, ...rest] = this.path.split('.')
+      return [firstSegment + 'DefaultValue', ...rest].join('.')
+    },
+    state () {
+      return get(this.$parent, this.path)
+    },
+    isChanged () {
+      return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault)
+    }
+  },
+  methods: {
+    update (e) {
+      set(this.$parent, this.path, e)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.BooleanSetting {
+}
+</style>
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 86703697d2..3cbcd28847 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -1,29 +1,16 @@
-import {
-  instanceDefaultProperties,
-  multiChoiceProperties,
-  defaultState as configDefaultState
-} from 'src/modules/config.js'
+import { defaultState as configDefaultState } from 'src/modules/config.js'
 
 const SharedComputedObject = () => ({
   user () {
     return this.$store.state.users.currentUser
   },
-  // Getting localized values for instance-default properties
-  ...instanceDefaultProperties
-    .filter(key => multiChoiceProperties.includes(key))
+  // Getting values for default properties
+  ...Object.keys(configDefaultState)
     .map(key => [
       key + 'DefaultValue',
       function () {
-        return this.$store.getters.instanceDefaultConfig[key]
-      }
-    ])
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
-  ...instanceDefaultProperties
-    .filter(key => !multiChoiceProperties.includes(key))
-    .map(key => [
-      key + 'LocalizedValue',
-      function () {
-        return this.$t('settings.values.' + this.$store.getters.instanceDefaultConfig[key])
+        console.log(this.$store.getters.defaultConfig)
+        return this.$store.getters.defaultConfig[key]
       }
     ])
     .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 3b2df55604..042732111d 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,5 +1,5 @@
 import { filter, trim } from 'lodash'
-import Checkbox from 'src/components/checkbox/checkbox.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
@@ -10,7 +10,7 @@ const FilteringTab = {
     }
   },
   components: {
-    Checkbox
+    BooleanSetting
   },
   computed: {
     ...SharedComputedObject(),
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index eea41514dd..6c42718b14 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -5,34 +5,34 @@
         <span class="label">{{ $t('settings.notification_visibility') }}</span>
         <ul class="option-list">
           <li>
-            <Checkbox v-model="notificationVisibility.likes">
+            <BooleanSetting path="notificationVisibility.likes">
               {{ $t('settings.notification_visibility_likes') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.repeats">
+            <BooleanSetting path="notificationVisibility.repeats">
               {{ $t('settings.notification_visibility_repeats') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.follows">
+            <BooleanSetting path="notificationVisibility.follows">
               {{ $t('settings.notification_visibility_follows') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.mentions">
+            <BooleanSetting path="notificationVisibility.mentions">
               {{ $t('settings.notification_visibility_mentions') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.moves">
+            <BooleanSetting path="notificationVisibility.moves">
               {{ $t('settings.notification_visibility_moves') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox v-model="notificationVisibility.emojiReactions">
+            <BooleanSetting path="notificationVisibility.emojiReactions">
               {{ $t('settings.notification_visibility_emoji_reactions') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
         </ul>
       </div>
@@ -57,14 +57,14 @@
         </label>
       </div>
       <div>
-        <Checkbox v-model="hidePostStats">
-          {{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hidePostStats">
+          {{ $t('settings.hide_post_stats') }}
+        </BooleanSetting>
       </div>
       <div>
-        <Checkbox v-model="hideUserStats">
-          {{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hideUserStats">
+          {{ $t('settings.hide_user_stats') }}
+        </BooleanSetting>
       </div>
     </div>
     <div class="setting-item">
@@ -76,9 +76,9 @@
         />
       </div>
       <div>
-        <Checkbox v-model="hideFilteredStatuses">
-          {{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hideFilteredStatuses">
+          {{ $t('settings.hide_filtered_statuses') }}
+        </BooleanSetting>
       </div>
     </div>
   </div>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 0eb37e44eb..679ef684f2 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -1,4 +1,4 @@
-import Checkbox from 'src/components/checkbox/checkbox.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
@@ -16,7 +16,7 @@ const GeneralTab = {
     }
   },
   components: {
-    Checkbox,
+    BooleanSetting,
     InterfaceLanguageSwitcher
   },
   computed: {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 7f06d0bd3a..e03e731b23 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -7,9 +7,9 @@
           <interface-language-switcher />
         </li>
         <li v-if="instanceSpecificPanelPresent">
-          <Checkbox v-model="hideISP">
+          <BooleanSetting path="hideISP">
             {{ $t('settings.hide_isp') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -17,46 +17,46 @@
       <h2>{{ $t('nav.timeline') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="hideMutedPosts">
-            {{ $t('settings.hide_muted_posts') }} {{ $t('settings.instance_default', { value: hideMutedPostsLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="hideMutedPosts">
+            {{ $t('settings.hide_muted_posts') }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="collapseMessageWithSubject">
-            {{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="collapseMessageWithSubject">
+            {{ $t('settings.collapse_subject') }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="streaming">
+          <BooleanSetting path="streaming">
             {{ $t('settings.streaming') }}
-          </Checkbox>
+          </BooleanSetting>
           <ul
             class="setting-list suboptions"
             :class="[{disabled: !streaming}]"
           >
             <li>
-              <Checkbox
-                v-model="pauseOnUnfocused"
+              <BooleanSetting
+                path="pauseOnUnfocused"
                 :disabled="!streaming"
               >
                 {{ $t('settings.pause_on_unfocused') }}
-              </Checkbox>
+              </BooleanSetting>
             </li>
           </ul>
         </li>
         <li>
-          <Checkbox v-model="useStreamingApi">
+          <BooleanSetting path="useStreamingApi">
             {{ $t('settings.useStreamingApi') }}
             <br>
             <small>
               {{ $t('settings.useStreamingApiWarning') }}
             </small>
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="emojiReactionsOnTimeline">
+          <BooleanSetting path="emojiReactionsOnTimeline">
             {{ $t('settings.emoji_reactions_on_timeline') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -65,14 +65,14 @@
       <h2>{{ $t('settings.composing') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="scopeCopy">
-            {{ $t('settings.scope_copy') }} {{ $t('settings.instance_default', { value: scopeCopyLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="scopeCopy">
+            {{ $t('settings.scope_copy') }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="alwaysShowSubjectInput">
-            {{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="alwaysShowSubjectInput">
+            {{ $t('settings.subject_input_always_show') }}
+          </BooleanSetting>
         </li>
         <li>
           <div>
@@ -127,19 +127,19 @@
           </div>
         </li>
         <li>
-          <Checkbox v-model="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="minimalScopesMode">
+            {{ $t('settings.minimal_scopes_mode') }} {{ minimalScopesModeDefaultValue }}
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="autohideFloatingPostButton">
+          <BooleanSetting path="autohideFloatingPostButton">
             {{ $t('settings.autohide_floating_post_button') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="padEmoji">
+          <BooleanSetting path="padEmoji">
             {{ $t('settings.pad_emoji') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -148,14 +148,14 @@
       <h2>{{ $t('settings.attachments') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="hideAttachments">
+          <BooleanSetting path="hideAttachments">
             {{ $t('settings.hide_attachments_in_tl') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="hideAttachmentsInConv">
+          <BooleanSetting path="hideAttachmentsInConv">
             {{ $t('settings.hide_attachments_in_convo') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
           <label for="maxThumbnails">
@@ -163,7 +163,7 @@
           </label>
           <input
             id="maxThumbnails"
-            v-model.number="maxThumbnails"
+            path.number="maxThumbnails"
             class="number-input"
             type="number"
             min="0"
@@ -171,48 +171,48 @@
           >
         </li>
         <li>
-          <Checkbox v-model="hideNsfw">
+          <BooleanSetting path="hideNsfw">
             {{ $t('settings.nsfw_clickthrough') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <ul class="setting-list suboptions">
           <li>
-            <Checkbox
-              v-model="preloadImage"
+            <BooleanSetting
+              path="preloadImage"
               :disabled="!hideNsfw"
             >
               {{ $t('settings.preload_images') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
           <li>
-            <Checkbox
-              v-model="useOneClickNsfw"
+            <BooleanSetting
+              path="useOneClickNsfw"
               :disabled="!hideNsfw"
             >
               {{ $t('settings.use_one_click_nsfw') }}
-            </Checkbox>
+            </BooleanSetting>
           </li>
         </ul>
         <li>
-          <Checkbox v-model="stopGifs">
+          <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="loopVideo">
+          <BooleanSetting path="loopVideo">
             {{ $t('settings.loop_video') }}
-          </Checkbox>
+          </BooleanSetting>
           <ul
             class="setting-list suboptions"
             :class="[{disabled: !streaming}]"
           >
             <li>
-              <Checkbox
-                v-model="loopVideoSilentOnly"
+              <BooleanSetting
+                path="loopVideoSilentOnly"
                 :disabled="!loopVideo || !loopSilentAvailable"
               >
                 {{ $t('settings.loop_video_silent_only') }}
-              </Checkbox>
+              </BooleanSetting>
               <div
                 v-if="!loopSilentAvailable"
                 class="unavailable"
@@ -223,14 +223,14 @@
           </ul>
         </li>
         <li>
-          <Checkbox v-model="playVideosInModal">
+          <BooleanSetting path="playVideosInModal">
             {{ $t('settings.play_videos_in_modal') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="useContainFit">
+          <BooleanSetting path="useContainFit">
             {{ $t('settings.use_contain_fit') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -239,9 +239,9 @@
       <h2>{{ $t('settings.notifications') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="webPushNotifications">
+          <BooleanSetting path="webPushNotifications">
             {{ $t('settings.enable_web_push_notifications') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -250,9 +250,9 @@
       <h2>{{ $t('settings.fun') }}</h2>
       <ul class="setting-list">
         <li>
-          <Checkbox v-model="greentext">
-            {{ $t('settings.greentext') }} {{ $t('settings.instance_default', { value: greentextLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="greentext">
+            {{ $t('settings.greentext') }}
+          </BooleanSetting>
         </li>
       </ul>
     </div>
diff --git a/src/modules/config.js b/src/modules/config.js
index 409d77a451..2c1e881f5f 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -74,18 +74,24 @@ export const instanceDefaultProperties = Object.entries(defaultState)
   .map(([key, value]) => key)
 
 const config = {
-  state: defaultState,
+  state: { ...defaultState },
   getters: {
-    mergedConfig (state, getters, rootState, rootGetters) {
+    defaultConfig (state, getters, rootState, rootGetters) {
       const { instance } = rootState
+      console.log('DC', instance.minimalScopesMode)
       return {
-        ...state,
-        ...instanceDefaultProperties
-          .map(key => [key, state[key] === undefined
-            ? instance[key]
-            : state[key]
-          ])
-          .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+        ...defaultState,
+        ...Object.fromEntries(
+          instanceDefaultProperties.map(key => [key, instance[key]])
+        )
+      }
+    },
+    mergedConfig (state, getters, rootState, rootGetters) {
+      const { defaultConfig } = rootGetters
+      console.log('DC2', defaultConfig.hideISP)
+      return {
+        ...defaultConfig,
+        ...state
       }
     }
   },

From e695506c514e49964dfd81c7db5c5b4d4918f47d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 17 Oct 2020 22:28:49 +0300
Subject: [PATCH 002/119] proper modified icon + popup

---
 .../helpers/boolean_setting.vue               | 10 ++--
 .../settings_modal/helpers/modified_icon.vue  | 46 +++++++++++++++++++
 src/i18n/en.json                              |  1 +
 3 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/modified_icon.vue

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 11b354edba..f7c392cddd 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -6,30 +6,30 @@
       :checked="state"
       @change="update"
       :disabled="disabled"
-      >
+    >
       <span
         v-if="!!$slots.default"
         class="label"
         >
         <slot />
       </span>
+      <ModifiedIcon :changed="isChanged" />
     </Checkbox>
-    <span v-if="isChanged">
-      <strong>CHANGED</strong>
-    </span>
   </label>
 </template>
 
 <script>
 import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
+import ModifiedIcon from './modified_icon.vue'
 export default {
   props: [
     'path',
     'disabled'
   ],
   components: {
-    Checkbox
+    Checkbox,
+    ModifiedIcon
   },
   computed: {
     pathDefault () {
diff --git a/src/components/settings_modal/helpers/modified_icon.vue b/src/components/settings_modal/helpers/modified_icon.vue
new file mode 100644
index 0000000000..27e0a9c5ef
--- /dev/null
+++ b/src/components/settings_modal/helpers/modified_icon.vue
@@ -0,0 +1,46 @@
+<template>
+  <span
+    v-if="changed"
+    class="ModifiedIcon"
+    >
+    <Popover
+      trigger="hover"
+      >
+      <i
+        slot="trigger"
+        class="icon icon-wrench"
+        />
+      <div
+        class="modified-tooltip"
+        slot="content"
+        >
+      {{ $t('settings.setting_changed') }}
+      </div>
+    </Popover>
+  </span>
+</template>
+
+<script>
+import Popover from 'src/components/popover/popover.vue'
+export default {
+  props: ['changed'],
+  components: { Popover }
+}
+</script>
+
+<style lang="scss">
+.ModifiedIcon {
+  display: inline-block;
+  position: relative;
+
+  .icon {
+    display: inline-block;
+  }
+
+  .modified-tooltip {
+    margin: 0.5em 1em;
+    min-width: 10em;
+    text-align: center;
+  }
+}
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d3d575624e..e25bda8f7d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -240,6 +240,7 @@
   "settings": {
     "app_name": "App name",
     "security": "Security",
+    "setting_changed": "Setting is different from default",
     "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
     "mfa": {
       "otp": "OTP",

From 481c71517e41cdfc097b489b781847e0319f71fa Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Sat, 12 Dec 2020 15:17:42 +0300
Subject: [PATCH 003/119] Group staff members by role in the About page

---
 CHANGELOG.md                               |  1 +
 src/components/staff_panel/staff_panel.js  | 20 +++++++++++++---
 src/components/staff_panel/staff_panel.vue | 27 ++++++++++++++++++----
 src/i18n/en.json                           |  6 ++++-
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83bcee6ebf..9a78d328bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added some missing unicode emoji
 - Added the upload limit to the Features panel in the About page
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
+- Group staff members by role in the About page
 
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 8665648a5d..b9561bf191 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -1,4 +1,6 @@
 import map from 'lodash/map'
+import groupBy from 'lodash/groupBy'
+import { mapGetters, mapState } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
 const StaffPanel = {
@@ -10,9 +12,21 @@ const StaffPanel = {
     BasicUserCard
   },
   computed: {
-    staffAccounts () {
-      return map(this.$store.state.instance.staffAccounts, nickname => this.$store.getters.findUser(nickname)).filter(_ => _)
-    }
+    groupedStaffAccounts () {
+      const staffAccounts = map(this.staffAccounts, this.findUser).filter(_ => _)
+      const groupedStaffAccounts = groupBy(staffAccounts, 'role')
+
+      return [
+        { role: 'admin', users: groupedStaffAccounts['admin'] },
+        { role: 'moderator', users: groupedStaffAccounts['moderator'] }
+      ].filter(group => group.users)
+    },
+    ...mapGetters([
+      'findUser'
+    ]),
+    ...mapState({
+      staffAccounts: state => state.instance.staffAccounts
+    })
   }
 }
 
diff --git a/src/components/staff_panel/staff_panel.vue b/src/components/staff_panel/staff_panel.vue
index 1d13003df1..c52ade4259 100644
--- a/src/components/staff_panel/staff_panel.vue
+++ b/src/components/staff_panel/staff_panel.vue
@@ -7,11 +7,18 @@
         </div>
       </div>
       <div class="panel-body">
-        <basic-user-card
-          v-for="user in staffAccounts"
-          :key="user.screen_name"
-          :user="user"
-        />
+        <div
+          v-for="group in groupedStaffAccounts"
+          :key="group.role"
+          class="staff-group"
+        >
+          <h4>{{ $t('general.role.' + group.role) }}</h4>
+          <basic-user-card
+            v-for="user in group.users"
+            :key="user.screen_name"
+            :user="user"
+          />
+        </div>
       </div>
     </div>
   </div>
@@ -20,4 +27,14 @@
 <script src="./staff_panel.js" ></script>
 
 <style lang="scss">
+
+.staff-group {
+  padding-left: 1em;
+  padding-top: 1em;
+
+  .basic-user-card {
+    padding-left: 0;
+  }
+}
+
 </style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 26dd61445d..cb4c020511 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -75,7 +75,11 @@
     "confirm": "Confirm",
     "verify": "Verify",
     "close": "Close",
-    "peek": "Peek"
+    "peek": "Peek",
+    "role": {
+      "admin": "Admin",
+      "moderator": "Moderator"
+    }
   },
   "image_cropper": {
     "crop_picture": "Crop picture",

From 5ab96ae0d235b6a30648d2d493be3fd3c4301e5b Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 11 Jan 2021 19:40:35 +0200
Subject: [PATCH 004/119] don't filter own posts

---
 src/components/status/status.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index f9c710ab7d..2bf93a9eb6 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -157,6 +157,7 @@ const Status = {
       return muteWordHits(this.status, this.muteWords)
     },
     muted () {
+      if (this.statusoid.user.id === this.currentUser.id) return false
       const { status } = this
       const { reblog } = status
       const relationship = this.$store.getters.relationship(status.user.id)

From cdb9b4aea287bb5437d31cf574cc66503c981ea9 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 11 Jan 2021 19:41:42 +0200
Subject: [PATCH 005/119] changelog update

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f270bfeaf..d4dd484b5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Follows/Followers tabs on user profiles now display the content properly.
 - Handle punycode in screen names
 
+### Changed
+- Don't filter own posts when they hit your wordfilter
+
 ## [2.2.2] - 2020-12-22
 ### Added
 - Mouseover titles for emojis in reaction picker

From 9656c9b96919f17647adda80ba187a4f5b2299e1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 18 Jan 2021 15:54:12 -0600
Subject: [PATCH 006/119] Support old user.deactivated and new user.is_active
 fields

---
 src/services/entity_normalizer/entity_normalizer.service.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 625f593ea9..a199ebd040 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -188,7 +188,9 @@ export const parseUser = (data) => {
     output.follow_request_count = data.pleroma.follow_request_count
 
     output.tags = data.pleroma.tags
-    output.deactivated = data.pleroma.deactivated
+    // deactivated was changed to is_active in Pleroma 2.3.0
+    // backwards compatability kept for now
+    output.deactivated = data.pleroma.deactivated ? !data.pleroma.is_active : data.pleroma.deactivated
 
     output.notification_settings = data.pleroma.notification_settings
     output.unread_chat_count = data.pleroma.unread_chat_count

From 36e56354e448b3c2106668f353dedcab5fde794d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 19 Jan 2021 10:01:55 -0600
Subject: [PATCH 007/119] More robust backwards compatibility

---
 .../entity_normalizer/entity_normalizer.service.js         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index a199ebd040..d6d84d9aae 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -188,9 +188,12 @@ export const parseUser = (data) => {
     output.follow_request_count = data.pleroma.follow_request_count
 
     output.tags = data.pleroma.tags
+
     // deactivated was changed to is_active in Pleroma 2.3.0
-    // backwards compatability kept for now
-    output.deactivated = data.pleroma.deactivated ? !data.pleroma.is_active : data.pleroma.deactivated
+    // so check if is_active is present
+    output.deactivated = typeof data.pleroma.is_active !== undefined
+      ? !data.pleroma.is_active // new backend
+      : data.pleroma.deactivated // old backend
 
     output.notification_settings = data.pleroma.notification_settings
     output.unread_chat_count = data.pleroma.unread_chat_count

From b76a68e622b2db6474acdd206bbdfb2e66fefd8f Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 14:03:26 +0300
Subject: [PATCH 008/119] UserCard: Make user roles translateable

I did not add a translation for my native language in this patch because
I am not sure how weblate would react, but I did add it locally and it
seems to work.
---
 src/components/user_card/user_card.vue | 3 +--
 src/i18n/en.json                       | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 16dd524954..773f764a0e 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -83,7 +83,7 @@
                   v-if="!!visibleRole"
                   class="alert user-role"
                 >
-                  {{ visibleRole }}
+                  {{ $t(`user_card.roles.${visibleRole}`) }}
                 </span>
                 <span
                   v-if="user.bot"
@@ -507,7 +507,6 @@
 
     .user-role {
       flex: none;
-      text-transform: capitalize;
       color: $fallback--text;
       color: var(--alertNeutralText, $fallback--text);
       background-color: $fallback--fg;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 26dd61445d..16a368b162 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -729,6 +729,10 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    },
+    "roles": {
+      "admin": "Admin",
+      "moderator": "Moderator"
     }
   },
   "user_profile": {

From dcba920f92db596aea3a097bd7fca3753532cc6f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:01:57 +0200
Subject: [PATCH 009/119] fix profile field buttons, remove attachment button

---
 .../post_status_form/post_status_form.vue     | 26 +++++--------------
 .../settings_modal/tabs/profile_tab.scss      |  9 ++++---
 .../settings_modal/tabs/profile_tab.vue       | 14 +++++-----
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index ed830f573f..73f6a4f10e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -302,11 +302,12 @@
           :key="file.url"
           class="media-upload-wrapper"
         >
-          <FAIcon
-            class="fa-scale-110 fa-old-padding"
-            icon="times"
+          <button
+            class="button-unstyled hider"
             @click="removeMediaFile(file)"
-          />
+          >
+            <FAIcon icon="times" />
+          </button>
           <attachment
             :attachment="file"
             :set-media="() => $store.dispatch('setMedia', newStatus.files)"
@@ -516,26 +517,11 @@
   }
 
    .attachments .media-upload-wrapper {
-    padding: 0 0.5em;
+    position: relative;
 
     .attachment {
       margin: 0;
       padding: 0;
-      position: relative;
-    }
-
-    .fa-scale-110 fa-old-padding {
-      position: absolute;
-      margin: 10px;
-      margin: .75em;
-      padding: .5em;
-      background: rgba(230,230,230,0.6);
-      z-index: 2;
-      color: black;
-      border-radius: $fallback--attachmentRadius;
-      border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
-      font-weight: bold;
-      cursor: pointer;
     }
   }
 
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index e821f952da..1a19b50dda 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -111,16 +111,17 @@
   .profile-fields {
     display: flex;
 
-    &>.emoji-input {
+    & > .emoji-input {
       flex: 1 1 auto;
-      margin: 0 .2em .5em;
+      margin: 0 0.2em 0.5em;
       min-width: 0;
     }
 
-    &>.icon-container {
+    & > .button-unstyled {
       width: 20px;
       align-self: center;
-      margin: 0 .2em .5em;
+      margin: 0 0.2em 0.5em;
+      padding: 0 0.5em;
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index b7ef21d77a..abb16db2d8 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -124,24 +124,24 @@
               :placeholder="$t('settings.profile_fields.value')"
             >
           </EmojiInput>
-          <div
-            class="icon-container"
+          <button
+            class="button-unstyled"
+            @click="deleteField(i)"
           >
             <FAIcon
               v-show="newFields.length > 1"
               icon="times"
-              @click="deleteField(i)"
             />
-          </div>
+          </button>
         </div>
-        <a
+        <button
           v-if="newFields.length < maxFields"
-          class="add-field faint"
+          class="add-field faint button-unstyled"
           @click="addField"
         >
           <FAIcon icon="plus" />
           {{ $t("settings.profile_fields.add_field") }}
-        </a>
+        </button>
       </div>
       <p>
         <Checkbox v-model="bot">

From 8011556c289f5167a0294c47e849d88e53f0d0ed Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:03:51 +0200
Subject: [PATCH 010/119] backport 2.2.3 to changelog

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c1d9828d..12a38a039e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,10 @@ 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/).
 
-
 ## [Unreleased]
+
+
+## [2.2.3] - 2021-01-18
 ### Added
 - Added Report button to status ellipsis menu for easier reporting
 
@@ -15,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Don't filter own posts when they hit your wordfilter
 
+
 ## [2.2.2] - 2020-12-22
 ### Added
 - Mouseover titles for emojis in reaction picker

From 02ab803725e42a749c6c8f564e8093df70e97fc7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 20 Jan 2021 17:36:40 +0200
Subject: [PATCH 011/119] change a few more buttons to real buttons

---
 CHANGELOG.md                                  |  2 ++
 src/App.scss                                  |  7 +++++
 src/components/poll/poll_form.vue             | 30 ++++++-------------
 .../settings_modal/tabs/profile_tab.vue       |  4 +--
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12a38a039e..1107491e06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ 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/).
 
 ## [Unreleased]
+### Fixed
+- Button to remove uploaded media in post status form is now properly placed and sized.
 
 
 ## [2.2.3] - 2021-01-18
diff --git a/src/App.scss b/src/App.scss
index 2a1d7b1bc2..8b91f3dea1 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -178,6 +178,13 @@ a {
   &.-fullwidth {
     width: 100%;
   }
+
+  &.-hover-highlight {
+    &:hover svg {
+      color: $fallback--lightText;
+      color: var(--lightText, $fallback--lightText);
+    }
+  }
 }
 
 input, textarea, .select, .input {
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 31f204a00c..094961052a 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -21,20 +21,17 @@
           @keydown.enter.stop.prevent="nextOption(index)"
         >
       </div>
-      <div
+      <button
         v-if="options.length > 2"
-        class="icon-container"
+        class="delete-option button-unstyled -hover-highlight"
+        @click="deleteOption(index)"
       >
-        <FAIcon
-          icon="times"
-          class="delete"
-          @click="deleteOption(index)"
-        />
-      </div>
+        <FAIcon icon="times" />
+      </button>
     </div>
-    <a
+    <button
       v-if="options.length < maxOptions"
-      class="add-option faint"
+      class="add-option faint button-unstyled -hover-highlight"
       @click="addOption"
     >
       <FAIcon
@@ -43,7 +40,7 @@
       />
 
       {{ $t("polls.add_option") }}
-    </a>
+    </button>
     <div class="poll-type-expiry">
       <div
         class="poll-type"
@@ -116,7 +113,6 @@
     align-self: flex-start;
     padding-top: 0.25em;
     padding-left: 0.1em;
-    cursor: pointer;
   }
 
   .poll-option {
@@ -135,19 +131,11 @@
     }
   }
 
-  .icon-container {
+  .delete-option {
     // Hack: Move the icon over the input box
     width: 1.5em;
     margin-left: -1.5em;
     z-index: 1;
-
-    .delete {
-      cursor: pointer;
-
-      &:hover {
-        color: inherit;
-      }
-    }
   }
 
   .poll-type-expiry {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index abb16db2d8..cfbd94fc0d 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -125,7 +125,7 @@
             >
           </EmojiInput>
           <button
-            class="button-unstyled"
+            class="button-unstyled -hover-highlight"
             @click="deleteField(i)"
           >
             <FAIcon
@@ -136,7 +136,7 @@
         </div>
         <button
           v-if="newFields.length < maxFields"
-          class="add-field faint button-unstyled"
+          class="add-field faint button-unstyled -hover-highlight"
           @click="addField"
         >
           <FAIcon icon="plus" />

From 831cf9eafb193acb3cce1c3b5f705819ea41912b Mon Sep 17 00:00:00 2001
From: feld <feld@feld.me>
Date: Wed, 20 Jan 2021 16:04:49 +0000
Subject: [PATCH 012/119] Apply 1 suggestion(s) to 1 file(s)

---
 src/services/entity_normalizer/entity_normalizer.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index d6d84d9aae..6ed663e1c7 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -191,7 +191,7 @@ export const parseUser = (data) => {
 
     // deactivated was changed to is_active in Pleroma 2.3.0
     // so check if is_active is present
-    output.deactivated = typeof data.pleroma.is_active !== undefined
+    output.deactivated = typeof data.pleroma.is_active !== 'undefined'
       ? !data.pleroma.is_active // new backend
       : data.pleroma.deactivated // old backend
 

From 11c7355749b6e0180841dd02604a06dd924dd217 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 23:49:34 +0300
Subject: [PATCH 013/119] Use native language names in the language picker

This seems more intuitive to me and is what I've seen in most other
language pickers.
---
 CHANGELOG.md                                  |  1 +
 .../interface_language_switcher.vue           | 28 +++++++++----------
 src/services/locale/locale.service.js         | 12 ++++++++
 3 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 src/services/locale/locale.service.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c1d9828d..2d751bf393 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Don't filter own posts when they hit your wordfilter
+- Language picker now uses native language names
 
 ## [2.2.2] - 2020-12-22
 ### Added
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 524ec5e955..dc3bd4088c 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -12,11 +12,11 @@
         v-model="language"
       >
         <option
-          v-for="(langCode, i) in languageCodes"
-          :key="langCode"
-          :value="langCode"
+          v-for="lang in languages"
+          :key="lang.code"
+          :value="lang.code"
         >
-          {{ languageNames[i] }}
+          {{ lang.name }}
         </option>
       </select>
       <FAIcon
@@ -29,6 +29,7 @@
 
 <script>
 import languagesObject from '../../i18n/messages'
+import localeService from '../../services/locale/locale.service.js'
 import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -42,12 +43,8 @@ library.add(
 
 export default {
   computed: {
-    languageCodes () {
-      return languagesObject.languages
-    },
-
-    languageNames () {
-      return _.map(this.languageCodes, this.getLanguageName)
+    languages () {
+      return _.map(languagesObject.languages, (code) => ({ code: code, name: this.getLanguageName(code) })).sort((a, b) => a.name.localeCompare(b.name))
     },
 
     language: {
@@ -61,12 +58,13 @@ export default {
   methods: {
     getLanguageName (code) {
       const specialLanguageNames = {
-        'ja': 'Japanese (日本語)',
-        'ja_easy': 'Japanese (やさしいにほんご)',
-        'zh': 'Simplified Chinese (简体中文)',
-        'zh_Hant': 'Traditional Chinese (繁體中文)'
+        'ja_easy': 'やさしいにほんご',
+        'zh': '简体中文',
+        'zh_Hant': '繁體中文'
       }
-      return specialLanguageNames[code] || ISO6391.getName(code)
+      const languageName = specialLanguageNames[code] || ISO6391.getNativeName(code)
+      const browserLocale = localeService.internalToBrowserLocale(code)
+      return languageName.charAt(0).toLocaleUpperCase(browserLocale) + languageName.slice(1)
     }
   }
 }
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
new file mode 100644
index 0000000000..5be99d81f4
--- /dev/null
+++ b/src/services/locale/locale.service.js
@@ -0,0 +1,12 @@
+const specialLanguageCodes = {
+  'ja_easy': 'ja',
+  'zh_Hant': 'zh-HANT'
+}
+
+const internalToBrowserLocale = code => specialLanguageCodes[code] || code
+
+const localeService = {
+  internalToBrowserLocale
+}
+
+export default localeService

From 60a8a89f5b7526af44c9682e151dd92c979b1412 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Thu, 3 Dec 2020 00:17:55 +0300
Subject: [PATCH 014/119] Use app locale with toLocaleString/toLocaleDateString

Fixes inconsistent date formatting when browser language is different
from PleromaFE language.
---
 src/components/chat_message_date/chat_message_date.vue      | 4 +++-
 .../settings_modal/tabs/security_tab/security_tab.js        | 3 ++-
 src/components/timeago/timeago.vue                          | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/chat_message_date/chat_message_date.vue b/src/components/chat_message_date/chat_message_date.vue
index 79c346b617..98349b753c 100644
--- a/src/components/chat_message_date/chat_message_date.vue
+++ b/src/components/chat_message_date/chat_message_date.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import localeService from 'src/services/locale/locale.service.js'
+
 export default {
   name: 'Timeago',
   props: ['date'],
@@ -16,7 +18,7 @@ export default {
       if (this.date.getTime() === today.getTime()) {
         return this.$t('display_date.today')
       } else {
-        return this.date.toLocaleDateString('en', { day: 'numeric', month: 'long' })
+        return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale), { day: 'numeric', month: 'long' })
       }
     }
   }
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.js b/src/components/settings_modal/tabs/security_tab/security_tab.js
index 811161a51b..65d20fc0e3 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -1,6 +1,7 @@
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Mfa from './mfa.vue'
+import localeService from 'src/services/locale/locale.service.js'
 
 const SecurityTab = {
   data () {
@@ -37,7 +38,7 @@ const SecurityTab = {
         return {
           id: oauthToken.id,
           appName: oauthToken.app_name,
-          validUntil: new Date(oauthToken.valid_until).toLocaleDateString()
+          validUntil: new Date(oauthToken.valid_until).toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale))
         }
       })
     }
diff --git a/src/components/timeago/timeago.vue b/src/components/timeago/timeago.vue
index 6df0524db7..55a2dd9451 100644
--- a/src/components/timeago/timeago.vue
+++ b/src/components/timeago/timeago.vue
@@ -9,6 +9,7 @@
 
 <script>
 import * as DateUtils from 'src/services/date_utils/date_utils.js'
+import localeService from 'src/services/locale/locale.service.js'
 
 export default {
   name: 'Timeago',
@@ -21,9 +22,10 @@ export default {
   },
   computed: {
     localeDateString () {
+      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
       return typeof this.time === 'string'
-        ? new Date(Date.parse(this.time)).toLocaleString()
-        : this.time.toLocaleString()
+        ? new Date(Date.parse(this.time)).toLocaleString(browserLocale)
+        : this.time.toLocaleString(browserLocale)
     }
   },
   created () {

From 27a537d307964101a574a2616d4c90d3cd26431f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 22 Jan 2021 12:06:39 +0200
Subject: [PATCH 015/119] give delete field its own class

---
 src/components/settings_modal/tabs/profile_tab.scss | 2 +-
 src/components/settings_modal/tabs/profile_tab.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 1a19b50dda..111eaed38e 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -117,7 +117,7 @@
       min-width: 0;
     }
 
-    & > .button-unstyled {
+    .delete-field {
       width: 20px;
       align-self: center;
       margin: 0 0.2em 0.5em;
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index cfbd94fc0d..175a0219b2 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -125,7 +125,7 @@
             >
           </EmojiInput>
           <button
-            class="button-unstyled -hover-highlight"
+            class="delete-field button-unstyled -hover-highlight"
             @click="deleteField(i)"
           >
             <FAIcon

From 272ba8f7a926a4852dc01d05f2904cc57da3c8fd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 23 Jan 2021 13:58:40 +0200
Subject: [PATCH 016/119] Fix p's weird corrupt theme data crashing theme
 engine

---
 src/services/style_setter/style_setter.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 07425abd8f..0fb8f92aaf 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -242,9 +242,18 @@ export const generateShadows = (input, colors) => {
     panelHeader: 'panel',
     input: 'input'
   }
-  const inputShadows = input.shadows && !input.themeEngineVersion
-    ? shadows2to3(input.shadows, input.opacity)
-    : input.shadows || {}
+
+  const cleanInputShadows = Object.fromEntries(
+    Object.entries(input.shadows)
+      .map(([name, shadowSlot]) => [
+        name,
+        // defaulting color to black to avoid potential problems
+        shadowSlot.map(shadowDef => ({ color: '#000000', ...shadowDef }))
+      ])
+  )
+  const inputShadows = cleanInputShadows && !input.themeEngineVersion
+    ? shadows2to3(cleanInputShadows, input.opacity)
+    : cleanInputShadows || {}
   const shadows = Object.entries({
     ...DEFAULT_SHADOWS,
     ...inputShadows

From 9cf487497e8df5e9cb5872452a67a655d15d49e3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 25 Jan 2021 18:49:03 +0200
Subject: [PATCH 017/119] fix wrong route in side drawer shoutbox link

---
 CHANGELOG.md                               | 1 +
 src/components/side_drawer/side_drawer.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91908abe1d..588348a0fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
+- Fixed shoutbox not working in mobile layout
 
 
 ## [2.2.3] - 2021-01-18
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 695ae03b0a..223b163214 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -109,7 +109,7 @@
           v-if="chat"
           @click="toggleDrawer"
         >
-          <router-link :to="{ name: 'chat' }">
+          <router-link :to="{ name: 'chat-panel' }">
             <FAIcon
               fixed-width
               class="fa-scale-110 fa-old-padding"

From a02b769c8f3fb3a5c433b692bd6b8f1f978bd0b3 Mon Sep 17 00:00:00 2001
From: yasnost <yasnost@disroot.org>
Date: Fri, 15 Jan 2021 13:50:42 +0000
Subject: [PATCH 018/119] Translated using Weblate (Russian)

Currently translated at 83.1% (563 of 677 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index e063f09f10..7add64754e 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -190,7 +190,7 @@
     "current_profile_banner": "Текущий баннер профиля",
     "data_import_export_tab": "Импорт / Экспорт данных",
     "delete_account": "Удалить аккаунт",
-    "delete_account_description": "Удалить ваш аккаунт и все ваши сообщения.",
+    "delete_account_description": "Удалить вашу учётную запись и все ваши сообщения.",
     "delete_account_error": "Возникла ошибка в процессе удаления вашего аккаунта. Если это повторяется, свяжитесь с администратором вашего сервера.",
     "delete_account_instructions": "Введите ваш пароль в поле ниже для подтверждения удаления.",
     "export_theme": "Сохранить Тему",
@@ -238,7 +238,7 @@
     "hide_followers_count_description": "Не показывать число моих подписчиков",
     "show_admin_badge": "Показывать значок администратора в моем профиле",
     "show_moderator_badge": "Показывать значок модератора в моем профиле",
-    "nsfw_clickthrough": "Включить скрытие NSFW вложений и не показывать изображения в предпросмотре ссылок для NSFW статусов",
+    "nsfw_clickthrough": "Включить скрытие вложений и предпросмотра ссылок для NSFW статусов",
     "oauth_tokens": "OAuth токены",
     "token": "Токен",
     "refresh_token": "Рефреш токен",
@@ -330,7 +330,8 @@
         "borders": "Границы",
         "buttons": "Кнопки",
         "inputs": "Поля ввода",
-        "faint_text": "Маловажный текст"
+        "faint_text": "Маловажный текст",
+        "post": "Сообщения и описание пользователя"
       },
       "radii": {
         "_tab_label": "Скругление"
@@ -451,7 +452,16 @@
     "virtual_scrolling": "Оптимизировать рендеринг ленты",
     "hide_wallpaper": "Скрыть обои узла",
     "accent": "Акцент",
-    "upload_a_photo": "Загрузить фото"
+    "upload_a_photo": "Загрузить фото",
+    "notification_mutes": "Чтобы не получать уведомления от определённого пользователя, заглушите его.",
+    "reset_avatar_confirm": "Вы действительно хотите сбросить личный образ?",
+    "reset_profile_banner": "Сбросить личный баннер",
+    "reset_profile_background": "Сбросить личные обои",
+    "reset_avatar": "Сбросить личный образ",
+    "search_user_to_mute": "Искать, кого вы хотите заглушить",
+    "search_user_to_block": "Искать, кого вы хотите заблокировать",
+    "pad_emoji": "Выделять эмодзи пробелами при добавлении из панели",
+    "avatar_size_instruction": "Желательный наименьший размер личного образа 150 на 150 пикселей."
   },
   "timeline": {
     "collapse": "Свернуть",
@@ -584,7 +594,8 @@
     "title": "Особенности",
     "gopher": "Gopher",
     "who_to_follow": "Предложения кого читать",
-    "pleroma_chat_messages": "Pleroma Чат"
+    "pleroma_chat_messages": "Pleroma Чат",
+    "upload_limit": "Наибольший размер загружаемого файла"
   },
   "tool_tip": {
     "accept_follow_request": "Принять запрос на чтение",
@@ -673,6 +684,7 @@
     "you": "Вы:"
   },
   "remote_user_resolver": {
-    "error": "Не найдено."
+    "error": "Не найдено.",
+    "searching_for": "Ищем"
   }
 }

From 7c295e1e0f4f2f254ec10b6884f8517de0b73dd4 Mon Sep 17 00:00:00 2001
From: Dmitriy Nelovchenko <defleppard4002@gmail.com>
Date: Fri, 15 Jan 2021 13:57:12 +0000
Subject: [PATCH 019/119] Translated using Weblate (Russian)

Currently translated at 83.1% (563 of 677 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 7add64754e..582a34e6dd 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -295,7 +295,14 @@
         "use_source": "Новая версия",
         "use_snapshot": "Старая версия",
         "keep_as_is": "Оставить, как есть",
-        "load_theme": "Загрузить тему"
+        "load_theme": "Загрузить тему",
+        "help": {
+          "fe_upgraded": "Движок тем для фронт-энда Pleroma был изменен после обновления.",
+          "older_version_imported": "Файл, который вы импортировали, был сделан в старой версии фронт-энда.",
+          "future_version_imported": "Файл, который вы импортировали, был сделан в новой версии фронт-энда.",
+          "v2_imported": "Файл, который вы импортировали, был сделан под старый фронт-энд. Мы стараемся улучшить совместимость, но все еще возможны несостыковки.",
+          "upgraded_from_v2": "Фронт-энд Pleroma был изменен. Выбранная тема может выглядеть слегка по-другому."
+        }
       },
       "common": {
         "color": "Цвет",
@@ -331,7 +338,8 @@
         "buttons": "Кнопки",
         "inputs": "Поля ввода",
         "faint_text": "Маловажный текст",
-        "post": "Сообщения и описание пользователя"
+        "post": "Сообщения и описание пользователя",
+        "alert_neutral": "Нейтральный"
       },
       "radii": {
         "_tab_label": "Скругление"
@@ -461,7 +469,10 @@
     "search_user_to_mute": "Искать, кого вы хотите заглушить",
     "search_user_to_block": "Искать, кого вы хотите заблокировать",
     "pad_emoji": "Выделять эмодзи пробелами при добавлении из панели",
-    "avatar_size_instruction": "Желательный наименьший размер личного образа 150 на 150 пикселей."
+    "avatar_size_instruction": "Желательный наименьший размер личного образа 150 на 150 пикселей.",
+    "enable_web_push_notifications": "Включить web push-уведомления",
+    "notification_blocks": "Блокировка пользователя выключает все уведомления от него, а также отписывает вас от него.",
+    "notification_setting_hide_notification_contents": "Скрыть отправителя и содержимое push-уведомлений"
   },
   "timeline": {
     "collapse": "Свернуть",

From 67a0d835683e8ec4121cb7dabfb9b990d513cc6d Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Fri, 15 Jan 2021 23:51:26 +0000
Subject: [PATCH 020/119] Translated using Weblate (Portuguese)

Currently translated at 48.7% (330 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 1b8694d989..f2e6659987 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -406,7 +406,7 @@
     "favorite": "Favoritar",
     "user_settings": "Configurações do usuário"
   },
-  "upload":{
+  "upload": {
     "error": {
       "base": "Falha no envio.",
       "file_too_big": "Arquivo grande demais [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
@@ -419,5 +419,19 @@
       "GiB": "GiB",
       "TiB": "TiB"
     }
+  },
+  "about": {
+    "mrf": {
+      "simple": {
+        "quarantine": "Quarentena",
+        "reject": "Rejeitar",
+        "accept": "Aceitar"
+      },
+      "keyword": {
+        "replace": "Repor",
+        "reject": "Rejeitar"
+      },
+      "federation": "Federação"
+    }
   }
 }

From e8fb0f313e89978346d45bf9f105cfe84894c5ee Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Sat, 16 Jan 2021 17:47:01 +0000
Subject: [PATCH 021/119] Translated using Weblate (Portuguese)

Currently translated at 49.0% (332 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index f2e6659987..b68c8cc2a5 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -429,7 +429,9 @@
       },
       "keyword": {
         "replace": "Repor",
-        "reject": "Rejeitar"
+        "reject": "Rejeitar",
+        "is_replaced_by": "→",
+        "keyword_policies": "Políticas de palavras-chave"
       },
       "federation": "Federação"
     }

From 9a074fbdfa74e321afe61bcc10e02b873abe8190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20In=C3=A1cio?= <gamer101portugal@gmail.com>
Date: Sun, 17 Jan 2021 19:56:29 +0000
Subject: [PATCH 022/119] Translated using Weblate (Portuguese)

Currently translated at 56.8% (385 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 114 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 101 insertions(+), 13 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index b68c8cc2a5..bda76998f6 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -9,7 +9,8 @@
     "scope_options": "Opções de privacidade",
     "text_limit": "Limite de caracteres",
     "title": "Funções",
-    "who_to_follow": "Quem seguir"
+    "who_to_follow": "Quem seguir",
+    "upload_limit": "Limite de carregamento"
   },
   "finder": {
     "error_fetching_user": "Erro ao procurar usuário",
@@ -20,7 +21,19 @@
     "submit": "Enviar",
     "more": "Mais",
     "generic_error": "Houve um erro",
-    "optional": "opcional"
+    "optional": "opcional",
+    "peek": "Espreitar",
+    "close": "Fechar",
+    "verify": "Verificar",
+    "confirm": "Confirmar",
+    "enable": "Ativar",
+    "disable": "Desativar",
+    "cancel": "Cancelar",
+    "show_less": "Mostrar menos",
+    "show_more": "Mostrar mais",
+    "retry": "Tenta novamente",
+    "error_retry": "Por favor tente novamente",
+    "loading": "Carregando…"
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
@@ -35,7 +48,12 @@
     "placeholder": "p.e. lain",
     "register": "Registrar",
     "username": "Usuário",
-    "hint": "Entre para participar da discussão"
+    "hint": "Entre para participar da discussão",
+    "heading": {
+      "totp": "Autenticação de dois fatores"
+    },
+    "recovery_code": "Código de recuperação",
+    "authentication_code": "Código de autenticação"
   },
   "media_modal": {
     "previous": "Anterior",
@@ -50,10 +68,13 @@
     "dms": "Mensagens diretas",
     "public_tl": "Linha do tempo pública",
     "timeline": "Linha do tempo",
-    "twkn": "Toda a rede conhecida",
+    "twkn": "Rede conhecida",
     "user_search": "Buscar usuários",
     "who_to_follow": "Quem seguir",
-    "preferences": "Preferências"
+    "preferences": "Preferências",
+    "search": "Pesquisar",
+    "interactions": "Interações",
+    "administration": "Administração"
   },
   "notifications": {
     "broken_favorite": "Status desconhecido, buscando...",
@@ -63,7 +84,10 @@
     "notifications": "Notificações",
     "read": "Lido!",
     "repeated_you": "repetiu sua postagem",
-    "no_more_notifications": "Mais nenhuma notificação"
+    "no_more_notifications": "Mais nenhuma notificação",
+    "reacted_with": "reagiu com {0}",
+    "migrated_to": "migrou para",
+    "follow_request": "quer te seguir"
   },
   "post_status": {
     "new_status": "Postar novo status",
@@ -71,7 +95,9 @@
     "account_not_locked_warning_link": "restrita",
     "attachments_sensitive": "Marcar anexos como sensíveis",
     "content_type": {
-      "text/plain": "Texto puro"
+      "text/plain": "Texto puro",
+      "text/bbcode": "BBCode",
+      "text/html": "HTML"
     },
     "content_warning": "Assunto (opcional)",
     "default": "Acabei de chegar no Rio!",
@@ -82,7 +108,16 @@
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
       "public": "Público - Enviar a linhas do tempo públicas",
       "unlisted": "Não listado - Não enviar a linhas do tempo públicas"
-    }
+    },
+    "scope_notice": {
+      "unlisted": "Esta publicação não será visível na Public Timeline e na Rede conhecida por todos",
+      "private": "Esta publicação será visível apenas para os teus seguidores",
+      "public": "Esta publicação será visível para todos"
+    },
+    "empty_status_error": "Não consegues publicar um estado vazio sem ficheiros",
+    "preview_empty": "Vazio",
+    "preview": "Pre-visualização",
+    "media_description": "Descrição da mídia"
   },
   "registration": {
     "bio": "Biografia",
@@ -343,7 +378,19 @@
         "checkbox": "Li os termos e condições",
         "link": "um belo link"
       }
-    }
+    },
+    "mfa": {
+      "scan": {
+        "secret_code": "Chave",
+        "title": "Scan"
+      },
+      "authentication_methods": "Métodos de autenticação",
+      "recovery_codes": "Códigos de recuperação.",
+      "generate_new_recovery_codes": "Gerar novos códigos de recuperação",
+      "confirm_and_enable": "Confirmar e ativar a senha de uso único",
+      "otp": "Senha de uso único"
+    },
+    "security": "Segurança"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -425,15 +472,56 @@
       "simple": {
         "quarantine": "Quarentena",
         "reject": "Rejeitar",
-        "accept": "Aceitar"
+        "accept": "Aceitar",
+        "media_removal_desc": "Este domínio remove mídia das publicações dos seguintes domínios:",
+        "media_removal": "Remoção de mídia",
+        "ftl_removal_desc": "Este domínio remove os seguintes domínios da cronologia \"Rede conhecida por todos\":",
+        "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
+        "reject_desc": "Este domínio não aceitara mensagens dos seguintes domínios:",
+        "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
+        "simple_policies": "Política especifica ao domínio"
       },
       "keyword": {
         "replace": "Repor",
         "reject": "Rejeitar",
         "is_replaced_by": "→",
-        "keyword_policies": "Políticas de palavras-chave"
+        "keyword_policies": "Políticas Chave",
+        "ftl_removal": "Remoção da cronologia \"Rede conhecida por todos\""
       },
-      "federation": "Federação"
-    }
+      "federation": "Federação",
+      "mrf_policies": "Políticas MRF ativadas",
+      "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação na domínios.  As seguintes políticas estão ativadas:"
+    },
+    "staff": "Staff"
+  },
+  "remote_user_resolver": {
+    "searching_for": "Pesquisando por"
+  },
+  "emoji": {
+    "unicode": "Emoji Unicode",
+    "custom": "Emoji customizado",
+    "add_emoji": "Inserir emoji",
+    "search_emoji": "Pesquisar por um emoji",
+    "emoji": "Emoji"
+  },
+  "polls": {
+    "single_choice": "Única escolha",
+    "vote": "Vota",
+    "votes": "votos",
+    "option": "Opção",
+    "add_option": "Adicionar opção"
+  },
+  "importer": {
+    "error": "Um erro ocorreu enquanto importavas este ficheiro.",
+    "success": "Importado com sucesso",
+    "submit": "Enviar"
+  },
+  "exporter": {
+    "processing": "Processando, breviamente será pedido para tu descarregar o teu ficheiro",
+    "export": "Exportar"
+  },
+  "domain_mute_card": {
+    "mute_progress": "Silenciando…",
+    "mute": "Silenciar"
   }
 }

From 58528605c885cef96acbc0077d4ca0af19f5032e Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Sun, 17 Jan 2021 19:58:20 +0000
Subject: [PATCH 023/119] Translated using Weblate (Portuguese)

Currently translated at 56.8% (385 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index bda76998f6..20ad87005d 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -77,7 +77,7 @@
     "administration": "Administração"
   },
   "notifications": {
-    "broken_favorite": "Status desconhecido, buscando...",
+    "broken_favorite": "Estado desconhecido, a procurar…",
     "favorited_you": "favoritou sua postagem",
     "followed_you": "seguiu você",
     "load_older": "Carregar notificações antigas",
@@ -431,7 +431,7 @@
     "remote_follow": "Seguir remotamente",
     "statuses": "Postagens",
     "unblock": "Desbloquear",
-    "unblock_progress": "Desbloqueando...",
+    "unblock_progress": "Desbloqueando…",
     "block_progress": "Bloqueando...",
     "unmute": "Retirar silêncio",
     "unmute_progress": "Retirando silêncio...",

From 1036395dfc5d2f7a9e467eb81bead85eb81db640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Mon, 18 Jan 2021 00:49:15 +0000
Subject: [PATCH 024/119] Translated using Weblate (Portuguese)

Currently translated at 69.4% (470 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 183 +++++++++++++++++++++++++++++++----------------
 1 file changed, 121 insertions(+), 62 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 20ad87005d..e4639b315b 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -8,19 +8,20 @@
     "media_proxy": "Proxy de mídia",
     "scope_options": "Opções de privacidade",
     "text_limit": "Limite de caracteres",
-    "title": "Funções",
+    "title": "Características",
     "who_to_follow": "Quem seguir",
-    "upload_limit": "Limite de carregamento"
+    "upload_limit": "Limite de carregamento",
+    "pleroma_chat_messages": "Chat do Pleroma"
   },
   "finder": {
-    "error_fetching_user": "Erro ao procurar usuário",
-    "find_user": "Buscar usuário"
+    "error_fetching_user": "Erro ao procurar utilizador",
+    "find_user": "Procurar utilizador"
   },
   "general": {
     "apply": "Aplicar",
     "submit": "Enviar",
     "more": "Mais",
-    "generic_error": "Houve um erro",
+    "generic_error": "Ocorreu um erro",
     "optional": "opcional",
     "peek": "Espreitar",
     "close": "Fechar",
@@ -32,28 +33,32 @@
     "show_less": "Mostrar menos",
     "show_more": "Mostrar mais",
     "retry": "Tenta novamente",
-    "error_retry": "Por favor tente novamente",
-    "loading": "Carregando…"
+    "error_retry": "Por favor, tente novamente",
+    "loading": "A carregar…"
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
-    "save": "Salvar",
-    "cancel": "Cancelar"
+    "save": "Guardar",
+    "cancel": "Cancelar",
+    "save_without_cropping": "Guardar sem recortar"
   },
   "login": {
-    "login": "Entrar",
-    "description": "Entrar com OAuth",
-    "logout": "Sair",
+    "login": "Iniciar Sessão",
+    "description": "Iniciar sessão com OAuth",
+    "logout": "Terminar sessão",
     "password": "Senha",
     "placeholder": "p.e. lain",
     "register": "Registrar",
-    "username": "Usuário",
-    "hint": "Entre para participar da discussão",
+    "username": "Nome de Utilizador",
+    "hint": "Entre para participar na discussão",
     "heading": {
-      "totp": "Autenticação de dois fatores"
+      "totp": "Autenticação de dois fatores",
+      "recovery": "Recuperação de dois fatores"
     },
     "recovery_code": "Código de recuperação",
-    "authentication_code": "Código de autenticação"
+    "authentication_code": "Código de autenticação",
+    "enter_two_factor_code": "Introduza o código de dois fatores",
+    "enter_recovery_code": "Introduza um código de recuperação"
   },
   "media_modal": {
     "previous": "Anterior",
@@ -63,18 +68,19 @@
     "about": "Sobre",
     "back": "Voltar",
     "chat": "Chat local",
-    "friend_requests": "Solicitações de seguidores",
+    "friend_requests": "Pedidos de seguidores",
     "mentions": "Menções",
-    "dms": "Mensagens diretas",
-    "public_tl": "Linha do tempo pública",
-    "timeline": "Linha do tempo",
+    "dms": "Mensagens Diretas",
+    "public_tl": "Cronologia pública",
+    "timeline": "Cronologia",
     "twkn": "Rede conhecida",
     "user_search": "Buscar usuários",
     "who_to_follow": "Quem seguir",
     "preferences": "Preferências",
     "search": "Pesquisar",
     "interactions": "Interações",
-    "administration": "Administração"
+    "administration": "Administração",
+    "chats": "Salas de Chat"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
@@ -87,7 +93,8 @@
     "no_more_notifications": "Mais nenhuma notificação",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
-    "follow_request": "quer te seguir"
+    "follow_request": "quer seguir-te",
+    "error": "Erro ao obter notificações: {0}"
   },
   "post_status": {
     "new_status": "Postar novo status",
@@ -97,27 +104,31 @@
     "content_type": {
       "text/plain": "Texto puro",
       "text/bbcode": "BBCode",
-      "text/html": "HTML"
+      "text/html": "HTML",
+      "text/markdown": "Markdown"
     },
     "content_warning": "Assunto (opcional)",
-    "default": "Acabei de chegar no Rio!",
+    "default": "Acabei de chegar a Lisboa.",
     "direct_warning": "Este post será visível apenas para os usuários mencionados.",
     "posting": "Publicando",
     "scope": {
       "direct": "Direto - Enviar somente aos usuários mencionados",
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
-      "public": "Público - Enviar a linhas do tempo públicas",
-      "unlisted": "Não listado - Não enviar a linhas do tempo públicas"
+      "public": "Público - Publicar publicamente na cronologia",
+      "unlisted": "Não listado - Não exibir publicamente na cronologia"
     },
     "scope_notice": {
-      "unlisted": "Esta publicação não será visível na Public Timeline e na Rede conhecida por todos",
-      "private": "Esta publicação será visível apenas para os teus seguidores",
+      "unlisted": "Esta publicação não será visível na Cronologia pública e na Rede conhecida por todos",
+      "private": "Esta publicação será apenas visível para os teus seguidores",
       "public": "Esta publicação será visível para todos"
     },
-    "empty_status_error": "Não consegues publicar um estado vazio sem ficheiros",
+    "empty_status_error": "Não consegues publicar um estado vazio e sem ficheiros",
     "preview_empty": "Vazio",
-    "preview": "Pre-visualização",
-    "media_description": "Descrição da mídia"
+    "preview": "Pré-visualização",
+    "media_description": "Descrição da mídia",
+    "media_description_error": "Falha ao atualizar ficheiro, tente novamente",
+    "direct_warning_to_first_only": "Esta publicação só será visível para os utilizadores mencionados no início da mensagem.",
+    "direct_warning_to_all": "Esta publicação será visível para todos os utilizadores mencionados."
   },
   "registration": {
     "bio": "Biografia",
@@ -167,13 +178,13 @@
     "data_import_export_tab": "Importação/exportação de dados",
     "default_vis": "Opção de privacidade padrão",
     "delete_account": "Deletar conta",
-    "delete_account_description": "Deletar sua conta e mensagens permanentemente.",
+    "delete_account_description": "Apagar os seus dados permanentemente e desativar a sua conta.",
     "delete_account_error": "Houve um problema ao deletar sua conta. Se ele persistir, por favor entre em contato com o/a administrador/a da instância.",
     "delete_account_instructions": "Digite sua senha no campo abaixo para confirmar a exclusão da conta.",
     "avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
     "export_theme": "Salvar predefinições",
     "filtering": "Filtragem",
-    "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas; uma palavra por linha.",
+    "filtering_explanation": "Todas as publicações que contenham estas palavras serão silenciadas; uma palavra por linha",
     "follow_export": "Exportar quem você segue",
     "follow_export_button": "Exportar quem você segue para um arquivo CSV",
     "follow_export_processing": "Processando. Em breve você receberá a solicitação de download do arquivo",
@@ -183,7 +194,7 @@
     "foreground": "Primeiro Plano",
     "general": "Geral",
     "hide_attachments_in_convo": "Ocultar anexos em conversas",
-    "hide_attachments_in_tl": "Ocultar anexos na linha do tempo.",
+    "hide_attachments_in_tl": "Ocultar anexos na cronologia",
     "max_thumbnails": "Número máximo de miniaturas por post",
     "hide_isp": "Esconder painel específico da instância",
     "preload_images": "Pré-carregar imagens",
@@ -194,7 +205,7 @@
     "import_followers_from_a_csv_file": "Importe seguidores a partir de um arquivo CSV",
     "import_theme": "Carregar pré-definição",
     "inputRadius": "Campos de entrada",
-    "checkboxRadius": "Checkboxes",
+    "checkboxRadius": "Caixas de seleção",
     "instance_default": "(padrão: {value})",
     "instance_default_simple": "(padrão)",
     "interface": "Interface",
@@ -236,7 +247,7 @@
     "profile_banner": "Capa de perfil",
     "profile_tab": "Perfil",
     "radii_help": "Arredondar arestas da interface (em pixel)",
-    "replies_in_timeline": "Respostas na linha do tempo",
+    "replies_in_timeline": "Respostas na cronologia",
     "reply_visibility_all": "Mostrar todas as respostas",
     "reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
     "reply_visibility_self": "Só mostrar respostas direcionadas a mim",
@@ -260,7 +271,7 @@
     "theme": "Tema",
     "theme_help": "Use cores em código hexadecimal (#rrggbb) para personalizar seu esquema de cores.",
     "theme_help_v2_1": "Você também pode sobrescrever as cores e opacidade de alguns componentes ao modificar o checkbox, use \"Limpar todos\" para limpar todas as modificações.",
-    "theme_help_v2_2": "Alguns ícones sob registros são indicadores de fundo/contraste de textos, passe por cima para informações detalhadas.  Tenha ciência de que os indicadores de contraste não funcionam muito bem com transparência.",
+    "theme_help_v2_2": "Alguns ícones em registo são indicadores de fundo/contraste de textos, passe por cima para obter informações detalhadas. Tenha em atenção que os indicadores de contraste não funcionam muito bem com transparência.",
     "tooltipRadius": "Dicas/alertas",
     "upload_a_photo": "Enviar uma foto",
     "user_settings": "Configurações de Usuário",
@@ -333,7 +344,7 @@
           "always_drop_shadow": "Atenção, esta sombra sempre utiliza {0} quando compatível com o navegador.",
           "drop_shadow_syntax": "{0} não é compatível com o parâmetro {1} e a palavra-chave {2}.",
           "avatar_inset": "Tenha em mente que combinar as sombras de inserção e a não-inserção em avatares pode causar resultados inesperados em avatares transparentes.",
-          "spread_zero": "Sombras com uma difusão > 0 aparecerão como se fossem definidas como 0.",
+          "spread_zero": "Sombras com difusão > 0 aparecerão como se fossem definidas como zero",
           "inset_classic": "Sombras de inserção utilizarão {0}"
         },
         "components": {
@@ -371,10 +382,10 @@
         "button": "Botão",
         "text": "Vários {0} e {1}",
         "mono": "conteúdo",
-        "input": "Acabei de chegar no Rio!",
+        "input": "Acabei de chegar a Lisboa.",
         "faint_link": "manual útil",
         "fine_print": "Leia nosso {0} para não aprender nada!",
-        "header_faint": "Está ok!",
+        "header_faint": "Isto está bem",
         "checkbox": "Li os termos e condições",
         "link": "um belo link"
       }
@@ -382,15 +393,35 @@
     "mfa": {
       "scan": {
         "secret_code": "Chave",
-        "title": "Scan"
+        "title": "Scan",
+        "desc": "Utilizando a sua aplicação de dois fatores, faça scan deste código QR ou insira a chave de texto:"
       },
       "authentication_methods": "Métodos de autenticação",
       "recovery_codes": "Códigos de recuperação.",
       "generate_new_recovery_codes": "Gerar novos códigos de recuperação",
-      "confirm_and_enable": "Confirmar e ativar a senha de uso único",
-      "otp": "Senha de uso único"
+      "confirm_and_enable": "Confirmar e ativar a senha de utilização única",
+      "otp": "Senha de uso único",
+      "verify": {
+        "desc": "Para ativar a autenticação de dois fatores, introduza o código da sua aplicação de dois fatores:"
+      },
+      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueado.",
+      "waiting_a_recovery_codes": "A receber códigos de recuperação…",
+      "warning_of_generate_new_codes": "Quando gera novos códigos de recuperação, os antigos deixam de funcionar.",
+      "title": "Autenticação de Dois Fatores",
+      "wait_pre_setup_otp": "pré-configuração de senha de utilização única",
+      "setup_otp": "Configurar senha de utilização única"
     },
-    "security": "Segurança"
+    "security": "Segurança",
+    "mute_import_error": "Erro ao importar os silenciados",
+    "mute_import": "Importar silenciados",
+    "mute_export_button": "Exporta os silenciados para um ficheiro csv",
+    "mute_export": "Exportar silenciados",
+    "blocks_imported": "Lista de utilizadores bloqueados importada! O processo pode demorar alguns instantes.",
+    "block_import_error": "Erro ao importar a lista de utilizadores bloqueados",
+    "block_import": "Importar utilizadores bloqueados",
+    "block_export_button": "Exporta a tua lista de utilizadores bloqueados para um ficheiro csv",
+    "block_export": "Exportar utilizadores bloqueados",
+    "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -431,14 +462,14 @@
     "remote_follow": "Seguir remotamente",
     "statuses": "Postagens",
     "unblock": "Desbloquear",
-    "unblock_progress": "Desbloqueando…",
-    "block_progress": "Bloqueando...",
+    "unblock_progress": "A desbloquear…",
+    "block_progress": "A bloquear…",
     "unmute": "Retirar silêncio",
-    "unmute_progress": "Retirando silêncio...",
-    "mute_progress": "Silenciando..."
+    "unmute_progress": "A retirar silêncio…",
+    "mute_progress": "A silenciar…"
   },
   "user_profile": {
-    "timeline_title": "Linha do tempo do usuário",
+    "timeline_title": "Cronologia do Utilizador",
     "profile_does_not_exist": "Desculpe, este perfil não existe.",
     "profile_loading_error": "Desculpe, houve um erro ao carregar este perfil."
   },
@@ -479,49 +510,77 @@
         "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
         "reject_desc": "Este domínio não aceitara mensagens dos seguintes domínios:",
         "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
-        "simple_policies": "Política especifica ao domínio"
+        "simple_policies": "Política especifica ao domínio",
+        "media_nsfw": "Forçar definição de Mídia como Sensível",
+        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\""
       },
       "keyword": {
-        "replace": "Repor",
+        "replace": "Substituir",
         "reject": "Rejeitar",
         "is_replaced_by": "→",
-        "keyword_policies": "Políticas Chave",
-        "ftl_removal": "Remoção da cronologia \"Rede conhecida por todos\""
+        "keyword_policies": "Política de Palavras-Chave",
+        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\""
       },
       "federation": "Federação",
-      "mrf_policies": "Políticas MRF ativadas",
+      "mrf_policies": "Ativar Políticas MRF",
       "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação na domínios.  As seguintes políticas estão ativadas:"
     },
     "staff": "Staff"
   },
   "remote_user_resolver": {
-    "searching_for": "Pesquisando por"
+    "searching_for": "Pesquisando por",
+    "error": "Não encontrado.",
+    "remote_user_resolver": "Resolução de utilizador remoto"
   },
   "emoji": {
     "unicode": "Emoji Unicode",
     "custom": "Emoji customizado",
     "add_emoji": "Inserir emoji",
     "search_emoji": "Pesquisar por um emoji",
-    "emoji": "Emoji"
+    "emoji": "Emoji",
+    "load_all": "A carregar todos os {emojiAmount} emojis",
+    "load_all_hint": "Carregado o primeiro emoji {saneAmount}, carregar todos os emojis pode causar problemas de desempenho.",
+    "keep_open": "Manter o seletor aberto",
+    "stickers": "Autocolantes"
   },
   "polls": {
-    "single_choice": "Única escolha",
+    "single_choice": "Escolha única",
     "vote": "Vota",
     "votes": "votos",
     "option": "Opção",
-    "add_option": "Adicionar opção"
+    "add_option": "Adicionar Opção",
+    "not_enough_options": "Existem poucas opções únicas na votação",
+    "expired": "A votação terminou há {0}",
+    "expires_in": "A votação termina em {0}",
+    "expiry": "Tempo para finalizar votação"
   },
   "importer": {
-    "error": "Um erro ocorreu enquanto importavas este ficheiro.",
-    "success": "Importado com sucesso",
+    "error": "Ocorreu um erro ao importar este ficheiro.",
+    "success": "Importado com sucesso.",
     "submit": "Enviar"
   },
   "exporter": {
-    "processing": "Processando, breviamente será pedido para tu descarregar o teu ficheiro",
+    "processing": "A processar, brevemente será pedido que descarregue o ficheiro",
     "export": "Exportar"
   },
   "domain_mute_card": {
     "mute_progress": "Silenciando…",
-    "mute": "Silenciar"
+    "mute": "Silenciar",
+    "unmute": "Remover silêncio",
+    "unmute_progress": "A retirar o silêncio…"
+  },
+  "selectable_list": {
+    "select_all": "Seleccionar tudo"
+  },
+  "interactions": {
+    "load_older": "Carregar interações mais antigas",
+    "follows": "Novos seguidores",
+    "favs_repeats": "Favoritos e Repetidos"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."
+  },
+  "shoutbox": {
+    "title": "Chat Geral"
   }
 }

From 916d4e04964e4d840bc81331cc74c42abcb5503c Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:19:57 +0000
Subject: [PATCH 025/119] Translated using Weblate (Portuguese)

Currently translated at 69.4% (470 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index e4639b315b..3d592fffa7 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -34,7 +34,8 @@
     "show_more": "Mostrar mais",
     "retry": "Tenta novamente",
     "error_retry": "Por favor, tente novamente",
-    "loading": "A carregar…"
+    "loading": "A carregar…",
+    "dismiss": "Ignorar"
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
@@ -80,7 +81,9 @@
     "search": "Pesquisar",
     "interactions": "Interações",
     "administration": "Administração",
-    "chats": "Salas de Chat"
+    "chats": "Salas de Chat",
+    "timelines": "Cronologias",
+    "bookmarks": "Favoritos"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
@@ -421,7 +424,16 @@
     "block_import": "Importar utilizadores bloqueados",
     "block_export_button": "Exporta a tua lista de utilizadores bloqueados para um ficheiro csv",
     "block_export": "Exportar utilizadores bloqueados",
-    "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade"
+    "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade",
+    "mutes_and_blocks": "Silenciados e bloqueados",
+    "chatMessageRadius": "Mensagem de texto",
+    "changed_email": "Email modificado com sucesso!",
+    "change_email_error": "Houve um erro ao modificar o seu email.",
+    "change_email": "Mudar Email",
+    "bot": "Esta uma conta bot",
+    "import_mutes_from_a_csv_file": "Importar silenciados de um ficheiro csv",
+    "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
+    "allow_following_move": "Permitir auto-follow quando a conta migrar"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -512,7 +524,8 @@
         "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
         "simple_policies": "Política especifica ao domínio",
         "media_nsfw": "Forçar definição de Mídia como Sensível",
-        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\""
+        "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
+        "media_nsfw_desc": "Este domínio força a midia a ser marcada como Sensível nos seguintes domínios:"
       },
       "keyword": {
         "replace": "Substituir",
@@ -552,7 +565,10 @@
     "not_enough_options": "Existem poucas opções únicas na votação",
     "expired": "A votação terminou há {0}",
     "expires_in": "A votação termina em {0}",
-    "expiry": "Tempo para finalizar votação"
+    "expiry": "Tempo para finalizar votação",
+    "multiple_choices": "Escolha Múltipla",
+    "type": "Tipo de questionário",
+    "add_poll": "Adicionar Questionário"
   },
   "importer": {
     "error": "Ocorreu um erro ao importar este ficheiro.",

From 24f7cbf3c9fc159a523b36795a41e4d3bbbfd5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dr=2E=20Ant=C3=B3nio?= <cariosecus@gmail.com>
Date: Mon, 18 Jan 2021 11:26:45 +0000
Subject: [PATCH 026/119] Translated using Weblate (Portuguese)

Currently translated at 69.7% (472 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 3d592fffa7..74190b399d 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -425,7 +425,7 @@
     "block_export_button": "Exporta a tua lista de utilizadores bloqueados para um ficheiro csv",
     "block_export": "Exportar utilizadores bloqueados",
     "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade",
-    "mutes_and_blocks": "Silenciados e bloqueados",
+    "mutes_and_blocks": "Silenciados e Bloqueados",
     "chatMessageRadius": "Mensagem de texto",
     "changed_email": "Email modificado com sucesso!",
     "change_email_error": "Houve um erro ao modificar o seu email.",

From a5def5cf56704c763e17a4f68bcd122f82cf27dd Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:27:02 +0000
Subject: [PATCH 027/119] Translated using Weblate (Portuguese)

Currently translated at 69.7% (472 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 74190b399d..15ac8def1a 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -433,7 +433,9 @@
     "bot": "Esta uma conta bot",
     "import_mutes_from_a_csv_file": "Importar silenciados de um ficheiro csv",
     "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
-    "allow_following_move": "Permitir auto-follow quando a conta migrar"
+    "allow_following_move": "Permitir auto-follow quando a conta migrar",
+    "domain_mutes": "Domínios",
+    "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços"
   },
   "timeline": {
     "collapse": "Esconder",

From 600ff9a67b0ec997a25e632b47c5f0df21df5925 Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:27:45 +0000
Subject: [PATCH 028/119] Translated using Weblate (Portuguese)

Currently translated at 69.8% (473 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 15ac8def1a..476f4c19da 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -435,7 +435,8 @@
     "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
     "allow_following_move": "Permitir auto-follow quando a conta migrar",
     "domain_mutes": "Domínios",
-    "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços"
+    "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
+    "emoji_reactions_on_timeline": "Mostrar reações com emoji na cronografia"
   },
   "timeline": {
     "collapse": "Esconder",

From 21eac51029775a283d5693090d60579655baccd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dr=2E=20Ant=C3=B3nio?= <cariosecus@gmail.com>
Date: Mon, 18 Jan 2021 11:28:13 +0000
Subject: [PATCH 029/119] Translated using Weblate (Portuguese)

Currently translated at 70.0% (474 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 476f4c19da..0a509eddbc 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -436,7 +436,7 @@
     "allow_following_move": "Permitir auto-follow quando a conta migrar",
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
-    "emoji_reactions_on_timeline": "Mostrar reações com emoji na cronografia"
+    "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline"
   },
   "timeline": {
     "collapse": "Esconder",

From ac43a8145b484c857b48459b91a9c5bdc217a0ad Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:28:49 +0000
Subject: [PATCH 030/119] Translated using Weblate (Portuguese)

Currently translated at 70.0% (474 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 0a509eddbc..2169523261 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -436,7 +436,8 @@
     "allow_following_move": "Permitir auto-follow quando a conta migrar",
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
-    "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline"
+    "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline",
+    "hide_muted_posts": "Esconder posts de utilizadores silenciados"
   },
   "timeline": {
     "collapse": "Esconder",

From a9cbf3eafee2cac261039cd80f63aacfa800349c Mon Sep 17 00:00:00 2001
From: Afonso Pereira <afonso.pereira@protonmail.com>
Date: Mon, 18 Jan 2021 11:30:11 +0000
Subject: [PATCH 031/119] Translated using Weblate (Portuguese)

Currently translated at 71.9% (487 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 2169523261..5489c8b4f5 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -437,7 +437,18 @@
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
     "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline",
-    "hide_muted_posts": "Esconder posts de utilizadores silenciados"
+    "hide_muted_posts": "Esconder posts de utilizadores silenciados",
+    "hide_follows_count_description": "Não mostrar o número de contas seguidas",
+    "hide_followers_count_description": "Não mostrar o número de seguidores",
+    "notification_visibility_emoji_reactions": "Reações",
+    "new_email": "Novo email",
+    "profile_fields": {
+      "value": "Conteúdo",
+      "add_field": "Adicionar campo",
+      "label": "Metadados do perfil"
+    },
+    "import_blocks_from_a_csv_file": "Importar bloqueados a partir de um arquivo CSV",
+    "hide_wallpaper": "Esconder papel de parede da instância"
   },
   "timeline": {
     "collapse": "Esconder",

From e9c5e06f50b09486335bb27c7cb73664662b7467 Mon Sep 17 00:00:00 2001
From: Miguel Carreiro <miguel.carreiro97@gmail.com>
Date: Mon, 18 Jan 2021 12:49:13 +0000
Subject: [PATCH 032/119] Translated using Weblate (Portuguese)

Currently translated at 71.9% (487 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 5489c8b4f5..13f3178082 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -448,7 +448,11 @@
       "label": "Metadados do perfil"
     },
     "import_blocks_from_a_csv_file": "Importar bloqueados a partir de um arquivo CSV",
-    "hide_wallpaper": "Esconder papel de parede da instância"
+    "hide_wallpaper": "Esconder papel de parede da instância",
+    "notification_setting_privacy": "Privacidade",
+    "notification_setting_filters": "Filtros",
+    "fun": "Divertido",
+    "user_mutes": "Utilizadores"
   },
   "timeline": {
     "collapse": "Esconder",

From cdd632f04cbef88676a26131167952e82730793d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Mon, 18 Jan 2021 15:30:49 +0000
Subject: [PATCH 033/119] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 13f3178082..c68d4f6b07 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -47,11 +47,11 @@
     "login": "Iniciar Sessão",
     "description": "Iniciar sessão com OAuth",
     "logout": "Terminar sessão",
-    "password": "Senha",
+    "password": "Palavra-passe",
     "placeholder": "p.e. lain",
     "register": "Registrar",
     "username": "Nome de Utilizador",
-    "hint": "Entre para participar na discussão",
+    "hint": "Entra para participar na discussão",
     "heading": {
       "totp": "Autenticação de dois fatores",
       "recovery": "Recuperação de dois fatores"
@@ -72,7 +72,7 @@
     "friend_requests": "Pedidos de seguidores",
     "mentions": "Menções",
     "dms": "Mensagens Diretas",
-    "public_tl": "Cronologia pública",
+    "public_tl": "Cronologia Pública",
     "timeline": "Cronologia",
     "twkn": "Rede conhecida",
     "user_search": "Buscar usuários",
@@ -83,7 +83,7 @@
     "administration": "Administração",
     "chats": "Salas de Chat",
     "timelines": "Cronologias",
-    "bookmarks": "Favoritos"
+    "bookmarks": "Items Guardados"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
@@ -452,7 +452,13 @@
     "notification_setting_privacy": "Privacidade",
     "notification_setting_filters": "Filtros",
     "fun": "Divertido",
-    "user_mutes": "Utilizadores"
+    "user_mutes": "Utilizadores",
+    "type_domains_to_mute": "Pesquisar domínios para silenciar",
+    "useStreamingApiWarning": "(não recomendado, experimental, pode omitir publicações)",
+    "useStreamingApi": "Receber publicações e notificações em tempo real",
+    "minimal_scopes_mode": "Minimizar as opções de publicação",
+    "search_user_to_mute": "Pesquisa quais os utilizadores deseja silenciar",
+    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -544,7 +550,7 @@
         "simple_policies": "Política especifica ao domínio",
         "media_nsfw": "Forçar definição de Mídia como Sensível",
         "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
-        "media_nsfw_desc": "Este domínio força a midia a ser marcada como Sensível nos seguintes domínios:"
+        "media_nsfw_desc": "Esta instância força a multimédia a ser marcada como sensível nas seguintes instâncias:"
       },
       "keyword": {
         "replace": "Substituir",
@@ -585,9 +591,9 @@
     "expired": "A votação terminou há {0}",
     "expires_in": "A votação termina em {0}",
     "expiry": "Tempo para finalizar votação",
-    "multiple_choices": "Escolha Múltipla",
-    "type": "Tipo de questionário",
-    "add_poll": "Adicionar Questionário"
+    "multiple_choices": "Escolha múltipla",
+    "type": "Tipo de votação",
+    "add_poll": "Adicionar Votação"
   },
   "importer": {
     "error": "Ocorreu um erro ao importar este ficheiro.",
@@ -610,7 +616,8 @@
   "interactions": {
     "load_older": "Carregar interações mais antigas",
     "follows": "Novos seguidores",
-    "favs_repeats": "Favoritos e Repetidos"
+    "favs_repeats": "Favoritos e Repetidos",
+    "moves": "Utilizador migrado"
   },
   "errors": {
     "storage_unavailable": "Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."

From c5477e489b23350699f005d6d00b2c92c10fd67e Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 18 Jan 2021 15:40:26 +0000
Subject: [PATCH 034/119] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index c68d4f6b07..50370492fc 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -445,7 +445,8 @@
     "profile_fields": {
       "value": "Conteúdo",
       "add_field": "Adicionar campo",
-      "label": "Metadados do perfil"
+      "label": "Metadados do perfil",
+      "name": "Etiqueta"
     },
     "import_blocks_from_a_csv_file": "Importar bloqueados a partir de um arquivo CSV",
     "hide_wallpaper": "Esconder papel de parede da instância",

From 6df5459ec9324d789f18964ee477927e52016589 Mon Sep 17 00:00:00 2001
From: Miguel Carreiro <miguel.carreiro97@gmail.com>
Date: Mon, 18 Jan 2021 15:42:06 +0000
Subject: [PATCH 035/119] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 50370492fc..124a99ff8f 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -294,7 +294,14 @@
         "save_load_hint": "Manter as opções preserva as opções atuais ao selecionar ou carregar temas; também salva as opções ao exportar um tempo. Quanto todos os campos estiverem desmarcados, tudo será salvo ao exportar o tema.",
         "reset": "Restaurar o padrão",
         "clear_all": "Limpar tudo",
-        "clear_opacity": "Limpar opacidade"
+        "clear_opacity": "Limpar opacidade",
+        "help": {
+          "upgraded_from_v2": "O PleromaFE foi atualizado, a aparência do tema poderá ser um pouco diferente."
+        },
+        "use_source": "Nova versão",
+        "use_snapshot": "Versão antiga",
+        "keep_as_is": "Manter como está",
+        "load_theme": "Carregar tema"
       },
       "common": {
         "color": "Cor",
@@ -459,7 +466,8 @@
     "useStreamingApi": "Receber publicações e notificações em tempo real",
     "minimal_scopes_mode": "Minimizar as opções de publicação",
     "search_user_to_mute": "Pesquisa quais os utilizadores deseja silenciar",
-    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear"
+    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear",
+    "notification_setting_hide_notification_contents": "Ocultar o remetente e o conteúdo das notificações push"
   },
   "timeline": {
     "collapse": "Esconder",

From ffd673d4a5ad42e09ed12013b486b8fb23092989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20In=C3=A1cio?= <gamer101portugal@gmail.com>
Date: Mon, 18 Jan 2021 15:31:03 +0000
Subject: [PATCH 036/119] Translated using Weblate (Portuguese)

Currently translated at 74.0% (501 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 124a99ff8f..0ba070d475 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -48,7 +48,7 @@
     "description": "Iniciar sessão com OAuth",
     "logout": "Terminar sessão",
     "password": "Palavra-passe",
-    "placeholder": "p.e. lain",
+    "placeholder": "p.ex. lain",
     "register": "Registrar",
     "username": "Nome de Utilizador",
     "hint": "Entra para participar na discussão",

From 0c2b425682ff1666298da4a5c990282134936d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Mon, 18 Jan 2021 15:44:35 +0000
Subject: [PATCH 037/119] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 342 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 267 insertions(+), 75 deletions(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 0ba070d475..51a6f6f65f 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -5,7 +5,7 @@
   "features_panel": {
     "chat": "Chat",
     "gopher": "Gopher",
-    "media_proxy": "Proxy de mídia",
+    "media_proxy": "Proxy de multimédia",
     "scope_options": "Opções de privacidade",
     "text_limit": "Limite de caracteres",
     "title": "Características",
@@ -14,8 +14,8 @@
     "pleroma_chat_messages": "Chat do Pleroma"
   },
   "finder": {
-    "error_fetching_user": "Erro ao procurar utilizador",
-    "find_user": "Procurar utilizador"
+    "error_fetching_user": "Erro ao pesquisar utilizador",
+    "find_user": "Pesquisar utilizador"
   },
   "general": {
     "apply": "Aplicar",
@@ -33,7 +33,7 @@
     "show_less": "Mostrar menos",
     "show_more": "Mostrar mais",
     "retry": "Tenta novamente",
-    "error_retry": "Por favor, tente novamente",
+    "error_retry": "Por favor, tenta novamente",
     "loading": "A carregar…",
     "dismiss": "Ignorar"
   },
@@ -49,7 +49,7 @@
     "logout": "Terminar sessão",
     "password": "Palavra-passe",
     "placeholder": "p.ex. lain",
-    "register": "Registrar",
+    "register": "Registar",
     "username": "Nome de Utilizador",
     "hint": "Entra para participar na discussão",
     "heading": {
@@ -75,7 +75,7 @@
     "public_tl": "Cronologia Pública",
     "timeline": "Cronologia",
     "twkn": "Rede conhecida",
-    "user_search": "Buscar usuários",
+    "user_search": "Pesquisa por Utilizadores",
     "who_to_follow": "Quem seguir",
     "preferences": "Preferências",
     "search": "Pesquisar",
@@ -87,21 +87,21 @@
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
-    "favorited_you": "favoritou sua postagem",
-    "followed_you": "seguiu você",
+    "favorited_you": "favoritou o teu post",
+    "followed_you": "seguiu-te",
     "load_older": "Carregar notificações antigas",
     "notifications": "Notificações",
     "read": "Lido!",
     "repeated_you": "repetiu sua postagem",
-    "no_more_notifications": "Mais nenhuma notificação",
+    "no_more_notifications": "Sem mais notificações",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
     "follow_request": "quer seguir-te",
     "error": "Erro ao obter notificações: {0}"
   },
   "post_status": {
-    "new_status": "Postar novo status",
-    "account_not_locked_warning": "Sua conta não é {0}. Qualquer pessoa pode te seguir e ver seus posts privados (só para seguidores).",
+    "new_status": "Publicar novo estado",
+    "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode te seguir e ver os seus posts privados (só para seguidores).",
     "account_not_locked_warning_link": "restrita",
     "attachments_sensitive": "Marcar anexos como sensíveis",
     "content_type": {
@@ -113,7 +113,7 @@
     "content_warning": "Assunto (opcional)",
     "default": "Acabei de chegar a Lisboa.",
     "direct_warning": "Este post será visível apenas para os usuários mencionados.",
-    "posting": "Publicando",
+    "posting": "A publicar",
     "scope": {
       "direct": "Direto - Enviar somente aos usuários mencionados",
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
@@ -128,34 +128,34 @@
     "empty_status_error": "Não consegues publicar um estado vazio e sem ficheiros",
     "preview_empty": "Vazio",
     "preview": "Pré-visualização",
-    "media_description": "Descrição da mídia",
+    "media_description": "Descrição da multimédia",
     "media_description_error": "Falha ao atualizar ficheiro, tente novamente",
     "direct_warning_to_first_only": "Esta publicação só será visível para os utilizadores mencionados no início da mensagem.",
     "direct_warning_to_all": "Esta publicação será visível para todos os utilizadores mencionados."
   },
   "registration": {
     "bio": "Biografia",
-    "email": "Correio eletrônico",
+    "email": "Endereço de e-mail",
     "fullname": "Nome para exibição",
-    "password_confirm": "Confirmação de senha",
-    "registration": "Registro",
+    "password_confirm": "Confirmação de palavra-passe",
+    "registration": "Registo",
     "token": "Código do convite",
     "captcha": "CAPTCHA",
     "new_captcha": "Clique na imagem para carregar um novo captcha",
     "username_placeholder": "p. ex. lain",
     "fullname_placeholder": "p. ex. Lain Iwakura",
-    "bio_placeholder": "e.g.\nOi, sou Lain\nSou uma garota que vive no subúrbio do Japão. Você deve me conhecer da Rede.",
+    "bio_placeholder": "p. ex.\nOlá, sou um exemplo\nAqui podes colocar algo representativo da tua parte... ou não.",
     "validations": {
       "username_required": "não pode ser deixado em branco",
       "fullname_required": "não pode ser deixado em branco",
       "email_required": "não pode ser deixado em branco",
       "password_required": "não pode ser deixado em branco",
       "password_confirmation_required": "não pode ser deixado em branco",
-      "password_confirmation_match": "deve ser idêntica à senha"
+      "password_confirmation_match": "deve corresponder à palavra-passe"
     }
   },
   "settings": {
-    "app_name": "Nome do aplicativo",
+    "app_name": "Nome da aplicação",
     "attachmentRadius": "Anexos",
     "attachments": "Anexos",
     "avatar": "Avatar",
@@ -169,23 +169,23 @@
     "cGreen": "Verde (Repetir)",
     "cOrange": "Laranja (Favoritar)",
     "cRed": "Vermelho (Cancelar)",
-    "change_password": "Mudar senha",
-    "change_password_error": "Houve um erro ao modificar sua senha.",
-    "changed_password": "Senha modificada com sucesso!",
+    "change_password": "Mudar palavra-passe",
+    "change_password_error": "Ocorreu um erro ao modificar a sua palavra-passe.",
+    "changed_password": "Palavra-passe modificada com sucesso!",
     "collapse_subject": "Esconder posts com assunto",
     "composing": "Escrita",
-    "confirm_new_password": "Confirmar nova senha",
+    "confirm_new_password": "Confirmar nova palavra-passe",
     "current_avatar": "Seu avatar atual",
-    "current_password": "Sua senha atual",
+    "current_password": "Palavra-passe atual",
     "current_profile_banner": "Sua capa de perfil atual",
     "data_import_export_tab": "Importação/exportação de dados",
     "default_vis": "Opção de privacidade padrão",
-    "delete_account": "Deletar conta",
+    "delete_account": "Eliminar conta",
     "delete_account_description": "Apagar os seus dados permanentemente e desativar a sua conta.",
-    "delete_account_error": "Houve um problema ao deletar sua conta. Se ele persistir, por favor entre em contato com o/a administrador/a da instância.",
-    "delete_account_instructions": "Digite sua senha no campo abaixo para confirmar a exclusão da conta.",
+    "delete_account_error": "Ocorreu um erro ao remover a sua conta. Se este persistir, por favor entre em contato com o/a administrador/a da instância.",
+    "delete_account_instructions": "Escreva a sua palavra-passe no campo abaixo para confirmar a remoção da conta.",
     "avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
-    "export_theme": "Salvar predefinições",
+    "export_theme": "Guardar predefinições",
     "filtering": "Filtragem",
     "filtering_explanation": "Todas as publicações que contenham estas palavras serão silenciadas; uma palavra por linha",
     "follow_export": "Exportar quem você segue",
@@ -220,11 +220,11 @@
     "loop_video": "Repetir vídeos",
     "loop_video_silent_only": "Repetir apenas vídeos sem som (como os \"gifs\" do Mastodon)",
     "mutes_tab": "Silenciados",
-    "play_videos_in_modal": "Tocar vídeos diretamente no visualizador de mídia",
+    "play_videos_in_modal": "Reproduzir vídeos diretamente no visualizador de multimédia",
     "use_contain_fit": "Não cortar o anexo na miniatura",
     "name": "Nome",
     "name_bio": "Nome & Biografia",
-    "new_password": "Nova senha",
+    "new_password": "Nova palavra-passe",
     "notification_visibility": "Tipos de notificação para mostrar",
     "notification_visibility_follows": "Seguidas",
     "notification_visibility_likes": "Favoritos",
@@ -237,7 +237,7 @@
     "hide_followers_description": "Não mostrar quem me segue",
     "show_admin_badge": "Mostrar título de Administrador em meu perfil",
     "show_moderator_badge": "Mostrar título de Moderador em meu perfil",
-    "nsfw_clickthrough": "Habilitar clique para ocultar anexos sensíveis",
+    "nsfw_clickthrough": "Ativar clique em anexos e pré-visualizações de links para ocultar anexos NSFW",
     "oauth_tokens": "Token OAuth",
     "token": "Token",
     "refresh_token": "Atualizar Token",
@@ -264,7 +264,7 @@
     "settings": "Configurações",
     "subject_input_always_show": "Sempre mostrar campo de assunto",
     "subject_line_behavior": "Copiar assunto ao responder",
-    "subject_line_email": "Como em email: \"re: assunto\"",
+    "subject_line_email": "Como num e-mail: \"re: assunto\"",
     "subject_line_mastodon": "Como o Mastodon: copiar como está",
     "subject_line_noop": "Não copiar",
     "post_status_content_type": "Tipo de conteúdo do status",
@@ -296,7 +296,17 @@
         "clear_all": "Limpar tudo",
         "clear_opacity": "Limpar opacidade",
         "help": {
-          "upgraded_from_v2": "O PleromaFE foi atualizado, a aparência do tema poderá ser um pouco diferente."
+          "upgraded_from_v2": "O PleromaFE foi atualizado, a aparência do tema poderá ser um pouco diferente.",
+          "snapshot_source_mismatch": "Conflito de versões: o mais provável é que o FE tenha revertido e voltado a atualizar, foi alterado o tema numa versão anterior do FE, o mais provável é desejar utilizar a versão anterior; caso contrário, utilize a nova versão.",
+          "migration_napshot_gone": "Por algum motivo, a pré-visualização estava em falta, algumas coisas poderão parecer diferentes do que se lembra.",
+          "migration_snapshot_ok": "Para estar seguro, foi carregada uma versão de pré-visualização do tema. Pode tentar carregar dados do tema.",
+          "fe_downgraded": "Versão do PleromaFE revertida.",
+          "fe_upgraded": "O criador de temas do PleromaFE foi atualizado depois da atualização da versão.",
+          "snapshot_missing": "Não existia nenhuma pré-visualização do tema no ficheiro, então pode parecer diferente do previsto originalmente.",
+          "snapshot_present": "Foi carregada uma pré-visualização do tema, todos os valores são substituídos. Caso contrário, pode carregar o tema completo.",
+          "older_version_imported": "O ficheiro que importaste foi criado numa versão antiga do FE.",
+          "future_version_imported": "O ficheiro que importaste foi criado para uma versão mais recente do FE.",
+          "v2_imported": "O ficheiro que importaste foi feito para uma versão antiga do FE. Tentamos maximizar a compatibilidade, porém, poderão existir incongruências."
         },
         "use_source": "Nova versão",
         "use_snapshot": "Versão antiga",
@@ -336,7 +346,27 @@
         "borders": "Bordas",
         "buttons": "Botões",
         "inputs": "Caixas de entrada",
-        "faint_text": "Texto esmaecido"
+        "faint_text": "Texto esmaecido",
+        "chat": {
+          "border": "Borda",
+          "outgoing": "Enviadas",
+          "incoming": "Recebidas"
+        },
+        "tabs": "Abas",
+        "toggled": "Alternado",
+        "disabled": "Desativado",
+        "selectedMenu": "Elemento do menu seleccionado",
+        "selectedPost": "Publicação seleccionada",
+        "pressed": "Pressionado",
+        "highlight": "Elementos destacados",
+        "icons": "Ícones",
+        "poll": "Gráfico da sondagem",
+        "wallpaper": "Fundo de ecrã",
+        "underlay": "Sublinhado",
+        "popover": "Sugestões, menus, etiquetas",
+        "post": "Publicações/Bios",
+        "alert_neutral": "Neutro",
+        "alert_warning": "Precaução"
       },
       "radii": {
         "_tab_label": "Arredondado"
@@ -369,7 +399,8 @@
           "buttonPressed": "Botão (pressionado)",
           "buttonPressedHover": "Botão (pressionado+em cima)",
           "input": "Campo de entrada"
-        }
+        },
+        "hintV3": "Para as sombras, também pode usar a notação {0} para usar outro espaço de cor."
       },
       "fonts": {
         "_tab_label": "Fontes",
@@ -409,17 +440,17 @@
       "authentication_methods": "Métodos de autenticação",
       "recovery_codes": "Códigos de recuperação.",
       "generate_new_recovery_codes": "Gerar novos códigos de recuperação",
-      "confirm_and_enable": "Confirmar e ativar a senha de utilização única",
-      "otp": "Senha de uso único",
+      "confirm_and_enable": "Confirmar e ativar a palavra-passe de utilização única",
+      "otp": "Palavra-passe de utilização única",
       "verify": {
         "desc": "Para ativar a autenticação de dois fatores, introduza o código da sua aplicação de dois fatores:"
       },
-      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueado.",
+      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueada.",
       "waiting_a_recovery_codes": "A receber códigos de recuperação…",
       "warning_of_generate_new_codes": "Quando gera novos códigos de recuperação, os antigos deixam de funcionar.",
       "title": "Autenticação de Dois Fatores",
-      "wait_pre_setup_otp": "pré-configuração de senha de utilização única",
-      "setup_otp": "Configurar senha de utilização única"
+      "wait_pre_setup_otp": "pré-configuração de palavra-passe de utilização única",
+      "setup_otp": "Configurar palavra-passe de utilização única"
     },
     "security": "Segurança",
     "mute_import_error": "Erro ao importar os silenciados",
@@ -434,13 +465,13 @@
     "enter_current_password_to_confirm": "Introduza a sua palavra-passe atual para confirmar a sua identidade",
     "mutes_and_blocks": "Silenciados e Bloqueados",
     "chatMessageRadius": "Mensagem de texto",
-    "changed_email": "Email modificado com sucesso!",
-    "change_email_error": "Houve um erro ao modificar o seu email.",
-    "change_email": "Mudar Email",
-    "bot": "Esta uma conta bot",
+    "changed_email": "Endereço de e-mail modificado com sucesso!",
+    "change_email_error": "Ocorreu um erro ao modificar o seu endereço de e-mail.",
+    "change_email": "Mudar Endereço de E-mail",
+    "bot": "Esta uma conta robô",
     "import_mutes_from_a_csv_file": "Importar silenciados de um ficheiro csv",
     "mutes_imported": "Silenciados importados! Processá-los pode demorar alguns instantes.",
-    "allow_following_move": "Permitir auto-follow quando a conta migrar",
+    "allow_following_move": "Permitir seguimento automático quando a conta for migrada para outra instância",
     "domain_mutes": "Domínios",
     "discoverable": "Permitir a descoberta desta conta em resultados de busca e outros serviços",
     "emoji_reactions_on_timeline": "Mostrar reações de emoji na timeline",
@@ -448,7 +479,7 @@
     "hide_follows_count_description": "Não mostrar o número de contas seguidas",
     "hide_followers_count_description": "Não mostrar o número de seguidores",
     "notification_visibility_emoji_reactions": "Reações",
-    "new_email": "Novo email",
+    "new_email": "Novo endereço de e-mail",
     "profile_fields": {
       "value": "Conteúdo",
       "add_field": "Adicionar campo",
@@ -465,9 +496,29 @@
     "useStreamingApiWarning": "(não recomendado, experimental, pode omitir publicações)",
     "useStreamingApi": "Receber publicações e notificações em tempo real",
     "minimal_scopes_mode": "Minimizar as opções de publicação",
-    "search_user_to_mute": "Pesquisa quais os utilizadores deseja silenciar",
-    "search_user_to_block": "Pesquisa quais utilizadores deseja bloquear",
-    "notification_setting_hide_notification_contents": "Ocultar o remetente e o conteúdo das notificações push"
+    "search_user_to_mute": "Pesquisar utilizadores que pretende silenciar",
+    "search_user_to_block": "Pesquisa quais utilizadores desejas bloquear",
+    "notification_setting_hide_notification_contents": "Ocultar o remetente e o conteúdo das notificações push",
+    "version": {
+      "frontend_version": "Versão do Frontend",
+      "backend_version": "Versão do Backend",
+      "title": "Versão"
+    },
+    "notification_blocks": "Bloquear um utilizador previne todas as notificações, bem como as desativa.",
+    "notification_mutes": "Para deixar de receber notificações de um utilizador específico, silencia-o.",
+    "notification_setting_block_from_strangers": "Bloqueia as notificações de utilizadores que não segues",
+    "greentext": "Texto verde (meme arrows)",
+    "virtual_scrolling": "Otimizar a apresentação da cronologia",
+    "reset_background_confirm": "Tens a certeza que desejas redefinir o fundo?",
+    "reset_banner_confirm": "Tens a certeza que desejas redefinir a imagem do cabeçalho?",
+    "reset_avatar_confirm": "Tens a certeza que desejas redefinir o avatar?",
+    "reset_profile_banner": "Redefinir imagem do cabeçalho do perfil",
+    "reset_profile_background": "Redefinir fundo de perfil",
+    "reset_avatar": "Redefinir avatar",
+    "autohide_floating_post_button": "Automaticamente ocultar o botão 'Nova Publicação' (telemóvel)",
+    "notification_visibility_moves": "Utilizador Migrado",
+    "accent": "Destaque",
+    "pad_emoji": "Preencher espaços ao adicionar emojis do seletor"
   },
   "timeline": {
     "collapse": "Esconder",
@@ -479,11 +530,36 @@
     "show_new": "Mostrar novas",
     "up_to_date": "Atualizado",
     "no_more_statuses": "Sem mais posts",
-    "no_statuses": "Sem posts"
+    "no_statuses": "Sem posts",
+    "reload": "Recarregar",
+    "error": "Erro a obter a cronologia: {0}"
   },
   "status": {
     "reply_to": "Responder a",
-    "replies_list": "Respostas:"
+    "replies_list": "Respostas:",
+    "unbookmark": "Remover post dos Items Guardados",
+    "expand": "Expandir",
+    "nsfw": "NSFW (Não apropriado para trabalho)",
+    "status_deleted": "Esta publicação foi apagada",
+    "hide_content": "Ocultar o conteúdo",
+    "show_content": "Mostrar o conteúdo",
+    "hide_full_subject": "Ocultar o assunto completo",
+    "show_full_subject": "Mostrar o assunto completo",
+    "thread_muted_and_words": ", contém:",
+    "thread_muted": "Conversação silenciada",
+    "external_source": "Fonte externa",
+    "copy_link": "Copiar o link do estado",
+    "status_unavailable": "Estado indisponível",
+    "unmute_conversation": "Mostrar a conversação",
+    "mute_conversation": "Silenciar a conversação",
+    "delete_confirm": "Tens a certeza que desejas apagar a publicação?",
+    "bookmark": "Guardar",
+    "pin": "Fixar no perfil",
+    "pinned": "Afixado",
+    "unpin": "Desafixar do perfil",
+    "delete": "Eliminar publicação",
+    "repeats": "Repetidos",
+    "favorites": "Favoritos"
   },
   "user_card": {
     "approve": "Aprovar",
@@ -501,7 +577,7 @@
     "following": "Seguindo!",
     "follows_you": "Segue você!",
     "its_you": "É você!",
-    "media": "Mídia",
+    "media": "Multimédia",
     "mute": "Silenciar",
     "muted": "Silenciado",
     "per_day": "por dia",
@@ -512,7 +588,34 @@
     "block_progress": "A bloquear…",
     "unmute": "Retirar silêncio",
     "unmute_progress": "A retirar silêncio…",
-    "mute_progress": "A silenciar…"
+    "mute_progress": "A silenciar…",
+    "admin_menu": {
+      "delete_user_confirmation": "Tens a certeza? Esta ação não pode ser revertida.",
+      "delete_user": "Eliminar utilizador",
+      "quarantine": "Não permitir publicações de utilizadores de instâncias remotas",
+      "disable_any_subscription": "Não permitir que nenhum utilizador te siga",
+      "disable_remote_subscription": "Não permitir seguidores de instâncias remotas",
+      "sandbox": "Forçar publicações apenas para seguidores",
+      "force_unlisted": "Forçar publicações como não listadas",
+      "strip_media": "Eliminar ficheiros multimédia das publicações",
+      "force_nsfw": "Marcar todas as publicações como NSFW (não apropriado para o trabalho)",
+      "delete_account": "Eliminar Conta",
+      "deactivate_account": "Desativar conta",
+      "activate_account": "Ativar conta",
+      "revoke_moderator": "Revogar permissões de Moderador",
+      "grant_moderator": "Conceder permissões de Moderador",
+      "revoke_admin": "Revogar permissões de Admin",
+      "grant_admin": "Conceder permissões de Admin",
+      "moderation": "Moderação"
+    },
+    "show_repeats": "Mostrar repetidos",
+    "hide_repeats": "Ocultar repetidos",
+    "unsubscribe": "Retirar subscrição",
+    "subscribe": "Subscrever",
+    "report": "Denunciar",
+    "message": "Mensagem",
+    "mention": "Mencionar",
+    "hidden": "Ocultar"
   },
   "user_profile": {
     "timeline_title": "Cronologia do Utilizador",
@@ -524,17 +627,22 @@
     "who_to_follow": "Quem seguir"
   },
   "tool_tip": {
-    "media_upload": "Envio de mídia",
+    "media_upload": "Envio de multimédia",
     "repeat": "Repetir",
     "reply": "Responder",
     "favorite": "Favoritar",
-    "user_settings": "Configurações do usuário"
+    "user_settings": "Configurações do usuário",
+    "bookmark": "Guardar",
+    "reject_follow_request": "Rejeitar o pedido de seguimento",
+    "accept_follow_request": "Aceitar o pedido de seguimento",
+    "add_reaction": "Adicionar Reação"
   },
   "upload": {
     "error": {
       "base": "Falha no envio.",
       "file_too_big": "Arquivo grande demais [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Tente novamente mais tarde"
+      "default": "Tente novamente mais tarde",
+      "message": "Falha ao enviar: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -550,14 +658,14 @@
         "quarantine": "Quarentena",
         "reject": "Rejeitar",
         "accept": "Aceitar",
-        "media_removal_desc": "Este domínio remove mídia das publicações dos seguintes domínios:",
-        "media_removal": "Remoção de mídia",
-        "ftl_removal_desc": "Este domínio remove os seguintes domínios da cronologia \"Rede conhecida por todos\":",
-        "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
-        "reject_desc": "Este domínio não aceitara mensagens dos seguintes domínios:",
-        "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
-        "simple_policies": "Política especifica ao domínio",
-        "media_nsfw": "Forçar definição de Mídia como Sensível",
+        "media_removal_desc": "Esta instância remove multimédia das publicações das seguintes instâncias:",
+        "media_removal": "Remoção de multimédia",
+        "ftl_removal_desc": "Esta instância remove as seguintes instâncias da cronologia \"Rede conhecida por todos\":",
+        "quarantine_desc": "Esta instância apenas irá publicar nas seguintes instâncias:",
+        "reject_desc": "Esta instância não aceitará mensagens das seguintes instâncias:",
+        "accept_desc": "Esta instância aceita apenas mensagens das seguintes instâncias:",
+        "simple_policies": "Políticas especificas da instância",
+        "media_nsfw": "Forçar definição de multimédia como Sensível",
         "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
         "media_nsfw_desc": "Esta instância força a multimédia a ser marcada como sensível nas seguintes instâncias:"
       },
@@ -575,7 +683,7 @@
     "staff": "Staff"
   },
   "remote_user_resolver": {
-    "searching_for": "Pesquisando por",
+    "searching_for": "A pesquisar por",
     "error": "Não encontrado.",
     "remote_user_resolver": "Resolução de utilizador remoto"
   },
@@ -596,13 +704,13 @@
     "votes": "votos",
     "option": "Opção",
     "add_option": "Adicionar Opção",
-    "not_enough_options": "Existem poucas opções únicas na votação",
-    "expired": "A votação terminou há {0}",
-    "expires_in": "A votação termina em {0}",
-    "expiry": "Tempo para finalizar votação",
+    "not_enough_options": "Existem poucas opções únicas na sondagem",
+    "expired": "A sondagem terminou há {0}",
+    "expires_in": "A sondagem termina em {0}",
+    "expiry": "Tempo para finalizar sondagem",
     "multiple_choices": "Escolha múltipla",
-    "type": "Tipo de votação",
-    "add_poll": "Adicionar Votação"
+    "type": "Tipo de sondagem",
+    "add_poll": "Adicionar Sondagem"
   },
   "importer": {
     "error": "Ocorreu um erro ao importar este ficheiro.",
@@ -610,14 +718,14 @@
     "submit": "Enviar"
   },
   "exporter": {
-    "processing": "A processar, brevemente será pedido que descarregue o ficheiro",
+    "processing": "A processar, brevemente será pedido que descarregues o ficheiro",
     "export": "Exportar"
   },
   "domain_mute_card": {
-    "mute_progress": "Silenciando…",
+    "mute_progress": "A silenciar…",
     "mute": "Silenciar",
     "unmute": "Remover silêncio",
-    "unmute_progress": "A retirar o silêncio…"
+    "unmute_progress": "A remover o silêncio…"
   },
   "selectable_list": {
     "select_all": "Seleccionar tudo"
@@ -629,9 +737,93 @@
     "moves": "Utilizador migrado"
   },
   "errors": {
-    "storage_unavailable": "Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."
+    "storage_unavailable": "O Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."
   },
   "shoutbox": {
     "title": "Chat Geral"
+  },
+  "chats": {
+    "chats": "Chats",
+    "empty_chat_list_placeholder": "Não tens conversações ainda. Inicia uma nova conversa!",
+    "error_sending_message": "Ocorreu algo de errado ao enviar a mensagem.",
+    "error_loading_chat": "Ocorreu algo de errado ao carregar o chat.",
+    "delete_confirm": "Desejas realmente apagar esta mensagem?",
+    "more": "Mais",
+    "empty_message_error": "Não podes publicar uma mensagem vazia",
+    "new": "Nova conversação",
+    "delete": "Apagar",
+    "message_user": "Mensagem de {nickname}",
+    "you": "Tu:"
+  },
+  "search": {
+    "hashtags": "Hashtags",
+    "no_results": "Sem resultados",
+    "person_talking": "{count} pessoa a falar",
+    "people_talking": "{0} pessoas a falar",
+    "people": "Pessoas"
+  },
+  "display_date": {
+    "today": "Hoje"
+  },
+  "file_type": {
+    "file": "Ficheiro",
+    "image": "Imagem",
+    "video": "Vídeo",
+    "audio": "Áudio"
+  },
+  "password_reset": {
+    "password_reset_required_but_mailer_is_disabled": "Deves repor a tua palavra-passe, porém, a reposição de palavra-passe está desativada. Contacta o administrador da tua instância.",
+    "password_reset_required": "Deves repor a tua palavra-passe para iniciar sessão.",
+    "password_reset_disabled": "A reposição da palavra-passe foi desativada. Contacta o administrador da tua instância.",
+    "too_many_requests": "Alcançaste o limite de tentativas, tenta novamente mais tarde.",
+    "return_home": "Voltar à página principal",
+    "check_email": "Verifica o teu endereço de e-mail para obter um link para repor a tua palavra-passe.",
+    "placeholder": "O teu endereço de e-mail ou nome de utilizador",
+    "instruction": "Introduz o teu endereço de e-mail ou nome de utilizador. Enviaremos um link para repores a tua palavra-passe.",
+    "password_reset": "Repor palavra-passe",
+    "forgot_password": "Esqueceu-se da palavra-passe?"
+  },
+  "user_reporting": {
+    "generic_error": "Ocorreu um erro ao processar o teu pedido.",
+    "submit": "Enviar",
+    "forward_to": "Encaminhar para {0}",
+    "forward_description": "A conta é de outro servidor. Enviar também uma cópia da denúncia à outra instância?",
+    "additional_comments": "Comentários adicionais",
+    "add_comment_description": "Esta denúncia será enviada aos moderadores desta instância. Podes fornecer uma explicação pela qual te encontras a denunciar esta conta abaixo:",
+    "title": "Denunciar {0}"
+  },
+  "time": {
+    "years_short": "{0}a",
+    "year_short": "{0}a",
+    "years": "{0} anos",
+    "year": "{0} ano",
+    "weeks_short": "{0}sem",
+    "week_short": "{0}sem",
+    "weeks": "{0} semanas",
+    "week": "{0} semana",
+    "seconds_short": "{0}s",
+    "second_short": "{0}s",
+    "seconds": "{0} segundos",
+    "second": "{0} segundo",
+    "now": "agora mesmo",
+    "now_short": "agora",
+    "months_short": "{0}m",
+    "month_short": "{0}m",
+    "months": "{0} meses",
+    "month": "{0} mês",
+    "minutes_short": "{0}min",
+    "minute_short": "{0}min",
+    "minutes": "{0} minutos",
+    "minute": "{0} minuto",
+    "in_past": "há {0}",
+    "in_future": "em {0}",
+    "hours_short": "{0}h",
+    "hour_short": "{0}h",
+    "hours": "{0} horas",
+    "hour": "{0} hora",
+    "days_short": "{0}d",
+    "day_short": "{0}d",
+    "days": "{0} dias",
+    "day": "{0} dia"
   }
 }

From da47d9a43dd46ea187099443c5c74754be8f5611 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 18 Jan 2021 22:20:07 +0000
Subject: [PATCH 038/119] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pt/
---
 src/i18n/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 51a6f6f65f..7679a7dda8 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -678,7 +678,7 @@
       },
       "federation": "Federação",
       "mrf_policies": "Ativar Políticas MRF",
-      "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação na domínios.  As seguintes políticas estão ativadas:"
+      "mrf_policies_desc": "Políticas MRF manipulam o comportamento da federação nos domínios.  As seguintes políticas estão ativadas:"
     },
     "staff": "Staff"
   },

From d39e918cd300ece1bdb9d650bc56a6a9fd4522c5 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 18 Jan 2021 22:20:24 +0000
Subject: [PATCH 039/119] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 7679a7dda8..c63d9c09bb 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -658,16 +658,16 @@
         "quarantine": "Quarentena",
         "reject": "Rejeitar",
         "accept": "Aceitar",
-        "media_removal_desc": "Esta instância remove multimédia das publicações das seguintes instâncias:",
+        "media_removal_desc": "Este domínio remove multimédia das publicações dos seguintes domínios:",
         "media_removal": "Remoção de multimédia",
-        "ftl_removal_desc": "Esta instância remove as seguintes instâncias da cronologia \"Rede conhecida por todos\":",
-        "quarantine_desc": "Esta instância apenas irá publicar nas seguintes instâncias:",
-        "reject_desc": "Esta instância não aceitará mensagens das seguintes instâncias:",
-        "accept_desc": "Esta instância aceita apenas mensagens das seguintes instâncias:",
-        "simple_policies": "Políticas especificas da instância",
+        "ftl_removal_desc": "Este domínio remove os seguintes domínios da cronologia \"Rede conhecida por todos\":",
+        "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
+        "reject_desc": "Este domínio não aceitará mensagens dos seguintes domínios:",
+        "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
+        "simple_policies": "Políticas especificas do domínio",
         "media_nsfw": "Forçar definição de multimédia como Sensível",
         "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
-        "media_nsfw_desc": "Esta instância força a multimédia a ser marcada como sensível nas seguintes instâncias:"
+        "media_nsfw_desc": "Este domínio força a multimédia a ser marcada como sensível nos seguintes domínios:"
       },
       "keyword": {
         "replace": "Substituir",
@@ -718,7 +718,7 @@
     "submit": "Enviar"
   },
   "exporter": {
-    "processing": "A processar, brevemente será pedido que descarregues o ficheiro",
+    "processing": "A processar, brevemente ser-te-á pedido que descarregues o ficheiro",
     "export": "Exportar"
   },
   "domain_mute_card": {

From c8240a48d5a16de81ff991f9702f0a1673bd283a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=20Margarida=20Guimar=C3=A3es=20Ribeiro=20Cardoso?=
 <ana.anngui@gmail.com>
Date: Mon, 18 Jan 2021 22:24:12 +0000
Subject: [PATCH 040/119] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index c63d9c09bb..b7900c1dab 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -48,7 +48,7 @@
     "description": "Iniciar sessão com OAuth",
     "logout": "Terminar sessão",
     "password": "Palavra-passe",
-    "placeholder": "p.ex. lain",
+    "placeholder": "ex. lain",
     "register": "Registar",
     "username": "Nome de Utilizador",
     "hint": "Entra para participar na discussão",
@@ -83,16 +83,16 @@
     "administration": "Administração",
     "chats": "Salas de Chat",
     "timelines": "Cronologias",
-    "bookmarks": "Items Guardados"
+    "bookmarks": "Itens Guardados"
   },
   "notifications": {
     "broken_favorite": "Estado desconhecido, a procurar…",
-    "favorited_you": "favoritou o teu post",
+    "favorited_you": "gostou do teu post",
     "followed_you": "seguiu-te",
     "load_older": "Carregar notificações antigas",
     "notifications": "Notificações",
     "read": "Lido!",
-    "repeated_you": "repetiu sua postagem",
+    "repeated_you": "repetiu o teu post",
     "no_more_notifications": "Sem mais notificações",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
@@ -101,14 +101,14 @@
   },
   "post_status": {
     "new_status": "Publicar novo estado",
-    "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode te seguir e ver os seus posts privados (só para seguidores).",
-    "account_not_locked_warning_link": "restrita",
+    "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode seguir-te e ver os seus posts privados (só para seguidores).",
+    "account_not_locked_warning_link": "restrito",
     "attachments_sensitive": "Marcar anexos como sensíveis",
     "content_type": {
       "text/plain": "Texto puro",
       "text/bbcode": "BBCode",
       "text/html": "HTML",
-      "text/markdown": "Markdown"
+      "text/markdown": "Remarcação"
     },
     "content_warning": "Assunto (opcional)",
     "default": "Acabei de chegar a Lisboa.",
@@ -117,8 +117,8 @@
     "scope": {
       "direct": "Direto - Enviar somente aos usuários mencionados",
       "private": "Apenas para seguidores - Enviar apenas para seguidores",
-      "public": "Público - Publicar publicamente na cronologia",
-      "unlisted": "Não listado - Não exibir publicamente na cronologia"
+      "public": "Público - Publicar em cronologias públicas",
+      "unlisted": "Não listado - Não exibir em cronologias públicas"
     },
     "scope_notice": {
       "unlisted": "Esta publicação não será visível na Cronologia pública e na Rede conhecida por todos",
@@ -142,9 +142,9 @@
     "token": "Código do convite",
     "captcha": "CAPTCHA",
     "new_captcha": "Clique na imagem para carregar um novo captcha",
-    "username_placeholder": "p. ex. lain",
-    "fullname_placeholder": "p. ex. Lain Iwakura",
-    "bio_placeholder": "p. ex.\nOlá, sou um exemplo\nAqui podes colocar algo representativo da tua parte... ou não.",
+    "username_placeholder": "ex. lain",
+    "fullname_placeholder": "ex. Lain Iwakura",
+    "bio_placeholder": "ex.\nOlá, sou a Lain\nSou uma menina de anime que vive no Japão suburbano. Devem conhecer-me do \"the Wired\".",
     "validations": {
       "username_required": "não pode ser deixado em branco",
       "fullname_required": "não pode ser deixado em branco",
@@ -161,7 +161,7 @@
     "avatar": "Avatar",
     "avatarAltRadius": "Avatares (Notificações)",
     "avatarRadius": "Avatares",
-    "background": "Pano de Fundo",
+    "background": "Imagem de Fundo",
     "bio": "Biografia",
     "blocks_tab": "Bloqueios",
     "btnRadius": "Botões",
@@ -445,7 +445,7 @@
       "verify": {
         "desc": "Para ativar a autenticação de dois fatores, introduza o código da sua aplicação de dois fatores:"
       },
-      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro, caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueada.",
+      "recovery_codes_warning": "Anote os códigos ou armazene-os num lugar seguro - caso contrário, não os voltará a ver. Se perder acesso à sua aplicação de dois fatores e aos códigos de recuperação, a sua conta ficará bloqueada.",
       "waiting_a_recovery_codes": "A receber códigos de recuperação…",
       "warning_of_generate_new_codes": "Quando gera novos códigos de recuperação, os antigos deixam de funcionar.",
       "title": "Autenticação de Dois Fatores",
@@ -704,7 +704,7 @@
     "votes": "votos",
     "option": "Opção",
     "add_option": "Adicionar Opção",
-    "not_enough_options": "Existem poucas opções únicas na sondagem",
+    "not_enough_options": "Demasiado poucas opções únicas na sondagem",
     "expired": "A sondagem terminou há {0}",
     "expires_in": "A sondagem termina em {0}",
     "expiry": "Tempo para finalizar sondagem",
@@ -733,8 +733,8 @@
   "interactions": {
     "load_older": "Carregar interações mais antigas",
     "follows": "Novos seguidores",
-    "favs_repeats": "Favoritos e Repetidos",
-    "moves": "Utilizador migrado"
+    "favs_repeats": "Gostos e Repetidos",
+    "moves": "O utilizador migra"
   },
   "errors": {
     "storage_unavailable": "O Pleroma não conseguiu aceder ao armazenamento do navegador. A sua sessão ou definições locais não serão armazenadas e poderá encontrar problemas inesperados. Tente ativar as cookies."

From 836fc4d2056c8f07ff998a45122aadd83a3565d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Tue, 19 Jan 2021 12:44:00 +0000
Subject: [PATCH 041/119] Translated using Weblate (Portuguese)

Currently translated at 100.0% (677 of 677 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index b7900c1dab..8f8b6e0c91 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -92,7 +92,7 @@
     "load_older": "Carregar notificações antigas",
     "notifications": "Notificações",
     "read": "Lido!",
-    "repeated_you": "repetiu o teu post",
+    "repeated_you": "partilhou o teu post",
     "no_more_notifications": "Sem mais notificações",
     "reacted_with": "reagiu com {0}",
     "migrated_to": "migrou para",
@@ -166,7 +166,7 @@
     "blocks_tab": "Bloqueios",
     "btnRadius": "Botões",
     "cBlue": "Azul (Responder, seguir)",
-    "cGreen": "Verde (Repetir)",
+    "cGreen": "Verde (Partilhar)",
     "cOrange": "Laranja (Favoritar)",
     "cRed": "Vermelho (Cancelar)",
     "change_password": "Mudar palavra-passe",
@@ -229,7 +229,7 @@
     "notification_visibility_follows": "Seguidas",
     "notification_visibility_likes": "Favoritos",
     "notification_visibility_mentions": "Menções",
-    "notification_visibility_repeats": "Repetições",
+    "notification_visibility_repeats": "Partilhas",
     "no_rich_text_description": "Remover formatação de todos os posts",
     "no_blocks": "Sem bloqueios",
     "no_mutes": "Sem silenciados",
@@ -525,8 +525,8 @@
     "conversation": "Conversa",
     "error_fetching": "Erro ao buscar atualizações",
     "load_older": "Carregar postagens antigas",
-    "no_retweet_hint": "Posts apenas para seguidores ou diretos não podem ser repetidos",
-    "repeated": "Repetido",
+    "no_retweet_hint": "Posts apenas para seguidores ou diretos não podem ser partilhados",
+    "repeated": "partilhado",
     "show_new": "Mostrar novas",
     "up_to_date": "Atualizado",
     "no_more_statuses": "Sem mais posts",
@@ -558,7 +558,7 @@
     "pinned": "Afixado",
     "unpin": "Desafixar do perfil",
     "delete": "Eliminar publicação",
-    "repeats": "Repetidos",
+    "repeats": "Partilhados",
     "favorites": "Favoritos"
   },
   "user_card": {
@@ -608,8 +608,8 @@
       "grant_admin": "Conceder permissões de Admin",
       "moderation": "Moderação"
     },
-    "show_repeats": "Mostrar repetidos",
-    "hide_repeats": "Ocultar repetidos",
+    "show_repeats": "Mostrar partilhas",
+    "hide_repeats": "Ocultar partilhas",
     "unsubscribe": "Retirar subscrição",
     "subscribe": "Subscrever",
     "report": "Denunciar",
@@ -628,7 +628,7 @@
   },
   "tool_tip": {
     "media_upload": "Envio de multimédia",
-    "repeat": "Repetir",
+    "repeat": "Partilhar",
     "reply": "Responder",
     "favorite": "Favoritar",
     "user_settings": "Configurações do usuário",
@@ -733,7 +733,7 @@
   "interactions": {
     "load_older": "Carregar interações mais antigas",
     "follows": "Novos seguidores",
-    "favs_repeats": "Gostos e Repetidos",
+    "favs_repeats": "Gostos e Partilhas",
     "moves": "O utilizador migra"
   },
   "errors": {

From 05e5bb640423b8b117256b52f39d48bd75f78daf Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 10:43:17 +0000
Subject: [PATCH 042/119] Translated using Weblate (Russian)

Currently translated at 83.8% (568 of 677 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
 src/i18n/ru.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 582a34e6dd..6a3d727100 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -183,7 +183,7 @@
     "change_password": "Сменить пароль",
     "change_password_error": "Произошла ошибка при попытке изменить пароль.",
     "changed_password": "Пароль изменён успешно!",
-    "collapse_subject": "Сворачивать посты с темой",
+    "collapse_subject": "Сворачивать статусы с темой",
     "confirm_new_password": "Подтверждение нового пароля",
     "current_avatar": "Текущий аватар",
     "current_password": "Текущий пароль",
@@ -486,7 +486,7 @@
     "error": "Ошибка при обновлении ленты: {0}"
   },
   "status": {
-    "bookmark": "В закладки",
+    "bookmark": "Добавить в закладки",
     "unbookmark": "Удалить из закладок",
     "status_deleted": "Пост удален",
     "reply_to": "Ответ",
@@ -494,7 +494,11 @@
     "favorites": "Понравилось",
     "unmute_conversation": "Прекратить игнорировать разговор",
     "mute_conversation": "Игнорировать разговор",
-    "thread_muted": "Разговор игнорируется"
+    "thread_muted": "Разговор игнорируется",
+    "external_source": "Перейти к источнику",
+    "delete_confirm": "Вы действительно хотите удалить данный статус?",
+    "delete": "Удалить",
+    "copy_link": "Скопировать ссылку"
   },
   "user_card": {
     "block": "Заблокировать",
@@ -536,7 +540,8 @@
     "media": "С вложениями",
     "mention": "Упомянуть",
     "show_repeats": "Показывать повторы",
-    "hide_repeats": "Скрыть повторы"
+    "hide_repeats": "Скрыть повторы",
+    "report": "Пожаловаться"
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"

From c3e5fd5fa12f289e5e8a5c69528ffb824fb8d596 Mon Sep 17 00:00:00 2001
From: Artur Mancha <joker@nadaradical.com>
Date: Wed, 20 Jan 2021 19:34:47 +0000
Subject: [PATCH 043/119] Translated using Weblate (Portuguese)

Currently translated at 100.0% (679 of 679 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 8f8b6e0c91..9d3a5d94bc 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -615,7 +615,11 @@
     "report": "Denunciar",
     "message": "Mensagem",
     "mention": "Mencionar",
-    "hidden": "Ocultar"
+    "hidden": "Ocultar",
+    "roles": {
+      "moderator": "Moderador",
+      "admin": "Admin"
+    }
   },
   "user_profile": {
     "timeline_title": "Cronologia do Utilizador",

From 238e9dcd351a4d2d23c09e22f713925f6c1cc3b6 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Jan 2021 20:44:42 +0000
Subject: [PATCH 044/119] Translated using Weblate (Russian)

Currently translated at 83.9% (570 of 679 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 6a3d727100..30a657414d 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -541,7 +541,11 @@
     "mention": "Упомянуть",
     "show_repeats": "Показывать повторы",
     "hide_repeats": "Скрыть повторы",
-    "report": "Пожаловаться"
+    "report": "Пожаловаться",
+    "roles": {
+      "moderator": "Модератор",
+      "admin": "Администратор"
+    }
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"

From 3b6a30ec9f96906ba9040c64ceeaeed6f8736efb Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Fri, 22 Jan 2021 13:16:11 +0000
Subject: [PATCH 045/119] Translated using Weblate (Italian)

Currently translated at 100.0% (679 of 679 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index ea8f176001..0939df2800 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -487,7 +487,11 @@
     "follow_progress": "Richiedo…",
     "follow_sent": "Richiesta inviata!",
     "favorites": "Preferiti",
-    "message": "Contatta"
+    "message": "Contatta",
+    "roles": {
+      "moderator": "Moderatore",
+      "admin": "Amministratore"
+    }
   },
   "chat": {
     "title": "Chat"

From c4fb123d079a5978d35c18d0c067784036519b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <joaoadriano3@gmail.com>
Date: Thu, 21 Jan 2021 18:21:29 +0000
Subject: [PATCH 046/119] Translated using Weblate (Portuguese)

Currently translated at 100.0% (679 of 679 strings)

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

diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 9d3a5d94bc..b79985e8a5 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -86,7 +86,7 @@
     "bookmarks": "Itens Guardados"
   },
   "notifications": {
-    "broken_favorite": "Estado desconhecido, a procurar…",
+    "broken_favorite": "Publicação desconhecida, a procurar…",
     "favorited_you": "gostou do teu post",
     "followed_you": "seguiu-te",
     "load_older": "Carregar notificações antigas",
@@ -100,7 +100,7 @@
     "error": "Erro ao obter notificações: {0}"
   },
   "post_status": {
-    "new_status": "Publicar novo estado",
+    "new_status": "Publicar nova publicação",
     "account_not_locked_warning": "A sua conta não é {0}. Qualquer pessoa pode seguir-te e ver os seus posts privados (só para seguidores).",
     "account_not_locked_warning_link": "restrito",
     "attachments_sensitive": "Marcar anexos como sensíveis",
@@ -125,7 +125,7 @@
       "private": "Esta publicação será apenas visível para os teus seguidores",
       "public": "Esta publicação será visível para todos"
     },
-    "empty_status_error": "Não consegues publicar um estado vazio e sem ficheiros",
+    "empty_status_error": "Não consegues publicar um post vazio e sem ficheiros",
     "preview_empty": "Vazio",
     "preview": "Pré-visualização",
     "media_description": "Descrição da multimédia",
@@ -548,8 +548,8 @@
     "thread_muted_and_words": ", contém:",
     "thread_muted": "Conversação silenciada",
     "external_source": "Fonte externa",
-    "copy_link": "Copiar o link do estado",
-    "status_unavailable": "Estado indisponível",
+    "copy_link": "Copiar o link do post",
+    "status_unavailable": "Publicação indisponível",
     "unmute_conversation": "Mostrar a conversação",
     "mute_conversation": "Silenciar a conversação",
     "delete_confirm": "Tens a certeza que desejas apagar a publicação?",

From bc9cd4170d3a16ee19b628b8674248f98cf5570d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 22 Jan 2021 08:25:29 +0000
Subject: [PATCH 047/119] Translated using Weblate (Ukrainian)

Currently translated at 99.4% (675 of 679 strings)

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

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 4ead8790ca..c3665d2885 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -25,7 +25,7 @@
   },
   "features_panel": {
     "gopher": "Gopher",
-    "pleroma_chat_messages": "Локальні балачки",
+    "pleroma_chat_messages": "Чати",
     "chat": "Міні-чат",
     "who_to_follow": "Кого відстежувати",
     "title": "Особливості",
@@ -135,7 +135,7 @@
     "error": "Помилка при оновленні сповіщень: {0}"
   },
   "nav": {
-    "chats": "Локальні балачки",
+    "chats": "Чати",
     "timelines": "Стрічки",
     "twkn": "Уся відома мережа",
     "about": "Інформація",

From 286527b489427ea4c1d1bf44cc67ea69a82ae88f Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Fri, 22 Jan 2021 13:22:47 +0000
Subject: [PATCH 048/119] Translated using Weblate (Italian)

Currently translated at 100.0% (679 of 679 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 0939df2800..b7d21e7ed9 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -30,7 +30,7 @@
     "administration": "Amministrazione",
     "back": "Indietro",
     "interactions": "Interazioni",
-    "dms": "Messaggi diretti",
+    "dms": "Messaggi privati",
     "user_search": "Ricerca utenti",
     "search": "Ricerca",
     "who_to_follow": "Chi seguire",
@@ -44,7 +44,7 @@
     "notifications": "Notifiche",
     "read": "Letto!",
     "broken_favorite": "Stato sconosciuto, lo sto cercando…",
-    "favorited_you": "ha gradito il tuo messaggio",
+    "favorited_you": "gradisce il tuo messaggio",
     "load_older": "Carica notifiche precedenti",
     "repeated_you": "ha condiviso il tuo messaggio",
     "follow_request": "vuole seguirti",
@@ -519,18 +519,18 @@
     "register": "Registrati",
     "username": "Nome utente",
     "description": "Accedi con OAuth",
-    "hint": "Accedi per partecipare alla discussione",
+    "hint": "Accedi per conversare",
     "authentication_code": "Codice di autenticazione",
     "enter_recovery_code": "Inserisci un codice di recupero",
-    "enter_two_factor_code": "Inserisci un codice two-factor",
+    "enter_two_factor_code": "Inserisci un codice 2FA",
     "recovery_code": "Codice di recupero",
     "heading": {
-      "totp": "Autenticazione two-factor",
-      "recovery": "Recupero two-factor"
+      "totp": "Autenticazione 2FA",
+      "recovery": "Recupero 2FA"
     }
   },
   "post_status": {
-    "account_not_locked_warning": "Il tuo profilo non è {0}. Chiunque può seguirti e vedere i tuoi messaggi riservati ai tuoi seguaci.",
+    "account_not_locked_warning": "Il tuo profilo non è {0}. Chiunque può seguirti e vedere i tuoi messaggi per seguaci.",
     "account_not_locked_warning_link": "protetto",
     "attachments_sensitive": "Nascondi gli allegati",
     "content_type": {
@@ -540,7 +540,7 @@
       "text/html": "HTML"
     },
     "content_warning": "Oggetto (facoltativo)",
-    "default": "Sono appena atterrato a Fiumicino.",
+    "default": "Sono appena atterrato a Città Laggiù.",
     "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
     "posting": "Sto pubblicando",
     "scope": {
@@ -650,20 +650,20 @@
   },
   "polls": {
     "add_poll": "Sondaggio",
-    "add_option": "Alternativa",
+    "add_option": "Aggiungi opzione",
     "option": "Opzione",
     "votes": "voti",
     "vote": "Vota",
     "type": "Tipo di sondaggio",
     "single_choice": "Scelta singola",
     "multiple_choices": "Scelta multipla",
-    "expiry": "Scadenza",
-    "expires_in": "Scade fra {0}",
-    "expired": "Scaduto {0} fa",
+    "expiry": "Età",
+    "expires_in": "Chiude fra {0}",
+    "expired": "Chiuso {0} fa",
     "not_enough_options": "Aggiungi altre risposte"
   },
   "interactions": {
-    "favs_repeats": "Condivisi e preferiti",
+    "favs_repeats": "Condivisi e Graditi",
     "load_older": "Carica vecchie interazioni",
     "moves": "Utenti migrati",
     "follows": "Nuovi seguìti"
@@ -672,8 +672,8 @@
     "load_all": "Carico tutti i {emojiAmount} emoji",
     "load_all_hint": "Primi {saneAmount} emoji caricati, caricarli tutti potrebbe causare rallentamenti.",
     "unicode": "Emoji Unicode",
-    "custom": "Emoji personale",
-    "add_emoji": "Inserisci Emoji",
+    "custom": "Emoji della stanza",
+    "add_emoji": "Inserisci emoji",
     "search_emoji": "Cerca un emoji",
     "keep_open": "Tieni aperto il menù",
     "emoji": "Emoji",
@@ -688,7 +688,7 @@
     "remote_user_resolver": "Cerca utenti remoti"
   },
   "errors": {
-    "storage_unavailable": "Pleroma non ha potuto accedere ai dati del tuo browser. Le tue credenziali o le tue impostazioni locali non potranno essere salvate e potresti incontrare strani errori. Prova ad abilitare i cookie."
+    "storage_unavailable": "Pleroma non può accedere ai dati del tuo browser. Il tuo accesso o le tue impostazioni non saranno salvate e potresti incontrare strani errori. Prova ad abilitare i cookie."
   },
   "status": {
     "pinned": "Intestato",

From 58a92c1b7dec1f2e3584571fcbcb9c757db408c3 Mon Sep 17 00:00:00 2001
From: Pavlo Bilous <pavlo.bilous@gmail.com>
Date: Fri, 22 Jan 2021 19:19:03 +0000
Subject: [PATCH 049/119] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (679 of 679 strings)

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

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c3665d2885..040d6f4f76 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -29,7 +29,7 @@
     "chat": "Міні-чат",
     "who_to_follow": "Кого відстежувати",
     "title": "Особливості",
-    "scope_options": "Параметри осягу",
+    "scope_options": "Параметри обсягу",
     "media_proxy": "Посередник медіа-даних",
     "text_limit": "Ліміт символів",
     "upload_limit": "Обмеження завантажень"
@@ -39,9 +39,9 @@
     "export": "Експорт"
   },
   "domain_mute_card": {
-    "unmute_progress": "Вимикаю…",
+    "unmute_progress": "Вмикаю…",
     "unmute": "Вимкнути заглушення",
-    "mute_progress": "Вмикаю…",
+    "mute_progress": "Вимикаю…",
     "mute": "Ігнорувати"
   },
   "shoutbox": {
@@ -51,13 +51,13 @@
     "staff": "Адміністрація",
     "mrf": {
       "simple": {
-        "media_nsfw_desc": "Даний інстанс примусово позначає медіа в наступних інстансах як NSFW:",
+        "media_nsfw_desc": "Даний інстанс примусово позначає медіа в наступних інстансах як дратівливий:",
         "media_nsfw": "Примусове визначення медіа як дратівливого",
         "media_removal_desc": "Поточний інстанс видаляє медіа з дописів на перелічених інстансах:",
         "media_removal": "Видалення медіа",
-        "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з \"Усієї відомої мережі\":",
-        "ftl_removal": "Видалення з \"Усієї відомої мережі\"",
-        "quarantine_desc": "Поточний інстанс буде надсилати тільки публічні дописи наступним інстансам:",
+        "ftl_removal_desc": "Цей інстанс видаляє перелічені інстанси з Федеративної стрічки:",
+        "ftl_removal": "Видалення зі стрічки Федеративної мережі",
+        "quarantine_desc": "Поточний інстанс надсилатиме тільки публічні дописи наступним інстансам:",
         "quarantine": "Карантин",
         "reject_desc": "Поточний інстанс не прийматиме повідомлення з перелічених інстансів:",
         "accept": "Прийняти",
@@ -66,7 +66,7 @@
         "simple_policies": "Правила поточного інстансу"
       },
       "mrf_policies_desc": "Правила MRF розповсюджуються на даний  інстанс. Наступні правила активні:",
-      "mrf_policies": "Активні правила MRF (модуль переписування повідомлень)",
+      "mrf_policies": "Активувати правила MRF (модуль переписування повідомлень)",
       "keyword": {
         "is_replaced_by": "→",
         "replace": "Замінити",
@@ -546,7 +546,8 @@
         "disabled": "Вимкнено",
         "selectedMenu": "Вибраний пункт меню",
         "tabs": "Вкладки",
-        "pressed": "Натиснуто"
+        "pressed": "Натиснуто",
+        "wallpaper": "Шпалери"
       },
       "common_colors": {
         "rgbo": "Піктограми, акценти, значки",
@@ -602,7 +603,8 @@
       "frontend_version": "Версія фронтенду",
       "backend_version": "Версія бекенду",
       "title": "Версія"
-    }
+    },
+    "hide_wallpaper": "Сховати шпалери екземпляру"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -758,7 +760,11 @@
     "unblock": "Розблокувати",
     "remote_follow": "Підписатись",
     "muted": "Заглушений",
-    "mute": "Заглушити"
+    "mute": "Заглушити",
+    "roles": {
+      "moderator": "Модератор",
+      "admin": "Адміністратор"
+    }
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 79e4df99dccd32dc243e7a21e61b69e10cb363b4 Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Sun, 24 Jan 2021 10:23:17 +0000
Subject: [PATCH 050/119] Translated using Weblate (Chinese (Traditional))

Currently translated at 98.5% (669 of 679 strings)

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

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index f63acab832..a8d0dc3c90 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -526,7 +526,8 @@
     "mute_import": "靜音導入",
     "mute_import_error": "導入靜音時出錯",
     "mute_export_button": "將靜音導出到csv文件",
-    "mute_export": "靜音導出"
+    "mute_export": "靜音導出",
+    "hide_wallpaper": "隱藏實例桌布"
   },
   "chats": {
     "more": "更多",

From 2576b750594ac78097fab83a101c21b2fd1925fc Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Thu, 28 Jan 2021 14:05:32 +0200
Subject: [PATCH 051/119] fallback if shadows aren't defined

---
 src/services/style_setter/style_setter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 0fb8f92aaf..a2bba67bce 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -244,7 +244,7 @@ export const generateShadows = (input, colors) => {
   }
 
   const cleanInputShadows = Object.fromEntries(
-    Object.entries(input.shadows)
+    Object.entries(input.shadows || {})
       .map(([name, shadowSlot]) => [
         name,
         // defaulting color to black to avoid potential problems

From 66f3e72b545a7f92d2569baa0fd52275a29d629a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Feb 2021 20:08:36 +0200
Subject: [PATCH 052/119] update branch with recent develop changes (FA, added
 settings)

---
 .../helpers/boolean_setting.vue               |  6 ++---
 ...dified_icon.vue => modified_indicator.vue} | 25 +++++++++++--------
 .../helpers/shared_computed_object.js         |  1 -
 .../settings_modal/tabs/general_tab.vue       |  8 +++---
 src/modules/config.js                         |  2 --
 5 files changed, 22 insertions(+), 20 deletions(-)
 rename src/components/settings_modal/helpers/{modified_icon.vue => modified_indicator.vue} (64%)

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index f7c392cddd..b600b63b57 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -13,7 +13,7 @@
         >
         <slot />
       </span>
-      <ModifiedIcon :changed="isChanged" />
+      <ModifiedIndicator :changed="isChanged" />
     </Checkbox>
   </label>
 </template>
@@ -21,7 +21,7 @@
 <script>
 import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
-import ModifiedIcon from './modified_icon.vue'
+import ModifiedIndicator from './modified_indicator.vue'
 export default {
   props: [
     'path',
@@ -29,7 +29,7 @@ export default {
   ],
   components: {
     Checkbox,
-    ModifiedIcon
+    ModifiedIndicator
   },
   computed: {
     pathDefault () {
diff --git a/src/components/settings_modal/helpers/modified_icon.vue b/src/components/settings_modal/helpers/modified_indicator.vue
similarity index 64%
rename from src/components/settings_modal/helpers/modified_icon.vue
rename to src/components/settings_modal/helpers/modified_indicator.vue
index 27e0a9c5ef..b75a28114f 100644
--- a/src/components/settings_modal/helpers/modified_icon.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@@ -1,15 +1,17 @@
 <template>
   <span
     v-if="changed"
-    class="ModifiedIcon"
+    class="ModifiedIndicator"
     >
     <Popover
       trigger="hover"
       >
-      <i
-        slot="trigger"
-        class="icon icon-wrench"
-        />
+      <span slot="trigger">
+        &nbsp;
+          <FAIcon
+            icon="wrench"
+          />
+      </span>
       <div
         class="modified-tooltip"
         slot="content"
@@ -22,6 +24,13 @@
 
 <script>
 import Popover from 'src/components/popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faWrench } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench
+)
+
 export default {
   props: ['changed'],
   components: { Popover }
@@ -29,14 +38,10 @@ export default {
 </script>
 
 <style lang="scss">
-.ModifiedIcon {
+.ModifiedIndicator {
   display: inline-block;
   position: relative;
 
-  .icon {
-    display: inline-block;
-  }
-
   .modified-tooltip {
     margin: 0.5em 1em;
     min-width: 10em;
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 3cbcd28847..2c833c0c08 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -9,7 +9,6 @@ const SharedComputedObject = () => ({
     .map(key => [
       key + 'DefaultValue',
       function () {
-        console.log(this.$store.getters.defaultConfig)
         return this.$store.getters.defaultConfig[key]
       }
     ])
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 92cd2069a7..f93f4ea05f 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -12,9 +12,9 @@
           </BooleanSetting>
         </li>
         <li v-if="instanceWallpaperUsed">
-          <Checkbox v-model="hideInstanceWallpaper">
+          <BooleanSetting path="hideInstanceWallpaper">
             {{ $t('settings.hide_wallpaper') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -64,9 +64,9 @@
           </BooleanSetting>
         </li>
         <li>
-          <Checkbox v-model="virtualScrolling">
+          <BooleanSetting path="virtualScrolling">
             {{ $t('settings.virtual_scrolling') }}
-          </Checkbox>
+          </BooleanSetting>
         </li>
       </ul>
     </div>
diff --git a/src/modules/config.js b/src/modules/config.js
index 444808cf85..f992519e3a 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -80,7 +80,6 @@ const config = {
   getters: {
     defaultConfig (state, getters, rootState, rootGetters) {
       const { instance } = rootState
-      console.log('DC', instance.minimalScopesMode)
       return {
         ...defaultState,
         ...Object.fromEntries(
@@ -90,7 +89,6 @@ const config = {
     },
     mergedConfig (state, getters, rootState, rootGetters) {
       const { defaultConfig } = rootGetters
-      console.log('DC2', defaultConfig.hideISP)
       return {
         ...defaultConfig,
         ...state

From 982c799b6fde804018656212aea6128a6f0df928 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Feb 2021 21:07:09 +0200
Subject: [PATCH 053/119] fix a bunch of <button>s acting as submit buttons
 breaking enter key

---
 src/components/emoji_input/emoji_input.vue       | 1 +
 src/components/mfa_form/recovery_form.vue        | 2 ++
 src/components/mfa_form/totp_form.vue            | 2 ++
 src/components/scope_selector/scope_selector.vue | 4 ++++
 src/components/search/search.vue                 | 1 +
 src/components/search_bar/search_bar.vue         | 3 +++
 src/components/tab_switcher/tab_switcher.js      | 4 +++-
 7 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 4becdc4199..1d6c760ef0 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -10,6 +10,7 @@
         v-if="!hideEmojiButton"
         class="button-unstyled emoji-picker-icon"
         @click.prevent="togglePicker"
+        type="button"
       >
         <FAIcon :icon="['far', 'smile-beam']" />
       </button>
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 0bf68e27cb..8457ec5d86 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -26,6 +26,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="requireTOTP"
+                type="button"
               >
                 {{ $t('login.enter_two_factor_code') }}
               </button>
@@ -33,6 +34,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="abortMFA"
+                type="button"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 79230148ee..5d80e1852e 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -28,6 +28,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="requireRecovery"
+                type="button"
               >
                 {{ $t('login.enter_recovery_code') }}
               </button>
@@ -35,6 +36,7 @@
               <button
                 class="button-unstyled -link"
                 @click.prevent="abortMFA"
+                type="button"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index 66ac612ea7..60e8c3baea 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -9,6 +9,7 @@
       :class="css.direct"
       :title="$t('post_status.scope.direct')"
       @click="changeVis('direct')"
+      type="button"
     >
       <FAIcon
         icon="envelope"
@@ -21,6 +22,7 @@
       :class="css.private"
       :title="$t('post_status.scope.private')"
       @click="changeVis('private')"
+      type="button"
     >
       <FAIcon
         icon="lock"
@@ -33,6 +35,7 @@
       :class="css.unlisted"
       :title="$t('post_status.scope.unlisted')"
       @click="changeVis('unlisted')"
+      type="button"
     >
       <FAIcon
         icon="lock-open"
@@ -45,6 +48,7 @@
       :class="css.public"
       :title="$t('post_status.scope.public')"
       @click="changeVis('public')"
+      type="button"
     >
       <FAIcon
         icon="globe"
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index a6503c9f74..fa64836541 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -16,6 +16,7 @@
       <button
         class="btn button-default search-button"
         @click="newQuery(searchTerm)"
+        type="submit"
       >
         <FAIcon icon="search" />
       </button>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 6cf9179e05..a7432dcba8 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')"
       @click.prevent.stop="toggleHidden"
+      type="button"
     >
       <FAIcon
         fixed-width
@@ -28,6 +29,7 @@
       <button
         class="button-default search-button"
         @click="find(searchTerm)"
+        type="submit"
       >
         <FAIcon
           fixed-width
@@ -37,6 +39,7 @@
       <button
         class="button-unstyled cancel-search"
         @click.prevent.stop="toggleHidden"
+        type="button"
       >
         <FAIcon
           fixed-width
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 76e7ef03d8..12aac8e667 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -93,7 +93,9 @@ export default Vue.component('tab-switcher', {
               <button
                 disabled={slot.data.attrs.disabled}
                 onClick={this.clickTab(index)}
-                class={classesTab.join(' ')}>
+                class={classesTab.join(' ')}
+                type="button"
+              >
                 <img src={slot.data.attrs.image} title={slot.data.attrs['image-tooltip']}/>
                 {slot.data.attrs.label ? '' : slot.data.attrs.label}
               </button>

From 78f8147aa610af9ae79886ad7805f9b905976758 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Feb 2021 21:07:40 +0200
Subject: [PATCH 054/119] change react button classnames for consistency

---
 src/components/react_button/react_button.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index ac940b9890..995234071c 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -1,6 +1,7 @@
 <template>
   <Popover
     trigger="click"
+    class="ReactButton"
     placement="top"
     :offset="{ y: 5 }"
     :bound-to="{ x: 'container' }"
@@ -42,7 +43,7 @@
     </div>
     <span
       slot="trigger"
-      class="ReactButton"
+      class="popover-trigger"
       :title="$t('tool_tip.add_reaction')"
     >
       <FAIcon

From 213c5637d4bbebcd3508f0b91da8e6bfae528c1d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 3 Feb 2021 09:18:44 +0200
Subject: [PATCH 055/119] Cleanup ReactButton's CSS, fix hitboxes of
 reactbutton and extrabuttons

---
 .../extra_buttons/extra_buttons.vue           |   5 +
 src/components/popover/popover.vue            |   1 +
 src/components/react_button/react_button.vue  | 105 ++++++++++--------
 3 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index e845d8fc5a..c6cb9fbe2f 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -139,6 +139,11 @@
 @import '../../_variables.scss';
 
 .ExtraButtons {
+  /* override of popover internal stuff */
+  .popover-trigger-button {
+    width: auto;
+  }
+
   .popover-trigger {
     position: static;
     padding: 10px;
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 2252c68f37..876dd61d67 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -7,6 +7,7 @@
       ref="trigger"
       class="button-unstyled -fullwidth popover-trigger-button"
       @click="onClick"
+      type="button"
     >
       <slot name="trigger" />
     </button>
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 995234071c..0473467458 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -59,63 +59,72 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.reaction-picker-filter {
-  padding: 0.5em;
-  display: flex;
-  input {
-    flex: 1;
+.ReactButton {
+  .reaction-picker-filter {
+    padding: 0.5em;
+    display: flex;
+
+    input {
+      flex: 1;
+    }
   }
-}
 
-.reaction-picker-divider {
-  height: 1px;
-  width: 100%;
-  margin: 0.5em;
-  background-color: var(--border, $fallback--border);
-}
+  .reaction-picker-divider {
+    height: 1px;
+    width: 100%;
+    margin: 0.5em;
+    background-color: var(--border, $fallback--border);
+  }
 
-.reaction-picker {
-  width: 10em;
-  height: 9em;
-  font-size: 1.5em;
-  overflow-y: scroll;
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0.5em;
-  text-align: center;
-  align-content: flex-start;
-  user-select: none;
+  .reaction-picker {
+    width: 10em;
+    height: 9em;
+    font-size: 1.5em;
+    overflow-y: scroll;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0.5em;
+    text-align: center;
+    align-content: flex-start;
+    user-select: none;
 
-  mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
-    linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
-    linear-gradient(to top, white, white);
-  transition: mask-size 150ms;
-  mask-size: 100% 20px, 100% 20px, auto;
-  // Autoprefixed seem to ignore this one, and also syntax is different
-  -webkit-mask-composite: xor;
-  mask-composite: exclude;
+    mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+          linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+          linear-gradient(to top, white, white);
+    transition: mask-size 150ms;
+    mask-size: 100% 20px, 100% 20px, auto;
 
-  .emoji-button {
-    cursor: pointer;
+    /* Autoprefixed seem to ignore this one, and also syntax is different */
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;
 
-    flex-basis: 20%;
-    line-height: 1.5em;
-    align-content: center;
+    .emoji-button {
+      cursor: pointer;
 
-    &:hover {
-      transform: scale(1.25);
+      flex-basis: 20%;
+      line-height: 1.5em;
+      align-content: center;
+
+      &:hover {
+        transform: scale(1.25);
+      }
+    }
+  }
+
+  /* override of popover internal stuff */
+  .popover-trigger-button {
+    width: auto;
+  }
+
+  .popover-trigger {
+    padding: 10px;
+    margin: -10px;
+
+    &:hover .svg-inline--fa {
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
     }
   }
 }
 
-.ReactButton {
-  padding: 10px;
-  margin: -10px;
-
-  &:hover .svg-inline--fa {
-    color: $fallback--text;
-    color: var(--text, $fallback--text);
-  }
-}
-
 </style>

From 1506b97e35c63f9f6ca685ee1a2b61e4580ac134 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 9 Feb 2021 16:32:33 +0300
Subject: [PATCH 056/119] Display 'people voted' instead of 'votes' for
 multi-choice polls

---
 CHANGELOG.md                 | 2 ++
 src/components/poll/poll.vue | 7 ++++++-
 src/i18n/en.json             | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588348a0fe..965b538bc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
 
+### Changed
+- Display 'people voted' instead of 'votes' for multi-choice polls
 
 ## [2.2.3] - 2021-01-18
 ### Added
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 42819c19fa..f1ae8f9c73 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -58,7 +58,12 @@
         {{ $t('polls.vote') }}
       </button>
       <div class="total">
-        {{ totalVotesCount }} {{ $t("polls.votes") }}&nbsp;·&nbsp;
+        <template v-if="poll.multiple">
+          {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
+        </template>
+        <template v-else>
+          {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
+        </template>
       </div>
       <i18n :path="expired ? 'polls.expired' : 'polls.expires_in'">
         <Timeago
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1d087bbd1e..f366445f6b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -147,7 +147,8 @@
     "add_poll": "Add Poll",
     "add_option": "Add Option",
     "option": "Option",
-    "votes": "votes",
+    "people_voted_count": "{count} person voted | {count} people voted",
+    "votes_count": "{count} vote | {count} votes",
     "vote": "Vote",
     "type": "Poll type",
     "single_choice": "Single choice",

From 13ff99881b3eff6f69b94d838845a63100a5c234 Mon Sep 17 00:00:00 2001
From: Eugenij <eugenijm@protonmail.com>
Date: Wed, 10 Feb 2021 12:28:39 +0000
Subject: [PATCH 057/119] Apply 1 suggestion(s) to 1 file(s)

---
 src/components/poll/poll.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index f1ae8f9c73..5adcb9c280 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -58,7 +58,7 @@
         {{ $t('polls.vote') }}
       </button>
       <div class="total">
-        <template v-if="poll.multiple">
+        <template v-if="poll.voters_count">
           {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
         </template>
         <template v-else>

From da807a12fb2b1862205b2c1163326806cca6bd26 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Fri, 12 Feb 2021 12:01:16 +0300
Subject: [PATCH 058/119] Make bot label localizable

---
 src/components/user_card/user_card.vue | 2 +-
 src/i18n/en.json                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 773f764a0e..c6c4dfeea1 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -89,7 +89,7 @@
                   v-if="user.bot"
                   class="alert user-role"
                 >
-                  bot
+                  {{ $t('user_card.bot') }}
                 </span>
               </template>
               <span v-if="user.locked">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1025a8e17c..3946f3cd2d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -716,6 +716,7 @@
     "mute_progress": "Muting…",
     "hide_repeats": "Hide repeats",
     "show_repeats": "Show repeats",
+    "bot": "Bot",
     "admin_menu": {
       "moderation": "Moderation",
       "grant_admin": "Grant Admin",

From 4859e63a89e641d5eb9b3afb2d328fd6adb4a9b3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 12 Feb 2021 18:14:54 +0200
Subject: [PATCH 059/119] Remove body scrollbar in chat layout, keep nav bar
 still on scroll lock, add tiny fade for media modal

---
 src/App.scss                               |  6 ++++++
 src/components/media_modal/media_modal.vue | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/App.scss b/src/App.scss
index 8b91f3dea1..90d083bbba 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -586,6 +586,7 @@ nav {
   color: var(--faint, $fallback--faint);
   box-shadow: 0px 0px 4px rgba(0,0,0,.6);
   box-shadow: var(--topBarShadow);
+  box-sizing: border-box;
 }
 
 .fade-enter-active, .fade-leave-active {
@@ -878,6 +879,11 @@ nav {
   overflow: hidden;
   height: 100%;
 
+  // Get rid of scrollbar on body as scrolling happens on different element
+  body {
+    overflow: hidden;
+  }
+
   // Ensures the fixed position of the mobile browser bars on scroll up / down events.
   // Prevents the mobile browser bars from overlapping or hiding the message posting form.
   @media all and (max-width: 800px) {
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index ea7f7a7f56..34394e7eae 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -73,11 +73,22 @@
   }
 }
 
+@keyframes media-fadein {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
 .modal-image {
   max-width: 90%;
   max-height: 90%;
   box-shadow: 0px 5px 15px 0 rgba(0, 0, 0, 0.5);
   image-orientation: from-image; // NOTE: only FF supports this
+  opacity: 1;
+  animation: 0.1s cubic-bezier(0.7, 0, 1, 0.6) media-fadein;
 }
 
 .modal-view-button-arrow {

From 01275fbac0e28d183e761e656a8e7b1c3b9612e9 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Wed, 10 Feb 2021 15:55:58 +0300
Subject: [PATCH 060/119] Ensure poll.voters_count doesn't fallback to
 poll.votes when it's 0

---
 src/components/poll/poll.vue | 2 +-
 src/i18n/en.json             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 5adcb9c280..187d1829d5 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -58,7 +58,7 @@
         {{ $t('polls.vote') }}
       </button>
       <div class="total">
-        <template v-if="poll.voters_count">
+        <template v-if="typeof poll.voters_count === 'number'">
           {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
         </template>
         <template v-else>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f366445f6b..78ce091932 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -147,6 +147,7 @@
     "add_poll": "Add Poll",
     "add_option": "Add Option",
     "option": "Option",
+    "votes": "votes",
     "people_voted_count": "{count} person voted | {count} people voted",
     "votes_count": "{count} vote | {count} votes",
     "vote": "Vote",

From 398aac65585cf7f743f323aa75d05646470da1d5 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 12 Feb 2021 18:47:10 +0200
Subject: [PATCH 061/119] remove redundant opacity2

---
 src/components/media_modal/media_modal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index 34394e7eae..54bc533528 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -87,7 +87,6 @@
   max-height: 90%;
   box-shadow: 0px 5px 15px 0 rgba(0, 0, 0, 0.5);
   image-orientation: from-image; // NOTE: only FF supports this
-  opacity: 1;
   animation: 0.1s cubic-bezier(0.7, 0, 1, 0.6) media-fadein;
 }
 

From c7018057f1df52edd2f02c4cf101e5dccf8d633c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 12 Feb 2021 18:49:57 +0200
Subject: [PATCH 062/119] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 660729799b..94b45a82a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
+- Fixed some UI jumpiness when opening images particularly in chat view
 
 
 ## [2.2.3] - 2021-01-18

From 1a836c85274f64cefeca0999336e3c5c9d10e5ad Mon Sep 17 00:00:00 2001
From: fiftyffs <fiftyffs@pm.me>
Date: Tue, 26 Jan 2021 06:45:21 +0000
Subject: [PATCH 063/119] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 70.1% (476 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nb_NO/
---
 src/i18n/nb.json | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index b9669a351f..8bd745f0f0 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -57,9 +57,9 @@
     "enter_recovery_code": "Skriv inn en gjenopprettingskode",
     "enter_two_factor_code": "Skriv inn en to-faktors kode",
     "recovery_code": "Gjenopprettingskode",
-    "heading" : {
-      "totp" : "To-faktors autentisering",
-      "recovery" : "To-faktors gjenoppretting"
+    "heading": {
+      "totp": "To-faktors autentisering",
+      "recovery": "To-faktors gjenoppretting"
     }
   },
   "media_modal": {
@@ -72,7 +72,7 @@
     "chat": "Lokal nettprat",
     "friend_requests": "Følgeforespørsler",
     "mentions": "Nevnt",
-    "interactions": "Interaksjooner",
+    "interactions": "Interaksjoner",
     "dms": "Direktemeldinger",
     "public_tl": "Offentlig Tidslinje",
     "timeline": "Tidslinje",
@@ -80,7 +80,9 @@
     "user_search": "Søk etter brukere",
     "search": "Søk",
     "who_to_follow": "Kontoer å følge",
-    "preferences": "Innstillinger"
+    "preferences": "Innstillinger",
+    "timelines": "Tidslinjer",
+    "bookmarks": "Bokmerker"
   },
   "notifications": {
     "broken_favorite": "Ukjent status, leter etter den...",
@@ -90,7 +92,8 @@
     "notifications": "Varslinger",
     "read": "Les!",
     "repeated_you": "Gjentok din status",
-    "no_more_notifications": "Ingen gjenstående varsler"
+    "no_more_notifications": "Ingen gjenstående varsler",
+    "follow_request": "ønsker å følge deg"
   },
   "polls": {
     "add_poll": "Legg til undersøkelse",
@@ -134,7 +137,7 @@
       "public": "Denne statusen vil være synlig for alle",
       "private": "Denne statusen vil være synlig for dine følgere",
       "unlisted": "Denne statusen vil ikke være synlig i Offentlig Tidslinje eller Det Hele Kjente Nettverket"
-      },
+    },
     "scope": {
       "direct": "Direkte, publiser bare til nevnte brukere",
       "private": "Bare følgere, publiser bare til brukere som følger deg",
@@ -171,17 +174,17 @@
     "security": "Sikkerhet",
     "enter_current_password_to_confirm": "Skriv inn ditt nåverende passord for å bekrefte din identitet",
     "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "Set opp OTP",
-      "wait_pre_setup_otp" : "forhåndsstiller OTP",
-      "confirm_and_enable" : "Bekreft og slå på OTP",
+      "otp": "OTP",
+      "setup_otp": "Set opp OTP",
+      "wait_pre_setup_otp": "forhåndsstiller OTP",
+      "confirm_and_enable": "Bekreft og slå på OTP",
       "title": "To-faktors autentisering",
-      "generate_new_recovery_codes" : "Generer nye gjenopprettingskoder",
-      "warning_of_generate_new_codes" : "Når du genererer nye gjenopprettingskoder, vil de gamle slutte å fungere.",
-      "recovery_codes" : "Gjenopprettingskoder.",
+      "generate_new_recovery_codes": "Generer nye gjenopprettingskoder",
+      "warning_of_generate_new_codes": "Når du genererer nye gjenopprettingskoder, vil de gamle slutte å fungere.",
+      "recovery_codes": "Gjenopprettingskoder.",
       "waiting_a_recovery_codes": "Mottar gjenopprettingskoder...",
-      "recovery_codes_warning" : "Skriv disse kodene ned eller plasser dem ett sikkert sted - ellers så vil du ikke se dem igjen. Dersom du mister tilgang til din to-faktors app og dine gjenopprettingskoder, vil du bli stengt ute av kontoen din.",
-      "authentication_methods" : "Autentiseringsmetoder",
+      "recovery_codes_warning": "Skriv disse kodene ned eller plasser dem ett sikkert sted - ellers så vil du ikke se dem igjen. Dersom du mister tilgang til din to-faktors app og dine gjenopprettingskoder, vil du bli stengt ute av kontoen din.",
+      "authentication_methods": "Autentiseringsmetoder",
       "scan": {
         "title": "Skann",
         "desc": "Ved hjelp av din to-faktors applikasjon, skann denne QR-koden eller skriv inn tekstnøkkelen",
@@ -579,7 +582,7 @@
     "favorite": "Lik",
     "user_settings": "Brukerinnstillinger"
   },
-  "upload":{
+  "upload": {
     "error": {
       "base": "Det oppsto en feil under opplastning.",
       "file_too_big": "Fil for stor [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",

From 0ffb7b67edadc6ab28b66067dc54a79e2712fa2c Mon Sep 17 00:00:00 2001
From: LibertAdmin <libertadmin@liberta.vip>
Date: Thu, 28 Jan 2021 19:41:23 +0000
Subject: [PATCH 064/119] Translated using Weblate (French)

Currently translated at 98.2% (667 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
---
 src/i18n/fr.json | 81 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 9 deletions(-)

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 63ad46d2cd..c2eff8084a 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -280,7 +280,7 @@
     "hide_followers_description": "Ne pas afficher qui est abonné à moi",
     "show_admin_badge": "Afficher le badge d'Administrateur⋅ice sur mon profil",
     "show_moderator_badge": "Afficher le badge de Modérateur⋅ice sur mon profil",
-    "nsfw_clickthrough": "Masquer les images marquées comme contenu adulte ou sensible",
+    "nsfw_clickthrough": "Activer le clic pour dévoiler les pièces jointes et cacher l'aperçu des liens pour les statuts marqués comme sensibles",
     "oauth_tokens": "Jetons OAuth",
     "token": "Jeton",
     "refresh_token": "Rafraichir le jeton",
@@ -409,7 +409,13 @@
         "tabs": "Onglets",
         "toggled": "(Dés)activé",
         "highlight": "Éléments mis en valeur",
-        "popover": "Infobulles, menus"
+        "popover": "Infobulles, menus",
+        "chat": {
+          "border": "Bordure",
+          "outgoing": "Sortant(s)",
+          "incoming": "Entrant(s)"
+        },
+        "wallpaper": "Fond d'écran"
       },
       "radii": {
         "_tab_label": "Rondeur"
@@ -485,7 +491,7 @@
     "notification_visibility_emoji_reactions": "Réactions",
     "hide_follows_count_description": "Masquer le nombre de suivis",
     "useStreamingApiWarning": "(Non recommandé, expérimental, connu pour rater des messages)",
-    "type_domains_to_mute": "Écrire les domaines à masquer",
+    "type_domains_to_mute": "Chercher les domaines à masquer",
     "fun": "Rigolo",
     "greentext": "greentexting",
     "allow_following_move": "Suivre automatiquement quand ce compte migre",
@@ -509,7 +515,21 @@
     "mute_import_error": "Erreur à l'import des masquages",
     "mute_import": "Import des masquages",
     "mute_export_button": "Exporter vos masquages dans un fichier CSV",
-    "mute_export": "Export des masquages"
+    "mute_export": "Export des masquages",
+    "notification_setting_hide_notification_contents": "Cacher l'expéditeur et le contenu des notifications push",
+    "notification_setting_block_from_strangers": "Bloquer les notifications des utilisateur⋅ice⋅s que vous ne suivez pas",
+    "virtual_scrolling": "Optimiser le rendu du fil d'actualité",
+    "reset_background_confirm": "Voulez-vraiment réinitialiser l'arrière-plan ?",
+    "reset_banner_confirm": "Voulez-vraiment réinitialiser la bannière ?",
+    "reset_avatar_confirm": "Voulez-vraiment réinitialiser l'avatar ?",
+    "reset_profile_banner": "Réinitialiser la bannière du profil",
+    "reset_profile_background": "Réinitialiser l'arrière-plan du profil",
+    "reset_avatar": "Réinitialiser l'avatar",
+    "profile_fields": {
+      "value": "Contenu",
+      "name": "Étiquette",
+      "add_field": "Ajouter un champ"
+    }
   },
   "timeline": {
     "collapse": "Fermer",
@@ -521,7 +541,9 @@
     "show_new": "Afficher plus",
     "up_to_date": "À jour",
     "no_more_statuses": "Pas plus de statuts",
-    "no_statuses": "Aucun statuts"
+    "no_statuses": "Aucun statuts",
+    "reload": "Recharger",
+    "error": "Erreur lors de l'affichage du fil d'actualité : {0}"
   },
   "status": {
     "favorites": "Favoris",
@@ -536,7 +558,19 @@
     "mute_conversation": "Masquer la conversation",
     "unmute_conversation": "Démasquer la conversation",
     "status_unavailable": "Status indisponible",
-    "copy_link": "Copier le lien au status"
+    "copy_link": "Copier le lien au status",
+    "expand": "Développer",
+    "nsfw": "Contenu sensible",
+    "status_deleted": "Ce post a été effacé",
+    "hide_content": "Cacher le contenu",
+    "show_content": "Montrer le contenu",
+    "hide_full_subject": "Cacher le sujet",
+    "show_full_subject": "Montrer le sujet en entier",
+    "thread_muted_and_words": ", contient les mots :",
+    "thread_muted": "Fil de discussion masqué",
+    "external_source": "Source externe",
+    "unbookmark": "Supprimer des favoris",
+    "bookmark": "Ajouter aux favoris"
   },
   "user_card": {
     "approve": "Accepter",
@@ -591,7 +625,12 @@
     "subscribe": "Abonner",
     "unsubscribe": "Désabonner",
     "hide_repeats": "Cacher les partages",
-    "show_repeats": "Montrer les partages"
+    "show_repeats": "Montrer les partages",
+    "roles": {
+      "moderator": "Modérateur⋅ice",
+      "admin": "Administrateur⋅ice"
+    },
+    "message": "Message"
   },
   "user_profile": {
     "timeline_title": "Journal de l'utilisateur⋅ice",
@@ -619,13 +658,15 @@
     "user_settings": "Paramètres utilisateur",
     "add_reaction": "Ajouter une réaction",
     "accept_follow_request": "Accepter la demande de suivit",
-    "reject_follow_request": "Rejeter la demande de suivit"
+    "reject_follow_request": "Rejeter la demande de suivit",
+    "bookmark": "Favori"
   },
   "upload": {
     "error": {
       "base": "L'envoi a échoué.",
       "file_too_big": "Fichier trop gros [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Réessayez plus tard"
+      "default": "Réessayez plus tard",
+      "message": "Envoi échoué : {0}"
     },
     "file_size_units": {
       "B": "O",
@@ -759,5 +800,27 @@
   },
   "shoutbox": {
     "title": "Shoutbox"
+  },
+  "display_date": {
+    "today": "Aujourd'hui"
+  },
+  "file_type": {
+    "file": "Fichier",
+    "image": "Image",
+    "video": "Vidéo",
+    "audio": "Audio"
+  },
+  "chats": {
+    "empty_chat_list_placeholder": "Vous n'avez pas encore de discussions. Démarrez-en une nouvelle !",
+    "error_sending_message": "Quelque chose s'est mal passé pendant l'envoi du message.",
+    "error_loading_chat": "Quelque chose s'est mal passé au chargement de la discussion.",
+    "delete_confirm": "Voulez-vous vraiment effacer ce message ?",
+    "more": "Plus",
+    "empty_message_error": "Impossible d'envoyer un message vide",
+    "new": "Nouvelle discussion",
+    "chats": "Discussions",
+    "delete": "Effacer",
+    "message_user": "Message à {nickname}",
+    "you": "Vous :"
   }
 }

From 63317a2fdfc8e7a68ffcf58c8d2a55dcba3c6b27 Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Thu, 28 Jan 2021 13:16:50 +0000
Subject: [PATCH 065/119] Translated using Weblate (Chinese (Traditional))

Currently translated at 99.2% (674 of 679 strings)

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

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index a8d0dc3c90..aba0cbb78e 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -216,7 +216,8 @@
           "incoming": "收到",
           "outgoing": "發出",
           "border": "邊框"
-        }
+        },
+        "wallpaper": "桌布"
       },
       "preview": {
         "header_faint": "這很正常",
@@ -572,16 +573,19 @@
     "thread_muted_and_words": ",有这些字:",
     "hide_full_subject": "隱藏完整標題",
     "show_content": "顯示內容",
-    "hide_content": "隱藏內容"
+    "hide_content": "隱藏內容",
+    "status_deleted": "",
+    "expand": "展开",
+    "external_source": "外部來源"
   },
   "time": {
-    "hours": "{0} 小時",
+    "hours": "{0} 時",
     "days_short": "{0}天",
     "day_short": "{0}天",
     "days": "{0} 天",
-    "hour": "{0} 小时",
-    "hour_short": "{0}h",
-    "hours_short": "{0}h",
+    "hour": "{0} 時",
+    "hour_short": "{0}時",
+    "hours_short": "{0}時",
     "years_short": "{0} y",
     "now": "剛剛",
     "day": "{0} 天",
@@ -655,7 +659,8 @@
     "reload": "重新載入",
     "up_to_date": "已是最新",
     "no_more_statuses": "没有更多發文",
-    "no_statuses": "没有發文"
+    "no_statuses": "没有發文",
+    "error": "取得時間線時發生錯誤：{0}"
   },
   "interactions": {
     "load_older": "載入更早的互動",
@@ -788,7 +793,8 @@
     "error": {
       "base": "上傳失敗。",
       "file_too_big": "文件太大[{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
-      "default": "稍後再試"
+      "default": "稍後再試",
+      "message": "上傳錯誤：{0}"
     }
   },
   "search": {

From 0a3f40eebb5338a2159ced8a017388660db77244 Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Sat, 30 Jan 2021 03:10:11 +0000
Subject: [PATCH 066/119] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (679 of 679 strings)

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

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index aba0cbb78e..e8be628f60 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -54,7 +54,7 @@
     "mentions": "提及",
     "friend_requests": "關注請求",
     "back": "後退",
-    "administration": "管理",
+    "administration": "管理員",
     "about": "關於"
   },
   "media_modal": {
@@ -413,7 +413,7 @@
     "hide_follows_description": "不要顯示我所關注的人",
     "hide_followers_description": "不要顯示關注我的人",
     "hide_follows_count_description": "不顯示關注數",
-    "nsfw_clickthrough": "將敏感附件隱藏，點擊才能打開",
+    "nsfw_clickthrough": "將敏感附件和鏈接隱藏，點擊才能打開",
     "valid_until": "有效期至",
     "panelRadius": "面板",
     "pause_on_unfocused": "在離開頁面時暫停時間線推送",
@@ -574,9 +574,10 @@
     "hide_full_subject": "隱藏完整標題",
     "show_content": "顯示內容",
     "hide_content": "隱藏內容",
-    "status_deleted": "",
+    "status_deleted": "該帖已被刪除",
     "expand": "展开",
-    "external_source": "外部來源"
+    "external_source": "外部來源",
+    "nsfw": "工作不安全"
   },
   "time": {
     "hours": "{0} 時",
@@ -751,7 +752,11 @@
     "unmute": "取消靜音",
     "unmute_progress": "取消靜音中…",
     "hide_repeats": "隱藏轉發",
-    "show_repeats": "顯示轉發"
+    "show_repeats": "顯示轉發",
+    "roles": {
+      "moderator": "主持人",
+      "admin": "管理員"
+    }
   },
   "user_profile": {
     "timeline_title": "用戶時間線",

From 4c845a1a994a5affc17f45650dd78af92b00ca9a Mon Sep 17 00:00:00 2001
From: Snow <build-a-website@protonmail.com>
Date: Sun, 31 Jan 2021 07:01:23 +0000
Subject: [PATCH 067/119] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (679 of 679 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index e8be628f60..b7b6d7acef 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -25,7 +25,7 @@
     "add_poll": "增加投票"
   },
   "notifications": {
-    "reacted_with": "和 {0} 互動過",
+    "reacted_with": "作出了 {0} 的反應",
     "migrated_to": "遷移到",
     "no_more_notifications": "沒有更多的通知",
     "repeated_you": "轉發了你的發文",

From 11081c287023abb1161530548fa35d66a6063c06 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Wed, 3 Feb 2021 08:25:41 +0000
Subject: [PATCH 068/119] Translated using Weblate (Italian)

Currently translated at 100.0% (680 of 680 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index b7d21e7ed9..a598677773 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -417,7 +417,8 @@
     "mute_import": "Importa silenziati",
     "mute_export_button": "Esporta la tua lista di silenziati in un file CSV",
     "mute_export": "Esporta silenziati",
-    "hide_wallpaper": "Nascondi sfondo della stanza"
+    "hide_wallpaper": "Nascondi sfondo della stanza",
+    "setting_changed": "Valore personalizzato"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",

From 21e2b3ce0e006845904c484a8d2810bb5cdd5510 Mon Sep 17 00:00:00 2001
From: tarteka <info@tarteka.net>
Date: Sat, 6 Feb 2021 23:52:33 +0000
Subject: [PATCH 069/119] Translated using Weblate (Spanish)

Currently translated at 100.0% (680 of 680 strings)

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

diff --git a/src/i18n/es.json b/src/i18n/es.json
index f4d87eb3e5..0ee67ed423 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -562,7 +562,8 @@
     "mute_import": "Importar silenciados",
     "mute_export_button": "Exportar los silenciados a un archivo csv",
     "mute_export": "Exportar silenciados",
-    "hide_wallpaper": "Ocultar el fondo de pantalla de la instancia"
+    "hide_wallpaper": "Ocultar el fondo de pantalla de la instancia",
+    "setting_changed": "La configuración es diferente a la predeterminada"
   },
   "time": {
     "day": "{0} día",
@@ -693,7 +694,11 @@
     "show_repeats": "Mostrar repetidos",
     "hide_repeats": "Ocultar repetidos",
     "message": "Mensaje",
-    "hidden": "Oculto"
+    "hidden": "Oculto",
+    "roles": {
+      "moderator": "Moderador",
+      "admin": "Administrador"
+    }
   },
   "user_profile": {
     "timeline_title": "Linea Temporal del Usuario",

From 586c538aa09c140b706c6a33cfc4b8bc1f67bed7 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Tue, 9 Feb 2021 01:36:08 +0000
Subject: [PATCH 070/119] Translated using Weblate (Japanese)

Currently translated at 98.0% (667 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 259 ++++++++++++++++++++++++++++++++------
 1 file changed, 223 insertions(+), 36 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index e2de10669d..f3683bfa03 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -13,7 +13,9 @@
     "scope_options": "公開範囲選択",
     "text_limit": "文字の数",
     "title": "有効な機能",
-    "who_to_follow": "おすすめユーザー"
+    "who_to_follow": "おすすめユーザー",
+    "upload_limit": "ファイルサイズの上限",
+    "pleroma_chat_messages": "Pleroma チャット"
   },
   "finder": {
     "error_fetching_user": "ユーザー検索がエラーになりました。",
@@ -31,7 +33,13 @@
     "disable": "無効",
     "enable": "有効",
     "confirm": "確認",
-    "verify": "検査"
+    "verify": "検査",
+    "peek": "隠す",
+    "close": "閉じる",
+    "dismiss": "無視",
+    "retry": "もう一度お試し下さい",
+    "error_retry": "もう一度お試し下さい",
+    "loading": "読み込み中…"
   },
   "image_cropper": {
     "crop_picture": "画像を切り抜く",
@@ -57,9 +65,9 @@
     "enter_recovery_code": "リカバリーコードを入力してください",
     "enter_two_factor_code": "2段階認証コードを入力してください",
     "recovery_code": "リカバリーコード",
-    "heading" : {
-      "totp" : "2段階認証",
-      "recovery" : "2段階リカバリー"
+    "heading": {
+      "totp": "2段階認証",
+      "recovery": "2段階リカバリー"
     }
   },
   "media_modal": {
@@ -76,11 +84,14 @@
     "dms": "ダイレクトメッセージ",
     "public_tl": "パブリックタイムライン",
     "timeline": "タイムライン",
-    "twkn": "接続しているすべてのネットワーク",
+    "twkn": "すべてのネットワーク",
     "user_search": "ユーザーを探す",
     "search": "検索",
     "who_to_follow": "おすすめユーザー",
-    "preferences": "設定"
+    "preferences": "設定",
+    "administration": "管理",
+    "bookmarks": "ブックマーク",
+    "timelines": "タイムライン"
   },
   "notifications": {
     "broken_favorite": "ステータスが見つかりません。探しています...",
@@ -90,7 +101,11 @@
     "notifications": "通知",
     "read": "読んだ！",
     "repeated_you": "あなたのステータスがリピートされました",
-    "no_more_notifications": "通知はありません"
+    "no_more_notifications": "通知はありません",
+    "reacted_with": "{0} でリアクションしました",
+    "migrated_to": "インスタンスを引っ越しました",
+    "follow_request": "フォローを申請しました",
+    "error": "通知の取得に失敗しました: {0}"
   },
   "polls": {
     "add_poll": "投票を追加",
@@ -113,7 +128,9 @@
     "search_emoji": "絵文字を検索",
     "add_emoji": "絵文字を挿入",
     "custom": "カスタム絵文字",
-    "unicode": "Unicode絵文字"
+    "unicode": "Unicode絵文字",
+    "load_all": "全 {emojiAmount} 絵文字を読み込む",
+    "load_all_hint": "最初の {saneAmount} 絵文字を読み込みました、全て読み込むと重くなる可能性があります。"
   },
   "stickers": {
     "add_sticker": "ステッカーを追加"
@@ -121,7 +138,8 @@
   "interactions": {
     "favs_repeats": "リピートとお気に入り",
     "follows": "新しいフォロワー",
-    "load_older": "古いインタラクションを見る"
+    "load_older": "古いインタラクションを見る",
+    "moves": "ユーザーの引っ越し"
   },
   "post_status": {
     "new_status": "投稿する",
@@ -147,10 +165,15 @@
     },
     "scope": {
       "direct": "ダイレクト: メンションされたユーザーのみに届きます。",
-      "private": "フォロワーげんてい: フォロワーのみに届きます。",
+      "private": "フォロワー限定: フォロワーのみに届きます。",
       "public": "パブリック: パブリックタイムラインに届きます。",
       "unlisted": "アンリステッド: パブリックタイムラインに届きません。"
-    }
+    },
+    "media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
+    "empty_status_error": "投稿内容を入力してください",
+    "preview_empty": "何もありません",
+    "preview": "プレビュー",
+    "media_description": "メディアの説明"
   },
   "registration": {
     "bio": "プロフィール",
@@ -181,17 +204,17 @@
     "security": "セキュリティ",
     "enter_current_password_to_confirm": "あなたのアイデンティティを証明するため、現在のパスワードを入力してください",
     "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "OTPのセットアップ",
-      "wait_pre_setup_otp" : "OTPのプリセット",
-      "confirm_and_enable" : "OTPの確認と有効化",
+      "otp": "OTP",
+      "setup_otp": "OTPのセットアップ",
+      "wait_pre_setup_otp": "OTPのプリセット",
+      "confirm_and_enable": "OTPの確認と有効化",
       "title": "2段階認証",
-      "generate_new_recovery_codes" : "新しいリカバリーコードを生成",
-      "warning_of_generate_new_codes" : "新しいリカバリーコードを生成すると、古いコードは使用できなくなります。",
-      "recovery_codes" : "リカバリーコード。",
-      "waiting_a_recovery_codes": "バックアップコードを受信しています...",
-      "recovery_codes_warning" : "コードを紙に書くか、安全な場所に保存してください。そうでなければ、あなたはコードを再び見ることはできません。もし2段階認証アプリのアクセスを喪失し、なおかつ、リカバリーコードもないならば、あなたは自分のアカウントから閉め出されます。",
-      "authentication_methods" : "認証方法",
+      "generate_new_recovery_codes": "新しいリカバリーコードを生成",
+      "warning_of_generate_new_codes": "新しいリカバリーコードを生成すると、古いコードは使用できなくなります。",
+      "recovery_codes": "リカバリーコード。",
+      "waiting_a_recovery_codes": "バックアップコードを受信しています…",
+      "recovery_codes_warning": "コードを紙に書くか、安全な場所に保存してください。そうでなければ、あなたはコードを再び見ることはできません。もし2段階認証アプリのアクセスを喪失し、なおかつ、リカバリーコードもないならば、あなたは自分のアカウントから閉め出されます。",
+      "authentication_methods": "認証方法",
       "scan": {
         "title": "スキャン",
         "desc": "あなたの2段階認証アプリを使って、このQRコードをスキャンするか、テキストキーを入力してください:",
@@ -231,7 +254,7 @@
     "data_import_export_tab": "インポートとエクスポート",
     "default_vis": "デフォルトの公開範囲",
     "delete_account": "アカウントを消す",
-    "delete_account_description": "あなたのアカウントとメッセージが、消えます。",
+    "delete_account_description": "あなたのデータが消えて、アカウントが使えなくなります。",
     "delete_account_error": "アカウントを消すことが、できなかったかもしれません。インスタンスの管理者に、連絡してください。",
     "delete_account_instructions": "本当にアカウントを消してもいいなら、パスワードを入力してください。",
     "discoverable": "検索などのサービスでこのアカウントを見つけることを許可する",
@@ -305,7 +328,7 @@
     "profile_background": "プロフィールのバックグラウンド",
     "profile_banner": "プロフィールバナー",
     "profile_tab": "プロフィール",
-    "radii_help": "インターフェースの丸さを設定する。",
+    "radii_help": "インターフェースの丸さを設定する",
     "replies_in_timeline": "タイムラインのリプライ",
     "reply_visibility_all": "すべてのリプライを見る",
     "reply_visibility_following": "私に宛てられたリプライと、フォローしている人からのリプライを見る",
@@ -356,7 +379,20 @@
         "save_load_hint": "「残す」オプションをONにすると、テーマを選んだときとロードしたとき、現在の設定を残します。また、テーマをエクスポートするとき、これらのオプションを維持します。すべてのチェックボックスをOFFにすると、テーマをエクスポートしたとき、すべての設定を保存します。",
         "reset": "リセット",
         "clear_all": "すべてクリア",
-        "clear_opacity": "透明度をクリア"
+        "clear_opacity": "透明度をクリア",
+        "help": {
+          "snapshot_missing": "テーマのスナップショットがありません。思っていた見た目と違うかもしれません。",
+          "migration_snapshot_ok": "念のために、テーマのスナップショットが読み込まれました。テーマのデータを読み込むことができます。",
+          "fe_downgraded": "フロントエンドが前のバージョンに戻りました。",
+          "fe_upgraded": "フロントエンドと一緒に、テーマエンジンが新しくなりました。",
+          "older_version_imported": "古いフロントエンドで作られたファイルをインポートしました。",
+          "future_version_imported": "新しいフロントエンドで作られたファイルをインポートしました。",
+          "v2_imported": "古いフロントエンドのためのファイルをインポートしました。設定した通りにならないかもしれません。",
+          "upgraded_from_v2": "フロントエンドが新しくなったので、今までの見た目と少し違うかもしれません。"
+        },
+        "use_source": "新しいバージョン",
+        "use_snapshot": "古いバージョン",
+        "load_theme": "テーマの読み込み"
       },
       "common": {
         "color": "色",
@@ -391,7 +427,27 @@
         "borders": "境界",
         "buttons": "ボタン",
         "inputs": "インプットフィールド",
-        "faint_text": "薄いテキスト"
+        "faint_text": "薄いテキスト",
+        "alert_neutral": "それ以外",
+        "chat": {
+          "border": "境界線",
+          "outgoing": "送信",
+          "incoming": "受信"
+        },
+        "tabs": "タブ",
+        "toggled": "切り替えたとき",
+        "disabled": "無効なとき",
+        "selectedMenu": "選択されたメニューアイテム",
+        "selectedPost": "選択された投稿",
+        "pressed": "押したとき",
+        "highlight": "強調された要素",
+        "icons": "アイコン",
+        "poll": "投票グラフ",
+        "wallpaper": "壁紙",
+        "underlay": "アンダーレイ",
+        "popover": "ツールチップ、メニュー、ポップオーバー",
+        "post": "投稿／プロフィール",
+        "alert_warning": "警告"
       },
       "radii": {
         "_tab_label": "丸さ"
@@ -459,7 +515,50 @@
       "title": "バージョン",
       "backend_version": "バックエンドのバージョン",
       "frontend_version": "フロントエンドのバージョン"
-    }
+    },
+    "notification_setting_hide_notification_contents": "送った人と内容を、プッシュ通知に表示しない",
+    "notification_setting_privacy": "プライバシー",
+    "notification_setting_block_from_strangers": "フォローしていないユーザーからの通知を拒否する",
+    "notification_setting_filters": "フィルター",
+    "fun": "お楽しみ",
+    "virtual_scrolling": "タイムラインの描画を最適化する",
+    "type_domains_to_mute": "ミュートしたいドメインを検索",
+    "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）",
+    "useStreamingApi": "投稿と通知を、すぐに受け取る",
+    "user_mutes": "ユーザー",
+    "reset_background_confirm": "本当にバックグラウンドを初期化しますか？",
+    "reset_banner_confirm": "本当にバナーを初期化しますか？",
+    "reset_avatar_confirm": "本当にアバターを初期化しますか？",
+    "hide_wallpaper": "インスタンスのバックグラウンドを隠す",
+    "reset_profile_background": "プロフィールのバックグラウンドを初期化",
+    "reset_profile_banner": "プロフィールのバナーを初期化",
+    "reset_avatar": "アバターを初期化",
+    "notification_visibility_emoji_reactions": "リアクション",
+    "notification_visibility_moves": "ユーザーの引っ越し",
+    "new_email": "新しいメールアドレス",
+    "profile_fields": {
+      "value": "内容",
+      "name": "ラベル",
+      "add_field": "枠を追加",
+      "label": "プロフィール補足情報"
+    },
+    "accent": "アクセント",
+    "mutes_imported": "ミュートをインポートしました！少し時間がかかるかもしれません。",
+    "emoji_reactions_on_timeline": "絵文字リアクションをタイムラインに表示",
+    "domain_mutes": "ドメイン",
+    "mutes_and_blocks": "ミュートとブロック",
+    "chatMessageRadius": "チャットメッセージ",
+    "change_email_error": "メールアドレスを変えることが、できなかったかもしれません。",
+    "changed_email": "メールアドレスが、変わりました！",
+    "change_email": "メールアドレスを変える",
+    "bot": "これは bot アカウントです",
+    "mute_export_button": "ミュートをCSVファイルにエクスポートする",
+    "import_mutes_from_a_csv_file": "CSVファイルからミュートをインポートする",
+    "mute_import_error": "ミュートのインポートに失敗しました",
+    "mute_import": "ミュートのインポート",
+    "mute_export": "ミュートのエクスポート",
+    "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
+    "setting_changed": "規定の設定と異なっています"
   },
   "time": {
     "day": "{0}日",
@@ -505,7 +604,9 @@
     "show_new": "読み込み",
     "up_to_date": "最新",
     "no_more_statuses": "これで終わりです",
-    "no_statuses": "ステータスはありません"
+    "no_statuses": "ステータスはありません",
+    "reload": "再読み込み",
+    "error": "タイムラインの読み込みに失敗しました: {0}"
   },
   "status": {
     "favorites": "お気に入り",
@@ -518,7 +619,21 @@
     "reply_to": "返信",
     "replies_list": "返信:",
     "mute_conversation": "スレッドをミュート",
-    "unmute_conversation": "スレッドのミュートを解除"
+    "unmute_conversation": "スレッドのミュートを解除",
+    "nsfw": "閲覧注意",
+    "expand": "広げる",
+    "status_deleted": "この投稿は削除されました",
+    "hide_content": "隠す",
+    "show_content": "見る",
+    "hide_full_subject": "隠す",
+    "show_full_subject": "全部見る",
+    "thread_muted_and_words": "以下の単語を含むため:",
+    "thread_muted": "ミュートされたスレッド",
+    "external_source": "外部ソース",
+    "copy_link": "リンクをコピー",
+    "status_unavailable": "利用できません",
+    "unbookmark": "ブックマーク解除",
+    "bookmark": "ブックマーク"
   },
   "user_card": {
     "approve": "受け入れ",
@@ -570,7 +685,15 @@
       "quarantine": "他のインスタンスからの投稿を止める",
       "delete_user": "ユーザーを削除",
       "delete_user_confirmation": "あなたの精神状態に何か問題はございませんか？ この操作を取り消すことはできません。"
-    }
+    },
+    "roles": {
+      "moderator": "モデレーター",
+      "admin": "管理者"
+    },
+    "show_repeats": "リピートを見る",
+    "hide_repeats": "リピートを隠す",
+    "message": "メッセージ",
+    "hidden": "隠す"
   },
   "user_profile": {
     "timeline_title": "ユーザータイムライン",
@@ -595,13 +718,18 @@
     "repeat": "リピート",
     "reply": "返信",
     "favorite": "お気に入り",
-    "user_settings": "ユーザー設定"
+    "user_settings": "ユーザー設定",
+    "bookmark": "ブックマーク",
+    "reject_follow_request": "フォローリクエストを拒否",
+    "accept_follow_request": "フォローリクエストを許可",
+    "add_reaction": "リアクションを追加"
   },
-  "upload":{
+  "upload": {
     "error": {
-    "base": "アップロードに失敗しました。",
-    "file_too_big": "ファイルが大きすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
-    "default": "しばらくしてから試してください"
+      "base": "アップロードに失敗しました。",
+      "file_too_big": "ファイルが大きすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
+      "default": "しばらくしてから試してください",
+      "message": "アップロードに失敗: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -626,6 +754,65 @@
     "check_email": "パスワードをリセットするためのリンクが記載されたメールが届いているか確認してください。",
     "return_home": "ホームページに戻る",
     "too_many_requests": "試行回数の制限に達しました。しばらく時間を置いてから再試行してください。",
-    "password_reset_disabled": "このインスタンスではパスワードリセットは無効になっています。インスタンスの管理者に連絡してください。"
+    "password_reset_disabled": "このインスタンスではパスワードリセットは無効になっています。インスタンスの管理者に連絡してください。",
+    "password_reset_required_but_mailer_is_disabled": "パスワードの初期化が必要ですが、初期化は使えません。インスタンスの管理者に連絡してください。",
+    "password_reset_required": "ログインするためにパスワードを初期化してください。"
+  },
+  "about": {
+    "mrf": {
+      "mrf_policies_desc": "MRFポリシーは、インスタンスの振る舞いを操作します。以下のポリシーが有効になっています:",
+      "federation": "連合",
+      "simple": {
+        "media_nsfw_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを閲覧注意に設定します:",
+        "media_nsfw": "メディアを閲覧注意に設定",
+        "media_removal_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを除去します:",
+        "media_removal": "メディア除去",
+        "ftl_removal": "「接続しているすべてのネットワーク」タイムラインから除外",
+        "ftl_removal_desc": "このインスタンスでは、以下のインスタンスを「接続しているすべてのネットワーク」タイムラインから除外します:",
+        "quarantine_desc": "このインスタンスでは、以下のインスタンスに対して公開投稿のみを送信します:",
+        "quarantine": "検疫",
+        "reject_desc": "このインスタンスでは、以下のインスタンスからのメッセージを受け付けません:",
+        "accept_desc": "このインスタンスでは、以下のインスタンスからのメッセージのみを受け付けます:",
+        "accept": "許可",
+        "simple_policies": "インスタンス固有のポリシー"
+      },
+      "mrf_policies": "有効なMRFポリシー",
+      "keyword": {
+        "replace": "置き換え",
+        "ftl_removal": "「接続しているすべてのネットワーク」タイムラインから除外",
+        "keyword_policies": "キーワードポリシー"
+      }
+    }
+  },
+  "display_date": {
+    "today": "今日"
+  },
+  "file_type": {
+    "file": "ファイル",
+    "image": "画像",
+    "video": "ビデオ",
+    "audio": "オーディオ"
+  },
+  "remote_user_resolver": {
+    "error": "見つかりませんでした。"
+  },
+  "errors": {
+    "storage_unavailable": "ブラウザのストレージに接続できなかったため、ログインや設定情報は保存されません。Cookieを有効にしてください。"
+  },
+  "shoutbox": {
+    "title": "Shoutbox"
+  },
+  "chats": {
+    "empty_chat_list_placeholder": "チャットはありません。新規チャットのボタンを押して始めましょう！",
+    "error_sending_message": "メッセージの送信に失敗しました。",
+    "error_loading_chat": "チャットの読み込みに失敗しました。",
+    "delete_confirm": "このメッセージを本当に消してもいいですか？",
+    "more": "もっと見る",
+    "empty_message_error": "メッセージを入力して下さい",
+    "new": "新規チャット",
+    "chats": "チャット一覧",
+    "delete": "削除",
+    "message_user": "{nickname} にメッセージ",
+    "you": "あなた:"
   }
 }

From e85fa160c7812adfeb9c6c9110ea88c2434b36d0 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Tue, 9 Feb 2021 01:53:24 +0000
Subject: [PATCH 071/119] Translated using Weblate (Japanese)

Currently translated at 98.0% (667 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index f3683bfa03..fb0277bfe9 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -91,7 +91,8 @@
     "preferences": "設定",
     "administration": "管理",
     "bookmarks": "ブックマーク",
-    "timelines": "タイムライン"
+    "timelines": "タイムライン",
+    "chats": "チャット"
   },
   "notifications": {
     "broken_favorite": "ステータスが見つかりません。探しています...",
@@ -774,15 +775,19 @@
         "reject_desc": "このインスタンスでは、以下のインスタンスからのメッセージを受け付けません:",
         "accept_desc": "このインスタンスでは、以下のインスタンスからのメッセージのみを受け付けます:",
         "accept": "許可",
-        "simple_policies": "インスタンス固有のポリシー"
+        "simple_policies": "インスタンス固有のポリシー",
+        "reject": "拒否"
       },
       "mrf_policies": "有効なMRFポリシー",
       "keyword": {
         "replace": "置き換え",
         "ftl_removal": "「接続しているすべてのネットワーク」タイムラインから除外",
-        "keyword_policies": "キーワードポリシー"
+        "keyword_policies": "キーワードポリシー",
+        "is_replaced_by": "→",
+        "reject": "拒否"
       }
-    }
+    },
+    "staff": "スタッフ"
   },
   "display_date": {
     "today": "今日"
@@ -814,5 +819,11 @@
     "delete": "削除",
     "message_user": "{nickname} にメッセージ",
     "you": "あなた:"
+  },
+  "domain_mute_card": {
+    "unmute_progress": "ミュート解除中…",
+    "unmute": "ミュート解除",
+    "mute_progress": "ミュート中…",
+    "mute": "ミュート"
   }
 }

From cccdda3a7bca60222212f6e5e0665c80b7b27fb4 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Tue, 9 Feb 2021 04:15:08 +0000
Subject: [PATCH 072/119] Translated using Weblate (Japanese)

Currently translated at 98.8% (672 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index fb0277bfe9..c28c9c9210 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -18,7 +18,7 @@
     "pleroma_chat_messages": "Pleroma チャット"
   },
   "finder": {
-    "error_fetching_user": "ユーザー検索がエラーになりました。",
+    "error_fetching_user": "ユーザー検索がエラーになりました",
     "find_user": "ユーザーを探す"
   },
   "general": {
@@ -95,7 +95,7 @@
     "chats": "チャット"
   },
   "notifications": {
-    "broken_favorite": "ステータスが見つかりません。探しています...",
+    "broken_favorite": "ステータスが見つかりません。探しています…",
     "favorited_you": "あなたのステータスがお気に入りされました",
     "followed_you": "フォローされました",
     "load_older": "古い通知をみる",
@@ -268,7 +268,7 @@
     "follow_export_button": "エクスポート",
     "follow_export_processing": "お待ちください。まもなくファイルをダウンロードできます。",
     "follow_import": "フォローのインポート",
-    "follow_import_error": "フォローのインポートがエラーになりました。",
+    "follow_import_error": "フォローのインポートがエラーになりました",
     "follows_imported": "フォローがインポートされました！ 少し時間がかかるかもしれません。",
     "foreground": "フォアグラウンド",
     "general": "全般",
@@ -356,7 +356,7 @@
     "streaming": "上までスクロールしたとき、自動的にストリーミングする",
     "text": "文字",
     "theme": "テーマ",
-    "theme_help": "カラーテーマをカスタマイズできます",
+    "theme_help": "カラーテーマをカスタマイズできます。",
     "theme_help_v2_1": "チェックボックスをONにすると、コンポーネントごとに、色と透明度をオーバーライドできます。「すべてクリア」ボタンを押すと、すべてのオーバーライドをやめます。",
     "theme_help_v2_2": "バックグラウンドとテキストのコントラストを表すアイコンがあります。マウスをホバーすると、詳しい説明が出ます。透明な色を使っているときは、最悪の場合のコントラストが示されます。",
     "tooltipRadius": "ツールチップとアラート",
@@ -402,8 +402,8 @@
           "hint": "コントラストは {ratio} です。{level}。({context})",
           "level": {
             "aa": "AAレベルガイドライン (ミニマル) を満たします",
-            "aaa": "AAAレベルガイドライン (レコメンデッド) を満たします。",
-            "bad": "ガイドラインを満たしません。"
+            "aaa": "AAAレベルガイドライン (レコメンデッド) を満たします",
+            "bad": "ガイドラインを満たしません"
           },
           "context": {
             "18pt": "大きい (18ポイント以上) テキスト",
@@ -467,7 +467,7 @@
           "drop_shadow_syntax": "{0} は、{1} パラメーターと {2} キーワードをサポートしていません。",
           "avatar_inset": "内側の影と外側の影を同時に使うと、透明なアバターの表示が乱れます。",
           "spread_zero": "広がりが 0 よりも大きな影は、0 と同じです。",
-          "inset_classic": "内側の影は {0} を使います。"
+          "inset_classic": "内側の影は {0} を使います"
         },
         "components": {
           "panel": "パネル",
@@ -502,7 +502,7 @@
         "content": "本文",
         "error": "エラーの例",
         "button": "ボタン",
-        "text": "これは{0}と{1}の例です。",
+        "text": "これは{0}と{1}の例です",
         "mono": "monospace",
         "input": "羽田空港に着きました。",
         "faint_link": "とても助けになるマニュアル",
@@ -655,7 +655,7 @@
     "media": "メディア",
     "mention": "メンション",
     "mute": "ミュート",
-    "muted": "ミュートしています！",
+    "muted": "ミュートしています",
     "per_day": "/日",
     "remote_follow": "リモートフォロー",
     "report": "通報",
@@ -663,11 +663,11 @@
     "subscribe": "購読",
     "unsubscribe": "購読を解除",
     "unblock": "ブロック解除",
-    "unblock_progress": "ブロックを解除しています...",
-    "block_progress": "ブロックしています...",
+    "unblock_progress": "ブロックを解除しています…",
+    "block_progress": "ブロックしています…",
     "unmute": "ミュート解除",
-    "unmute_progress": "ミュートを解除しています...",
-    "mute_progress": "ミュートしています...",
+    "unmute_progress": "ミュートを解除しています…",
+    "mute_progress": "ミュートしています…",
     "admin_menu": {
       "moderation": "モデレーション",
       "grant_admin": "管理者権限を付与",

From a848462f1970410eda223561cb1059d78686d697 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Tue, 9 Feb 2021 04:19:33 +0000
Subject: [PATCH 073/119] Translated using Weblate (Japanese)

Currently translated at 98.8% (672 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index c28c9c9210..936ce7daee 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -105,7 +105,7 @@
     "no_more_notifications": "通知はありません",
     "reacted_with": "{0} でリアクションしました",
     "migrated_to": "インスタンスを引っ越しました",
-    "follow_request": "フォローを申請しました",
+    "follow_request": "あなたをフォローしたいです",
     "error": "通知の取得に失敗しました: {0}"
   },
   "polls": {

From 0dc6937bf8b00447e07b1381527f62d7b9c96e7e Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Wed, 10 Feb 2021 02:29:27 +0000
Subject: [PATCH 074/119] Translated using Weblate (Korean)

Currently translated at 57.3% (390 of 680 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
---
 src/i18n/ko.json | 170 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 150 insertions(+), 20 deletions(-)

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 0968949b39..101ef487ec 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -9,7 +9,9 @@
     "scope_options": "범위 옵션",
     "text_limit": "텍스트 제한",
     "title": "기능",
-    "who_to_follow": "팔로우 추천"
+    "who_to_follow": "팔로우 추천",
+    "upload_limit": "최대 파일용량",
+    "pleroma_chat_messages": "Pleroma 채트"
   },
   "finder": {
     "error_fetching_user": "사용자 정보 불러오기 실패",
@@ -17,7 +19,23 @@
   },
   "general": {
     "apply": "적용",
-    "submit": "보내기"
+    "submit": "보내기",
+    "loading": "로딩중…",
+    "peek": "숨기기",
+    "close": "닫기",
+    "verify": "검사",
+    "confirm": "확인",
+    "enable": "유효",
+    "disable": "무효",
+    "cancel": "취소",
+    "dismiss": "무시",
+    "show_less": "접기",
+    "show_more": "더 보기",
+    "optional": "필수 아님",
+    "retry": "다시 시도하십시오",
+    "error_retry": "다시 시도하십시오",
+    "generic_error": "잘못되었습니다",
+    "more": "더 보기"
   },
   "login": {
     "login": "로그인",
@@ -26,10 +44,19 @@
     "password": "암호",
     "placeholder": "예시: lain",
     "register": "가입",
-    "username": "사용자 이름"
+    "username": "사용자 이름",
+    "heading": {
+      "recovery": "2단계 복구",
+      "totp": "2단계인증"
+    },
+    "recovery_code": "복구 코드",
+    "enter_two_factor_code": "2단계인증 코드를 입력하십시오",
+    "enter_recovery_code": "복구 코드를 입력하십시오",
+    "authentication_code": "인증 코드",
+    "hint": "로그인하여 대화에 참가합시다"
   },
   "nav": {
-    "about": "About",
+    "about": "인스턴스 소개",
     "back": "뒤로",
     "chat": "로컬 챗",
     "friend_requests": "팔로우 요청",
@@ -37,18 +64,28 @@
     "dms": "다이렉트 메시지",
     "public_tl": "공개 타임라인",
     "timeline": "타임라인",
-    "twkn": "모든 알려진 네트워크",
+    "twkn": "알려진 네트워크",
     "user_search": "사용자 검색",
-    "preferences": "환경설정"
+    "preferences": "환경설정",
+    "chats": "채트",
+    "timelines": "타임라인",
+    "who_to_follow": "추천된 사용자",
+    "search": "검색",
+    "bookmarks": "북마크",
+    "interactions": "대화",
+    "administration": "관리"
   },
   "notifications": {
-    "broken_favorite": "알 수 없는 게시물입니다, 검색 합니다...",
+    "broken_favorite": "알 수 없는 게시물입니다, 검색합니다…",
     "favorited_you": "당신의 게시물을 즐겨찾기",
     "followed_you": "당신을 팔로우",
     "load_older": "오래 된 알림 불러오기",
     "notifications": "알림",
     "read": "읽음!",
-    "repeated_you": "당신의 게시물을 리핏"
+    "repeated_you": "당신의 게시물을 리핏",
+    "no_more_notifications": "알림이 없습니다",
+    "migrated_to": "이사했습니다",
+    "reacted_with": "{0} 로 반응했습니다"
   },
   "post_status": {
     "new_status": "새 게시물 게시",
@@ -59,7 +96,7 @@
       "text/plain": "평문"
     },
     "content_warning": "주제 (필수 아님)",
-    "default": "LA에 도착!",
+    "default": "인천공항에 도착했습니다.",
     "direct_warning": "이 게시물을 멘션 된 사용자들에게만 보여집니다",
     "posting": "게시",
     "scope": {
@@ -67,7 +104,9 @@
       "private": "팔로워 전용 - 팔로워들에게만",
       "public": "공개 - 공개 타임라인으로",
       "unlisted": "비공개 - 공개 타임라인에 게시 안 함"
-    }
+    },
+    "preview_empty": "아무것도 없습니다",
+    "preview": "미리보기"
   },
   "registration": {
     "bio": "소개",
@@ -85,7 +124,9 @@
       "password_required": "공백으로 둘 수 없습니다",
       "password_confirmation_required": "공백으로 둘 수 없습니다",
       "password_confirmation_match": "패스워드와 일치해야 합니다"
-    }
+    },
+    "fullname_placeholder": "예: 김례인",
+    "username_placeholder": "예: lain"
   },
   "settings": {
     "attachmentRadius": "첨부물",
@@ -112,7 +153,7 @@
     "data_import_export_tab": "데이터 불러오기 / 내보내기",
     "default_vis": "기본 공개 범위",
     "delete_account": "계정 삭제",
-    "delete_account_description": "계정과 메시지를 영구히 삭제.",
+    "delete_account_description": "데이터가 영구히 삭제되고 계정이 불활성화됩니다.",
     "delete_account_error": "계정을 삭제하는데 문제가 있습니다. 계속 발생한다면 인스턴스 관리자에게 문의하세요.",
     "delete_account_instructions": "계정 삭제를 확인하기 위해 아래에 패스워드 입력.",
     "export_theme": "프리셋 저장",
@@ -156,7 +197,7 @@
     "notification_visibility_repeats": "반복",
     "no_rich_text_description": "모든 게시물의 서식을 지우기",
     "hide_follows_description": "내가 팔로우하는 사람을 표시하지 않음",
-    "hide_followers_description": "나를 따르는 사람을 보여주지 마라.",
+    "hide_followers_description": "나를 따르는 사람을 숨기기",
     "nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화",
     "oauth_tokens": "OAuth 토큰",
     "token": "토큰",
@@ -303,14 +344,29 @@
         "button": "버튼",
         "text": "더 많은 {0} 그리고 {1}",
         "mono": "내용",
-        "input": "LA에 막 도착!",
+        "input": "인천공항에 도착했습니다.",
         "faint_link": "도움 되는 설명서",
         "fine_print": "우리의 {0} 를 읽고 도움 되지 않는 것들을 배우자!",
         "header_faint": "이건 괜찮아",
         "checkbox": "나는 약관을 대충 훑어보았습니다",
         "link": "작고 귀여운 링크"
       }
-    }
+    },
+    "block_export": "차단 목록 내보내기",
+    "mfa": {
+      "scan": {
+        "secret_code": "키",
+        "title": "스캔"
+      },
+      "authentication_methods": "인증 방법",
+      "waiting_a_recovery_codes": "예비 코드를 수신하고 있습니다…",
+      "recovery_codes": "복구 코드.",
+      "generate_new_recovery_codes": "새로운 복구 코드를 작성",
+      "title": "2단계인증",
+      "confirm_and_enable": "OTP 확인과 활성화",
+      "setup_otp": "OTP 설치"
+    },
+    "security": "보안"
   },
   "timeline": {
     "collapse": "접기",
@@ -339,7 +395,7 @@
     "its_you": "당신입니다!",
     "mute": "침묵",
     "muted": "침묵 됨",
-    "per_day": " / 하루",
+    "per_day": "/ 하루",
     "remote_follow": "원격 팔로우",
     "statuses": "게시물"
   },
@@ -357,11 +413,11 @@
     "favorite": "즐겨찾기",
     "user_settings": "사용자 설정"
   },
-  "upload":{
+  "upload": {
     "error": {
-    "base": "업로드 실패.",
-    "file_too_big": "파일이 너무 커요 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-    "default": "잠시 후에 다시 시도해 보세요"
+      "base": "업로드 실패.",
+      "file_too_big": "파일이 너무 커요 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "잠시 후에 다시 시도해 보세요"
     },
     "file_size_units": {
       "B": "바이트",
@@ -370,5 +426,79 @@
       "GiB": "기비바이트",
       "TiB": "테비바이트"
     }
+  },
+  "interactions": {
+    "follows": "새 팔로워",
+    "favs_repeats": "반복과 즐겨찾기"
+  },
+  "emoji": {
+    "load_all": "전체 {emojiAmount} 이모지 불러오기",
+    "unicode": "Unicode 이모지",
+    "custom": "전용 이모지",
+    "add_emoji": "이모지 넣기",
+    "search_emoji": "이모지 검색",
+    "emoji": "이모지",
+    "stickers": "스티커"
+  },
+  "polls": {
+    "add_poll": "투표를 추가",
+    "votes": "표",
+    "vote": "투표",
+    "type": "투표 형식",
+    "expiry": "투표 기간"
+  },
+  "media_modal": {
+    "next": "다음",
+    "previous": "이전"
+  },
+  "importer": {
+    "error": "이 파일을 가져올 때 오류가 발생하였습니다.",
+    "success": "정상히 불러왔습니다.",
+    "submit": "보내기"
+  },
+  "image_cropper": {
+    "cancel": "취소",
+    "save_without_cropping": "그대로 저장",
+    "save": "저장",
+    "crop_picture": "사진 자르기"
+  },
+  "exporter": {
+    "processing": "처리중입니다, 처리가 끝나면 파일을 다운로드하라는 지시가 있겠습니다",
+    "export": "내보내기"
+  },
+  "domain_mute_card": {
+    "unmute_progress": "침묵을 해제중…",
+    "unmute": "침묵 해제",
+    "mute_progress": "침묵으로 설정중…",
+    "mute": "침묵"
+  },
+  "about": {
+    "staff": "운영자",
+    "mrf": {
+      "simple": {
+        "media_nsfw_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고에 붙혀 있는 매체는 민감함으로 설정됩니다:",
+        "media_nsfw": "매체를 민감함으로 설정",
+        "media_removal_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고에 붙혀 있는 매체는 제거됩니다:",
+        "media_removal": "매체 제거",
+        "ftl_removal_desc": "이 인스턴스에서 아래의 인스턴스들은 \"알려진 모든 네트워크\" 타임라인에서 제외됩니다:",
+        "ftl_removal": "\"알려진 모든 네트워크\" 타임라인에서 제외",
+        "quarantine_desc": "이 인스턴스는 아래의 인스턴스에게 공개투고만을 보냅니다:",
+        "quarantine": "검역",
+        "reject_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고를 받아들이지 않습니다:",
+        "accept_desc": "이 인스턴스에서는 아래의 인스턴스로부터 보내온 투고만이 접수됩니다:",
+        "reject": "거부",
+        "accept": "허가",
+        "simple_policies": "인스턴스 특유의 폴리시"
+      },
+      "mrf_policies": "사용되는 MRF 폴리시",
+      "keyword": {
+        "is_replaced_by": "→",
+        "replace": "바꾸기",
+        "reject": "거부",
+        "ftl_removal": "\"알려진 모든 네트워크\" 타임라인에서 제외",
+        "keyword_policies": "단어 폴리시"
+      },
+      "federation": "연합"
+    }
   }
 }

From 376d4316817331c8ebc10a19ab460fcaa6b83e54 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Fri, 12 Feb 2021 08:23:47 +0000
Subject: [PATCH 075/119] Translated using Weblate (Italian)

Currently translated at 100.0% (682 of 682 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index a598677773..927856b03a 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -17,7 +17,11 @@
     "close": "Chiudi",
     "retry": "Riprova",
     "error_retry": "Per favore, riprova",
-    "loading": "Carico…"
+    "loading": "Carico…",
+    "role": {
+      "moderator": "Moderatore",
+      "admin": "Amministratore"
+    }
   },
   "nav": {
     "mentions": "Menzioni",

From 6acf812101f79b450dc4efd2da051c634dd18621 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Sat, 13 Feb 2021 16:34:43 +0300
Subject: [PATCH 076/119] User card: use general.role instead of card-specific
 roles

Also removes admin_menu.roles from some localizations since it is not
used anywhere
---
 src/components/user_card/user_card.vue |  2 +-
 src/i18n/en.json                       |  4 ----
 src/i18n/it.json                       | 12 ++++++------
 src/i18n/pt.json                       | 13 +++++++------
 src/i18n/ru.json                       | 12 ++++++------
 src/i18n/uk.json                       | 12 ++++++------
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c6c4dfeea1..572943b594 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -83,7 +83,7 @@
                   v-if="!!visibleRole"
                   class="alert user-role"
                 >
-                  {{ $t(`user_card.roles.${visibleRole}`) }}
+                  {{ $t(`general.role.${visibleRole}`) }}
                 </span>
                 <span
                   v-if="user.bot"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 46614ef1c8..4cc2af0ebd 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -737,10 +737,6 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
-    },
-    "roles": {
-      "admin": "Admin",
-      "moderator": "Moderator"
     }
   },
   "user_profile": {
diff --git a/src/i18n/it.json b/src/i18n/it.json
index b7d21e7ed9..ece1f33a0d 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -17,7 +17,11 @@
     "close": "Chiudi",
     "retry": "Riprova",
     "error_retry": "Per favore, riprova",
-    "loading": "Carico…"
+    "loading": "Carico…",
+    "role": {
+      "moderator": "Moderatore",
+      "admin": "Amministratore"
+    }
   },
   "nav": {
     "mentions": "Menzioni",
@@ -487,11 +491,7 @@
     "follow_progress": "Richiedo…",
     "follow_sent": "Richiesta inviata!",
     "favorites": "Preferiti",
-    "message": "Contatta",
-    "roles": {
-      "moderator": "Moderatore",
-      "admin": "Amministratore"
-    }
+    "message": "Contatta"
   },
   "chat": {
     "title": "Chat"
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index b79985e8a5..841516c045 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -35,7 +35,12 @@
     "retry": "Tenta novamente",
     "error_retry": "Por favor, tenta novamente",
     "loading": "A carregar…",
-    "dismiss": "Ignorar"
+    "dismiss": "Ignorar",
+    "role":
+    {
+      "moderator": "Moderador",
+      "admin": "Admin"
+    }
   },
   "image_cropper": {
     "crop_picture": "Cortar imagem",
@@ -615,11 +620,7 @@
     "report": "Denunciar",
     "message": "Mensagem",
     "mention": "Mencionar",
-    "hidden": "Ocultar",
-    "roles": {
-      "moderator": "Moderador",
-      "admin": "Admin"
-    }
+    "hidden": "Ocultar"
   },
   "user_profile": {
     "timeline_title": "Cronologia do Utilizador",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 30a657414d..15ebda95df 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -24,7 +24,11 @@
     "retry": "Попробуйте еще раз",
     "error_retry": "Пожалуйста попробуйте еще раз",
     "close": "Закрыть",
-    "loading": "Загрузка…"
+    "loading": "Загрузка…",
+    "role": {
+      "moderator": "Модератор",
+      "admin": "Администратор"
+    }
   },
   "login": {
     "login": "Войти",
@@ -541,11 +545,7 @@
     "mention": "Упомянуть",
     "show_repeats": "Показывать повторы",
     "hide_repeats": "Скрыть повторы",
-    "report": "Пожаловаться",
-    "roles": {
-      "moderator": "Модератор",
-      "admin": "Администратор"
-    }
+    "report": "Пожаловаться"
   },
   "user_profile": {
     "timeline_title": "Лента пользователя"
diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 040d6f4f76..98f65a0e2c 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -17,7 +17,11 @@
     "more": "Більше",
     "submit": "Відправити",
     "apply": "Застосувати",
-    "peek": "Глянути"
+    "peek": "Глянути",
+    "role": {
+      "moderator": "Модератор",
+      "admin": "Адміністратор"
+    }
   },
   "finder": {
     "error_fetching_user": "Користувача не знайдено",
@@ -760,11 +764,7 @@
     "unblock": "Розблокувати",
     "remote_follow": "Підписатись",
     "muted": "Заглушений",
-    "mute": "Заглушити",
-    "roles": {
-      "moderator": "Модератор",
-      "admin": "Адміністратор"
-    }
+    "mute": "Заглушити"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",

From 033b7eaeb94fc552e6bf04671153d3afae089f87 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 13 Feb 2021 12:35:35 +0000
Subject: [PATCH 077/119] Translated using Weblate (Russian)

Currently translated at 83.6% (573 of 685 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 30a657414d..caba8ec935 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -24,7 +24,11 @@
     "retry": "Попробуйте еще раз",
     "error_retry": "Пожалуйста попробуйте еще раз",
     "close": "Закрыть",
-    "loading": "Загрузка…"
+    "loading": "Загрузка…",
+    "role": {
+      "moderator": "Модератор",
+      "admin": "Администратор"
+    }
   },
   "login": {
     "login": "Войти",
@@ -615,7 +619,8 @@
     "gopher": "Gopher",
     "who_to_follow": "Предложения кого читать",
     "pleroma_chat_messages": "Pleroma Чат",
-    "upload_limit": "Наибольший размер загружаемого файла"
+    "upload_limit": "Наибольший размер загружаемого файла",
+    "scope_options": "Настраиваемая видимость статусов"
   },
   "tool_tip": {
     "accept_follow_request": "Принять запрос на чтение",

From cba48476ad4ade6253bd7fa64fbc4f180960ad75 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Sat, 13 Feb 2021 22:46:59 +0000
Subject: [PATCH 078/119] Translated using Weblate (Italian)

Currently translated at 100.0% (685 of 685 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 927856b03a..31e3d9682b 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -496,7 +496,8 @@
     "roles": {
       "moderator": "Moderatore",
       "admin": "Amministratore"
-    }
+    },
+    "bot": "Bot"
   },
   "chat": {
     "title": "Chat"
@@ -665,7 +666,9 @@
     "expiry": "Età",
     "expires_in": "Chiude fra {0}",
     "expired": "Chiuso {0} fa",
-    "not_enough_options": "Aggiungi altre risposte"
+    "not_enough_options": "Aggiungi altre risposte",
+    "votes_count": "{count} voto | {count} voti",
+    "people_voted_count": "{count} votante | {count} votanti"
   },
   "interactions": {
     "favs_repeats": "Condivisi e Graditi",

From 7e11093fcde8815f37c2c4d15eeb96ef43533d7a Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 13 Feb 2021 22:33:33 +0000
Subject: [PATCH 079/119] Translated using Weblate (Japanese)

Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 49 +++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 936ce7daee..f54add7b84 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -4,7 +4,7 @@
   },
   "exporter": {
     "export": "エクスポート",
-    "processing": "処理中です。処理が完了すると、ファイルをダウンロードするよう指示があります。"
+    "processing": "処理中です。処理が完了すると、ファイルをダウンロードするよう指示があります"
   },
   "features_panel": {
     "chat": "チャット",
@@ -39,7 +39,11 @@
     "dismiss": "無視",
     "retry": "もう一度お試し下さい",
     "error_retry": "もう一度お試し下さい",
-    "loading": "読み込み中…"
+    "loading": "読み込み中…",
+    "role": {
+      "moderator": "モデレーター",
+      "admin": "管理者"
+    }
   },
   "image_cropper": {
     "crop_picture": "画像を切り抜く",
@@ -120,7 +124,9 @@
     "expiry": "投票期間",
     "expires_in": "投票は {0} で終了します",
     "expired": "投票は {0} 前に終了しました",
-    "not_enough_options": "相異なる選択肢が不足しています"
+    "not_enough_options": "相異なる選択肢が不足しています",
+    "votes_count": "{count} 票 | {count} 票",
+    "people_voted_count": "{count} 人投票 | {count} 人投票"
   },
   "emoji": {
     "stickers": "ステッカー",
@@ -161,14 +167,14 @@
     "posting": "投稿",
     "scope_notice": {
       "public": "この投稿は、誰でも見ることができます",
-      "private": "この投稿は、あなたのフォロワーだけが、見ることができます。",
-      "unlisted": "この投稿は、パブリックタイムラインと、接続しているすべてのネットワークには、表示されません。"
+      "private": "この投稿は、あなたのフォロワーだけが、見ることができます",
+      "unlisted": "この投稿は、パブリックタイムラインと、接続しているすべてのネットワークには、表示されません"
     },
     "scope": {
-      "direct": "ダイレクト: メンションされたユーザーのみに届きます。",
-      "private": "フォロワー限定: フォロワーのみに届きます。",
-      "public": "パブリック: パブリックタイムラインに届きます。",
-      "unlisted": "アンリステッド: パブリックタイムラインに届きません。"
+      "direct": "ダイレクト: メンションされたユーザーのみに届きます",
+      "private": "フォロワー限定: フォロワーのみに届きます",
+      "public": "パブリック: パブリックタイムラインに届きます",
+      "unlisted": "アンリステッド: パブリックタイムラインに届きません"
     },
     "media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
     "empty_status_error": "投稿内容を入力してください",
@@ -263,7 +269,7 @@
     "pad_emoji": "ピッカーから絵文字を挿入するとき、絵文字の両側にスペースを入れる",
     "export_theme": "保存",
     "filtering": "フィルタリング",
-    "filtering_explanation": "これらの言葉を含むすべてのものがミュートされます。1行に1つの言葉を書いてください。",
+    "filtering_explanation": "これらの言葉を含むすべてのものがミュートされます。1行に1つの言葉を書いてください",
     "follow_export": "フォローのエクスポート",
     "follow_export_button": "エクスポート",
     "follow_export_processing": "お待ちください。まもなくファイルをダウンロードできます。",
@@ -389,11 +395,15 @@
           "older_version_imported": "古いフロントエンドで作られたファイルをインポートしました。",
           "future_version_imported": "新しいフロントエンドで作られたファイルをインポートしました。",
           "v2_imported": "古いフロントエンドのためのファイルをインポートしました。設定した通りにならないかもしれません。",
-          "upgraded_from_v2": "フロントエンドが新しくなったので、今までの見た目と少し違うかもしれません。"
+          "upgraded_from_v2": "フロントエンドが新しくなったので、今までの見た目と少し違うかもしれません。",
+          "snapshot_source_mismatch": "フロントエンドがロールバックと更新を繰り返したため、バージョンが競合しています。",
+          "migration_napshot_gone": "スナップショットがありません、覚えているものと見た目が違うかもしれません。",
+          "snapshot_present": "テーマのスナップショットが読み込まれました。設定は上書きされました。代わりとして実データを読み込むことができます。"
         },
         "use_source": "新しいバージョン",
         "use_snapshot": "古いバージョン",
-        "load_theme": "テーマの読み込み"
+        "load_theme": "テーマの読み込み",
+        "keep_as_is": "変更しない"
       },
       "common": {
         "color": "色",
@@ -466,7 +476,7 @@
           "always_drop_shadow": "ブラウザーがサポートしていれば、常に {0} が使われます。",
           "drop_shadow_syntax": "{0} は、{1} パラメーターと {2} キーワードをサポートしていません。",
           "avatar_inset": "内側の影と外側の影を同時に使うと、透明なアバターの表示が乱れます。",
-          "spread_zero": "広がりが 0 よりも大きな影は、0 と同じです。",
+          "spread_zero": "広がりが 0 よりも大きな影は、0 と同じです",
           "inset_classic": "内側の影は {0} を使います"
         },
         "components": {
@@ -481,7 +491,8 @@
           "buttonPressed": "ボタン (押されているとき)",
           "buttonPressedHover": "ボタン (ホバー、かつ、押されているとき)",
           "input": "インプットフィールド"
-        }
+        },
+        "hintV3": "影の場合は、 {0} 表記を使って他の色スロットを使うこともできます。"
       },
       "fonts": {
         "_tab_label": "フォント",
@@ -559,7 +570,8 @@
     "mute_import": "ミュートのインポート",
     "mute_export": "ミュートのエクスポート",
     "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
-    "setting_changed": "規定の設定と異なっています"
+    "setting_changed": "規定の設定と異なっています",
+    "greentext": "引用を緑色で表示"
   },
   "time": {
     "day": "{0}日",
@@ -694,7 +706,8 @@
     "show_repeats": "リピートを見る",
     "hide_repeats": "リピートを隠す",
     "message": "メッセージ",
-    "hidden": "隠す"
+    "hidden": "隠す",
+    "bot": "bot"
   },
   "user_profile": {
     "timeline_title": "ユーザータイムライン",
@@ -799,7 +812,9 @@
     "audio": "オーディオ"
   },
   "remote_user_resolver": {
-    "error": "見つかりませんでした。"
+    "error": "見つかりませんでした。",
+    "searching_for": "検索中",
+    "remote_user_resolver": "リモートユーザーリゾルバ"
   },
   "errors": {
     "storage_unavailable": "ブラウザのストレージに接続できなかったため、ログインや設定情報は保存されません。Cookieを有効にしてください。"

From c3b267f2b9f6e36bc727708198de2bae705f85e0 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 15 Feb 2021 08:30:41 +0200
Subject: [PATCH 080/119] add padding to poll type to not have arrow icon
 overlap text

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

diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 094961052a..c440321052 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -151,6 +151,7 @@
       border: none;
       box-shadow: none;
       background-color: transparent;
+      padding-right: 0.75em;
     }
   }
 

From a636e5340426f8c9b40811bd01c8710f438a2cf2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 15 Feb 2021 11:10:09 +0200
Subject: [PATCH 081/119] add reason field when approval is required

---
 src/boot/after_store.js                      |  1 +
 src/components/registration/registration.js  | 17 +++++++++++++----
 src/components/registration/registration.vue | 17 +++++++++++++++++
 src/i18n/en.json                             |  2 ++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index b472fcf64e..45090e5d7a 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -51,6 +51,7 @@ const getInstanceConfig = async ({ store }) => {
       const vapidPublicKey = data.pleroma.vapid_public_key
 
       store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
+      store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required })
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index dab06e1ee4..1ac8e8beab 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -10,7 +10,8 @@ const registration = {
       fullname: '',
       username: '',
       password: '',
-      confirm: ''
+      confirm: '',
+      reason: ''
     },
     captcha: {}
   }),
@@ -24,7 +25,8 @@ const registration = {
         confirm: {
           required,
           sameAsPassword: sameAs('password')
-        }
+        },
+        reason: { required: requiredIf(() => this.accountApprovalRequired) }
       }
     }
   },
@@ -38,7 +40,10 @@ const registration = {
   computed: {
     token () { return this.$route.params.token },
     bioPlaceholder () {
-      return this.$t('registration.bio_placeholder').replace(/\s*\n\s*/g, ' \n')
+      return this.replaceNewlines(this.$t('registration.bio_placeholder'))
+    },
+    reasonPlaceholder () {
+      return this.replaceNewlines(this.$t('registration.reason_placeholder'))
     },
     ...mapState({
       registrationOpen: (state) => state.instance.registrationOpen,
@@ -46,7 +51,8 @@ const registration = {
       isPending: (state) => state.users.signUpPending,
       serverValidationErrors: (state) => state.users.signUpErrors,
       termsOfService: (state) => state.instance.tos,
-      accountActivationRequired: (state) => state.instance.accountActivationRequired
+      accountActivationRequired: (state) => state.instance.accountActivationRequired,
+      accountApprovalRequired: (state) => state.instance.accountApprovalRequired
     })
   },
   methods: {
@@ -73,6 +79,9 @@ const registration = {
     },
     setCaptcha () {
       this.getCaptcha().then(cpt => { this.captcha = cpt })
+    },
+    replaceNewlines (str) {
+      return str.replace(/\s*\n\s*/g, ' \n')
     }
   }
 }
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 100df0d6e5..062d4121e9 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -162,6 +162,23 @@
               </ul>
             </div>
 
+            <div
+              v-if="accountApprovalRequired"
+              class="form-group"
+            >
+              <label
+                class="form--label"
+                for="reason"
+              >{{ $t('registration.reason') }}</label>
+              <textarea
+                id="reason"
+                v-model="user.reason"
+                :disabled="isPending"
+                class="form-control"
+                :placeholder="reasonPlaceholder"
+              />
+            </div>
+
             <div
               v-if="captcha.type != 'none'"
               id="captcha-group"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4cc2af0ebd..0e069785d6 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -228,6 +228,8 @@
     "username_placeholder": "e.g. lain",
     "fullname_placeholder": "e.g. Lain Iwakura",
     "bio_placeholder": "e.g.\nHi, I'm Lain.\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
+    "reason": "Reason to register",
+    "reason_placeholder": "This instance approves registrations manually.\nLet the administration know why you want to register.",
     "validations": {
       "username_required": "cannot be left blank",
       "fullname_required": "cannot be left blank",

From 23a5c601a74d65e2f7368f6e918fdd07ffc85174 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 15 Feb 2021 11:35:14 +0200
Subject: [PATCH 082/119] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4be7da45..c11c3162ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
 
+### Added
+- Added reason field for registration when approval is required
+
 ## [2.2.3] - 2021-01-18
 ### Added
 - Added Report button to status ellipsis menu for easier reporting

From 265bb2cd411a15faabfdc08f20b9355d379091fe Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Mon, 15 Feb 2021 13:17:52 +0300
Subject: [PATCH 083/119] Add myself to .mailmap

I changed my email to rin@patch.cx
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..0b198a4703
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+rinpatch <rin@patch.cx> <rinpatch@sdf.org>
\ No newline at end of file

From e720d4dd8ab2ee8470719cc55974dcccf998815a Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Mon, 15 Feb 2021 08:57:25 +0000
Subject: [PATCH 084/119] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (682 of 683 strings)

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

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index b4185b3050..3b377b85ea 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -39,7 +39,11 @@
     "close": "关闭",
     "retry": "重试",
     "error_retry": "请重试",
-    "loading": "载入中…"
+    "loading": "载入中…",
+    "role": {
+      "moderator": "监察员",
+      "admin": "管理员"
+    }
   },
   "image_cropper": {
     "crop_picture": "裁剪图片",
@@ -120,7 +124,9 @@
     "expiry": "投票期限",
     "expires_in": "投票于 {0} 后结束",
     "expired": "投票 {0} 前已结束",
-    "not_enough_options": "投票的选项太少"
+    "not_enough_options": "投票的选项太少",
+    "votes_count": "{count} 票 | {count} 票",
+    "people_voted_count": "{count} 人已投票 | {count} 人已投票"
   },
   "stickers": {
     "add_sticker": "添加贴纸"
@@ -552,7 +558,8 @@
     "mute_import": "隐藏名单导入",
     "mute_export_button": "导出你的隐藏名单到一个 csv 文件",
     "mute_export": "隐藏名单导出",
-    "hide_wallpaper": "隐藏实例壁纸"
+    "hide_wallpaper": "隐藏实例壁纸",
+    "setting_changed": "与默认设置不同"
   },
   "time": {
     "day": "{0} 天",
@@ -683,7 +690,8 @@
     "show_repeats": "显示转发",
     "hide_repeats": "隐藏转发",
     "message": "消息",
-    "mention": "提及"
+    "mention": "提及",
+    "bot": "机器人"
   },
   "user_profile": {
     "timeline_title": "用户时间线",

From 47770ed7151ad0ba1cd8b77eb52590edd9ce9737 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Feb 2021 10:16:58 +0200
Subject: [PATCH 085/119] get rid of older messages when scrolling down in chat
 to keep it from bloating dom

---
 src/components/chat/chat.js               |  1 +
 src/modules/chats.js                      |  6 ++++++
 src/services/chat_service/chat_service.js | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index e57fcb91e7..f446f25b40 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -241,6 +241,7 @@ const Chat = {
         this.fetchChat({ maxId: this.currentChatMessageService.minId })
       } else if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
         this.jumpToBottomButtonVisible = false
+        this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId)
         if (this.newMessageCount > 0) {
           // Use a delay before marking as read to prevent situation where new messages
           // arrive just as you're leaving the view and messages that you didn't actually
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 0a373d88a8..69d683bd85 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -115,6 +115,9 @@ const chats = {
     },
     handleMessageError ({ commit }, value) {
       commit('handleMessageError', { commit, ...value })
+    },
+    cullOlderMessages ({ commit }, chatId) {
+      commit('cullOlderMessages', chatId)
     }
   },
   mutations: {
@@ -227,6 +230,9 @@ const chats = {
     handleMessageError (state, { chatId, fakeId, isRetry }) {
       const chatMessageService = state.openedChatMessageServices[chatId]
       chatService.handleMessageError(chatMessageService, fakeId, isRetry)
+    },
+    cullOlderMessages (state, chatId) {
+      chatService.cullOlderMessages(state.openedChatMessageServices[chatId])
     }
   }
 }
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index e653ebc120..92ff689d17 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -48,6 +48,22 @@ const deleteMessage = (storage, messageId) => {
   }
 }
 
+const cullOlderMessages = (storage) => {
+  const maxIndex = storage.messages.length
+  const minIndex = maxIndex - 50
+  if (maxIndex <= 50) return
+
+  storage.messages = _.sortBy(storage.messages, ['id'])
+  storage.minId = storage.messages[minIndex].id
+  for (const message of storage.messages) {
+    if (message.id < storage.minId) {
+      delete storage.idIndex[message.id]
+      delete storage.idempotencyKeyIndex[message.idempotency_key]
+    }
+  }
+  storage.messages = storage.messages.slice(minIndex, maxIndex)
+}
+
 const handleMessageError = (storage, fakeId, isRetry) => {
   if (!storage) { return }
   const fakeMessage = storage.idIndex[fakeId]
@@ -201,6 +217,7 @@ const ChatService = {
   empty,
   getView,
   deleteMessage,
+  cullOlderMessages,
   resetNewMessageCount,
   clear,
   handleMessageError

From 7834ff52b1df539f27fd4f30efc0181fcc3d9995 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Feb 2021 10:53:38 +0200
Subject: [PATCH 086/119] add test

---
 .../services/chat_service/chat_service.spec.js  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js
index 0251cae782..fbbca4361b 100644
--- a/test/unit/specs/services/chat_service/chat_service.spec.js
+++ b/test/unit/specs/services/chat_service/chat_service.spec.js
@@ -88,4 +88,21 @@ describe('chatService', () => {
       expect(view.map(i => i.type)).to.eql(['date', 'message', 'message', 'date', 'message'])
     })
   })
+
+  describe('.cullOlderMessages', () => {
+    it('keeps 50 newest messages and idIndex matches', () => {
+      const chat = chatService.empty()
+
+      for (let i = 100; i > 0; i--) {
+        // Use decimal values with toFixed to hack together constant length predictable strings
+        chatService.add(chat, { messages: [{ ...message1, id: 'a' + (i / 1000).toFixed(3), idempotency_key: i }] })
+      }
+      chatService.cullOlderMessages(chat)
+      expect(chat.messages.length).to.eql(50)
+      expect(chat.messages[0].id).to.eql('a0.051')
+      expect(chat.minId).to.eql('a0.051')
+      expect(chat.messages[49].id).to.eql('a0.100')
+      expect(Object.keys(chat.idIndex).length).to.eql(50)
+    })
+  })
 })

From ee1cf36d523126630c20b0de0498207bafa14b3d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Feb 2021 10:54:14 +0200
Subject: [PATCH 087/119] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4be7da45..7b286f40d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
+- Optimized chat to not get horrible performance after keeping the same chat open for a long time
 
 ## [2.2.3] - 2021-01-18
 ### Added

From 67f3532ac95b2a8740ccbde581e74ac65eb20a9a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Feb 2021 10:14:45 +0200
Subject: [PATCH 088/119] add additional check with timeout

---
 src/components/chat/chat.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index f446f25b40..2780be75e9 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -234,6 +234,13 @@ const Chat = {
       const scrollable = this.$refs.scrollable
       return scrollable && scrollable.scrollTop <= 0
     },
+    cullOlderCheck () {
+      window.setTimeout(() => {
+        if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
+          this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId)
+        }
+      }, 5000)
+    },
     handleScroll: _.throttle(function () {
       if (!this.currentChat) { return }
 
@@ -241,7 +248,7 @@ const Chat = {
         this.fetchChat({ maxId: this.currentChatMessageService.minId })
       } else if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
         this.jumpToBottomButtonVisible = false
-        this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId)
+        this.cullOlderCheck()
         if (this.newMessageCount > 0) {
           // Use a delay before marking as read to prevent situation where new messages
           // arrive just as you're leaving the view and messages that you didn't actually

From d0b1a68f8625fdb217533d6599bc5ce0c23d0699 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 20 Feb 2021 16:01:20 +0000
Subject: [PATCH 089/119] Translated using Weblate (Esperanto)

Currently translated at 100.0% (683 of 683 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 58f8e12533..9f0491fbeb 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -35,7 +35,11 @@
     "retry": "Reprovi",
     "error_retry": "Bonvolu reprovi",
     "loading": "Enlegante…",
-    "peek": "Antaŭmontri"
+    "peek": "Antaŭmontri",
+    "role": {
+      "moderator": "Reguligisto",
+      "admin": "Administranto"
+    }
   },
   "image_cropper": {
     "crop_picture": "Tondi bildon",
@@ -365,7 +369,8 @@
         "post": "Afiŝoj/Priskriboj de uzantoj",
         "alert_neutral": "Neŭtrala",
         "alert_warning": "Averto",
-        "toggled": "Ŝaltita"
+        "toggled": "Ŝaltita",
+        "wallpaper": "Fonbildo"
       },
       "radii": {
         "_tab_label": "Rondeco"
@@ -516,7 +521,9 @@
     "mute_import_error": "Eraris enporto de silentigoj",
     "mute_import": "Enporto de silentigoj",
     "mute_export_button": "Elportu viajn silentigojn al CSV-dosiero",
-    "mute_export": "Elporto de silentigoj"
+    "mute_export": "Elporto de silentigoj",
+    "hide_wallpaper": "Kaŝi fonbildon de nodo",
+    "setting_changed": "Agordo malsamas de la implicita"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -586,7 +593,8 @@
     "show_repeats": "Montri ripetojn",
     "hide_repeats": "Kaŝi ripetojn",
     "unsubscribe": "Ne ricevi sciigojn",
-    "subscribe": "Ricevi sciigojn"
+    "subscribe": "Ricevi sciigojn",
+    "bot": "Roboto"
   },
   "user_profile": {
     "timeline_title": "Historio de uzanto",
@@ -612,7 +620,8 @@
     "error": {
       "base": "Alŝuto malsukcesis.",
       "file_too_big": "Dosiero estas tro granda [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Reprovu pli poste"
+      "default": "Reprovu pli poste",
+      "message": "Malsukcesis alŝuto: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -645,7 +654,9 @@
     "votes": "voĉoj",
     "option": "Elekteblo",
     "add_option": "Aldoni elekteblon",
-    "add_poll": "Aldoni enketon"
+    "add_poll": "Aldoni enketon",
+    "votes_count": "{count} voĉdono | {count} voĉdonoj",
+    "people_voted_count": "{count} persono voĉdonis | {count} personoj voĉdonis"
   },
   "importer": {
     "error": "Eraris enporto de ĉi tiu dosiero.",
@@ -732,7 +743,9 @@
     "repeats": "Ripetoj",
     "favorites": "Ŝatoj",
     "status_deleted": "Ĉi tiu afiŝo foriĝis",
-    "nsfw": "Konsterna"
+    "nsfw": "Konsterna",
+    "expand": "Etendi",
+    "external_source": "Ekstera fonto"
   },
   "time": {
     "years_short": "{0}j",

From d5f191db389c10918f99e138b567ebc3b35ee977 Mon Sep 17 00:00:00 2001
From: Ben Is <spambenis@fastwebnet.it>
Date: Sat, 20 Feb 2021 22:47:05 +0000
Subject: [PATCH 090/119] Translated using Weblate (Italian)

Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 0a3d0ce2fe..320282624b 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -584,7 +584,9 @@
     "fullname_placeholder": "es. Lupo Lucio",
     "username_placeholder": "es. mister_wolf",
     "new_captcha": "Clicca l'immagine per avere un altro captcha",
-    "captcha": "CAPTCHA"
+    "captcha": "CAPTCHA",
+    "reason_placeholder": "L'amministratore esamina ciascuna richiesta.\nFornisci il motivo della tua iscrizione.",
+    "reason": "Motivo dell'iscrizione"
   },
   "user_profile": {
     "timeline_title": "Sequenza dell'Utente",

From 20997d6cfc954d35a15cbed6668e7236ff4ee948 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 20 Feb 2021 23:26:19 +0000
Subject: [PATCH 091/119] Translated using Weblate (Japanese)

Currently translated at 100.0% (685 of 685 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
---
 src/i18n/ja_pedantic.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index f54add7b84..267a89aee6 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -201,7 +201,9 @@
       "password_required": "必須",
       "password_confirmation_required": "必須",
       "password_confirmation_match": "パスワードが違います"
-    }
+    },
+    "reason_placeholder": "このインスタンスは、新規登録を手動で受け付けています。\n登録したい理由を、インスタンスの管理者に教えてください。",
+    "reason": "登録するための目的"
   },
   "selectable_list": {
     "select_all": "すべて選択"

From 3983ea79cd76decc0ca0ffbf43444ccd7d70651b Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 20 Feb 2021 23:29:55 +0000
Subject: [PATCH 092/119] Translated using Weblate (Korean)

Currently translated at 66.7% (457 of 685 strings)

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

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 101ef487ec..73e50f3f0f 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -35,7 +35,11 @@
     "retry": "다시 시도하십시오",
     "error_retry": "다시 시도하십시오",
     "generic_error": "잘못되었습니다",
-    "more": "더 보기"
+    "more": "더 보기",
+    "role": {
+      "moderator": "중재자",
+      "admin": "관리자"
+    }
   },
   "login": {
     "login": "로그인",
@@ -85,7 +89,8 @@
     "repeated_you": "당신의 게시물을 리핏",
     "no_more_notifications": "알림이 없습니다",
     "migrated_to": "이사했습니다",
-    "reacted_with": "{0} 로 반응했습니다"
+    "reacted_with": "{0} 로 반응했습니다",
+    "error": "알림 불러오기 실패: {0}"
   },
   "post_status": {
     "new_status": "새 게시물 게시",
@@ -93,7 +98,10 @@
     "account_not_locked_warning_link": "잠김",
     "attachments_sensitive": "첨부물을 민감함으로 설정",
     "content_type": {
-      "text/plain": "평문"
+      "text/plain": "평문",
+      "text/bbcode": "BBCode",
+      "text/markdown": "Markdown",
+      "text/html": "HTML"
     },
     "content_warning": "주제 (필수 아님)",
     "default": "인천공항에 도착했습니다.",
@@ -106,7 +114,13 @@
       "unlisted": "비공개 - 공개 타임라인에 게시 안 함"
     },
     "preview_empty": "아무것도 없습니다",
-    "preview": "미리보기"
+    "preview": "미리보기",
+    "scope_notice": {
+      "public": "이 글은 누구나 볼 수 있습니다"
+    },
+    "media_description_error": "파일을 올리지 못하였습니다. 다시한번 시도하여 주십시오",
+    "empty_status_error": "글을 입력하십시오",
+    "media_description": "첨부파일 설명"
   },
   "registration": {
     "bio": "소개",
@@ -288,7 +302,16 @@
         "borders": "테두리",
         "buttons": "버튼",
         "inputs": "입력칸",
-        "faint_text": "흐려진 텍스트"
+        "faint_text": "흐려진 텍스트",
+        "chat": {
+          "border": "경계선",
+          "outgoing": "송신",
+          "incoming": "수신"
+        },
+        "selectedMenu": "선택된 메뉴 요소",
+        "selectedPost": "선택된 글",
+        "icons": "아이콘",
+        "alert_warning": "경고"
       },
       "radii": {
         "_tab_label": "둥글기"
@@ -364,9 +387,24 @@
       "generate_new_recovery_codes": "새로운 복구 코드를 작성",
       "title": "2단계인증",
       "confirm_and_enable": "OTP 확인과 활성화",
-      "setup_otp": "OTP 설치"
+      "setup_otp": "OTP 설치",
+      "otp": "OTP"
     },
-    "security": "보안"
+    "security": "보안",
+    "emoji_reactions_on_timeline": "이모지 반응을 타임라인으로 표시",
+    "avatar_size_instruction": "크기를 150x150 이상으로 설정할 것을 추장합니다.",
+    "blocks_tab": "차단",
+    "notification_setting_privacy": "보안",
+    "user_mutes": "사용자",
+    "notification_visibility_emoji_reactions": "반응",
+    "profile_fields": {
+      "value": "내용"
+    },
+    "mutes_and_blocks": "침묵과 차단",
+    "chatMessageRadius": "챗 메시지",
+    "change_email": "전자메일 주소 바꾸기",
+    "changed_email": "메일주소가 갱신되었습니다!",
+    "bot": "이 계정은 bot입니다"
   },
   "timeline": {
     "collapse": "접기",
@@ -445,7 +483,11 @@
     "votes": "표",
     "vote": "투표",
     "type": "투표 형식",
-    "expiry": "투표 기간"
+    "expiry": "투표 기간",
+    "votes_count": "{count} 표 | {count} 표",
+    "people_voted_count": "{count} 명 투표 | {count} 명 투표",
+    "option": "선택지",
+    "add_option": "선택지 추가"
   },
   "media_modal": {
     "next": "다음",
@@ -500,5 +542,44 @@
       },
       "federation": "연합"
     }
+  },
+  "shoutbox": {
+    "title": "Shoutbox"
+  },
+  "time": {
+    "years_short": "{0} 년",
+    "year_short": "{0} 년",
+    "years": "{0} 년",
+    "year": "{0} 년",
+    "weeks_short": "{0} 주일",
+    "week_short": "{0} 주일",
+    "weeks": "{0} 주일",
+    "week": "{0} 주일",
+    "seconds_short": "{0} 초",
+    "second_short": "{0} 초",
+    "seconds": "{0} 초",
+    "second": "{0} 초",
+    "now_short": "방금",
+    "now": "방끔",
+    "months_short": "{0} 달 전",
+    "month_short": "{0} 달 전",
+    "months": "{0} 달 전",
+    "month": "{0} 달 전",
+    "minutes_short": "{0} 분",
+    "minute_short": "{0} 분",
+    "minutes": "{0} 분",
+    "minute": "{0} 분",
+    "in_past": "{0} 전",
+    "hours_short": "{0} 시간",
+    "hour_short": "{0} 시간",
+    "hours": "{0} 시간",
+    "hour": "{0} 시간",
+    "days_short": "{0} 일",
+    "day_short": "{0} 일",
+    "days": "{0} 일",
+    "day": "{0} 일"
+  },
+  "remote_user_resolver": {
+    "error": "찾을 수 없습니다."
   }
 }

From 226ec1c5bea8aa3a77f95fcc4581e5e01efa7c54 Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sun, 21 Feb 2021 02:54:02 +0000
Subject: [PATCH 093/119] Translated using Weblate (Korean)

Currently translated at 66.8% (458 of 685 strings)

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

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 73e50f3f0f..c8d213f3e0 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -404,7 +404,8 @@
     "chatMessageRadius": "챗 메시지",
     "change_email": "전자메일 주소 바꾸기",
     "changed_email": "메일주소가 갱신되었습니다!",
-    "bot": "이 계정은 bot입니다"
+    "bot": "이 계정은 bot입니다",
+    "mutes_tab": "침묵"
   },
   "timeline": {
     "collapse": "접기",

From 5ddfc787ed78313952b34e63f4f3156387b50098 Mon Sep 17 00:00:00 2001
From: Kana <gudzpoz@live.com>
Date: Sun, 21 Feb 2021 03:44:53 +0000
Subject: [PATCH 094/119] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (684 of 685 strings)

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

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 3b377b85ea..5e377f7c58 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -189,7 +189,9 @@
       "password_required": "不能留空",
       "password_confirmation_required": "不能留空",
       "password_confirmation_match": "密码不一致"
-    }
+    },
+    "reason_placeholder": "此实例的注册需要手动批准。\n请让管理员知道您为什么想要注册。",
+    "reason": "注册理由"
   },
   "selectable_list": {
     "select_all": "选择全部"

From 2f60c6a821bd574fa352e45ac5bcc67097af7e11 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 22 Feb 2021 16:44:12 +0200
Subject: [PATCH 095/119] fix redline again

---
 CHANGELOG.md                                 | 1 +
 src/components/conversation/conversation.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4be7da45..9f1ff903c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
+- Fixed missing highlighted border in expanded conversations again
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 353859b8e2..3fb26d9239 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -50,7 +50,6 @@
 
 .Conversation {
   .conversation-status {
-    border-left: none;
     border-bottom-width: 1px;
     border-bottom-style: solid;
     border-bottom-color: var(--border, $fallback--border);

From 3f23aecd10e570f78b4142687a9a3fa349c13018 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 23 Feb 2021 10:00:23 +0200
Subject: [PATCH 096/119] add sensitive by default option

---
 src/components/post_status_form/post_status_form.js | 4 ++--
 src/components/settings_modal/tabs/general_tab.vue  | 7 ++++++-
 src/i18n/en.json                                    | 1 +
 src/modules/config.js                               | 3 ++-
 src/modules/instance.js                             | 1 +
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 4148381c83..e540654be3 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -115,7 +115,7 @@ const PostStatusForm = {
       ? this.copyMessageScope
       : this.$store.state.users.currentUser.default_scope
 
-    const { postContentType: contentType } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, sensitiveByDefault } = this.$store.getters.mergedConfig
 
     return {
       dropFiles: [],
@@ -126,7 +126,7 @@ const PostStatusForm = {
       newStatus: {
         spoilerText: this.subject || '',
         status: statusText,
-        nsfw: false,
+        nsfw: !!sensitiveByDefault,
         files: [],
         poll: {},
         mediaDescriptions: {},
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index f93f4ea05f..9228c78e25 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -144,7 +144,12 @@
         </li>
         <li>
           <BooleanSetting path="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }} {{ minimalScopesModeDefaultValue }}
+            {{ $t('settings.minimal_scopes_mode') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="sensitiveByDefault">
+            {{ $t('settings.sensitive_by_default') }}
           </BooleanSetting>
         </li>
         <li>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0e069785d6..e6acda9c6c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -429,6 +429,7 @@
     "subject_line_mastodon": "Like mastodon: copy as is",
     "subject_line_noop": "Do not copy",
     "post_status_content_type": "Post status content type",
+    "sensitive_by_default": "Mark posts as sensitive by default",
     "stop_gifs": "Play-on-hover GIFs",
     "streaming": "Enable automatic streaming of new posts when scrolled to the top",
     "user_mutes": "Users",
diff --git a/src/modules/config.js b/src/modules/config.js
index f992519e3a..b08903d18e 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -67,7 +67,8 @@ export const defaultState = {
   greentext: undefined, // instance default
   hidePostStats: undefined, // instance default
   hideUserStats: undefined, // instance default
-  virtualScrolling: undefined // instance default
+  virtualScrolling: undefined, // instance default
+  sensitiveByDefault: undefined
 }
 
 // caching the instance default properties
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 411b1caa87..96de73ca15 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -43,6 +43,7 @@ const defaultState = {
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
   virtualScrolling: true,
+  sensitiveByDefault: false,
 
   // Nasty stuff
   customEmoji: [],

From 29dae3c12e9533f9d9b8ce058686f9a6a47719ad Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 23 Feb 2021 10:03:29 +0200
Subject: [PATCH 097/119] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb357557..0abc39292b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 - Added reason field for registration when approval is required
+- Added option to mark posts as sensitive by default
 
 ## [2.2.3] - 2021-01-18
 ### Added

From ecb211606cddeeec809c8a6bc39f9c96a0af95f5 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 23 Feb 2021 10:06:45 +0200
Subject: [PATCH 098/119] change config comment to be consistent

---
 src/modules/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/config.js b/src/modules/config.js
index b08903d18e..eca58c12c3 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -68,7 +68,7 @@ export const defaultState = {
   hidePostStats: undefined, // instance default
   hideUserStats: undefined, // instance default
   virtualScrolling: undefined, // instance default
-  sensitiveByDefault: undefined
+  sensitiveByDefault: undefined // instance default
 }
 
 // caching the instance default properties

From 51a78e8b8a89065062d5b4c1b72d5bdd457d9663 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 10:56:16 +0200
Subject: [PATCH 099/119] add a quick settings menu for timeline headers

---
 CHANGELOG.md                                  |   1 +
 .../moderation_tools/moderation_tools.vue     |  33 ++----
 src/components/popover/popover.js             |   7 ++
 src/components/popover/popover.vue            |  37 +++++-
 .../helpers/boolean_setting.vue               |  12 +-
 src/components/timeline/timeline.js           |   9 +-
 src/components/timeline/timeline.vue          |   4 +
 .../timeline/timeline_quick_settings.js       |  60 ++++++++++
 .../timeline/timeline_quick_settings.vue      | 105 ++++++++++++++++++
 src/i18n/en.json                              |   6 +
 10 files changed, 233 insertions(+), 41 deletions(-)
 create mode 100644 src/components/timeline/timeline_quick_settings.js
 create mode 100644 src/components/timeline/timeline_quick_settings.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb357557..ba0ad7c935 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 - Added reason field for registration when approval is required
+- Added a quick settings to timeline header for easier access
 
 ## [2.2.3] - 2021-01-18
 ### Added
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 5c7b82ecfa..bf25adc533 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -50,74 +50,74 @@
               class="button-default dropdown-item"
               @click="toggleTag(tags.FORCE_NSFW)"
             >
-              {{ $t('user_card.admin_menu.force_nsfw') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.FORCE_NSFW) }"
               />
+              {{ $t('user_card.admin_menu.force_nsfw') }}
             </button>
             <button
               class="button-default dropdown-item"
               @click="toggleTag(tags.STRIP_MEDIA)"
             >
-              {{ $t('user_card.admin_menu.strip_media') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.STRIP_MEDIA) }"
               />
+              {{ $t('user_card.admin_menu.strip_media') }}
             </button>
             <button
               class="button-default dropdown-item"
               @click="toggleTag(tags.FORCE_UNLISTED)"
             >
-              {{ $t('user_card.admin_menu.force_unlisted') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.FORCE_UNLISTED) }"
               />
+              {{ $t('user_card.admin_menu.force_unlisted') }}
             </button>
             <button
               class="button-default dropdown-item"
               @click="toggleTag(tags.SANDBOX)"
             >
-              {{ $t('user_card.admin_menu.sandbox') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.SANDBOX) }"
               />
+              {{ $t('user_card.admin_menu.sandbox') }}
             </button>
             <button
               v-if="user.is_local"
               class="button-default dropdown-item"
               @click="toggleTag(tags.DISABLE_REMOTE_SUBSCRIPTION)"
             >
-              {{ $t('user_card.admin_menu.disable_remote_subscription') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.DISABLE_REMOTE_SUBSCRIPTION) }"
               />
+              {{ $t('user_card.admin_menu.disable_remote_subscription') }}
             </button>
             <button
               v-if="user.is_local"
               class="button-default dropdown-item"
               @click="toggleTag(tags.DISABLE_ANY_SUBSCRIPTION)"
             >
-              {{ $t('user_card.admin_menu.disable_any_subscription') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.DISABLE_ANY_SUBSCRIPTION) }"
               />
+              {{ $t('user_card.admin_menu.disable_any_subscription') }}
             </button>
             <button
               v-if="user.is_local"
               class="button-default dropdown-item"
               @click="toggleTag(tags.QUARANTINE)"
             >
-              {{ $t('user_card.admin_menu.quarantine') }}
               <span
                 class="menu-checkbox"
                 :class="{ 'menu-checkbox-checked': hasTag(tags.QUARANTINE) }"
               />
+              {{ $t('user_card.admin_menu.quarantine') }}
             </button>
           </span>
         </div>
@@ -163,25 +163,6 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.menu-checkbox {
-  float: right;
-  min-width: 22px;
-  max-width: 22px;
-  min-height: 22px;
-  max-height: 22px;
-  line-height: 22px;
-  text-align: center;
-  border-radius: 0px;
-  background-color: $fallback--fg;
-  background-color: var(--input, $fallback--fg);
-  box-shadow: 0px 0px 2px black inset;
-  box-shadow: var(--inputShadow);
-
-  &.menu-checkbox-checked::after {
-    content: '✓';
-  }
-}
-
 .moderation-tools-popover {
   height: 100%;
   .trigger {
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 5e417fa0ed..61cc728d12 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -3,25 +3,32 @@ const Popover = {
   props: {
     // Action to trigger popover: either 'hover' or 'click'
     trigger: String,
+
     // Either 'top' or 'bottom'
     placement: String,
+
     // Takes object with properties 'x' and 'y', values of these can be
     // 'container' for using offsetParent as boundaries for either axis
     // or 'viewport'
     boundTo: Object,
+
     // Takes a selector to use as a replacement for the parent container
     // for getting boundaries for x an y axis
     boundToSelector: String,
+
     // Takes a top/bottom/left/right object, how much space to leave
     // between boundary and popover element
     margin: Object,
+
     // Takes a x/y object and tells how many pixels to offset from
     // anchor point on either axis
     offset: Object,
+
     // Replaces the classes you may want for the popover container.
     // Use 'popover-default' in addition to get the default popover
     // styles with your custom class.
     popoverClass: String,
+
     // If true, subtract padding when calculating position for the popover,
     // use it when popover offset looks to be different on top vs bottom.
     removePadding: Boolean
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 876dd61d67..2e78a09eec 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -6,8 +6,8 @@
     <button
       ref="trigger"
       class="button-unstyled -fullwidth popover-trigger-button"
-      @click="onClick"
       type="button"
+      @click="onClick"
     >
       <slot name="trigger" />
     </button>
@@ -82,10 +82,9 @@
 
   .dropdown-item {
     line-height: 21px;
-    margin-right: 5px;
     overflow: auto;
     display: block;
-    padding: .25rem 1.0rem .25rem 1.5rem;
+    padding: .5em 0.75em;
     clear: both;
     font-weight: 400;
     text-align: inherit;
@@ -101,10 +100,9 @@
     --btnText: var(--popoverText, $fallback--text);
 
     &-icon {
-      padding-left: 0.5rem;
-
       svg {
-        margin-right: 0.25rem;
+        width: 22px;
+        margin-right: 0.75rem;
         color: var(--menuPopoverIcon, $fallback--icon)
       }
     }
@@ -123,6 +121,33 @@
       }
     }
 
+    .menu-checkbox {
+      display: inline-block;
+      vertical-align: middle;
+      min-width: 22px;
+      max-width: 22px;
+      min-height: 22px;
+      max-height: 22px;
+      line-height: 22px;
+      text-align: center;
+      border-radius: 0px;
+      background-color: $fallback--fg;
+      background-color: var(--input, $fallback--fg);
+      box-shadow: 0px 0px 2px black inset;
+      box-shadow: var(--inputShadow);
+      margin-right: 0.75em;
+
+      &.menu-checkbox-checked::after {
+        font-size: 1.25em;
+        content: '✓';
+      }
+
+      &.menu-checkbox-radio::after {
+        font-size: 2em;
+        content: '•';
+      }
+    }
+
   }
 }
 </style>
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index b600b63b57..146ad6c125 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -4,13 +4,13 @@
   >
     <Checkbox
       :checked="state"
-      @change="update"
       :disabled="disabled"
+      @change="update"
     >
       <span
         v-if="!!$slots.default"
         class="label"
-        >
+      >
         <slot />
       </span>
       <ModifiedIndicator :changed="isChanged" />
@@ -23,14 +23,14 @@ import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ModifiedIndicator from './modified_indicator.vue'
 export default {
-  props: [
-    'path',
-    'disabled'
-  ],
   components: {
     Checkbox,
     ModifiedIndicator
   },
+  props: [
+    'path',
+    'disabled'
+  ],
   computed: {
     pathDefault () {
       const [firstSegment, ...rest] = this.path.split('.')
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 665d195ea1..44f749c380 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -2,12 +2,14 @@ import Status from '../status/status.vue'
 import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
 import Conversation from '../conversation/conversation.vue'
 import TimelineMenu from '../timeline_menu/timeline_menu.vue'
+import TimelineQuickSettings from './timeline_quick_settings.vue'
 import { debounce, throttle, keyBy } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+import { faCircleNotch, faCog } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faCircleNotch
+  faCircleNotch,
+  faCog
 )
 
 export const getExcludedStatusIdsByPinning = (statuses, pinnedStatusIds) => {
@@ -47,7 +49,8 @@ const Timeline = {
   components: {
     Status,
     Conversation,
-    TimelineMenu
+    TimelineMenu,
+    TimelineQuickSettings
   },
   computed: {
     newStatusCount () {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 4c43fe5ce8..286477c25e 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -16,6 +16,7 @@
       >
         {{ $t('timeline.up_to_date') }}
       </div>
+      <TimelineQuickSettings v-if="!embedded" />
     </div>
     <div :class="classes.body">
       <div
@@ -103,9 +104,12 @@
   max-width: 100%;
   flex-wrap: nowrap;
   align-items: center;
+  position: relative;
+
   .loadmore-button {
     flex-shrink: 0;
   }
+
   .loadmore-text {
     flex-shrink: 0;
     line-height: 1em;
diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
new file mode 100644
index 0000000000..eb1eb8fbce
--- /dev/null
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -0,0 +1,60 @@
+import Popover from '../popover/popover.vue'
+import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
+import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faFilter, faWrench } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faFilter,
+  faWrench
+)
+
+const TimelineQuickSettings = {
+  components: {
+    Popover,
+    BooleanSetting
+  },
+  methods: {
+    setReplyVisibility (visibility) {
+      console.log('set reply visibility', visibility)
+      this.$store.dispatch('setOption', { name: 'replyVisibility', value: visibility })
+      this.$store.dispatch('queueFlushAll')
+    },
+    openTab (tab) {
+      this.$store.dispatch('openSettingsModalTab', tab)
+    }
+  },
+  computed: {
+    ...mapGetters(['mergedConfig']),
+    replyVisibilitySelf: {
+      get () { return this.mergedConfig.replyVisibility === 'self' },
+      set () { this.setReplyVisibility('self') }
+    },
+    replyVisibilityFollowing: {
+      get () { return this.mergedConfig.replyVisibility === 'following' },
+      set () { this.setReplyVisibility('following') }
+    },
+    replyVisibilityAll: {
+      get () { return this.mergedConfig.replyVisibility === 'all' },
+      set () { this.setReplyVisibility('all') }
+    },
+    hideMedia: {
+      get () { return this.mergedConfig.hideAttachments || this.mergedConfig.hideAttachmentsInConv },
+      set () {
+        const value = !this.hideMedia
+        this.$store.dispatch('setOption', { name: 'hideAttachments', value })
+        this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value })
+      }
+    },
+    hideMutedPosts: {
+      get () { return this.mergedConfig.hideMutedPosts || this.mergedConfig.hideFilteredStatuses },
+      set () {
+        const value = !this.hideMutedPosts
+        this.$store.dispatch('setOption', { name: 'hideMutedPosts', value })
+        this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
+      }
+    }
+  }
+}
+
+export default TimelineQuickSettings
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
new file mode 100644
index 0000000000..51edff7185
--- /dev/null
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -0,0 +1,105 @@
+<template>
+  <Popover
+    trigger="click"
+    class="TimelineQuickSettings"
+    :bound-to="{ x: 'container' }"
+  >
+    <div
+      slot="content"
+      class="timeline-settings-menu dropdown-menu"
+    >
+      <button
+        class="button-default dropdown-item"
+        @click="replyVisibilityAll = true"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-radio': replyVisibilityAll }"
+        />{{ $t('settings.reply_visibility_all') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="replyVisibilityFollowing = true"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-radio': replyVisibilityFollowing }"
+        />{{ $t('settings.reply_visibility_following_short') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="replyVisibilitySelf = true"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-radio': replyVisibilitySelf }"
+        />{{ $t('settings.reply_visibility_self_short') }}
+      </button>
+      <div
+        role="separator"
+        class="dropdown-divider"
+      />
+      <button
+        class="button-default dropdown-item"
+        @click="hideMedia = !hideMedia"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': hideMedia }"
+        />{{ $t('settings.hide_media_previews') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="hideMutedPosts = !hideMutedPosts"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': hideMutedPosts }"
+        />{{ $t('settings.hide_all_muted_posts') }}
+      </button>
+      <button
+        class="button-default dropdown-item dropdown-item-icon"
+        @click="openTab('filtering')"
+      >
+        <FAIcon icon="filter" />{{ $t('settings.word_filter') }}
+      </button>
+      <button
+        class="button-default dropdown-item dropdown-item-icon"
+        @click="openTab('general')"
+      >
+        <FAIcon icon="wrench" />{{ $t('settings.more_settings') }}
+      </button>
+    </div>
+    <div slot="trigger">
+      <FAIcon icon="cog" />
+    </div>
+  </Popover>
+</template>
+
+<script src="./timeline_quick_settings.js"></script>
+
+<style lang="scss">
+
+.TimelineQuickSettings {
+  align-self: stretch;
+
+  > button {
+    font-size: 1.2em;
+    padding-left: 0.7em;
+    padding-right: 0.2em;
+    line-height: 100%;
+    height: 100%;
+  }
+
+  .dropdown-item {
+    margin: 0;
+  }
+
+  .timeline-settings-menu {
+    display: flex;
+    min-width: 12em;
+    flex-direction: column;
+  }
+}
+
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0e069785d6..ec16f044c3 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -325,6 +325,7 @@
     "export_theme": "Save preset",
     "filtering": "Filtering",
     "filtering_explanation": "All statuses containing these words will be muted, one per line",
+    "word_filter": "Word filter",
     "follow_export": "Follow export",
     "follow_export_button": "Export your follows to a csv file",
     "follow_import": "Follow import",
@@ -335,7 +336,9 @@
     "general": "General",
     "hide_attachments_in_convo": "Hide attachments in conversations",
     "hide_attachments_in_tl": "Hide attachments in timeline",
+    "hide_media_previews": "Hide media previews",
     "hide_muted_posts": "Hide posts of muted users",
+    "hide_all_muted_posts": "Hide muted posts",
     "max_thumbnails": "Maximum amount of thumbnails per post",
     "hide_isp": "Hide instance-specific panel",
     "hide_wallpaper": "Hide instance wallpaper",
@@ -405,6 +408,8 @@
     "reply_visibility_all": "Show all replies",
     "reply_visibility_following": "Only show replies directed at me or users I'm following",
     "reply_visibility_self": "Only show replies directed at me",
+    "reply_visibility_following_short": "Show replies to my follows",
+    "reply_visibility_self_short": "Show replies to self",
     "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
     "saving_err": "Error saving settings",
     "saving_ok": "Settings saved",
@@ -458,6 +463,7 @@
     "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
     "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
     "enable_web_push_notifications": "Enable web push notifications",
+    "more_settings": "More settings",
     "style": {
       "switcher": {
         "keep_color": "Keep colors",

From 93785634a72420338911d8a8a7fc7eef3eb478e4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 11:01:11 +0200
Subject: [PATCH 100/119] basic loggedin check for reply filtering

---
 .../timeline/timeline_quick_settings.js       |  3 +
 .../timeline/timeline_quick_settings.vue      | 64 ++++++++++---------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index eb1eb8fbce..ecac06e958 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -26,6 +26,9 @@ const TimelineQuickSettings = {
   },
   computed: {
     ...mapGetters(['mergedConfig']),
+    loggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
     replyVisibilitySelf: {
       get () { return this.mergedConfig.replyVisibility === 'self' },
       set () { this.setReplyVisibility('self') }
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
index 51edff7185..67f6be53bd 100644
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -8,37 +8,39 @@
       slot="content"
       class="timeline-settings-menu dropdown-menu"
     >
-      <button
-        class="button-default dropdown-item"
-        @click="replyVisibilityAll = true"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-radio': replyVisibilityAll }"
-        />{{ $t('settings.reply_visibility_all') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="replyVisibilityFollowing = true"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-radio': replyVisibilityFollowing }"
-        />{{ $t('settings.reply_visibility_following_short') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="replyVisibilitySelf = true"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-radio': replyVisibilitySelf }"
-        />{{ $t('settings.reply_visibility_self_short') }}
-      </button>
-      <div
-        role="separator"
-        class="dropdown-divider"
-      />
+      <div v-if="loggedIn">
+        <button
+          class="button-default dropdown-item"
+          @click="replyVisibilityAll = true"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-radio': replyVisibilityAll }"
+          />{{ $t('settings.reply_visibility_all') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="replyVisibilityFollowing = true"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-radio': replyVisibilityFollowing }"
+          />{{ $t('settings.reply_visibility_following_short') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="replyVisibilitySelf = true"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-radio': replyVisibilitySelf }"
+          />{{ $t('settings.reply_visibility_self_short') }}
+        </button>
+        <div
+          role="separator"
+          class="dropdown-divider"
+        />
+      </div>
       <button
         class="button-default dropdown-item"
         @click="hideMedia = !hideMedia"

From 096747a5dc7df8bad63ef462bd9b920a6e64aafb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 11:12:51 +0200
Subject: [PATCH 101/119] add only to wording

---
 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 ec16f044c3..fa338652a2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -409,7 +409,7 @@
     "reply_visibility_following": "Only show replies directed at me or users I'm following",
     "reply_visibility_self": "Only show replies directed at me",
     "reply_visibility_following_short": "Show replies to my follows",
-    "reply_visibility_self_short": "Show replies to self",
+    "reply_visibility_self_short": "Show replies to self only",
     "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
     "saving_err": "Error saving settings",
     "saving_ok": "Settings saved",

From 59aaade7fc796ce43f5fd035fa5f1375d5e3dc75 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 14:32:21 +0200
Subject: [PATCH 102/119] fix vue warnings

---
 src/components/emoji_input/emoji_input.vue    |  2 +-
 src/components/mfa_form/recovery_form.vue     |  4 ++--
 src/components/mfa_form/totp_form.vue         |  4 ++--
 src/components/popover/popover.vue            |  2 +-
 .../scope_selector/scope_selector.vue         |  8 ++++----
 src/components/search/search.vue              |  2 +-
 src/components/search_bar/search_bar.vue      |  6 +++---
 .../helpers/boolean_setting.vue               | 12 +++++------
 .../helpers/modified_indicator.vue            | 20 +++++++++----------
 .../settings_modal/tabs/filtering_tab.vue     |  2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 1d6c760ef0..ad62484d6e 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -9,8 +9,8 @@
       <button
         v-if="!hideEmojiButton"
         class="button-unstyled emoji-picker-icon"
-        @click.prevent="togglePicker"
         type="button"
+        @click.prevent="togglePicker"
       >
         <FAIcon :icon="['far', 'smile-beam']" />
       </button>
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 8457ec5d86..7c59422837 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -25,16 +25,16 @@
             <div>
               <button
                 class="button-unstyled -link"
-                @click.prevent="requireTOTP"
                 type="button"
+                @click.prevent="requireTOTP"
               >
                 {{ $t('login.enter_two_factor_code') }}
               </button>
               <br>
               <button
                 class="button-unstyled -link"
-                @click.prevent="abortMFA"
                 type="button"
+                @click.prevent="abortMFA"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index 5d80e1852e..4ee1399245 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -27,16 +27,16 @@
             <div>
               <button
                 class="button-unstyled -link"
-                @click.prevent="requireRecovery"
                 type="button"
+                @click.prevent="requireRecovery"
               >
                 {{ $t('login.enter_recovery_code') }}
               </button>
               <br>
               <button
                 class="button-unstyled -link"
-                @click.prevent="abortMFA"
                 type="button"
+                @click.prevent="abortMFA"
               >
                 {{ $t('general.cancel') }}
               </button>
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 876dd61d67..bacbc5904d 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -6,8 +6,8 @@
     <button
       ref="trigger"
       class="button-unstyled -fullwidth popover-trigger-button"
-      @click="onClick"
       type="button"
+      @click="onClick"
     >
       <slot name="trigger" />
     </button>
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index 60e8c3baea..a01242fc1c 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -8,8 +8,8 @@
       class="button-unstyled scope"
       :class="css.direct"
       :title="$t('post_status.scope.direct')"
-      @click="changeVis('direct')"
       type="button"
+      @click="changeVis('direct')"
     >
       <FAIcon
         icon="envelope"
@@ -21,8 +21,8 @@
       class="button-unstyled scope"
       :class="css.private"
       :title="$t('post_status.scope.private')"
-      @click="changeVis('private')"
       type="button"
+      @click="changeVis('private')"
     >
       <FAIcon
         icon="lock"
@@ -34,8 +34,8 @@
       class="button-unstyled scope"
       :class="css.unlisted"
       :title="$t('post_status.scope.unlisted')"
-      @click="changeVis('unlisted')"
       type="button"
+      @click="changeVis('unlisted')"
     >
       <FAIcon
         icon="lock-open"
@@ -47,8 +47,8 @@
       class="button-unstyled scope"
       :class="css.public"
       :title="$t('post_status.scope.public')"
-      @click="changeVis('public')"
       type="button"
+      @click="changeVis('public')"
     >
       <FAIcon
         icon="globe"
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index fa64836541..b7bfc1f395 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -15,8 +15,8 @@
       >
       <button
         class="btn button-default search-button"
-        @click="newQuery(searchTerm)"
         type="submit"
+        @click="newQuery(searchTerm)"
       >
         <FAIcon icon="search" />
       </button>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index a7432dcba8..222f57ba33 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -7,8 +7,8 @@
       v-if="hidden"
       class="button-unstyled nav-icon"
       :title="$t('nav.search')"
-      @click.prevent.stop="toggleHidden"
       type="button"
+      @click.prevent.stop="toggleHidden"
     >
       <FAIcon
         fixed-width
@@ -28,8 +28,8 @@
       >
       <button
         class="button-default search-button"
-        @click="find(searchTerm)"
         type="submit"
+        @click="find(searchTerm)"
       >
         <FAIcon
           fixed-width
@@ -38,8 +38,8 @@
       </button>
       <button
         class="button-unstyled cancel-search"
-        @click.prevent.stop="toggleHidden"
         type="button"
+        @click.prevent.stop="toggleHidden"
       >
         <FAIcon
           fixed-width
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index b600b63b57..146ad6c125 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -4,13 +4,13 @@
   >
     <Checkbox
       :checked="state"
-      @change="update"
       :disabled="disabled"
+      @change="update"
     >
       <span
         v-if="!!$slots.default"
         class="label"
-        >
+      >
         <slot />
       </span>
       <ModifiedIndicator :changed="isChanged" />
@@ -23,14 +23,14 @@ import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ModifiedIndicator from './modified_indicator.vue'
 export default {
-  props: [
-    'path',
-    'disabled'
-  ],
   components: {
     Checkbox,
     ModifiedIndicator
   },
+  props: [
+    'path',
+    'disabled'
+  ],
   computed: {
     pathDefault () {
       const [firstSegment, ...rest] = this.path.split('.')
diff --git a/src/components/settings_modal/helpers/modified_indicator.vue b/src/components/settings_modal/helpers/modified_indicator.vue
index b75a28114f..9f4e81fec5 100644
--- a/src/components/settings_modal/helpers/modified_indicator.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@@ -2,21 +2,21 @@
   <span
     v-if="changed"
     class="ModifiedIndicator"
-    >
+  >
     <Popover
       trigger="hover"
-      >
+    >
       <span slot="trigger">
         &nbsp;
-          <FAIcon
-            icon="wrench"
-          />
+        <FAIcon
+          icon="wrench"
+        />
       </span>
       <div
-        class="modified-tooltip"
         slot="content"
-        >
-      {{ $t('settings.setting_changed') }}
+        class="modified-tooltip"
+      >
+        {{ $t('settings.setting_changed') }}
       </div>
     </Popover>
   </span>
@@ -32,8 +32,8 @@ library.add(
 )
 
 export default {
-  props: ['changed'],
-  components: { Popover }
+  components: { Popover },
+  props: ['changed']
 }
 </script>
 
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 18dd4be98a..402c2a4aa6 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -75,8 +75,8 @@
         <p>{{ $t('settings.filtering_explanation') }}</p>
         <textarea
           id="muteWords"
-          class="resize-height"
           v-model="muteWordsString"
+          class="resize-height"
         />
       </div>
       <div>

From 34d18ac0c4e1903cb174df8957b855a048ec6b7e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 17:27:29 +0200
Subject: [PATCH 103/119] focus input in emoji picker and react picker

---
 CHANGELOG.md                                 | 1 +
 src/components/emoji_input/emoji_input.js    | 8 ++++++++
 src/components/popover/popover.js            | 7 +++++--
 src/components/react_button/react_button.js  | 6 ++++++
 src/components/react_button/react_button.vue | 1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb357557..ae7e0dafcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
 - Optimized chat to not get horrible performance after keeping the same chat open for a long time
+- When opening emoji picker or react picker, it automatically focuses the search field
 
 ### Added
 - Added reason field for registration when approval is required
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 2068a598c7..cda2382e88 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -194,11 +194,18 @@ const EmojiInput = {
     }
   },
   methods: {
+    focusPickerInput () {
+      const pickerEl = this.$refs.picker.$el
+      if (!pickerEl) return
+      const pickerInput = pickerEl.querySelector('input')
+      if (pickerInput) pickerInput.focus()
+    },
     triggerShowPicker () {
       this.showPicker = true
       this.$refs.picker.startEmojiLoad()
       this.$nextTick(() => {
         this.scrollIntoView()
+        this.focusPickerInput()
       })
       // This temporarily disables "click outside" handler
       // since external trigger also means click originates
@@ -214,6 +221,7 @@ const EmojiInput = {
       if (this.showPicker) {
         this.scrollIntoView()
         this.$refs.picker.startEmojiLoad()
+        this.$nextTick(() => this.focusPickerInput())
       }
     },
     replace (replacement) {
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 5e417fa0ed..bfe39212c5 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -121,9 +121,12 @@ const Popover = {
       }
     },
     showPopover () {
-      if (this.hidden) this.$emit('show')
+      const wasHidden = this.hidden
       this.hidden = false
-      this.$nextTick(this.updateStyles)
+      this.$nextTick(() => {
+        if (wasHidden) this.$emit('show')
+        this.updateStyles()
+      })
     },
     hidePopover () {
       if (!this.hidden) this.$emit('close')
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 5e7b7580b1..ce82c90da7 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -23,6 +23,12 @@ const ReactButton = {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
       close()
+    },
+    focusInput () {
+      this.$nextTick(() => {
+        const input = this.$el.querySelector('input')
+        if (input) input.focus()
+      })
     }
   },
   computed: {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 0473467458..4839024c61 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -6,6 +6,7 @@
     :offset="{ y: 5 }"
     :bound-to="{ x: 'container' }"
     remove-padding
+    @show="focusInput"
   >
     <div
       slot="content"

From acc08932cdc704fd875fbd66180c08c13c243c5e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 25 Feb 2021 17:32:54 +0200
Subject: [PATCH 104/119] save a few characters

---
 src/components/emoji_input/emoji_input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index cda2382e88..dc03bc9f44 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -221,7 +221,7 @@ const EmojiInput = {
       if (this.showPicker) {
         this.scrollIntoView()
         this.$refs.picker.startEmojiLoad()
-        this.$nextTick(() => this.focusPickerInput())
+        this.$nextTick(this.focusPickerInput)
       }
     },
     replace (replacement) {

From cef6ecb916e7decc93e7b41bba6f1bb44e02cf21 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 10:30:30 +0200
Subject: [PATCH 105/119] update shelljs to get rid of warnings on build

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

diff --git a/package.json b/package.json
index e11396bf68..372155dfb9 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "selenium-server": "2.53.1",
     "semver": "^5.3.0",
     "serviceworker-webpack-plugin": "^1.0.0",
-    "shelljs": "^0.7.4",
+    "shelljs": "^0.8.4",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "stylelint": "^13.6.1",
diff --git a/yarn.lock b/yarn.lock
index 6682841b8d..6d0095db96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7842,9 +7842,10 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shelljs@^0.7.4:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+shelljs@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
+  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"

From 6fefa5a9c5f95e5a72486c0bebbec0c198e412b6 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 11:00:21 +0200
Subject: [PATCH 106/119] fix chat unread badge

---
 src/components/chat/chat.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index aef58495cd..3a26686c40 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -98,10 +98,10 @@
     .unread-message-count {
       font-size: 0.8em;
       left: 50%;
-      transform: translate(-50%, 0);
-      border-radius: 100%;
       margin-top: -1rem;
-      padding: 0;
+      padding: 0.1em;
+      border-radius: 50px;
+      position: absolute;
     }
 
     .chat-loading-error {

From 2e7529cf50d43f7746bb630a525cf9982411c74e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 11:03:26 +0200
Subject: [PATCH 107/119] changelog mention

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb357557..dbba715c06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed shoutbox not working in mobile layout
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
+- Fixed chat unread badge looking weird
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls

From cd2f5ced31a3598eb8a1fcdeef47d70dabf8bb00 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 14:27:25 +0200
Subject: [PATCH 108/119] add basic validation for statusless status
 notifications

---
 CHANGELOG.md                                  |  1 +
 src/modules/statuses.js                       | 29 ++++++++++++++-----
 .../notification_utils/notification_utils.js  |  7 +++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2685fd324b..929292f54b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
 - Fixed chat unread badge looking weird
+- Fixed notifications crashing on an invalid notificaiton
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 33c68c57c1..ac5d25c4ca 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,7 +13,11 @@ import {
   omitBy
 } from 'lodash'
 import { set } from 'vue'
-import { isStatusNotification, maybeShowNotification } from '../services/notification_utils/notification_utils.js'
+import {
+  isStatusNotification,
+  isValidNotification,
+  maybeShowNotification
+} from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
 
 const emptyTl = (userId = 0) => ({
@@ -310,8 +314,24 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 }
 
+const updateNotificationsMinMaxId = (state, notification) => {
+  state.notifications.maxId = notification.id > state.notifications.maxId
+    ? notification.id
+    : state.notifications.maxId
+  state.notifications.minId = notification.id < state.notifications.minId
+    ? notification.id
+    : state.notifications.minId
+}
+
 const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters, newNotificationSideEffects }) => {
   each(notifications, (notification) => {
+    // If invalid notification, update ids but don't add it to store
+    if (!isValidNotification(notification)) {
+      console.error('Invalid notification:', notification)
+      updateNotificationsMinMaxId(state, notification)
+      return
+    }
+
     if (isStatusNotification(notification.type)) {
       notification.action = addStatusToGlobalStorage(state, notification.action).item
       notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item
@@ -323,12 +343,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
 
     // Only add a new notification if we don't have one for the same action
     if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
-      state.notifications.maxId = notification.id > state.notifications.maxId
-        ? notification.id
-        : state.notifications.maxId
-      state.notifications.minId = notification.id < state.notifications.minId
-        ? notification.id
-        : state.notifications.minId
+      updateNotificationsMinMaxId(state, notification)
 
       state.notifications.data.push(notification)
       state.notifications.idStore[notification.id] = notification
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index d912d19f2f..6fef102263 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -22,6 +22,13 @@ const statusNotifications = ['like', 'mention', 'repeat', 'pleroma:emoji_reactio
 
 export const isStatusNotification = (type) => includes(statusNotifications, type)
 
+export const isValidNotification = (notification) => {
+  if (isStatusNotification(notification.type) && !notification.status) {
+    return false
+  }
+  return true
+}
+
 const sortById = (a, b) => {
   const seqA = Number(a.id)
   const seqB = Number(b.id)

From 7c37f495f649f5ad1fd7c536279fb09f26dd9a98 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Fri, 26 Feb 2021 12:36:58 +0000
Subject: [PATCH 109/119] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 929292f54b..270e957d2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
 - Fixed chat unread badge looking weird
-- Fixed notifications crashing on an invalid notificaiton
+- Fixed notifications crashing on an invalid notification
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls

From 09fe160e8b9fad7a8c70e44ae894d67211b993e1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 16:23:11 +0200
Subject: [PATCH 110/119] separate screen_name and screen_name_ui with decoded
 punycode

---
 CHANGELOG.md                                           |  1 +
 src/components/basic_user_card/basic_user_card.vue     |  2 +-
 src/components/chat/chat.js                            |  2 +-
 src/components/chat_title/chat_title.js                |  2 +-
 src/components/emoji_input/suggestor.js                |  4 ++--
 src/components/notification/notification.vue           | 10 +++++-----
 src/components/status/status.js                        |  4 ++--
 src/components/status/status.vue                       |  6 +++---
 src/components/user_avatar/user_avatar.vue             |  4 ++--
 src/components/user_card/user_card.vue                 |  4 ++--
 src/components/user_list_popover/user_list_popover.vue |  2 +-
 .../user_reporting_modal/user_reporting_modal.vue      |  2 +-
 .../entity_normalizer/entity_normalizer.service.js     |  5 +++--
 .../entity_normalizer/entity_normalizer.spec.js        |  2 +-
 14 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2685fd324b..20d96f98c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fixed missing highlighted border in expanded conversations again
 - Fixed some UI jumpiness when opening images particularly in chat view
 - Fixed chat unread badge looking weird
+- Fixed punycode names not working properly
 
 ### Changed
 - Display 'people voted' instead of 'votes' for multi-choice polls
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 9e4106102d..c53f6a9c7f 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -42,7 +42,7 @@
           class="basic-user-card-screen-name"
           :to="userProfileLink(user)"
         >
-          @{{ user.screen_name }}
+          @{{ user.screen_name_ui }}
         </router-link>
       </div>
       <slot />
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 2780be75e9..b54f5fb2c1 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -73,7 +73,7 @@ const Chat = {
     },
     formPlaceholder () {
       if (this.recipient) {
-        return this.$t('chats.message_user', { nickname: this.recipient.screen_name })
+        return this.$t('chats.message_user', { nickname: this.recipient.screen_name_ui })
       } else {
         return ''
       }
diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js
index e424bb1f05..edfbe7a400 100644
--- a/src/components/chat_title/chat_title.js
+++ b/src/components/chat_title/chat_title.js
@@ -12,7 +12,7 @@ export default Vue.component('chat-title', {
   ],
   computed: {
     title () {
-      return this.user ? this.user.screen_name : ''
+      return this.user ? this.user.screen_name_ui : ''
     },
     htmlTitle () {
       return this.user ? this.user.name_html : ''
diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 14a2b41edf..e8efbd1e0a 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -116,8 +116,8 @@ export const suggestUsers = ({ dispatch, state }) => {
 
       return diff + nameAlphabetically + screenNameAlphabetically
       /* eslint-disable camelcase */
-    }).map(({ screen_name, name, profile_image_url_original }) => ({
-      displayText: screen_name,
+    }).map(({ screen_name, screen_name_ui, name, profile_image_url_original }) => ({
+      displayText: screen_name_ui,
       detailText: name,
       imageUrl: profile_image_url_original,
       replacement: '@' + screen_name + ' '
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index f56aa977da..0081dee4d0 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -11,7 +11,7 @@
     >
       <small>
         <router-link :to="userProfileLink">
-          {{ notification.from_profile.screen_name }}
+          {{ notification.from_profile.screen_name_ui }}
         </router-link>
       </small>
       <button
@@ -54,14 +54,14 @@
             <bdi
               v-if="!!notification.from_profile.name_html"
               class="username"
-              :title="'@'+notification.from_profile.screen_name"
+              :title="'@'+notification.from_profile.screen_name_ui"
               v-html="notification.from_profile.name_html"
             />
             <!-- eslint-enable vue/no-v-html -->
             <span
               v-else
               class="username"
-              :title="'@'+notification.from_profile.screen_name"
+              :title="'@'+notification.from_profile.screen_name_ui"
             >{{ notification.from_profile.name }}</span>
             <span v-if="notification.type === 'like'">
               <FAIcon
@@ -152,7 +152,7 @@
             :to="userProfileLink"
             class="follow-name"
           >
-            @{{ notification.from_profile.screen_name }}
+            @{{ notification.from_profile.screen_name_ui }}
           </router-link>
           <div
             v-if="notification.type === 'follow_request'"
@@ -177,7 +177,7 @@
           class="move-text"
         >
           <router-link :to="targetUserProfileLink">
-            @{{ notification.target.screen_name }}
+            @{{ notification.target.screen_name_ui }}
           </router-link>
         </div>
         <template v-else>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 2bf93a9eb6..470c01f191 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -136,7 +136,7 @@ const Status = {
       }
     },
     retweet () { return !!this.statusoid.retweeted_status },
-    retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name },
+    retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name_ui },
     retweeterHtml () { return this.statusoid.user.name_html },
     retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) },
     status () {
@@ -216,7 +216,7 @@ const Status = {
         return this.status.in_reply_to_screen_name
       } else {
         const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
-        return user && user.screen_name
+        return user && user.screen_name_ui
       }
     },
     replySubject () {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 6ee8117f2a..00e962f301 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -26,7 +26,7 @@
             icon="retweet"
           />
           <router-link :to="userProfileLink">
-            {{ status.user.screen_name }}
+            {{ status.user.screen_name_ui }}
           </router-link>
         </small>
         <small
@@ -156,10 +156,10 @@
                 </h4>
                 <router-link
                   class="account-name"
-                  :title="status.user.screen_name"
+                  :title="status.user.screen_name_ui"
                   :to="userProfileLink"
                 >
-                  {{ status.user.screen_name }}
+                  {{ status.user.screen_name_ui }}
                 </router-link>
                 <img
                   v-if="!!(status.user && status.user.favicon)"
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 0f7c584b13..4040e263c8 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -2,8 +2,8 @@
   <StillImage
     v-if="user"
     class="Avatar"
-    :alt="user.screen_name"
-    :title="user.screen_name"
+    :alt="user.screen_name_ui"
+    :title="user.screen_name_ui"
     :src="imgSrc(user.profile_image_url_original)"
     :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }"
     :image-load-error="imageLoadError"
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 572943b594..60776ebbba 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -73,10 +73,10 @@
             <div class="bottom-line">
               <router-link
                 class="user-screen-name"
-                :title="user.screen_name"
+                :title="user.screen_name_ui"
                 :to="userProfileLink(user)"
               >
-                @{{ user.screen_name }}
+                @{{ user.screen_name_ui }}
               </router-link>
               <template v-if="!hideBio">
                 <span
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 95673733e3..d0aa315e1d 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -26,7 +26,7 @@
             <!-- eslint-disable vue/no-v-html -->
             <span v-html="user.name_html" />
             <!-- eslint-enable vue/no-v-html -->
-            <span class="user-list-screen-name">{{ user.screen_name }}</span>
+            <span class="user-list-screen-name">{{ user.screen_name_ui }}</span>
           </div>
         </div>
       </div>
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index fb43094f18..a71c02c193 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -6,7 +6,7 @@
     <div class="user-reporting-panel panel">
       <div class="panel-heading">
         <div class="title">
-          {{ $t('user_reporting.title', [user.screen_name]) }}
+          {{ $t('user_reporting.title', [user.screen_name_ui]) }}
         </div>
       </div>
       <div class="panel-body">
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 6ed663e1c7..9b2b30e6b2 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -203,7 +203,8 @@ export const parseUser = (data) => {
   output.rights = output.rights || {}
   output.notification_settings = output.notification_settings || {}
 
-  // Convert punycode to unicode
+  // Convert punycode to unicode for UI
+  output.screen_name_ui = output.screen_name
   if (output.screen_name.includes('@')) {
     const parts = output.screen_name.split('@')
     let unicodeDomain = punycode.toUnicode(parts[1])
@@ -211,7 +212,7 @@ export const parseUser = (data) => {
       // Add some identifier so users can potentially spot spoofing attempts:
       // lain.com and xn--lin-6cd.com would appear identical otherwise.
       unicodeDomain = '🌏' + unicodeDomain
-      output.screen_name = [parts[0], unicodeDomain].join('@')
+      output.screen_name_ui = [parts[0], unicodeDomain].join('@')
     }
   }
 
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index a3f49b2cef..759539e0c8 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -315,7 +315,7 @@ describe('API Entities normalizer', () => {
     it('converts IDN to unicode and marks it as internatonal', () => {
       const user = makeMockUserMasto({ acct: 'lain@xn--lin-6cd.com' })
 
-      expect(parseUser(user)).to.have.property('screen_name').that.equal('lain@🌏lаin.com')
+      expect(parseUser(user)).to.have.property('screen_name_ui').that.equal('lain@🌏lаin.com')
     })
   })
 

From 49aa10e1c0e279d692fb92695f92e4b8548f6b12 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Feb 2021 16:37:46 +0200
Subject: [PATCH 111/119] add screen_name_ui to tests

---
 test/unit/specs/components/user_profile.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js
index 80092b410c..142db73ce6 100644
--- a/test/unit/specs/components/user_profile.spec.js
+++ b/test/unit/specs/components/user_profile.spec.js
@@ -31,13 +31,15 @@ const testGetters = {
 const localUser = {
   id: 100,
   is_local: true,
-  screen_name: 'testUser'
+  screen_name: 'testUser',
+  screen_name_ui: 'testUser'
 }
 
 const extUser = {
   id: 100,
   is_local: false,
-  screen_name: 'testUser@test.instance'
+  screen_name: 'testUser@test.instance',
+  screen_name_ui: 'testUser@test.instance'
 }
 
 const externalProfileStore = new Vuex.Store({

From 670abd633f97e75cf35981ee0f617d0be1b43816 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Sun, 28 Feb 2021 15:36:51 +0000
Subject: [PATCH 112/119] Update timeline_quick_settings.js

---
 src/components/timeline/timeline_quick_settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index ecac06e958..2c1a3df8af 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -16,7 +16,6 @@ const TimelineQuickSettings = {
   },
   methods: {
     setReplyVisibility (visibility) {
-      console.log('set reply visibility', visibility)
       this.$store.dispatch('setOption', { name: 'replyVisibility', value: visibility })
       this.$store.dispatch('queueFlushAll')
     },

From 846e58c3d2cf07442c7cb819b4c6d1b4dbf4ec7d Mon Sep 17 00:00:00 2001
From: Ryo Ueno <r.ueno.nfive@gmail.com>
Date: Sat, 27 Feb 2021 23:07:22 +0000
Subject: [PATCH 113/119] Translated using Weblate (Japanese)

Currently translated at 100.0% (686 of 686 strings)

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

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 267a89aee6..846c793ac1 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -413,8 +413,8 @@
         "contrast": {
           "hint": "コントラストは {ratio} です。{level}。({context})",
           "level": {
-            "aa": "AAレベルガイドライン (ミニマル) を満たします",
-            "aaa": "AAAレベルガイドライン (レコメンデッド) を満たします",
+            "aa": "AAレベルガイドライン (最低限) を満たします",
+            "aaa": "AAAレベルガイドライン (推奨) を満たします",
             "bad": "ガイドラインを満たしません"
           },
           "context": {
@@ -573,7 +573,8 @@
     "mute_export": "ミュートのエクスポート",
     "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
     "setting_changed": "規定の設定と異なっています",
-    "greentext": "引用を緑色で表示"
+    "greentext": "引用を緑色で表示",
+    "sensitive_by_default": "はじめから投稿をセンシティブとして設定"
   },
   "time": {
     "day": "{0}日",

From fc5483f7641f3aa6866fbbd9beaca0139083ee86 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 10:14:17 +0200
Subject: [PATCH 114/119] change icons around

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

diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index 2c1a3df8af..9ec1a007f4 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -2,10 +2,11 @@ import Popover from '../popover/popover.vue'
 import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faFilter, faWrench } from '@fortawesome/free-solid-svg-icons'
+import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
   faFilter,
+  faFont,
   faWrench
 )
 
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
index 67f6be53bd..4ad2842b30 100644
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -63,7 +63,7 @@
         class="button-default dropdown-item dropdown-item-icon"
         @click="openTab('filtering')"
       >
-        <FAIcon icon="filter" />{{ $t('settings.word_filter') }}
+        <FAIcon icon="font" />{{ $t('settings.word_filter') }}
       </button>
       <button
         class="button-default dropdown-item dropdown-item-icon"
@@ -73,7 +73,7 @@
       </button>
     </div>
     <div slot="trigger">
-      <FAIcon icon="cog" />
+      <FAIcon icon="filter" />
     </div>
   </Popover>
 </template>

From d1ab424ebcd0a41fca9b848de02d03a2015ed9c7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 2 Mar 2021 09:53:17 +0200
Subject: [PATCH 115/119] update changelog with 2.3.0

---
 CHANGELOG.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2b48b9ec..eb6a459990 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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/).
 
 ## [Unreleased]
+### Added
+- Added a quick settings to timeline header for easier access
+- Added option to mark posts as sensitive by default
+
+## [2.3.0] - 2021-03-01
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
@@ -17,11 +22,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Display 'people voted' instead of 'votes' for multi-choice polls
 - Optimized chat to not get horrible performance after keeping the same chat open for a long time
 - When opening emoji picker or react picker, it automatically focuses the search field
+- Language picker now uses native language names
 
 ### Added
 - Added reason field for registration when approval is required
-- Added a quick settings to timeline header for easier access
-- Added option to mark posts as sensitive by default
+- Group staff members by role in the About page
 
 ## [2.2.3] - 2021-01-18
 ### Added
@@ -33,7 +38,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Don't filter own posts when they hit your wordfilter
-- Language picker now uses native language names
 
 
 ## [2.2.2] - 2020-12-22
@@ -43,7 +47,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added some missing unicode emoji
 - Added the upload limit to the Features panel in the About page
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
-- Group staff members by role in the About page
 
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form

From 0673511fc246d67356dd656ad81ba401e3179108 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 3 Mar 2021 16:46:53 +0200
Subject: [PATCH 116/119] fix shoutbox header, use custom scroll-to-bottom
 system, remove vue-chat-scroll, temporarily add chat test hack

---
 package.json                             |  1 -
 src/App.vue                              |  2 +-
 src/components/chat_panel/chat_panel.js  | 12 ++++++++++++
 src/components/chat_panel/chat_panel.vue | 15 ++++++++++-----
 src/main.js                              |  2 --
 src/modules/chat.js                      | 19 +++++++++++++++++++
 yarn.lock                                |  4 ----
 7 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 372155dfb9..8dbf25030b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "punycode.js": "^2.1.0",
     "v-click-outside": "^2.1.1",
     "vue": "^2.6.11",
-    "vue-chat-scroll": "^1.2.1",
     "vue-i18n": "^7.3.2",
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.6.11",
diff --git a/src/App.vue b/src/App.vue
index 1a1667788d..e09ce4c8f3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
       <media-modal />
     </div>
     <chat-panel
-      v-if="currentUser && chat"
+      v-if="currentUser"
       :floating="true"
       class="floating-chat mobile-hidden"
     />
diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
index c388709802..556694aef2 100644
--- a/src/components/chat_panel/chat_panel.js
+++ b/src/components/chat_panel/chat_panel.js
@@ -35,6 +35,18 @@ const chatPanel = {
     userProfileLink (user) {
       return generateProfileLink(user.id, user.username, this.$store.state.instance.restrictedNicknames)
     }
+  },
+  watch: {
+    messages (newVal) {
+      const scrollEl = this.$el.querySelector('.chat-window')
+      if (!scrollEl) return
+      if (scrollEl.scrollTop + scrollEl.offsetHeight + 20 > scrollEl.scrollHeight) {
+        this.$nextTick(() => {
+          if (!scrollEl) return
+          scrollEl.scrollTop = scrollEl.scrollHeight - scrollEl.offsetHeight
+        })
+      }
+    }
   }
 }
 
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 7993c94d9a..8a829115b2 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -10,17 +10,15 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <span>{{ $t('shoutbox.title') }}</span>
+          {{ $t('shoutbox.title') }}
           <FAIcon
             v-if="floating"
             icon="times"
+            class="close-icon"
           />
         </div>
       </div>
-      <div
-        v-chat-scroll
-        class="chat-window"
-      >
+      <div class="chat-window">
         <div
           v-for="message in messages"
           :key="message.id"
@@ -94,6 +92,13 @@
     .icon {
       color: $fallback--text;
       color: var(--text, $fallback--text);
+      margin-right: 0.5em;
+    }
+
+    .title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
   }
 
diff --git a/src/main.js b/src/main.js
index 90ee288783..e1cac748fc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,7 +28,6 @@ import pushNotifications from './lib/push_notifications_plugin.js'
 
 import messages from './i18n/messages.js'
 
-import VueChatScroll from 'vue-chat-scroll'
 import VueClickOutside from 'v-click-outside'
 import PortalVue from 'portal-vue'
 import VBodyScrollLock from './directives/body_scroll_lock'
@@ -42,7 +41,6 @@ const currentLocale = (window.navigator.language || 'en').split('-')[0]
 Vue.use(Vuex)
 Vue.use(VueRouter)
 Vue.use(VueI18n)
-Vue.use(VueChatScroll)
 Vue.use(VueClickOutside)
 Vue.use(PortalVue)
 Vue.use(VBodyScrollLock)
diff --git a/src/modules/chat.js b/src/modules/chat.js
index c798549dd1..264ba00b71 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,6 +18,25 @@ const chat = {
   actions: {
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
+      let id = 0
+      const createmsg = () => {
+        id += 1
+        return {
+          text: 'test' + id,
+          author: {
+            username: 'test',
+            avatar: '',
+            id
+          }
+        }
+      }
+
+      const loop = () => {
+        store.commit('addMessage', createmsg())
+        setTimeout(loop, 3000)
+      }
+      loop()
+
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)
       })
diff --git a/yarn.lock b/yarn.lock
index 6d0095db96..80c09312d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8923,10 +8923,6 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
-vue-chat-scroll@^1.2.1:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/vue-chat-scroll/-/vue-chat-scroll-1.3.5.tgz#a5ee5bae5058f614818a96eac5ee3be4394a2f68"
-
 vue-eslint-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"

From becacf064303f0fceca8def3f1c49248b9d3e5f8 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 3 Mar 2021 16:47:59 +0200
Subject: [PATCH 117/119] remove shoutbox test hacks

---
 src/App.vue         |  2 +-
 src/modules/chat.js | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e09ce4c8f3..1a1667788d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
       <media-modal />
     </div>
     <chat-panel
-      v-if="currentUser"
+      v-if="currentUser && chat"
       :floating="true"
       class="floating-chat mobile-hidden"
     />
diff --git a/src/modules/chat.js b/src/modules/chat.js
index 264ba00b71..ffeb272b67 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,24 +18,6 @@ const chat = {
   actions: {
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
-      let id = 0
-      const createmsg = () => {
-        id += 1
-        return {
-          text: 'test' + id,
-          author: {
-            username: 'test',
-            avatar: '',
-            id
-          }
-        }
-      }
-
-      const loop = () => {
-        store.commit('addMessage', createmsg())
-        setTimeout(loop, 3000)
-      }
-      loop()
 
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)

From b4f5df9ce502efbf35eccf5c62066200b04428f8 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Thu, 4 Mar 2021 22:24:17 +0300
Subject: [PATCH 118/119] Make it possible to localize user highlight options

---
 src/components/user_card/user_card.vue | 8 ++++----
 src/i18n/en.json                       | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 60776ebbba..c59faaa6c3 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -141,10 +141,10 @@
                 v-model="userHighlightType"
                 class="userHighlightSel"
               >
-                <option value="disabled">No highlight</option>
-                <option value="solid">Solid bg</option>
-                <option value="striped">Striped bg</option>
-                <option value="side">Side stripe</option>
+                <option value="disabled">{{$t('user_card.highlight.disabled')}}</option>
+                <option value="solid">{{$t('user_card.highlight.solid')}}</option>
+                <option value="striped">{{$t('user_card.highlight.striped')}}</option>
+                <option value="side">{{$t('user_card.highlight.side')}}</option>
               </select>
               <FAIcon
                 class="select-down-icon"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index bf77536361..2aefebc9d3 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -746,6 +746,12 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    },
+    "highlight": {
+      "disabled": "No highlight",
+      "solid": "Solid bg",
+      "striped": "Striped bg",
+      "side": "Side stripe"
     }
   },
   "user_profile": {

From c14c144cc8774fe03bb6dc981fad0470ac1bcebb Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Thu, 4 Mar 2021 19:46:03 +0000
Subject: [PATCH 119/119] Apply 1 suggestion(s) to 1 file(s)

---
 src/components/user_card/user_card.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c59faaa6c3..4b7ee7d5a2 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -141,10 +141,10 @@
                 v-model="userHighlightType"
                 class="userHighlightSel"
               >
-                <option value="disabled">{{$t('user_card.highlight.disabled')}}</option>
-                <option value="solid">{{$t('user_card.highlight.solid')}}</option>
-                <option value="striped">{{$t('user_card.highlight.striped')}}</option>
-                <option value="side">{{$t('user_card.highlight.side')}}</option>
+                <option value="disabled">{{ $t('user_card.highlight.disabled') }}</option>
+                <option value="solid">{{ $t('user_card.highlight.solid') }}</option>
+                <option value="striped">{{ $t('user_card.highlight.striped') }}</option>
+                <option value="side">{{ $t('user_card.highlight.side') }}</option>
               </select>
               <FAIcon
                 class="select-down-icon"