From 1946661911c97651ba5356db22a0ddd00ba04864 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sat, 9 Nov 2019 00:27:09 -0600
Subject: [PATCH 001/415] update terms of service instructions

---
 static/terms-of-service.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/static/terms-of-service.html b/static/terms-of-service.html
index c02cb719..c880b72c 100644
--- a/static/terms-of-service.html
+++ b/static/terms-of-service.html
@@ -1,7 +1,8 @@
 <h4>Terms of Service</h4>
 
-<p>This is a placeholder ToS.</p>
+<p>This is the default placeholder ToS.  You should change it to fit the needs of your instance.</p>
 
-<p>Edit <code>"/static/terms-of-service.html"</code> to make it fit the needs of your instance.</p>
+<p>To do so, place a file at <code>"/instance/static/terms-of-service.html"</code> in your
+   Pleroma install containing the real ToS for your instance.</p>
 <br>
-<img src="/static/logo.png"/ style="display: block; margin: auto;">
+<img src="/static/logo.png" style="display: block; margin: auto;">

From ca4d5950d08aec6fe016b56f7125f7328c1e19a1 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Sat, 16 Nov 2019 03:12:16 +0900
Subject: [PATCH 002/415] Display user profile fields

---
 src/components/user_profile/user_profile.js  |  8 ++++
 src/components/user_profile/user_profile.vue | 50 ++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 00055707..c5ab5f26 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -123,6 +123,14 @@ const UserProfile = {
     onTabSwitch (tab) {
       this.tab = tab
       this.$router.replace({ query: { tab } })
+    },
+    linkClicked ({ target }) {
+      if (target.tagName === 'SPAN') {
+        target = target.parentNode
+      }
+      if (target.tagName === 'A') {
+        window.open(target.href, '_blank')
+      }
     }
   },
   watch: {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 14082e83..f979eff4 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -11,6 +11,44 @@
         :allow-zooming-avatar="true"
         rounded="top"
       />
+      <div
+        v-if="user.fields_html && user.fields_html.length > 0"
+        class="user-profile-fields"
+      >
+        <dl
+          v-for="(field, index) in user.fields_html"
+          :key="index"
+        >
+          <!-- eslint-disable vue/no-v-html -->
+          <dt
+            class="user-profile-field-name"
+            @click.prevent="linkClicked"
+            v-html="field.name"
+          />
+          <dd
+            class="user-profile-field-value"
+            @click.prevent="linkClicked"
+            v-html="field.value"
+          />
+          <!-- eslint-enable vue/no-v-html -->
+        </dl>
+      </div>
+      <div
+        v-else-if="user.fields && user.fields.length > 0"
+        class="user-card-fields"
+      >
+        <dl
+          v-for="(field, index) in user.fields"
+          :key="index"
+        >
+          <dt class="user-card-field-name">
+            {{ field.name }}
+          </dt>
+          <dd class="user-card-field-value">
+            {{ field.value }}
+          </dd>
+        </dl>
+      </div>
       <tab-switcher
         :active-tab="tab"
         :render-only-focused="true"
@@ -113,6 +151,18 @@
   flex: 2;
   flex-basis: 500px;
 
+  .user-profile-fields {
+    dl {
+      margin: 1em 1.5em;
+
+      dt, dd {
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+    }
+  }
+
   .userlist-placeholder {
     display: flex;
     justify-content: center;

From 2bc549a66a0e189698e38c029cf8d0bfb19d0351 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Mon, 18 Nov 2019 00:27:14 +0900
Subject: [PATCH 003/415] Fix emoji size

---
 src/components/user_profile/user_profile.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index f979eff4..d5aa514e 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -152,6 +152,18 @@
   flex-basis: 500px;
 
   .user-profile-fields {
+    img {
+      object-fit: contain;
+      vertical-align: middle;
+      max-width: 100%;
+      max-height: 400px;
+
+      &.emoji {
+        width: 32px;
+        height: 32px;
+      }
+    }
+
     dl {
       margin: 1em 1.5em;
 

From 004827a7f17a0bc349baf1257aa5debe3c6f6060 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Mon, 18 Nov 2019 02:16:37 +0900
Subject: [PATCH 004/415] Change profile fields design to horizontal

---
 src/components/user_profile/user_profile.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index d5aa514e..fdff0385 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -159,15 +159,31 @@
       max-height: 400px;
 
       &.emoji {
-        width: 32px;
-        height: 32px;
+        width: 18px;
+        height: 18px;
       }
     }
 
     dl {
+      display: flex;
       margin: 1em 1.5em;
 
+      dt {
+        flex: 0 0 auto;
+        font-weight: 500;
+        color: var(--lightText);
+        width: 30%;
+        min-width: 120px;
+      }
+
+      dd {
+        flex: 1 1 auto;
+        color: var(--text);
+        margin-left: 10px;
+      }
+
       dt, dd {
+        line-height: 18px;
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;

From 87940ead8a9bedd312f10635462933a02e0ffb1c Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 18:59:37 +0900
Subject: [PATCH 005/415] Change css selectors to classname from elementname

---
 src/components/user_profile/user_profile.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fdff0385..c1337411 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -18,6 +18,7 @@
         <dl
           v-for="(field, index) in user.fields_html"
           :key="index"
+          class="user-profile-field"
         >
           <!-- eslint-disable vue/no-v-html -->
           <dt
@@ -164,11 +165,11 @@
       }
     }
 
-    dl {
+    .user-profile-field {
       display: flex;
       margin: 1em 1.5em;
 
-      dt {
+      .user-profile-field-name {
         flex: 0 0 auto;
         font-weight: 500;
         color: var(--lightText);
@@ -176,13 +177,13 @@
         min-width: 120px;
       }
 
-      dd {
+      .user-profile-field-value {
         flex: 1 1 auto;
         color: var(--text);
         margin-left: 10px;
       }
 
-      dt, dd {
+      .user-profile-field-name, .user-profile-field-value {
         line-height: 18px;
         text-overflow: ellipsis;
         white-space: nowrap;

From d2e334daa3891d42f77dd10283f0ea2dd23f08bc Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 19:18:19 +0900
Subject: [PATCH 006/415] Add tooltip

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index c1337411..20a64409 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -22,11 +22,13 @@
         >
           <!-- eslint-disable vue/no-v-html -->
           <dt
+            :title="user.fields[index].name"
             class="user-profile-field-name"
             @click.prevent="linkClicked"
             v-html="field.name"
           />
           <dd
+            :title="user.fields[index].value"
             class="user-profile-field-value"
             @click.prevent="linkClicked"
             v-html="field.value"

From a15baa8962a14dd8d0d3f72695be8b677a78b606 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 19:22:20 +0900
Subject: [PATCH 007/415] Use fields_html only

---
 src/components/user_profile/user_profile.vue | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 20a64409..0268e5da 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -36,22 +36,6 @@
           <!-- eslint-enable vue/no-v-html -->
         </dl>
       </div>
-      <div
-        v-else-if="user.fields && user.fields.length > 0"
-        class="user-card-fields"
-      >
-        <dl
-          v-for="(field, index) in user.fields"
-          :key="index"
-        >
-          <dt class="user-card-field-name">
-            {{ field.name }}
-          </dt>
-          <dd class="user-card-field-value">
-            {{ field.value }}
-          </dd>
-        </dl>
-      </div>
       <tab-switcher
         :active-tab="tab"
         :render-only-focused="true"

From bfdf7c876c015beb2748cf709d27b9f66df3fe61 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 19:25:11 +0900
Subject: [PATCH 008/415] Change field name to right justify

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 0268e5da..5bffba3a 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -158,6 +158,7 @@
       .user-profile-field-name {
         flex: 0 0 auto;
         font-weight: 500;
+        text-align: right;
         color: var(--lightText);
         width: 30%;
         min-width: 120px;

From da55b0d4352d2daf4a8d9f4130d34546e9f01555 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 19 Feb 2020 20:57:58 +0900
Subject: [PATCH 009/415] Add fields_text for tooltip

---
 .../entity_normalizer/entity_normalizer.service.js  |  6 ++++++
 .../entity_normalizer/entity_normalizer.spec.js     | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ca79df6f..ca2075a4 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -53,6 +53,12 @@ export const parseUser = (data) => {
         value: addEmojis(field.value, data.emojis)
       }
     })
+    output.fields_text = data.fields.map(field => {
+      return {
+        name: field.name.replace(/<[^>]*>/g, ''),
+        value: field.value.replace(/<[^>]*>/g, '')
+      }
+    })
 
     // Utilize avatar_static for gif avatars?
     output.profile_image_url = data.avatar
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 cfb380ba..9df84575 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -290,6 +290,19 @@ describe('API Entities normalizer', () => {
       expect(field).to.have.property('value').that.contains('<img')
     })
 
+    it('removes html tags from user profile fields', () => {
+      const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), fields: [{ name: 'user', value: '<a rel="me" href="https://example.com/@user">@user</a>' }] })
+
+      const parsedUser = parseUser(user)
+
+      expect(parsedUser).to.have.property('fields_text').to.be.an('array')
+
+      const field = parsedUser.fields_text[0]
+
+      expect(field).to.have.property('name').that.equal('user')
+      expect(field).to.have.property('value').that.equal('@user')
+    })
+
     it('adds hide_follows and hide_followers user settings', () => {
       const user = makeMockUserMasto({ pleroma: { hide_followers: true, hide_follows: false, hide_followers_count: false, hide_follows_count: true } })
 

From 064b59812c715d60526727d42c124375a2bc89d5 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 19 Feb 2020 21:00:39 +0900
Subject: [PATCH 010/415] Change to use tags removed fields instead of raw
 fields

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 5bffba3a..54f2d4b3 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -22,13 +22,13 @@
         >
           <!-- eslint-disable vue/no-v-html -->
           <dt
-            :title="user.fields[index].name"
+            :title="user.fields_text[index].name"
             class="user-profile-field-name"
             @click.prevent="linkClicked"
             v-html="field.name"
           />
           <dd
-            :title="user.fields[index].value"
+            :title="user.fields_text[index].value"
             class="user-profile-field-value"
             @click.prevent="linkClicked"
             v-html="field.value"

From 88fbbb5e9bc0f34ab265a4af3151cc96b0b00f0e Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 1 Mar 2020 09:47:21 +0100
Subject: [PATCH 011/415] status.vue: Add support for favicons

Put in replacement to the external icon when possible
---
 src/components/status/status.vue                     | 12 +++++++++++-
 .../entity_normalizer/entity_normalizer.service.js   |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ca295640..ec32b60c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -150,8 +150,18 @@
                   class="source_url"
                   title="Source"
                 >
-                  <i class="button-icon icon-link-ext-alt" />
+                  <img
+                    height="18px"
+                    v-if="!!(status.user && status.user.favicon)"
+                    :src="status.user.favicon"
+                  />
+                  <i v-else class="button-icon icon-link-ext-alt" />
                 </a>
+                <img
+                  v-else-if="!!(status.user && status.user.favicon)"
+                  height="18px"
+                  :src="status.user.favicon"
+                />
                 <template v-if="expandable && !isPreview">
                   <a
                     href="#"
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 84169a7b..9370b93f 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -71,6 +71,7 @@ export const parseUser = (data) => {
       const relationship = data.pleroma.relationship
 
       output.background_image = data.pleroma.background_image
+      output.favicon = data.pleroma.favicon
       output.token = data.pleroma.chat_token
 
       if (relationship) {

From 7dfa734665bbb74058e221af0f71a88b4f37936d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 25 Mar 2020 20:06:48 +0300
Subject: [PATCH 012/415] after_store: Remove most of StatusNet config usage

Information under `pleromafe` key is equivalent to the one under
`pleroma_fe` key in  `/api/pleroma/frontend_configurations`.

All other information had equivalents in `/nodeinfo/2.0.json`, except
`textlimit` and `vapidPublicKey`.
---
 src/boot/after_store.js | 51 ++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index d70e1058..b943ed95 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -13,28 +13,13 @@ const getStatusnetConfig = async ({ store }) => {
     const res = await window.fetch('/api/statusnet/config.json')
     if (res.ok) {
       const data = await res.json()
-      const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey, safeDMMentionsEnabled } = data.site
+      const { textlimit, vapidPublicKey } = data.site
 
-      store.dispatch('setInstanceOption', { name: 'name', value: name })
-      store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
       store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
-      store.dispatch('setInstanceOption', { name: 'server', value: server })
-      store.dispatch('setInstanceOption', { name: 'safeDM', value: safeDMMentionsEnabled !== '0' })
-
-      // TODO: default values for this stuff, added if to not make it break on
-      // my dev config out of the box.
-      if (uploadlimit) {
-        store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadlimit.uploadlimit) })
-        store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadlimit.avatarlimit) })
-        store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadlimit.backgroundlimit) })
-        store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
-      }
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
       }
-
-      return data.site.pleromafe
     } else {
       throw (res)
     }
@@ -44,6 +29,21 @@ const getStatusnetConfig = async ({ store }) => {
   }
 }
 
+const getBackendProvidedConfig = async ({ store }) => {
+  try {
+    const res = await window.fetch('/api/pleroma/frontend_configurations')
+    if (res.ok) {
+      const data = await res.json()
+      return data.pleroma_fe
+    } else {
+      throw (res)
+    }
+  } catch (error) {
+    console.error('Could not load backend-provided frontend config, potentially fatal')
+    console.error(error)
+  }
+}
+
 const getStaticConfig = async () => {
   try {
     const res = await window.fetch('/static/config.json')
@@ -200,13 +200,22 @@ const getNodeInfo = async ({ store }) => {
       const data = await res.json()
       const metadata = data.metadata
       const features = metadata.features
+      store.dispatch('setInstanceOption', { name: 'name', value: metadata.nodeName })
+      store.dispatch('setInstanceOption', { name: 'registrationOpen', value: data.openRegistrations })
       store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
+      store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
       store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
       store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
       store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
       store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
 
+      const uploadLimits = metadata.uploadLimits
+      store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
+      store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadLimits.avatar) })
+      store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadLimits.background) })
+      store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadLimits.banner) })
+
       store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
       store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
 
@@ -254,7 +263,7 @@ const getNodeInfo = async ({ store }) => {
 
 const setConfig = async ({ store }) => {
   // apiConfig, staticConfig
-  const configInfos = await Promise.all([getStatusnetConfig({ store }), getStaticConfig()])
+  const configInfos = await Promise.all([getBackendProvidedConfig({ store }), getStaticConfig()])
   const apiConfig = configInfos[0]
   const staticConfig = configInfos[1]
 
@@ -277,6 +286,11 @@ const checkOAuthToken = async ({ store }) => {
 const afterStoreSetup = async ({ store, i18n }) => {
   const width = windowWidth()
   store.dispatch('setMobileLayout', width <= 800)
+
+  const overrides = window.___pleromafe_dev_overrides || {}
+  const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin
+  store.dispatch('setInstanceOption', { name: 'server', value: server })
+
   await setConfig({ store })
 
   const { customTheme, customThemeSource } = store.state.config
@@ -301,7 +315,8 @@ const afterStoreSetup = async ({ store, i18n }) => {
     getTOS({ store }),
     getInstancePanel({ store }),
     getStickers({ store }),
-    getNodeInfo({ store })
+    getNodeInfo({ store }),
+    getStatusnetConfig({ store })
   ])
 
   const router = new VueRouter({

From 2e35289c3376881ca17b9330113c816a3327f245 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 3 May 2020 17:36:12 +0300
Subject: [PATCH 013/415] initial work on settings modal

---
 src/App.js                                    |   5 +
 src/App.scss                                  |   3 +
 src/App.vue                                   |   7 +-
 .../mobile_post_status_button.js              |   2 +-
 .../post_status_modal/post_status_modal.js    |   3 -
 .../post_status_modal/post_status_modal.vue   |   1 -
 .../settings_modal/settings_modal.js          |  39 ++
 .../settings_modal/settings_modal.scss        |  59 ++
 .../settings_modal/settings_modal.vue         |  31 +
 .../settings_modal/tabs/data_import_export.js |  65 ++
 .../tabs/data_import_export.vue               |  43 ++
 .../settings_modal/tabs/mutes_and_blocks.js   | 124 ++++
 .../settings_modal/tabs/mutes_and_blocks.vue  | 173 +++++
 .../settings_modal/tabs/notifications.js      |  27 +
 .../settings_modal/tabs/notifications.vue     |  42 ++
 src/components/settings_modal/tabs/profile.js | 179 ++++++
 .../settings_modal/tabs/profile.scss          |  82 +++
 .../settings_modal/tabs/profile.vue           | 213 +++++++
 .../settings_modal/tabs/security.js           | 106 ++++
 .../settings_modal/tabs/security.vue          | 143 +++++
 src/components/tab_switcher/tab_switcher.js   |   7 +-
 src/components/tab_switcher/tab_switcher.scss | 220 +++++--
 src/components/user_settings/user_settings.js | 257 +-------
 .../user_settings/user_settings.vue           | 597 ------------------
 src/i18n/en.json                              |   1 +
 src/modules/interface.js                      |  28 +
 26 files changed, 1530 insertions(+), 927 deletions(-)
 create mode 100644 src/components/settings_modal/settings_modal.js
 create mode 100644 src/components/settings_modal/settings_modal.scss
 create mode 100644 src/components/settings_modal/settings_modal.vue
 create mode 100644 src/components/settings_modal/tabs/data_import_export.js
 create mode 100644 src/components/settings_modal/tabs/data_import_export.vue
 create mode 100644 src/components/settings_modal/tabs/mutes_and_blocks.js
 create mode 100644 src/components/settings_modal/tabs/mutes_and_blocks.vue
 create mode 100644 src/components/settings_modal/tabs/notifications.js
 create mode 100644 src/components/settings_modal/tabs/notifications.vue
 create mode 100644 src/components/settings_modal/tabs/profile.js
 create mode 100644 src/components/settings_modal/tabs/profile.scss
 create mode 100644 src/components/settings_modal/tabs/profile.vue
 create mode 100644 src/components/settings_modal/tabs/security.js
 create mode 100644 src/components/settings_modal/tabs/security.vue

diff --git a/src/App.js b/src/App.js
index 61b5eec1..4d9d50d4 100644
--- a/src/App.js
+++ b/src/App.js
@@ -6,6 +6,7 @@ import InstanceSpecificPanel from './components/instance_specific_panel/instance
 import FeaturesPanel from './components/features_panel/features_panel.vue'
 import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
 import ChatPanel from './components/chat_panel/chat_panel.vue'
+import SettingsModal from './components/settings_modal/settings_modal.vue'
 import MediaModal from './components/media_modal/media_modal.vue'
 import SideDrawer from './components/side_drawer/side_drawer.vue'
 import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue'
@@ -29,6 +30,7 @@ export default {
     SideDrawer,
     MobilePostStatusButton,
     MobileNav,
+    SettingsModal,
     UserReportingModal,
     PostStatusModal
   },
@@ -112,6 +114,9 @@ export default {
     onSearchBarToggled (hidden) {
       this.searchBarHidden = hidden
     },
+    openSettingsModal () {
+      this.$store.dispatch('openSettingsModal')
+    },
     updateMobileState () {
       const mobileLayout = windowWidth() <= 800
       const changed = mobileLayout !== this.isMobileLayout
diff --git a/src/App.scss b/src/App.scss
index 89aa3215..7db9461c 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -860,6 +860,7 @@ nav {
   }
 }
 
+// DELETE
 .setting-item {
   border-bottom: 2px solid var(--fg, $fallback--fg);
   margin: 1em 1em 1.4em;
@@ -905,6 +906,8 @@ nav {
     max-width: 6em;
   }
 }
+// DELETE
+
 .select-multiple {
   display: flex;
   .option-list {
diff --git a/src/App.vue b/src/App.vue
index ff62fc51..db3f981f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -46,15 +46,15 @@
             @toggled="onSearchBarToggled"
             @click.stop.native
           />
-          <router-link
+          <a
             class="mobile-hidden"
-            :to="{ name: 'settings'}"
+            @click.stop="openSettingsModal"
           >
             <i
               class="button-icon icon-cog nav-icon"
               :title="$t('nav.preferences')"
             />
-          </router-link>
+          </a>
           <a
             v-if="currentUser && currentUser.role === 'admin'"
             href="/pleroma/admin/#/login-pleroma"
@@ -122,6 +122,7 @@
     <MobilePostStatusButton />
     <UserReportingModal />
     <PostStatusModal />
+    <SettingsModal />
     <portal-target name="modal" />
   </div>
 </template>
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index 0ad12bb1..ff2d4eaa 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -52,7 +52,7 @@ const MobilePostStatusButton = {
       window.removeEventListener('scroll', this.handleScrollEnd)
     },
     openPostForm () {
-      this.$store.dispatch('openPostStatusModal')
+      this.$store.dispatch('openSettingsModal')
     },
     handleOSK () {
       // This is a big hack: we're guessing from changed window sizes if the
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index b44354db..be945400 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -13,9 +13,6 @@ const PostStatusModal = {
     }
   },
   computed: {
-    isLoggedIn () {
-      return !!this.$store.state.users.currentUser
-    },
     modalActivated () {
       return this.$store.state.postStatus.modalActivated
     },
diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue
index dbcd321e..07c58f74 100644
--- a/src/components/post_status_modal/post_status_modal.vue
+++ b/src/components/post_status_modal/post_status_modal.vue
@@ -1,6 +1,5 @@
 <template>
   <Modal
-    v-if="isLoggedIn && !resettingForm"
     :is-open="modalActivated"
     class="post-form-modal-view"
     @backdropClicked="closeModal"
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
new file mode 100644
index 00000000..1f4c038f
--- /dev/null
+++ b/src/components/settings_modal/settings_modal.js
@@ -0,0 +1,39 @@
+import Modal from '../modal/modal.vue'
+import TabSwitcher from '../tab_switcher/tab_switcher.js'
+
+import Profile from './tabs/profile.vue'
+import Security from './tabs/security.vue'
+import Notifications from './tabs/notifications.vue'
+import DataImportExport from './tabs/data_import_export.vue'
+import MutesAndBlocks from './tabs/mutes_and_blocks.vue'
+
+const SettingsModal = {
+  components: {
+    Modal,
+    TabSwitcher,
+    Profile,
+    Security,
+    Notifications,
+    DataImportExport,
+    MutesAndBlocks
+  },
+  data () {
+    return {
+      resettingForm: false
+    }
+  },
+  computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
+    modalActivated () {
+      return this.$store.state.interface.settingsModalState !== 'hidden'
+    }
+  },
+  watch: {
+  },
+  methods: {
+  }
+}
+
+export default SettingsModal
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
new file mode 100644
index 00000000..8cea52d2
--- /dev/null
+++ b/src/components/settings_modal/settings_modal.scss
@@ -0,0 +1,59 @@
+@import '../../_variables.scss';
+.settings-modal {
+  .settings_tab-switcher {
+    height: 100%;
+  }
+  .settings-modal-panel {
+    width: 1000px;
+    max-width: 90vw;
+    height: 90vh;
+  }
+  .panel-body {
+    overflow-y: hidden;
+  }
+  .setting-item {
+    border-bottom: 2px solid var(--fg, $fallback--fg);
+    margin: 1em 1em 1.4em;
+    padding-bottom: 1.4em;
+
+    > div {
+      margin-bottom: .5em;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    &:last-child {
+      border-bottom: none;
+      padding-bottom: 0;
+      margin-bottom: 1em;
+    }
+
+    select {
+      min-width: 10em;
+    }
+
+
+    textarea {
+      width: 100%;
+      max-width: 100%;
+      height: 100px;
+    }
+
+    .unavailable,
+    .unavailable i {
+      color: var(--cRed, $fallback--cRed);
+      color: $fallback--cRed;
+    }
+
+    .btn {
+      min-height: 28px;
+      min-width: 10em;
+      padding: 0 2em;
+    }
+
+    .number-input {
+      max-width: 6em;
+    }
+  }
+}
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
new file mode 100644
index 00000000..9e35d3f6
--- /dev/null
+++ b/src/components/settings_modal/settings_modal.vue
@@ -0,0 +1,31 @@
+<template>
+<Modal
+  v-if="isLoggedIn && !resettingForm"
+  :is-open="modalActivated"
+  class="settings-modal"
+  >
+  <div class="settings-modal-panel panel">
+    <div class="panel-heading">
+      {{ $t('settings.settings') }}
+    </div>
+    <div class="panel-body">
+      <tab-switcher
+        class="settings_tab-switcher"
+        :sideTabBar="true"
+        :scrollableTabs="true"
+        ref="tabSwitcher"
+        >
+        <div :label="$t('settings.profile_tab')"><Profile /></div>
+        <div :label="$t('settings.security_tab')"><Security /></div>
+        <div :label="$t('settings.notifications')"><Notifications /></div>
+        <div :label="$t('settings.data_import_export_tab')"><DataImportExport /></div>
+        <div :label="$t('settings.mutes_and_blocks')"><MutesAndBlocks /></div>
+      </tab-switcher>
+    </div>
+  </div>
+</Modal>
+</template>
+
+<script src="./settings_modal.js"></script>
+
+<style src="./settings_modal.scss" lang="scss"></style>
diff --git a/src/components/settings_modal/tabs/data_import_export.js b/src/components/settings_modal/tabs/data_import_export.js
new file mode 100644
index 00000000..f68d12e9
--- /dev/null
+++ b/src/components/settings_modal/tabs/data_import_export.js
@@ -0,0 +1,65 @@
+import Importer from '../../importer/importer.vue'
+import Exporter from '../../exporter/exporter.vue'
+import Checkbox from '../../checkbox/checkbox.vue'
+
+const DataImportExport = {
+  data () {
+    return {
+      activeTab: 'profile',
+      newDomainToMute: ''
+    }
+  },
+  created () {
+    this.$store.dispatch('fetchTokens')
+  },
+  components: {
+    Importer,
+    Exporter,
+    Checkbox
+  },
+  computed: {
+    user () {
+      return this.$store.state.users.currentUser
+    }
+  },
+  methods: {
+    getFollowsContent () {
+      return this.$store.state.api.backendInteractor.exportFriends({ id: this.$store.state.users.currentUser.id })
+        .then(this.generateExportableUsersContent)
+    },
+    getBlocksContent () {
+      return this.$store.state.api.backendInteractor.fetchBlocks()
+        .then(this.generateExportableUsersContent)
+    },
+    importFollows (file) {
+      return this.$store.state.api.backendInteractor.importFollows({ file })
+        .then((status) => {
+          if (!status) {
+            throw new Error('failed')
+          }
+        })
+    },
+    importBlocks (file) {
+      return this.$store.state.api.backendInteractor.importBlocks({ file })
+        .then((status) => {
+          if (!status) {
+            throw new Error('failed')
+          }
+        })
+    },
+    generateExportableUsersContent (users) {
+      // Get addresses
+      return users.map((user) => {
+        // check is it's a local user
+        if (user && user.is_local) {
+          // append the instance address
+          // eslint-disable-next-line no-undef
+          return user.screen_name + '@' + location.hostname
+        }
+        return user.screen_name
+      }).join('\n')
+    }
+  }
+}
+
+export default DataImportExport
diff --git a/src/components/settings_modal/tabs/data_import_export.vue b/src/components/settings_modal/tabs/data_import_export.vue
new file mode 100644
index 00000000..464df6d3
--- /dev/null
+++ b/src/components/settings_modal/tabs/data_import_export.vue
@@ -0,0 +1,43 @@
+<template>
+<div
+  :label="$t('settings.data_import_export_tab')"
+  >
+  <div class="setting-item">
+    <h2>{{ $t('settings.follow_import') }}</h2>
+    <p>{{ $t('settings.import_followers_from_a_csv_file') }}</p>
+    <Importer
+      :submit-handler="importFollows"
+      :success-message="$t('settings.follows_imported')"
+      :error-message="$t('settings.follow_import_error')"
+      />
+  </div>
+  <div class="setting-item">
+    <h2>{{ $t('settings.follow_export') }}</h2>
+    <Exporter
+      :get-content="getFollowsContent"
+      filename="friends.csv"
+      :export-button-label="$t('settings.follow_export_button')"
+      />
+  </div>
+  <div class="setting-item">
+    <h2>{{ $t('settings.block_import') }}</h2>
+    <p>{{ $t('settings.import_blocks_from_a_csv_file') }}</p>
+    <Importer
+      :submit-handler="importBlocks"
+      :success-message="$t('settings.blocks_imported')"
+      :error-message="$t('settings.block_import_error')"
+      />
+  </div>
+  <div class="setting-item">
+    <h2>{{ $t('settings.block_export') }}</h2>
+    <Exporter
+      :get-content="getBlocksContent"
+      filename="blocks.csv"
+      :export-button-label="$t('settings.block_export_button')"
+      />
+  </div>
+</div>
+</template>
+
+<script src="./data_import_export.js"></script>
+<!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks.js b/src/components/settings_modal/tabs/mutes_and_blocks.js
new file mode 100644
index 00000000..51895ddc
--- /dev/null
+++ b/src/components/settings_modal/tabs/mutes_and_blocks.js
@@ -0,0 +1,124 @@
+import get from 'lodash/get'
+import map from 'lodash/map'
+import reject from 'lodash/reject'
+import Autosuggest from '../../autosuggest/autosuggest.vue'
+import TabSwitcher from '../../tab_switcher/tab_switcher.js'
+import BlockCard from '../../block_card/block_card.vue'
+import MuteCard from '../../mute_card/mute_card.vue'
+import DomainMuteCard from '../../domain_mute_card/domain_mute_card.vue'
+import SelectableList from '../../selectable_list/selectable_list.vue'
+import ProgressButton from '../../progress_button/progress_button.vue'
+import withSubscription from '../../../hocs/with_subscription/with_subscription'
+import Checkbox from '../../checkbox/checkbox.vue'
+
+const BlockList = withSubscription({
+  fetch: (props, $store) => $store.dispatch('fetchBlocks'),
+  select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
+  childPropName: 'items'
+})(SelectableList)
+
+const MuteList = withSubscription({
+  fetch: (props, $store) => $store.dispatch('fetchMutes'),
+  select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
+  childPropName: 'items'
+})(SelectableList)
+
+const DomainMuteList = withSubscription({
+  fetch: (props, $store) => $store.dispatch('fetchDomainMutes'),
+  select: (props, $store) => get($store.state.users.currentUser, 'domainMutes', []),
+  childPropName: 'items'
+})(SelectableList)
+
+const MutesAndBlocks = {
+  data () {
+    return {
+      activeTab: 'profile',
+      newDomainToMute: ''
+    }
+  },
+  created () {
+    this.$store.dispatch('fetchTokens')
+  },
+  components: {
+    TabSwitcher,
+    BlockList,
+    MuteList,
+    DomainMuteList,
+    BlockCard,
+    MuteCard,
+    DomainMuteCard,
+    ProgressButton,
+    Autosuggest,
+    Checkbox
+  },
+  methods: {
+    importFollows (file) {
+      return this.$store.state.api.backendInteractor.importFollows({ file })
+        .then((status) => {
+          if (!status) {
+            throw new Error('failed')
+          }
+        })
+    },
+    importBlocks (file) {
+      return this.$store.state.api.backendInteractor.importBlocks({ file })
+        .then((status) => {
+          if (!status) {
+            throw new Error('failed')
+          }
+        })
+    },
+    generateExportableUsersContent (users) {
+      // Get addresses
+      return users.map((user) => {
+        // check is it's a local user
+        if (user && user.is_local) {
+          // append the instance address
+          // eslint-disable-next-line no-undef
+          return user.screen_name + '@' + location.hostname
+        }
+        return user.screen_name
+      }).join('\n')
+    },
+    activateTab (tabName) {
+      this.activeTab = tabName
+    },
+    filterUnblockedUsers (userIds) {
+      return reject(userIds, (userId) => {
+        const user = this.$store.getters.findUser(userId)
+        return !user || user.statusnet_blocking || user.id === this.$store.state.users.currentUser.id
+      })
+    },
+    filterUnMutedUsers (userIds) {
+      return reject(userIds, (userId) => {
+        const user = this.$store.getters.findUser(userId)
+        return !user || user.muted || user.id === this.$store.state.users.currentUser.id
+      })
+    },
+    queryUserIds (query) {
+      return this.$store.dispatch('searchUsers', query)
+        .then((users) => map(users, 'id'))
+    },
+    blockUsers (ids) {
+      return this.$store.dispatch('blockUsers', ids)
+    },
+    unblockUsers (ids) {
+      return this.$store.dispatch('unblockUsers', ids)
+    },
+    muteUsers (ids) {
+      return this.$store.dispatch('muteUsers', ids)
+    },
+    unmuteUsers (ids) {
+      return this.$store.dispatch('unmuteUsers', ids)
+    },
+    unmuteDomains (domains) {
+      return this.$store.dispatch('unmuteDomains', domains)
+    },
+    muteDomain () {
+      return this.$store.dispatch('muteDomain', this.newDomainToMute)
+        .then(() => { this.newDomainToMute = '' })
+    }
+  }
+}
+
+export default MutesAndBlocks
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks.vue b/src/components/settings_modal/tabs/mutes_and_blocks.vue
new file mode 100644
index 00000000..3aff47a0
--- /dev/null
+++ b/src/components/settings_modal/tabs/mutes_and_blocks.vue
@@ -0,0 +1,173 @@
+<template>
+  <tab-switcher>
+    <div :label="$t('settings.blocks_tab')">
+      <div class="profile-edit-usersearch-wrapper">
+        <Autosuggest
+          :filter="filterUnblockedUsers"
+          :query="queryUserIds"
+          :placeholder="$t('settings.search_user_to_block')"
+          >
+          <BlockCard
+            slot-scope="row"
+            :user-id="row.item"
+            />
+        </Autosuggest>
+      </div>
+      <BlockList
+        :refresh="true"
+        :get-key="identity"
+        >
+        <template
+          slot="header"
+          slot-scope="{selected}"
+          >
+          <div class="profile-edit-bulk-actions">
+            <ProgressButton
+              v-if="selected.length > 0"
+              class="btn btn-default"
+              :click="() => blockUsers(selected)"
+              >
+              {{ $t('user_card.block') }}
+              <template slot="progress">
+                {{ $t('user_card.block_progress') }}
+              </template>
+            </ProgressButton>
+            <ProgressButton
+              v-if="selected.length > 0"
+              class="btn btn-default"
+              :click="() => unblockUsers(selected)"
+              >
+              {{ $t('user_card.unblock') }}
+              <template slot="progress">
+                {{ $t('user_card.unblock_progress') }}
+              </template>
+            </ProgressButton>
+          </div>
+        </template>
+        <template
+          slot="item"
+          slot-scope="{item}"
+          >
+          <BlockCard :user-id="item" />
+        </template>
+        <template slot="empty">
+          {{ $t('settings.no_blocks') }}
+        </template>
+      </BlockList>
+    </div>
+
+    <div :label="$t('settings.mutes_tab')">
+      <tab-switcher>
+        <div label="Users">
+          <div class="profile-edit-usersearch-wrapper">
+            <Autosuggest
+              :filter="filterUnMutedUsers"
+              :query="queryUserIds"
+              :placeholder="$t('settings.search_user_to_mute')"
+              >
+              <MuteCard
+                slot-scope="row"
+                :user-id="row.item"
+                />
+            </Autosuggest>
+          </div>
+          <MuteList
+            :refresh="true"
+            :get-key="identity"
+            >
+            <template
+              slot="header"
+              slot-scope="{selected}"
+              >
+              <div class="profile-edit-bulk-actions">
+                <ProgressButton
+                  v-if="selected.length > 0"
+                  class="btn btn-default"
+                  :click="() => muteUsers(selected)"
+                  >
+                  {{ $t('user_card.mute') }}
+                  <template slot="progress">
+                    {{ $t('user_card.mute_progress') }}
+                  </template>
+                </ProgressButton>
+                <ProgressButton
+                  v-if="selected.length > 0"
+                  class="btn btn-default"
+                  :click="() => unmuteUsers(selected)"
+                  >
+                  {{ $t('user_card.unmute') }}
+                  <template slot="progress">
+                    {{ $t('user_card.unmute_progress') }}
+                  </template>
+                </ProgressButton>
+              </div>
+            </template>
+            <template
+              slot="item"
+              slot-scope="{item}"
+              >
+              <MuteCard :user-id="item" />
+            </template>
+            <template slot="empty">
+              {{ $t('settings.no_mutes') }}
+            </template>
+          </MuteList>
+        </div>
+
+        <div :label="$t('settings.domain_mutes')">
+          <div class="profile-edit-domain-mute-form">
+            <input
+              v-model="newDomainToMute"
+              :placeholder="$t('settings.type_domains_to_mute')"
+              type="text"
+              @keyup.enter="muteDomain"
+              >
+            <ProgressButton
+              class="btn btn-default"
+              :click="muteDomain"
+              >
+              {{ $t('domain_mute_card.mute') }}
+              <template slot="progress">
+                {{ $t('domain_mute_card.mute_progress') }}
+              </template>
+            </ProgressButton>
+          </div>
+          <DomainMuteList
+            :refresh="true"
+            :get-key="identity"
+            >
+            <template
+              slot="header"
+              slot-scope="{selected}"
+              >
+              <div class="profile-edit-bulk-actions">
+                <ProgressButton
+                  v-if="selected.length > 0"
+                  class="btn btn-default"
+                  :click="() => unmuteDomains(selected)"
+                  >
+                  {{ $t('domain_mute_card.unmute') }}
+                  <template slot="progress">
+                    {{ $t('domain_mute_card.unmute_progress') }}
+                  </template>
+                </ProgressButton>
+              </div>
+            </template>
+            <template
+              slot="item"
+              slot-scope="{item}"
+              >
+              <DomainMuteCard :domain="item" />
+            </template>
+            <template slot="empty">
+              {{ $t('settings.no_mutes') }}
+            </template>
+          </DomainMuteList>
+        </div>
+      </tab-switcher>
+    </div>
+  </tab-switcher>
+</template>
+
+<script src="./mutes_and_blocks.js"></script>
+<!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/settings_modal/tabs/notifications.js b/src/components/settings_modal/tabs/notifications.js
new file mode 100644
index 00000000..0a870b3f
--- /dev/null
+++ b/src/components/settings_modal/tabs/notifications.js
@@ -0,0 +1,27 @@
+import Checkbox from '../../checkbox/checkbox.vue'
+
+const Notifications = {
+  data () {
+    return {
+      activeTab: 'profile',
+      notificationSettings: this.$store.state.users.currentUser.notification_settings,
+      newDomainToMute: ''
+    }
+  },
+  components: {
+    Checkbox
+  },
+  computed: {
+    user () {
+      return this.$store.state.users.currentUser
+    }
+  },
+  methods: {
+    updateNotificationSettings () {
+      this.$store.state.api.backendInteractor
+        .updateNotificationSettings({ settings: this.notificationSettings })
+    }
+  }
+}
+
+export default Notifications
diff --git a/src/components/settings_modal/tabs/notifications.vue b/src/components/settings_modal/tabs/notifications.vue
new file mode 100644
index 00000000..f9a7c17b
--- /dev/null
+++ b/src/components/settings_modal/tabs/notifications.vue
@@ -0,0 +1,42 @@
+<template>
+<div :label="$t('settings.notifications')">
+  <div class="setting-item">
+    <div class="select-multiple">
+      <span class="label">{{ $t('settings.notification_setting') }}</span>
+      <ul class="option-list">
+        <li>
+          <Checkbox v-model="notificationSettings.follows">
+            {{ $t('settings.notification_setting_follows') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationSettings.followers">
+            {{ $t('settings.notification_setting_followers') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationSettings.non_follows">
+            {{ $t('settings.notification_setting_non_follows') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationSettings.non_followers">
+            {{ $t('settings.notification_setting_non_followers') }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
+    <p>{{ $t('settings.notification_mutes') }}</p>
+    <p>{{ $t('settings.notification_blocks') }}</p>
+    <button
+      class="btn btn-default"
+      @click="updateNotificationSettings"
+      >
+      {{ $t('general.submit') }}
+    </button>
+  </div>
+</div>
+</template>
+
+<script src="./notifications.js"></script>
+<!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/settings_modal/tabs/profile.js b/src/components/settings_modal/tabs/profile.js
new file mode 100644
index 00000000..18c44024
--- /dev/null
+++ b/src/components/settings_modal/tabs/profile.js
@@ -0,0 +1,179 @@
+import unescape from 'lodash/unescape'
+import ImageCropper from '../../image_cropper/image_cropper.vue'
+import ScopeSelector from '../../scope_selector/scope_selector.vue'
+import fileSizeFormatService from '../../../services/file_size_format/file_size_format.js'
+import ProgressButton from '../../progress_button/progress_button.vue'
+import EmojiInput from '../../emoji_input/emoji_input.vue'
+import suggestor from '../../emoji_input/suggestor.js'
+import Autosuggest from '../../autosuggest/autosuggest.vue'
+import Checkbox from '../../checkbox/checkbox.vue'
+
+const ProfileTab = {
+  data () {
+    return {
+      newName: this.$store.state.users.currentUser.name,
+      newBio: unescape(this.$store.state.users.currentUser.description),
+      newLocked: this.$store.state.users.currentUser.locked,
+      newNoRichText: this.$store.state.users.currentUser.no_rich_text,
+      newDefaultScope: this.$store.state.users.currentUser.default_scope,
+      hideFollows: this.$store.state.users.currentUser.hide_follows,
+      hideFollowers: this.$store.state.users.currentUser.hide_followers,
+      hideFollowsCount: this.$store.state.users.currentUser.hide_follows_count,
+      hideFollowersCount: this.$store.state.users.currentUser.hide_followers_count,
+      showRole: this.$store.state.users.currentUser.show_role,
+      role: this.$store.state.users.currentUser.role,
+      discoverable: this.$store.state.users.currentUser.discoverable,
+      allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
+      pickAvatarBtnVisible: true,
+      bannerUploading: false,
+      backgroundUploading: false,
+      banner: null,
+      bannerPreview: null,
+      background: null,
+      backgroundPreview: null,
+      bannerUploadError: null,
+      backgroundUploadError: null,
+    }
+  },
+  components: {
+    ScopeSelector,
+    ImageCropper,
+    EmojiInput,
+    Autosuggest,
+    ProgressButton,
+    Checkbox
+  },
+  computed: {
+    user () {
+      return this.$store.state.users.currentUser
+    },
+    emojiUserSuggestor () {
+      return suggestor({
+        emoji: [
+          ...this.$store.state.instance.emoji,
+          ...this.$store.state.instance.customEmoji
+        ],
+        users: this.$store.state.users.users,
+        updateUsersList: (input) => this.$store.dispatch('searchUsers', input)
+      })
+    },
+    emojiSuggestor () {
+      return suggestor({ emoji: [
+        ...this.$store.state.instance.emoji,
+        ...this.$store.state.instance.customEmoji
+      ] })
+    }
+  },
+  methods: {
+    updateProfile () {
+      this.$store.state.api.backendInteractor
+        .updateProfile({
+          params: {
+            note: this.newBio,
+            locked: this.newLocked,
+            // Backend notation.
+            /* eslint-disable camelcase */
+            display_name: this.newName,
+            default_scope: this.newDefaultScope,
+            no_rich_text: this.newNoRichText,
+            hide_follows: this.hideFollows,
+            hide_followers: this.hideFollowers,
+            discoverable: this.discoverable,
+            allow_following_move: this.allowFollowingMove,
+            hide_follows_count: this.hideFollowsCount,
+            hide_followers_count: this.hideFollowersCount,
+            show_role: this.showRole
+            /* eslint-enable camelcase */
+          } }).then((user) => {
+          this.$store.commit('addNewUsers', [user])
+          this.$store.commit('setCurrentUser', user)
+        })
+    },
+    changeVis (visibility) {
+      this.newDefaultScope = visibility
+    },
+    uploadFile (slot, e) {
+      const file = e.target.files[0]
+      if (!file) { return }
+      if (file.size > this.$store.state.instance[slot + 'limit']) {
+        const filesize = fileSizeFormatService.fileSizeFormat(file.size)
+        const allowedsize = fileSizeFormatService.fileSizeFormat(this.$store.state.instance[slot + 'limit'])
+        this[slot + 'UploadError'] = [
+          this.$t('upload.error.base'),
+          this.$t(
+            'upload.error.file_too_big',
+            {
+              filesize: filesize.num,
+              filesizeunit: filesize.unit,
+              allowedsize: allowedsize.num,
+              allowedsizeunit: allowedsize.unit
+            }
+          )
+        ].join(' ')
+        return
+      }
+      // eslint-disable-next-line no-undef
+      const reader = new FileReader()
+      reader.onload = ({ target }) => {
+        const img = target.result
+        this[slot + 'Preview'] = img
+        this[slot] = file
+      }
+      reader.readAsDataURL(file)
+    },
+    submitAvatar (cropper, file) {
+      const that = this
+      return new Promise((resolve, reject) => {
+        function updateAvatar (avatar) {
+          that.$store.state.api.backendInteractor.updateAvatar({ avatar })
+            .then((user) => {
+              that.$store.commit('addNewUsers', [user])
+              that.$store.commit('setCurrentUser', user)
+              resolve()
+            })
+            .catch((err) => {
+              reject(new Error(that.$t('upload.error.base') + ' ' + err.message))
+            })
+        }
+
+        if (cropper) {
+          cropper.getCroppedCanvas().toBlob(updateAvatar, file.type)
+        } else {
+          updateAvatar(file)
+        }
+      })
+    },
+    submitBanner () {
+      if (!this.bannerPreview) { return }
+
+      this.bannerUploading = true
+      this.$store.state.api.backendInteractor.updateBanner({ banner: this.banner })
+        .then((user) => {
+          this.$store.commit('addNewUsers', [user])
+          this.$store.commit('setCurrentUser', user)
+          this.bannerPreview = null
+        })
+        .catch((err) => {
+          this.bannerUploadError = this.$t('upload.error.base') + ' ' + err.message
+        })
+        .then(() => { this.bannerUploading = false })
+    },
+    submitBg () {
+      if (!this.backgroundPreview) { return }
+      let background = this.background
+      this.backgroundUploading = true
+      this.$store.state.api.backendInteractor.updateBg({ background }).then((data) => {
+        if (!data.error) {
+          this.$store.commit('addNewUsers', [data])
+          this.$store.commit('setCurrentUser', data)
+          this.backgroundPreview = null
+        } else {
+          this.backgroundUploadError = this.$t('upload.error.base') + data.error
+        }
+        this.backgroundUploading = false
+      })
+    }
+  }
+}
+
+export default ProfileTab
diff --git a/src/components/settings_modal/tabs/profile.scss b/src/components/settings_modal/tabs/profile.scss
new file mode 100644
index 00000000..4aab81eb
--- /dev/null
+++ b/src/components/settings_modal/tabs/profile.scss
@@ -0,0 +1,82 @@
+@import '../../../_variables.scss';
+.profile-tab {
+  .bio {
+    margin: 0;
+  }
+
+  .visibility-tray {
+    padding-top: 5px;
+  }
+
+  input[type=file] {
+    padding: 5px;
+    height: auto;
+  }
+
+  .banner {
+    max-width: 100%;
+  }
+
+  .uploading {
+    font-size: 1.5em;
+    margin: 0.25em;
+  }
+
+  .name-changer {
+    width: 100%;
+  }
+
+  .bg {
+    max-width: 100%;
+  }
+
+  .current-avatar {
+    display: block;
+    width: 150px;
+    height: 150px;
+    border-radius: $fallback--avatarRadius;
+    border-radius: var(--avatarRadius, $fallback--avatarRadius);
+  }
+
+  .oauth-tokens {
+    width: 100%;
+
+    th {
+      text-align: left;
+    }
+
+    .actions {
+      text-align: right;
+    }
+  }
+
+  &-usersearch-wrapper {
+    padding: 1em;
+  }
+
+  &-bulk-actions {
+    text-align: right;
+    padding: 0 1em;
+    min-height: 28px;
+
+    button {
+      width: 10em;
+    }
+  }
+
+  &-domain-mute-form {
+    padding: 1em;
+    display: flex;
+    flex-direction: column;
+
+    button {
+      align-self: flex-end;
+      margin-top: 1em;
+      width: 10em;
+    }
+  }
+
+  .setting-subitem {
+    margin-left: 1.75em;
+  }
+}
diff --git a/src/components/settings_modal/tabs/profile.vue b/src/components/settings_modal/tabs/profile.vue
new file mode 100644
index 00000000..335fc12e
--- /dev/null
+++ b/src/components/settings_modal/tabs/profile.vue
@@ -0,0 +1,213 @@
+<template>
+<div class="profile-tab">
+  <div class="setting-item">
+    <h2>{{ $t('settings.name_bio') }}</h2>
+    <p>{{ $t('settings.name') }}</p>
+    <EmojiInput
+      v-model="newName"
+      enable-emoji-picker
+      :suggest="emojiSuggestor"
+      >
+      <input
+        id="username"
+        v-model="newName"
+        classname="name-changer"
+        >
+    </EmojiInput>
+    <p>{{ $t('settings.bio') }}</p>
+    <EmojiInput
+      v-model="newBio"
+      enable-emoji-picker
+      :suggest="emojiUserSuggestor"
+      >
+      <textarea
+        v-model="newBio"
+        classname="bio"
+        />
+    </EmojiInput>
+    <p>
+      <Checkbox v-model="newLocked">
+        {{ $t('settings.lock_account_description') }}
+      </Checkbox>
+    </p>
+    <div>
+      <label for="default-vis">{{ $t('settings.default_vis') }}</label>
+      <div
+        id="default-vis"
+        class="visibility-tray"
+        >
+        <scope-selector
+          :show-all="true"
+          :user-default="newDefaultScope"
+          :initial-scope="newDefaultScope"
+          :on-scope-change="changeVis"
+          />
+      </div>
+    </div>
+    <p>
+      <Checkbox v-model="newNoRichText">
+        {{ $t('settings.no_rich_text_description') }}
+      </Checkbox>
+    </p>
+    <p>
+      <Checkbox v-model="hideFollows">
+        {{ $t('settings.hide_follows_description') }}
+      </Checkbox>
+    </p>
+    <p class="setting-subitem">
+      <Checkbox
+        v-model="hideFollowsCount"
+        :disabled="!hideFollows"
+        >
+        {{ $t('settings.hide_follows_count_description') }}
+      </Checkbox>
+    </p>
+    <p>
+      <Checkbox v-model="hideFollowers">
+        {{ $t('settings.hide_followers_description') }}
+      </Checkbox>
+    </p>
+    <p class="setting-subitem">
+      <Checkbox
+        v-model="hideFollowersCount"
+        :disabled="!hideFollowers"
+        >
+        {{ $t('settings.hide_followers_count_description') }}
+      </Checkbox>
+    </p>
+    <p>
+      <Checkbox v-model="allowFollowingMove">
+        {{ $t('settings.allow_following_move') }}
+      </Checkbox>
+    </p>
+    <p v-if="role === 'admin' || role === 'moderator'">
+      <Checkbox v-model="showRole">
+        <template v-if="role === 'admin'">
+          {{ $t('settings.show_admin_badge') }}
+        </template>
+        <template v-if="role === 'moderator'">
+          {{ $t('settings.show_moderator_badge') }}
+        </template>
+      </Checkbox>
+    </p>
+    <p>
+      <Checkbox v-model="discoverable">
+        {{ $t('settings.discoverable') }}
+      </Checkbox>
+    </p>
+    <button
+      :disabled="newName && newName.length === 0"
+      class="btn btn-default"
+      @click="updateProfile"
+      >
+      {{ $t('general.submit') }}
+    </button>
+  </div>
+  <div class="setting-item">
+    <h2>{{ $t('settings.avatar') }}</h2>
+    <p class="visibility-notice">
+      {{ $t('settings.avatar_size_instruction') }}
+    </p>
+    <p>{{ $t('settings.current_avatar') }}</p>
+    <img
+      :src="user.profile_image_url_original"
+      class="current-avatar"
+      >
+    <p>{{ $t('settings.set_new_avatar') }}</p>
+    <button
+      v-show="pickAvatarBtnVisible"
+      id="pick-avatar"
+      class="btn"
+      type="button"
+      >
+      {{ $t('settings.upload_a_photo') }}
+    </button>
+    <image-cropper
+      trigger="#pick-avatar"
+      :submit-handler="submitAvatar"
+      @open="pickAvatarBtnVisible=false"
+      @close="pickAvatarBtnVisible=true"
+      />
+  </div>
+  <div class="setting-item">
+    <h2>{{ $t('settings.profile_banner') }}</h2>
+    <p>{{ $t('settings.current_profile_banner') }}</p>
+    <img
+      :src="user.cover_photo"
+      class="banner"
+      >
+    <p>{{ $t('settings.set_new_profile_banner') }}</p>
+    <img
+      v-if="bannerPreview"
+      class="banner"
+      :src="bannerPreview"
+      >
+    <div>
+      <input
+        type="file"
+        @change="uploadFile('banner', $event)"
+        >
+    </div>
+    <i
+      v-if="bannerUploading"
+      class=" icon-spin4 animate-spin uploading"
+      />
+    <button
+      v-else-if="bannerPreview"
+      class="btn btn-default"
+      @click="submitBanner"
+      >
+      {{ $t('general.submit') }}
+    </button>
+    <div
+      v-if="bannerUploadError"
+      class="alert error"
+      >
+      Error: {{ bannerUploadError }}
+      <i
+        class="button-icon icon-cancel"
+        @click="clearUploadError('banner')"
+        />
+    </div>
+  </div>
+  <div class="setting-item">
+    <h2>{{ $t('settings.profile_background') }}</h2>
+    <p>{{ $t('settings.set_new_profile_background') }}</p>
+    <img
+      v-if="backgroundPreview"
+      class="bg"
+      :src="backgroundPreview"
+      >
+    <div>
+      <input
+        type="file"
+        @change="uploadFile('background', $event)"
+        >
+    </div>
+    <i
+      v-if="backgroundUploading"
+      class=" icon-spin4 animate-spin uploading"
+      />
+    <button
+      v-else-if="backgroundPreview"
+      class="btn btn-default"
+      @click="submitBg"
+      >
+      {{ $t('general.submit') }}
+    </button>
+    <div
+      v-if="backgroundUploadError"
+      class="alert error"
+      >
+      Error: {{ backgroundUploadError }}
+      <i
+        class="button-icon icon-cancel"
+        @click="clearUploadError('background')"
+        />
+    </div>
+  </div>
+</div>
+</template>
+
+<script src="./profile.js"></script>
+<style lang="scss" src="./profile.scss"></style>
diff --git a/src/components/settings_modal/tabs/security.js b/src/components/settings_modal/tabs/security.js
new file mode 100644
index 00000000..cc791b7a
--- /dev/null
+++ b/src/components/settings_modal/tabs/security.js
@@ -0,0 +1,106 @@
+import ProgressButton from '../../progress_button/progress_button.vue'
+import Checkbox from '../../checkbox/checkbox.vue'
+import Mfa from '../../user_settings/mfa.vue'
+
+const Security = {
+  data () {
+    return {
+      newEmail: '',
+      changeEmailError: false,
+      changeEmailPassword: '',
+      changedEmail: false,
+      deletingAccount: false,
+      deleteAccountConfirmPasswordInput: '',
+      deleteAccountError: false,
+      changePasswordInputs: [ '', '', '' ],
+      changedPassword: false,
+      changePasswordError: false
+    }
+  },
+  created () {
+    this.$store.dispatch('fetchTokens')
+  },
+  components: {
+    ProgressButton,
+    Mfa,
+    Checkbox
+  },
+  computed: {
+    user () {
+      return this.$store.state.users.currentUser
+    },
+    pleromaBackend () {
+      return this.$store.state.instance.pleromaBackend
+    },
+    oauthTokens () {
+      return this.$store.state.oauthTokens.tokens.map(oauthToken => {
+        return {
+          id: oauthToken.id,
+          appName: oauthToken.app_name,
+          validUntil: new Date(oauthToken.valid_until).toLocaleDateString()
+        }
+      })
+    }
+  },
+  methods: {
+    confirmDelete () {
+      this.deletingAccount = true
+    },
+    deleteAccount () {
+      this.$store.state.api.backendInteractor.deleteAccount({ password: this.deleteAccountConfirmPasswordInput })
+        .then((res) => {
+          if (res.status === 'success') {
+            this.$store.dispatch('logout')
+            this.$router.push({ name: 'root' })
+          } else {
+            this.deleteAccountError = res.error
+          }
+        })
+    },
+    changePassword () {
+      const params = {
+        password: this.changePasswordInputs[0],
+        newPassword: this.changePasswordInputs[1],
+        newPasswordConfirmation: this.changePasswordInputs[2]
+      }
+      this.$store.state.api.backendInteractor.changePassword(params)
+        .then((res) => {
+          if (res.status === 'success') {
+            this.changedPassword = true
+            this.changePasswordError = false
+            this.logout()
+          } else {
+            this.changedPassword = false
+            this.changePasswordError = res.error
+          }
+        })
+    },
+    changeEmail () {
+      const params = {
+        email: this.newEmail,
+        password: this.changeEmailPassword
+      }
+      this.$store.state.api.backendInteractor.changeEmail(params)
+        .then((res) => {
+          if (res.status === 'success') {
+            this.changedEmail = true
+            this.changeEmailError = false
+          } else {
+            this.changedEmail = false
+            this.changeEmailError = res.error
+          }
+        })
+    },
+    logout () {
+      this.$store.dispatch('logout')
+      this.$router.replace('/')
+    },
+    revokeToken (id) {
+      if (window.confirm(`${this.$i18n.t('settings.revoke_token')}?`)) {
+        this.$store.dispatch('revokeToken', id)
+      }
+    }
+  }
+}
+
+export default Security
diff --git a/src/components/settings_modal/tabs/security.vue b/src/components/settings_modal/tabs/security.vue
new file mode 100644
index 00000000..603c9a04
--- /dev/null
+++ b/src/components/settings_modal/tabs/security.vue
@@ -0,0 +1,143 @@
+<template>
+<div :label="$t('settings.security_tab')">
+  <div class="setting-item">
+    <h2>{{ $t('settings.change_email') }}</h2>
+    <div>
+      <p>{{ $t('settings.new_email') }}</p>
+      <input
+        v-model="newEmail"
+        type="email"
+        autocomplete="email"
+        >
+    </div>
+    <div>
+      <p>{{ $t('settings.current_password') }}</p>
+      <input
+        v-model="changeEmailPassword"
+        type="password"
+        autocomplete="current-password"
+        >
+    </div>
+    <button
+      class="btn btn-default"
+      @click="changeEmail"
+      >
+      {{ $t('general.submit') }}
+    </button>
+    <p v-if="changedEmail">
+      {{ $t('settings.changed_email') }}
+    </p>
+    <template v-if="changeEmailError !== false">
+      <p>{{ $t('settings.change_email_error') }}</p>
+      <p>{{ changeEmailError }}</p>
+    </template>
+  </div>
+
+  <div class="setting-item">
+    <h2>{{ $t('settings.change_password') }}</h2>
+    <div>
+      <p>{{ $t('settings.current_password') }}</p>
+      <input
+        v-model="changePasswordInputs[0]"
+        type="password"
+        >
+    </div>
+    <div>
+      <p>{{ $t('settings.new_password') }}</p>
+      <input
+        v-model="changePasswordInputs[1]"
+        type="password"
+        >
+    </div>
+    <div>
+      <p>{{ $t('settings.confirm_new_password') }}</p>
+      <input
+        v-model="changePasswordInputs[2]"
+        type="password"
+        >
+    </div>
+    <button
+      class="btn btn-default"
+      @click="changePassword"
+      >
+      {{ $t('general.submit') }}
+    </button>
+    <p v-if="changedPassword">
+      {{ $t('settings.changed_password') }}
+    </p>
+    <p v-else-if="changePasswordError !== false">
+      {{ $t('settings.change_password_error') }}
+    </p>
+    <p v-if="changePasswordError">
+      {{ changePasswordError }}
+    </p>
+  </div>
+
+  <div class="setting-item">
+    <h2>{{ $t('settings.oauth_tokens') }}</h2>
+    <table class="oauth-tokens">
+      <thead>
+        <tr>
+          <th>{{ $t('settings.app_name') }}</th>
+          <th>{{ $t('settings.valid_until') }}</th>
+          <th />
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          v-for="oauthToken in oauthTokens"
+          :key="oauthToken.id"
+          >
+          <td>{{ oauthToken.appName }}</td>
+          <td>{{ oauthToken.validUntil }}</td>
+          <td class="actions">
+            <button
+              class="btn btn-default"
+              @click="revokeToken(oauthToken.id)"
+              >
+              {{ $t('settings.revoke_token') }}
+            </button>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <mfa />
+  <div class="setting-item">
+    <h2>{{ $t('settings.delete_account') }}</h2>
+    <p v-if="!deletingAccount">
+      {{ $t('settings.delete_account_description') }}
+    </p>
+    <div v-if="deletingAccount">
+      <p>{{ $t('settings.delete_account_instructions') }}</p>
+      <p>{{ $t('login.password') }}</p>
+      <input
+        v-model="deleteAccountConfirmPasswordInput"
+        type="password"
+        >
+      <button
+        class="btn btn-default"
+        @click="deleteAccount"
+        >
+        {{ $t('settings.delete_account') }}
+      </button>
+    </div>
+    <p v-if="deleteAccountError !== false">
+      {{ $t('settings.delete_account_error') }}
+    </p>
+    <p v-if="deleteAccountError">
+      {{ deleteAccountError }}
+    </p>
+    <button
+      v-if="!deletingAccount"
+      class="btn btn-default"
+      @click="confirmDelete"
+      >
+      {{ $t('general.submit') }}
+    </button>
+  </div>
+</div>
+</template>
+
+<script src="./security.js"></script>
+<!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 008e1e95..97791de3 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -24,6 +24,11 @@ export default Vue.component('tab-switcher', {
       required: false,
       type: Boolean,
       default: false
+    },
+    sideTabBar: {
+      required: false,
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -105,7 +110,7 @@ export default Vue.component('tab-switcher', {
     })
 
     return (
-      <div class="tab-switcher">
+      <div class={'tab-switcher ' + (this.sideTabBar ? 'side-tabs' : 'top-tabs')}>
         <div class="tabs">
           {tabs}
         </div>
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index df585faa..a443531e 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -2,7 +2,116 @@
 
 .tab-switcher {
   display: flex;
-  flex-direction: column;
+
+  &.top-tabs {
+    flex-direction: column;
+    > .tabs {
+      width: 100%;
+      overflow-y: hidden;
+      overflow-x: auto;
+      padding-top: 5px;
+      flex-direction: row;
+      &::after, &::before {
+        content: '';
+        flex: 1 1 auto;
+        border-bottom: 1px solid;
+        border-bottom-color: $fallback--border;
+        border-bottom-color: var(--border, $fallback--border);
+      }
+      .tab-wrapper {
+        height: 28px;
+
+        &:not(.active)::after {
+          left: 0;
+          right: 0;
+          bottom: 0;
+          border-bottom: 1px solid;
+          border-bottom-color: $fallback--border;
+          border-bottom-color: var(--border, $fallback--border);
+        }
+      }
+      .tab {
+        width: 100%;
+        min-width: 1px;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+        padding-bottom: 99px;
+        margin-bottom: 6px - 99px;
+      }
+    }
+    .contents.scrollable-tabs {
+      flex-basis: 0;
+    }
+  }
+
+  &.side-tabs {
+    flex-direction: row;
+    > .contents {
+      flex: 0 1 80%;
+    }
+    > .tabs {
+      flex: 1 0 auto;
+      overflow-y: auto;
+      overflow-x: hidden;
+      padding-top: 5px;
+      flex-direction: column;
+      &::after {
+        content: '';
+        flex: 1 1 auto;
+        border-right: 1px solid;
+        border-right-color: $fallback--border;
+        border-right-color: var(--border, $fallback--border);
+      }
+      .tab-wrapper {
+        min-width: 10em;
+        &:not(.active)::after {
+          top: 0;
+          right: 0;
+          bottom: 0;
+          border-right: 1px solid;
+          border-right-color: $fallback--border;
+          border-right-color: var(--border, $fallback--border);
+        }
+      }
+      .tab {
+        box-sizing: content-box;
+        width: 100%;
+        margin-bottom: 5px;
+        min-width: 10em;
+        min-width: 1px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        // padding-right: 200px;
+        // margin-right: 6px - 200px;
+        margin-left: 6px;
+      }
+
+      .tab-wrapper {
+        min-width: 10em;
+        &:not(.active)::after {
+          top: 0;
+          right: 0;
+          bottom: 0;
+          border-right: 1px solid;
+          border-right-color: $fallback--border;
+          border-right-color: var(--border, $fallback--border);
+        }
+      }
+      .tab {
+        box-sizing: content-box;
+        width: 100%;
+        margin-bottom: 5px;
+        min-width: 10em;
+        min-width: 1px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        // padding-right: 200px;
+        // margin-right: 6px - 200px;
+        margin-left: 6px;
+      }
+    }
+  }
+
 
   .contents {
     flex: 1 0 auto;
@@ -13,86 +122,65 @@
     }
 
     &.scrollable-tabs {
-      flex-basis: 0;
       overflow-y: auto;
     }
   }
+
+  .tab {
+    position: relative;
+    white-space: nowrap;
+
+    padding: 6px 1em;
+    color: $fallback--text;
+    color: var(--tabText, $fallback--text);
+    background-color: $fallback--fg;
+    background-color: var(--tab, $fallback--fg);
+
+    &:not(.active) {
+      z-index: 4;
+
+      &:hover {
+        z-index: 6;
+      }
+    }
+
+    &.active {
+      background: transparent;
+      z-index: 5;
+      color: $fallback--text;
+      color: var(--tabActiveText, $fallback--text);
+    }
+
+    img {
+      max-height: 26px;
+      vertical-align: top;
+      margin-top: -5px;
+    }
+  }
+
+
   .tabs {
     display: flex;
     position: relative;
-    width: 100%;
-    overflow-y: hidden;
-    overflow-x: auto;
-    padding-top: 5px;
     box-sizing: border-box;
 
     &::after, &::before {
       display: block;
-      content: '';
       flex: 1 1 auto;
-      border-bottom: 1px solid;
-      border-bottom-color: $fallback--border;
-      border-bottom-color: var(--border, $fallback--border);
     }
+  }
 
-    .tab-wrapper {
-      height: 28px;
-      position: relative;
-      display: flex;
-      flex: 0 0 auto;
+  .tab-wrapper {
+    position: relative;
+    display: flex;
+    flex: 0 0 auto;
 
-      .tab {
-        width: 100%;
-        min-width: 1px;
-        position: relative;
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: 0;
-        padding: 6px 1em;
-        padding-bottom: 99px;
-        margin-bottom: 6px - 99px;
-        white-space: nowrap;
-
-        color: $fallback--text;
-        color: var(--tabText, $fallback--text);
-        background-color: $fallback--fg;
-        background-color: var(--tab, $fallback--fg);
-
-        &:not(.active) {
-          z-index: 4;
-
-          &:hover {
-            z-index: 6;
-          }
-        }
-
-        &.active {
-          background: transparent;
-          z-index: 5;
-          color: $fallback--text;
-          color: var(--tabActiveText, $fallback--text);
-        }
-
-        img {
-          max-height: 26px;
-          vertical-align: top;
-          margin-top: -5px;
-        }
-      }
-
-      &:not(.active) {
-        &::after {
-          content: '';
-          position: absolute;
-          left: 0;
-          right: 0;
-          bottom: 0;
-          z-index: 7;
-          border-bottom: 1px solid;
-          border-bottom-color: $fallback--border;
-          border-bottom-color: var(--border, $fallback--border);
-        }
+    &:not(.active) {
+      &::after {
+        content: '';
+        position: absolute;
+        z-index: 7;
       }
     }
-
   }
 }
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index eca6f9b1..e07d4e56 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -1,25 +1,17 @@
-import unescape from 'lodash/unescape'
 import get from 'lodash/get'
 import map from 'lodash/map'
 import reject from 'lodash/reject'
+import Autosuggest from '../autosuggest/autosuggest.vue'
 import TabSwitcher from '../tab_switcher/tab_switcher.js'
-import ImageCropper from '../image_cropper/image_cropper.vue'
-import StyleSwitcher from '../style_switcher/style_switcher.vue'
-import ScopeSelector from '../scope_selector/scope_selector.vue'
-import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 import BlockCard from '../block_card/block_card.vue'
 import MuteCard from '../mute_card/mute_card.vue'
 import DomainMuteCard from '../domain_mute_card/domain_mute_card.vue'
 import SelectableList from '../selectable_list/selectable_list.vue'
 import ProgressButton from '../progress_button/progress_button.vue'
-import EmojiInput from '../emoji_input/emoji_input.vue'
-import suggestor from '../emoji_input/suggestor.js'
-import Autosuggest from '../autosuggest/autosuggest.vue'
 import Importer from '../importer/importer.vue'
 import Exporter from '../exporter/exporter.vue'
 import withSubscription from '../../hocs/with_subscription/with_subscription'
 import Checkbox from '../checkbox/checkbox.vue'
-import Mfa from './mfa.vue'
 
 const BlockList = withSubscription({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
@@ -42,40 +34,7 @@ const DomainMuteList = withSubscription({
 const UserSettings = {
   data () {
     return {
-      newEmail: '',
-      newName: this.$store.state.users.currentUser.name,
-      newBio: unescape(this.$store.state.users.currentUser.description),
-      newLocked: this.$store.state.users.currentUser.locked,
-      newNoRichText: this.$store.state.users.currentUser.no_rich_text,
-      newDefaultScope: this.$store.state.users.currentUser.default_scope,
-      hideFollows: this.$store.state.users.currentUser.hide_follows,
-      hideFollowers: this.$store.state.users.currentUser.hide_followers,
-      hideFollowsCount: this.$store.state.users.currentUser.hide_follows_count,
-      hideFollowersCount: this.$store.state.users.currentUser.hide_followers_count,
-      showRole: this.$store.state.users.currentUser.show_role,
-      role: this.$store.state.users.currentUser.role,
-      discoverable: this.$store.state.users.currentUser.discoverable,
-      allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
-      pickAvatarBtnVisible: true,
-      bannerUploading: false,
-      backgroundUploading: false,
-      banner: null,
-      bannerPreview: null,
-      background: null,
-      backgroundPreview: null,
-      bannerUploadError: null,
-      backgroundUploadError: null,
-      changeEmailError: false,
-      changeEmailPassword: '',
-      changedEmail: false,
-      deletingAccount: false,
-      deleteAccountConfirmPasswordInput: '',
-      deleteAccountError: false,
-      changePasswordInputs: [ '', '', '' ],
-      changedPassword: false,
-      changePasswordError: false,
       activeTab: 'profile',
-      notificationSettings: this.$store.state.users.currentUser.notification_settings,
       newDomainToMute: ''
     }
   },
@@ -83,176 +42,29 @@ const UserSettings = {
     this.$store.dispatch('fetchTokens')
   },
   components: {
-    StyleSwitcher,
-    ScopeSelector,
     TabSwitcher,
-    ImageCropper,
     BlockList,
     MuteList,
     DomainMuteList,
-    EmojiInput,
-    Autosuggest,
     BlockCard,
     MuteCard,
     DomainMuteCard,
     ProgressButton,
-    Importer,
-    Exporter,
-    Mfa,
+    Autosuggest,
     Checkbox
   },
   computed: {
     user () {
       return this.$store.state.users.currentUser
     },
-    emojiUserSuggestor () {
-      return suggestor({
-        emoji: [
-          ...this.$store.state.instance.emoji,
-          ...this.$store.state.instance.customEmoji
-        ],
-        users: this.$store.state.users.users,
-        updateUsersList: (input) => this.$store.dispatch('searchUsers', input)
-      })
-    },
-    emojiSuggestor () {
-      return suggestor({ emoji: [
-        ...this.$store.state.instance.emoji,
-        ...this.$store.state.instance.customEmoji
-      ] })
-    },
     pleromaBackend () {
       return this.$store.state.instance.pleromaBackend
     },
-    minimalScopesMode () {
-      return this.$store.state.instance.minimalScopesMode
-    },
-    vis () {
-      return {
-        public: { selected: this.newDefaultScope === 'public' },
-        unlisted: { selected: this.newDefaultScope === 'unlisted' },
-        private: { selected: this.newDefaultScope === 'private' },
-        direct: { selected: this.newDefaultScope === 'direct' }
-      }
-    },
     currentSaveStateNotice () {
       return this.$store.state.interface.settings.currentSaveStateNotice
-    },
-    oauthTokens () {
-      return this.$store.state.oauthTokens.tokens.map(oauthToken => {
-        return {
-          id: oauthToken.id,
-          appName: oauthToken.app_name,
-          validUntil: new Date(oauthToken.valid_until).toLocaleDateString()
-        }
-      })
     }
   },
   methods: {
-    updateProfile () {
-      this.$store.state.api.backendInteractor
-        .updateProfile({
-          params: {
-            note: this.newBio,
-            locked: this.newLocked,
-            // Backend notation.
-            /* eslint-disable camelcase */
-            display_name: this.newName,
-            default_scope: this.newDefaultScope,
-            no_rich_text: this.newNoRichText,
-            hide_follows: this.hideFollows,
-            hide_followers: this.hideFollowers,
-            discoverable: this.discoverable,
-            allow_following_move: this.allowFollowingMove,
-            hide_follows_count: this.hideFollowsCount,
-            hide_followers_count: this.hideFollowersCount,
-            show_role: this.showRole
-            /* eslint-enable camelcase */
-          } }).then((user) => {
-          this.$store.commit('addNewUsers', [user])
-          this.$store.commit('setCurrentUser', user)
-        })
-    },
-    updateNotificationSettings () {
-      this.$store.state.api.backendInteractor
-        .updateNotificationSettings({ settings: this.notificationSettings })
-    },
-    changeVis (visibility) {
-      this.newDefaultScope = visibility
-    },
-    uploadFile (slot, e) {
-      const file = e.target.files[0]
-      if (!file) { return }
-      if (file.size > this.$store.state.instance[slot + 'limit']) {
-        const filesize = fileSizeFormatService.fileSizeFormat(file.size)
-        const allowedsize = fileSizeFormatService.fileSizeFormat(this.$store.state.instance[slot + 'limit'])
-        this[slot + 'UploadError'] = this.$t('upload.error.base') + ' ' + this.$t('upload.error.file_too_big', { filesize: filesize.num, filesizeunit: filesize.unit, allowedsize: allowedsize.num, allowedsizeunit: allowedsize.unit })
-        return
-      }
-      // eslint-disable-next-line no-undef
-      const reader = new FileReader()
-      reader.onload = ({ target }) => {
-        const img = target.result
-        this[slot + 'Preview'] = img
-        this[slot] = file
-      }
-      reader.readAsDataURL(file)
-    },
-    submitAvatar (cropper, file) {
-      const that = this
-      return new Promise((resolve, reject) => {
-        function updateAvatar (avatar) {
-          that.$store.state.api.backendInteractor.updateAvatar({ avatar })
-            .then((user) => {
-              that.$store.commit('addNewUsers', [user])
-              that.$store.commit('setCurrentUser', user)
-              resolve()
-            })
-            .catch((err) => {
-              reject(new Error(that.$t('upload.error.base') + ' ' + err.message))
-            })
-        }
-
-        if (cropper) {
-          cropper.getCroppedCanvas().toBlob(updateAvatar, file.type)
-        } else {
-          updateAvatar(file)
-        }
-      })
-    },
-    clearUploadError (slot) {
-      this[slot + 'UploadError'] = null
-    },
-    submitBanner () {
-      if (!this.bannerPreview) { return }
-
-      this.bannerUploading = true
-      this.$store.state.api.backendInteractor.updateBanner({ banner: this.banner })
-        .then((user) => {
-          this.$store.commit('addNewUsers', [user])
-          this.$store.commit('setCurrentUser', user)
-          this.bannerPreview = null
-        })
-        .catch((err) => {
-          this.bannerUploadError = this.$t('upload.error.base') + ' ' + err.message
-        })
-        .then(() => { this.bannerUploading = false })
-    },
-    submitBg () {
-      if (!this.backgroundPreview) { return }
-      let background = this.background
-      this.backgroundUploading = true
-      this.$store.state.api.backendInteractor.updateBg({ background }).then((data) => {
-        if (!data.error) {
-          this.$store.commit('addNewUsers', [data])
-          this.$store.commit('setCurrentUser', data)
-          this.backgroundPreview = null
-        } else {
-          this.backgroundUploadError = this.$t('upload.error.base') + data.error
-        }
-        this.backgroundUploading = false
-      })
-    },
     importFollows (file) {
       return this.$store.state.api.backendInteractor.importFollows({ file })
         .then((status) => {
@@ -281,74 +93,9 @@ const UserSettings = {
         return user.screen_name
       }).join('\n')
     },
-    getFollowsContent () {
-      return this.$store.state.api.backendInteractor.exportFriends({ id: this.$store.state.users.currentUser.id })
-        .then(this.generateExportableUsersContent)
-    },
-    getBlocksContent () {
-      return this.$store.state.api.backendInteractor.fetchBlocks()
-        .then(this.generateExportableUsersContent)
-    },
-    confirmDelete () {
-      this.deletingAccount = true
-    },
-    deleteAccount () {
-      this.$store.state.api.backendInteractor.deleteAccount({ password: this.deleteAccountConfirmPasswordInput })
-        .then((res) => {
-          if (res.status === 'success') {
-            this.$store.dispatch('logout')
-            this.$router.push({ name: 'root' })
-          } else {
-            this.deleteAccountError = res.error
-          }
-        })
-    },
-    changePassword () {
-      const params = {
-        password: this.changePasswordInputs[0],
-        newPassword: this.changePasswordInputs[1],
-        newPasswordConfirmation: this.changePasswordInputs[2]
-      }
-      this.$store.state.api.backendInteractor.changePassword(params)
-        .then((res) => {
-          if (res.status === 'success') {
-            this.changedPassword = true
-            this.changePasswordError = false
-            this.logout()
-          } else {
-            this.changedPassword = false
-            this.changePasswordError = res.error
-          }
-        })
-    },
-    changeEmail () {
-      const params = {
-        email: this.newEmail,
-        password: this.changeEmailPassword
-      }
-      this.$store.state.api.backendInteractor.changeEmail(params)
-        .then((res) => {
-          if (res.status === 'success') {
-            this.changedEmail = true
-            this.changeEmailError = false
-          } else {
-            this.changedEmail = false
-            this.changeEmailError = res.error
-          }
-        })
-    },
     activateTab (tabName) {
       this.activeTab = tabName
     },
-    logout () {
-      this.$store.dispatch('logout')
-      this.$router.replace('/')
-    },
-    revokeToken (id) {
-      if (window.confirm(`${this.$i18n.t('settings.revoke_token')}?`)) {
-        this.$store.dispatch('revokeToken', id)
-      }
-    },
     filterUnblockedUsers (userIds) {
       return reject(userIds, (userId) => {
         const user = this.$store.getters.findUser(userId)
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 8b2336b4..2a88714f 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -25,603 +25,6 @@
       </transition>
     </div>
     <div class="panel-body profile-edit">
-      <tab-switcher>
-        <div :label="$t('settings.profile_tab')">
-          <div class="setting-item">
-            <h2>{{ $t('settings.name_bio') }}</h2>
-            <p>{{ $t('settings.name') }}</p>
-            <EmojiInput
-              v-model="newName"
-              enable-emoji-picker
-              :suggest="emojiSuggestor"
-            >
-              <input
-                id="username"
-                v-model="newName"
-                classname="name-changer"
-              >
-            </EmojiInput>
-            <p>{{ $t('settings.bio') }}</p>
-            <EmojiInput
-              v-model="newBio"
-              enable-emoji-picker
-              :suggest="emojiUserSuggestor"
-            >
-              <textarea
-                v-model="newBio"
-                classname="bio"
-              />
-            </EmojiInput>
-            <p>
-              <Checkbox v-model="newLocked">
-                {{ $t('settings.lock_account_description') }}
-              </Checkbox>
-            </p>
-            <div>
-              <label for="default-vis">{{ $t('settings.default_vis') }}</label>
-              <div
-                id="default-vis"
-                class="visibility-tray"
-              >
-                <scope-selector
-                  :show-all="true"
-                  :user-default="newDefaultScope"
-                  :initial-scope="newDefaultScope"
-                  :on-scope-change="changeVis"
-                />
-              </div>
-            </div>
-            <p>
-              <Checkbox v-model="newNoRichText">
-                {{ $t('settings.no_rich_text_description') }}
-              </Checkbox>
-            </p>
-            <p>
-              <Checkbox v-model="hideFollows">
-                {{ $t('settings.hide_follows_description') }}
-              </Checkbox>
-            </p>
-            <p class="setting-subitem">
-              <Checkbox
-                v-model="hideFollowsCount"
-                :disabled="!hideFollows"
-              >
-                {{ $t('settings.hide_follows_count_description') }}
-              </Checkbox>
-            </p>
-            <p>
-              <Checkbox v-model="hideFollowers">
-                {{ $t('settings.hide_followers_description') }}
-              </Checkbox>
-            </p>
-            <p class="setting-subitem">
-              <Checkbox
-                v-model="hideFollowersCount"
-                :disabled="!hideFollowers"
-              >
-                {{ $t('settings.hide_followers_count_description') }}
-              </Checkbox>
-            </p>
-            <p>
-              <Checkbox v-model="allowFollowingMove">
-                {{ $t('settings.allow_following_move') }}
-              </Checkbox>
-            </p>
-            <p v-if="role === 'admin' || role === 'moderator'">
-              <Checkbox v-model="showRole">
-                <template v-if="role === 'admin'">
-                  {{ $t('settings.show_admin_badge') }}
-                </template>
-                <template v-if="role === 'moderator'">
-                  {{ $t('settings.show_moderator_badge') }}
-                </template>
-              </Checkbox>
-            </p>
-            <p>
-              <Checkbox v-model="discoverable">
-                {{ $t('settings.discoverable') }}
-              </Checkbox>
-            </p>
-            <button
-              :disabled="newName && newName.length === 0"
-              class="btn btn-default"
-              @click="updateProfile"
-            >
-              {{ $t('general.submit') }}
-            </button>
-          </div>
-          <div class="setting-item">
-            <h2>{{ $t('settings.avatar') }}</h2>
-            <p class="visibility-notice">
-              {{ $t('settings.avatar_size_instruction') }}
-            </p>
-            <p>{{ $t('settings.current_avatar') }}</p>
-            <img
-              :src="user.profile_image_url_original"
-              class="current-avatar"
-            >
-            <p>{{ $t('settings.set_new_avatar') }}</p>
-            <button
-              v-show="pickAvatarBtnVisible"
-              id="pick-avatar"
-              class="btn"
-              type="button"
-            >
-              {{ $t('settings.upload_a_photo') }}
-            </button>
-            <image-cropper
-              trigger="#pick-avatar"
-              :submit-handler="submitAvatar"
-              @open="pickAvatarBtnVisible=false"
-              @close="pickAvatarBtnVisible=true"
-            />
-          </div>
-          <div class="setting-item">
-            <h2>{{ $t('settings.profile_banner') }}</h2>
-            <p>{{ $t('settings.current_profile_banner') }}</p>
-            <img
-              :src="user.cover_photo"
-              class="banner"
-            >
-            <p>{{ $t('settings.set_new_profile_banner') }}</p>
-            <img
-              v-if="bannerPreview"
-              class="banner"
-              :src="bannerPreview"
-            >
-            <div>
-              <input
-                type="file"
-                @change="uploadFile('banner', $event)"
-              >
-            </div>
-            <i
-              v-if="bannerUploading"
-              class=" icon-spin4 animate-spin uploading"
-            />
-            <button
-              v-else-if="bannerPreview"
-              class="btn btn-default"
-              @click="submitBanner"
-            >
-              {{ $t('general.submit') }}
-            </button>
-            <div
-              v-if="bannerUploadError"
-              class="alert error"
-            >
-              Error: {{ bannerUploadError }}
-              <i
-                class="button-icon icon-cancel"
-                @click="clearUploadError('banner')"
-              />
-            </div>
-          </div>
-          <div class="setting-item">
-            <h2>{{ $t('settings.profile_background') }}</h2>
-            <p>{{ $t('settings.set_new_profile_background') }}</p>
-            <img
-              v-if="backgroundPreview"
-              class="bg"
-              :src="backgroundPreview"
-            >
-            <div>
-              <input
-                type="file"
-                @change="uploadFile('background', $event)"
-              >
-            </div>
-            <i
-              v-if="backgroundUploading"
-              class=" icon-spin4 animate-spin uploading"
-            />
-            <button
-              v-else-if="backgroundPreview"
-              class="btn btn-default"
-              @click="submitBg"
-            >
-              {{ $t('general.submit') }}
-            </button>
-            <div
-              v-if="backgroundUploadError"
-              class="alert error"
-            >
-              Error: {{ backgroundUploadError }}
-              <i
-                class="button-icon icon-cancel"
-                @click="clearUploadError('background')"
-              />
-            </div>
-          </div>
-        </div>
-
-        <div :label="$t('settings.security_tab')">
-          <div class="setting-item">
-            <h2>{{ $t('settings.change_email') }}</h2>
-            <div>
-              <p>{{ $t('settings.new_email') }}</p>
-              <input
-                v-model="newEmail"
-                type="email"
-                autocomplete="email"
-              >
-            </div>
-            <div>
-              <p>{{ $t('settings.current_password') }}</p>
-              <input
-                v-model="changeEmailPassword"
-                type="password"
-                autocomplete="current-password"
-              >
-            </div>
-            <button
-              class="btn btn-default"
-              @click="changeEmail"
-            >
-              {{ $t('general.submit') }}
-            </button>
-            <p v-if="changedEmail">
-              {{ $t('settings.changed_email') }}
-            </p>
-            <template v-if="changeEmailError !== false">
-              <p>{{ $t('settings.change_email_error') }}</p>
-              <p>{{ changeEmailError }}</p>
-            </template>
-          </div>
-
-          <div class="setting-item">
-            <h2>{{ $t('settings.change_password') }}</h2>
-            <div>
-              <p>{{ $t('settings.current_password') }}</p>
-              <input
-                v-model="changePasswordInputs[0]"
-                type="password"
-              >
-            </div>
-            <div>
-              <p>{{ $t('settings.new_password') }}</p>
-              <input
-                v-model="changePasswordInputs[1]"
-                type="password"
-              >
-            </div>
-            <div>
-              <p>{{ $t('settings.confirm_new_password') }}</p>
-              <input
-                v-model="changePasswordInputs[2]"
-                type="password"
-              >
-            </div>
-            <button
-              class="btn btn-default"
-              @click="changePassword"
-            >
-              {{ $t('general.submit') }}
-            </button>
-            <p v-if="changedPassword">
-              {{ $t('settings.changed_password') }}
-            </p>
-            <p v-else-if="changePasswordError !== false">
-              {{ $t('settings.change_password_error') }}
-            </p>
-            <p v-if="changePasswordError">
-              {{ changePasswordError }}
-            </p>
-          </div>
-
-          <div class="setting-item">
-            <h2>{{ $t('settings.oauth_tokens') }}</h2>
-            <table class="oauth-tokens">
-              <thead>
-                <tr>
-                  <th>{{ $t('settings.app_name') }}</th>
-                  <th>{{ $t('settings.valid_until') }}</th>
-                  <th />
-                </tr>
-              </thead>
-              <tbody>
-                <tr
-                  v-for="oauthToken in oauthTokens"
-                  :key="oauthToken.id"
-                >
-                  <td>{{ oauthToken.appName }}</td>
-                  <td>{{ oauthToken.validUntil }}</td>
-                  <td class="actions">
-                    <button
-                      class="btn btn-default"
-                      @click="revokeToken(oauthToken.id)"
-                    >
-                      {{ $t('settings.revoke_token') }}
-                    </button>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-          <mfa />
-          <div class="setting-item">
-            <h2>{{ $t('settings.delete_account') }}</h2>
-            <p v-if="!deletingAccount">
-              {{ $t('settings.delete_account_description') }}
-            </p>
-            <div v-if="deletingAccount">
-              <p>{{ $t('settings.delete_account_instructions') }}</p>
-              <p>{{ $t('login.password') }}</p>
-              <input
-                v-model="deleteAccountConfirmPasswordInput"
-                type="password"
-              >
-              <button
-                class="btn btn-default"
-                @click="deleteAccount"
-              >
-                {{ $t('settings.delete_account') }}
-              </button>
-            </div>
-            <p v-if="deleteAccountError !== false">
-              {{ $t('settings.delete_account_error') }}
-            </p>
-            <p v-if="deleteAccountError">
-              {{ deleteAccountError }}
-            </p>
-            <button
-              v-if="!deletingAccount"
-              class="btn btn-default"
-              @click="confirmDelete"
-            >
-              {{ $t('general.submit') }}
-            </button>
-          </div>
-        </div>
-
-        <div
-          v-if="pleromaBackend"
-          :label="$t('settings.notifications')"
-        >
-          <div class="setting-item">
-            <div class="select-multiple">
-              <span class="label">{{ $t('settings.notification_setting') }}</span>
-              <ul class="option-list">
-                <li>
-                  <Checkbox v-model="notificationSettings.follows">
-                    {{ $t('settings.notification_setting_follows') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="notificationSettings.followers">
-                    {{ $t('settings.notification_setting_followers') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="notificationSettings.non_follows">
-                    {{ $t('settings.notification_setting_non_follows') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="notificationSettings.non_followers">
-                    {{ $t('settings.notification_setting_non_followers') }}
-                  </Checkbox>
-                </li>
-              </ul>
-            </div>
-            <p>{{ $t('settings.notification_mutes') }}</p>
-            <p>{{ $t('settings.notification_blocks') }}</p>
-            <button
-              class="btn btn-default"
-              @click="updateNotificationSettings"
-            >
-              {{ $t('general.submit') }}
-            </button>
-          </div>
-        </div>
-
-        <div
-          v-if="pleromaBackend"
-          :label="$t('settings.data_import_export_tab')"
-        >
-          <div class="setting-item">
-            <h2>{{ $t('settings.follow_import') }}</h2>
-            <p>{{ $t('settings.import_followers_from_a_csv_file') }}</p>
-            <Importer
-              :submit-handler="importFollows"
-              :success-message="$t('settings.follows_imported')"
-              :error-message="$t('settings.follow_import_error')"
-            />
-          </div>
-          <div class="setting-item">
-            <h2>{{ $t('settings.follow_export') }}</h2>
-            <Exporter
-              :get-content="getFollowsContent"
-              filename="friends.csv"
-              :export-button-label="$t('settings.follow_export_button')"
-            />
-          </div>
-          <div class="setting-item">
-            <h2>{{ $t('settings.block_import') }}</h2>
-            <p>{{ $t('settings.import_blocks_from_a_csv_file') }}</p>
-            <Importer
-              :submit-handler="importBlocks"
-              :success-message="$t('settings.blocks_imported')"
-              :error-message="$t('settings.block_import_error')"
-            />
-          </div>
-          <div class="setting-item">
-            <h2>{{ $t('settings.block_export') }}</h2>
-            <Exporter
-              :get-content="getBlocksContent"
-              filename="blocks.csv"
-              :export-button-label="$t('settings.block_export_button')"
-            />
-          </div>
-        </div>
-
-        <div :label="$t('settings.blocks_tab')">
-          <div class="profile-edit-usersearch-wrapper">
-            <Autosuggest
-              :filter="filterUnblockedUsers"
-              :query="queryUserIds"
-              :placeholder="$t('settings.search_user_to_block')"
-            >
-              <BlockCard
-                slot-scope="row"
-                :user-id="row.item"
-              />
-            </Autosuggest>
-          </div>
-          <BlockList
-            :refresh="true"
-            :get-key="identity"
-          >
-            <template
-              slot="header"
-              slot-scope="{selected}"
-            >
-              <div class="profile-edit-bulk-actions">
-                <ProgressButton
-                  v-if="selected.length > 0"
-                  class="btn btn-default"
-                  :click="() => blockUsers(selected)"
-                >
-                  {{ $t('user_card.block') }}
-                  <template slot="progress">
-                    {{ $t('user_card.block_progress') }}
-                  </template>
-                </ProgressButton>
-                <ProgressButton
-                  v-if="selected.length > 0"
-                  class="btn btn-default"
-                  :click="() => unblockUsers(selected)"
-                >
-                  {{ $t('user_card.unblock') }}
-                  <template slot="progress">
-                    {{ $t('user_card.unblock_progress') }}
-                  </template>
-                </ProgressButton>
-              </div>
-            </template>
-            <template
-              slot="item"
-              slot-scope="{item}"
-            >
-              <BlockCard :user-id="item" />
-            </template>
-            <template slot="empty">
-              {{ $t('settings.no_blocks') }}
-            </template>
-          </BlockList>
-        </div>
-
-        <div :label="$t('settings.mutes_tab')">
-          <tab-switcher>
-            <div label="Users">
-              <div class="profile-edit-usersearch-wrapper">
-                <Autosuggest
-                  :filter="filterUnMutedUsers"
-                  :query="queryUserIds"
-                  :placeholder="$t('settings.search_user_to_mute')"
-                >
-                  <MuteCard
-                    slot-scope="row"
-                    :user-id="row.item"
-                  />
-                </Autosuggest>
-              </div>
-              <MuteList
-                :refresh="true"
-                :get-key="identity"
-              >
-                <template
-                  slot="header"
-                  slot-scope="{selected}"
-                >
-                  <div class="profile-edit-bulk-actions">
-                    <ProgressButton
-                      v-if="selected.length > 0"
-                      class="btn btn-default"
-                      :click="() => muteUsers(selected)"
-                    >
-                      {{ $t('user_card.mute') }}
-                      <template slot="progress">
-                        {{ $t('user_card.mute_progress') }}
-                      </template>
-                    </ProgressButton>
-                    <ProgressButton
-                      v-if="selected.length > 0"
-                      class="btn btn-default"
-                      :click="() => unmuteUsers(selected)"
-                    >
-                      {{ $t('user_card.unmute') }}
-                      <template slot="progress">
-                        {{ $t('user_card.unmute_progress') }}
-                      </template>
-                    </ProgressButton>
-                  </div>
-                </template>
-                <template
-                  slot="item"
-                  slot-scope="{item}"
-                >
-                  <MuteCard :user-id="item" />
-                </template>
-                <template slot="empty">
-                  {{ $t('settings.no_mutes') }}
-                </template>
-              </MuteList>
-            </div>
-
-            <div :label="$t('settings.domain_mutes')">
-              <div class="profile-edit-domain-mute-form">
-                <input
-                  v-model="newDomainToMute"
-                  :placeholder="$t('settings.type_domains_to_mute')"
-                  type="text"
-                  @keyup.enter="muteDomain"
-                >
-                <ProgressButton
-                  class="btn btn-default"
-                  :click="muteDomain"
-                >
-                  {{ $t('domain_mute_card.mute') }}
-                  <template slot="progress">
-                    {{ $t('domain_mute_card.mute_progress') }}
-                  </template>
-                </ProgressButton>
-              </div>
-              <DomainMuteList
-                :refresh="true"
-                :get-key="identity"
-              >
-                <template
-                  slot="header"
-                  slot-scope="{selected}"
-                >
-                  <div class="profile-edit-bulk-actions">
-                    <ProgressButton
-                      v-if="selected.length > 0"
-                      class="btn btn-default"
-                      :click="() => unmuteDomains(selected)"
-                    >
-                      {{ $t('domain_mute_card.unmute') }}
-                      <template slot="progress">
-                        {{ $t('domain_mute_card.unmute_progress') }}
-                      </template>
-                    </ProgressButton>
-                  </div>
-                </template>
-                <template
-                  slot="item"
-                  slot-scope="{item}"
-                >
-                  <DomainMuteCard :domain="item" />
-                </template>
-                <template slot="empty">
-                  {{ $t('settings.no_mutes') }}
-                </template>
-              </DomainMuteList>
-            </div>
-          </tab-switcher>
-        </div>
-      </tab-switcher>
     </div>
   </div>
 </template>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 37d9591c..312f7283 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -278,6 +278,7 @@
     "current_avatar": "Your current avatar",
     "current_password": "Current password",
     "current_profile_banner": "Your current profile banner",
+    "mutes_and_blocks": "Mutes and Blocks",
     "data_import_export_tab": "Data Import / Export",
     "default_vis": "Default visibility scope",
     "delete_account": "Delete Account",
diff --git a/src/modules/interface.js b/src/modules/interface.js
index 5b2762e5..e55b7290 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -1,6 +1,7 @@
 import { set, delete as del } from 'vue'
 
 const defaultState = {
+  settingsModalState: 'hidden',
   settings: {
     currentSaveStateNotice: null,
     noticeClearTimeout: null,
@@ -35,6 +36,24 @@ const interfaceMod = {
     },
     setMobileLayout (state, value) {
       state.mobileLayout = value
+    },
+    closeSettingsModal (state) {
+      state.settingsModalState = 'hidden'
+    },
+    togglePeekSettingsModal (state) {
+      switch (state.settingsModalState) {
+        case 'minimized':
+          state.settingsModalState = 'visible'
+          return
+        case 'visible':
+          state.settingsModalState = 'minimized'
+          return
+        default:
+          throw new Error('Illegal minimization state of settings modal')
+      }
+    },
+    openSettingsModal (state) {
+      state.settingsModalState = 'visible'
     }
   },
   actions: {
@@ -49,6 +68,15 @@ const interfaceMod = {
     },
     setMobileLayout ({ commit }, value) {
       commit('setMobileLayout', value)
+    },
+    closeSettingsModal ({ commit }) {
+      commit('closeSettingsModal')
+    },
+    openSettingsModal ({ commit }) {
+      commit('openSettingsModal')
+    },
+    togglePeekSettingsModal ({ commit }) {
+      commit('togglePeekSettingsModal')
     }
   }
 }

From 9180fdb4927af12c123751a30ef55d6f56ffa173 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 8 May 2020 15:56:53 -0500
Subject: [PATCH 014/415] Clarify that we only delete data, not the account

---
 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 d5748719..c7f8839d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -281,7 +281,7 @@
     "data_import_export_tab": "Data Import / Export",
     "default_vis": "Default visibility scope",
     "delete_account": "Delete Account",
-    "delete_account_description": "Permanently delete your account and all your messages.",
+    "delete_account_description": "Permanently delete your data and deactivate your account.",
     "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
     "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
     "discoverable": "Allow discovery of this account in search results and other services",

From bcebec478e43b3851e85c94335940e8fc7546cc8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 10 May 2020 06:46:06 +0300
Subject: [PATCH 015/415] moved stuff from settings, cleaned up naming for
 tabs, added close and peek

---
 src/App.scss                                  |  48 --
 src/components/modal/modal.vue                |  16 +-
 src/components/settings/settings.js           | 128 ------
 src/components/settings/settings.vue          | 424 ------------------
 .../settings_modal/settings_modal.js          |  42 +-
 .../settings_modal/settings_modal.scss        |  30 +-
 .../settings_modal/settings_modal.vue         |  26 +-
 ...rt_export.js => data_import_export_tab.js} |  10 +-
 ..._export.vue => data_import_export_tab.vue} |   2 +-
 .../settings_modal/tabs/filtering_tab.js      |  26 ++
 .../settings_modal/tabs/filtering_tab.vue     |  86 ++++
 .../settings_modal/tabs/general_tab.js        |  32 ++
 .../settings_modal/tabs/general_tab.vue       | 272 +++++++++++
 .../tabs/helpers/shared_computed_object.js    |  69 +++
 ..._and_blocks.js => mutes_and_blocks_tab.js} |  18 +-
 ...nd_blocks.vue => mutes_and_blocks_tab.vue} |   8 +-
 ...{notifications.js => notifications_tab.js} |   6 +-
 ...otifications.vue => notifications_tab.vue} |   2 +-
 .../tabs/{profile.js => profile_tab.js}       |  16 +-
 .../tabs/{profile.scss => profile_tab.scss}   |   0
 .../tabs/{profile.vue => profile_tab.vue}     |   4 +-
 .../tabs/security_tab}/confirm.js             |   0
 .../tabs/security_tab}/confirm.vue            |   0
 .../tabs/security_tab}/mfa.js                 |   0
 .../tabs/security_tab}/mfa.vue                |  11 +-
 .../tabs/security_tab}/mfa_backup_codes.js    |   0
 .../tabs/security_tab}/mfa_backup_codes.vue   |  18 +-
 .../tabs/security_tab}/mfa_totp.js            |   0
 .../tabs/security_tab}/mfa_totp.vue           |   0
 .../security_tab.js}                          |  10 +-
 .../security_tab.vue}                         |   2 +-
 .../tabs/theme_tab}/preview.vue               |   0
 .../tabs/theme_tab/theme_tab.js}              |  27 +-
 .../tabs/theme_tab/theme_tab.scss}            |  18 +-
 .../tabs/theme_tab/theme_tab.vue}             | 168 +++----
 .../settings_modal/tabs/version_tab.js        |  24 +
 .../settings_modal/tabs/version_tab.vue       |  31 ++
 src/components/tab_switcher/tab_switcher.scss |   6 +
 src/components/user_card/user_card.vue        |  11 +-
 src/components/user_settings/user_settings.js | 140 ------
 .../user_settings/user_settings.vue           | 119 -----
 src/i18n/en.json                              |   4 +-
 42 files changed, 801 insertions(+), 1053 deletions(-)
 delete mode 100644 src/components/settings/settings.js
 delete mode 100644 src/components/settings/settings.vue
 rename src/components/settings_modal/tabs/{data_import_export.js => data_import_export_tab.js} (86%)
 rename src/components/settings_modal/tabs/{data_import_export.vue => data_import_export_tab.vue} (96%)
 create mode 100644 src/components/settings_modal/tabs/filtering_tab.js
 create mode 100644 src/components/settings_modal/tabs/filtering_tab.vue
 create mode 100644 src/components/settings_modal/tabs/general_tab.js
 create mode 100644 src/components/settings_modal/tabs/general_tab.vue
 create mode 100644 src/components/settings_modal/tabs/helpers/shared_computed_object.js
 rename src/components/settings_modal/tabs/{mutes_and_blocks.js => mutes_and_blocks_tab.js} (83%)
 rename src/components/settings_modal/tabs/{mutes_and_blocks.vue => mutes_and_blocks_tab.vue} (97%)
 rename src/components/settings_modal/tabs/{notifications.js => notifications_tab.js} (80%)
 rename src/components/settings_modal/tabs/{notifications.vue => notifications_tab.vue} (96%)
 rename src/components/settings_modal/tabs/{profile.js => profile_tab.js} (90%)
 rename src/components/settings_modal/tabs/{profile.scss => profile_tab.scss} (100%)
 rename src/components/settings_modal/tabs/{profile.vue => profile_tab.vue} (98%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/confirm.js (100%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/confirm.vue (100%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/mfa.js (100%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/mfa.vue (97%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/mfa_backup_codes.js (100%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/mfa_backup_codes.vue (69%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/mfa_totp.js (100%)
 rename src/components/{user_settings => settings_modal/tabs/security_tab}/mfa_totp.vue (100%)
 rename src/components/settings_modal/tabs/{security.js => security_tab/security_tab.js} (92%)
 rename src/components/settings_modal/tabs/{security.vue => security_tab/security_tab.vue} (98%)
 rename src/components/{style_switcher => settings_modal/tabs/theme_tab}/preview.vue (100%)
 rename src/components/{style_switcher/style_switcher.js => settings_modal/tabs/theme_tab/theme_tab.js} (96%)
 rename src/components/{style_switcher/style_switcher.scss => settings_modal/tabs/theme_tab/theme_tab.scss} (97%)
 rename src/components/{style_switcher/style_switcher.vue => settings_modal/tabs/theme_tab/theme_tab.vue} (92%)
 create mode 100644 src/components/settings_modal/tabs/version_tab.js
 create mode 100644 src/components/settings_modal/tabs/version_tab.vue
 delete mode 100644 src/components/user_settings/user_settings.js
 delete mode 100644 src/components/user_settings/user_settings.vue

diff --git a/src/App.scss b/src/App.scss
index 7db9461c..120eea53 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -860,54 +860,6 @@ nav {
   }
 }
 
-// DELETE
-.setting-item {
-  border-bottom: 2px solid var(--fg, $fallback--fg);
-  margin: 1em 1em 1.4em;
-  padding-bottom: 1.4em;
-
-  > div {
-    margin-bottom: .5em;
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  &:last-child {
-    border-bottom: none;
-    padding-bottom: 0;
-    margin-bottom: 1em;
-  }
-
-  select {
-    min-width: 10em;
-  }
-
-
-  textarea {
-    width: 100%;
-    max-width: 100%;
-    height: 100px;
-  }
-
-  .unavailable,
-  .unavailable i {
-    color: var(--cRed, $fallback--cRed);
-    color: $fallback--cRed;
-  }
-
-  .btn {
-    min-height: 28px;
-    min-width: 10em;
-    padding: 0 2em;
-  }
-
-  .number-input {
-    max-width: 6em;
-  }
-}
-// DELETE
-
 .select-multiple {
   display: flex;
   .option-list {
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index cee24241..e5ecc0c0 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -3,6 +3,7 @@
     v-show="isOpen"
     v-body-scroll-lock="isOpen"
     class="modal-view"
+    :class="{ 'modal-background': !noBackground }"
     @click.self="$emit('backdropClicked')"
   >
     <slot />
@@ -15,6 +16,10 @@ export default {
     isOpen: {
       type: Boolean,
       default: true
+    },
+    noBackground: {
+      type: Boolean,
+      default: false
     }
   }
 }
@@ -32,10 +37,19 @@ export default {
   justify-content: center;
   align-items: center;
   overflow: auto;
+  pointer-events: none;
   animation-duration: 0.2s;
-  background-color: rgba(0, 0, 0, 0.5);
   animation-name: modal-background-fadein;
 
+  > * {
+    pointer-events: initial;
+  }
+
+  &.modal-background {
+    pointer-events: initial;
+    background-color: rgba(0, 0, 0, 0.5);
+  }
+
   body:not(.scroll-locked) & {
     opacity: 0;
   }
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
deleted file mode 100644
index 31a9e9be..00000000
--- a/src/components/settings/settings.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/* eslint-env browser */
-import { filter, trim } from 'lodash'
-
-import TabSwitcher from '../tab_switcher/tab_switcher.js'
-import StyleSwitcher from '../style_switcher/style_switcher.vue'
-import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
-import { extractCommit } from '../../services/version/version.service'
-import { instanceDefaultProperties, defaultState as configDefaultState } from '../../modules/config.js'
-import Checkbox from '../checkbox/checkbox.vue'
-
-const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
-const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
-
-const multiChoiceProperties = [
-  'postContentType',
-  'subjectLineBehavior'
-]
-
-const settings = {
-  data () {
-    const instance = this.$store.state.instance
-
-    return {
-      loopSilentAvailable:
-        // Firefox
-        Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||
-        // Chrome-likes
-        Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') ||
-        // Future spec, still not supported in Nightly 63 as of 08/2018
-        Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
-
-      backendVersion: instance.backendVersion,
-      frontendVersion: instance.frontendVersion
-    }
-  },
-  components: {
-    TabSwitcher,
-    StyleSwitcher,
-    InterfaceLanguageSwitcher,
-    Checkbox
-  },
-  computed: {
-    user () {
-      return this.$store.state.users.currentUser
-    },
-    currentSaveStateNotice () {
-      return this.$store.state.interface.settings.currentSaveStateNotice
-    },
-    postFormats () {
-      return this.$store.state.instance.postFormats || []
-    },
-    instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
-    frontendVersionLink () {
-      return pleromaFeCommitUrl + this.frontendVersion
-    },
-    backendVersionLink () {
-      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
-    },
-    // Getting localized values for instance-default properties
-    ...instanceDefaultProperties
-      .filter(key => multiChoiceProperties.includes(key))
-      .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])
-        }
-      ])
-      .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
-    // Generating computed values for vuex properties
-    ...Object.keys(configDefaultState)
-      .map(key => [key, {
-        get () { return this.$store.getters.mergedConfig[key] },
-        set (value) {
-          this.$store.dispatch('setOption', { name: key, value })
-        }
-      }])
-      .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
-    // Special cases (need to transform values or perform actions first)
-    muteWordsString: {
-      get () { return this.$store.getters.mergedConfig.muteWords.join('\n') },
-      set (value) {
-        this.$store.dispatch('setOption', {
-          name: 'muteWords',
-          value: filter(value.split('\n'), (word) => trim(word).length > 0)
-        })
-      }
-    },
-    useStreamingApi: {
-      get () { return this.$store.getters.mergedConfig.useStreamingApi },
-      set (value) {
-        const promise = value
-          ? this.$store.dispatch('enableMastoSockets')
-          : this.$store.dispatch('disableMastoSockets')
-
-        promise.then(() => {
-          this.$store.dispatch('setOption', { name: 'useStreamingApi', value })
-        }).catch((e) => {
-          console.error('Failed starting MastoAPI Streaming socket', e)
-          this.$store.dispatch('disableMastoSockets')
-          this.$store.dispatch('setOption', { name: 'useStreamingApi', value: false })
-        })
-      }
-    }
-  },
-  // Updating nested properties
-  watch: {
-    notificationVisibility: {
-      handler (value) {
-        this.$store.dispatch('setOption', {
-          name: 'notificationVisibility',
-          value: this.$store.getters.mergedConfig.notificationVisibility
-        })
-      },
-      deep: true
-    }
-  }
-}
-
-export default settings
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
deleted file mode 100644
index 9e14b449..00000000
--- a/src/components/settings/settings.vue
+++ /dev/null
@@ -1,424 +0,0 @@
-<template>
-  <div class="settings panel panel-default">
-    <div class="panel-heading">
-      <div class="title">
-        {{ $t('settings.settings') }}
-      </div>
-
-      <transition name="fade">
-        <template v-if="currentSaveStateNotice">
-          <div
-            v-if="currentSaveStateNotice.error"
-            class="alert error"
-            @click.prevent
-          >
-            {{ $t('settings.saving_err') }}
-          </div>
-
-          <div
-            v-if="!currentSaveStateNotice.error"
-            class="alert transparent"
-            @click.prevent
-          >
-            {{ $t('settings.saving_ok') }}
-          </div>
-        </template>
-      </transition>
-    </div>
-    <div class="panel-body">
-      <keep-alive>
-        <tab-switcher>
-          <div :label="$t('settings.general')">
-            <div class="setting-item">
-              <h2>{{ $t('settings.interface') }}</h2>
-              <ul class="setting-list">
-                <li>
-                  <interface-language-switcher />
-                </li>
-                <li v-if="instanceSpecificPanelPresent">
-                  <Checkbox v-model="hideISP">
-                    {{ $t('settings.hide_isp') }}
-                  </Checkbox>
-                </li>
-              </ul>
-            </div>
-            <div class="setting-item">
-              <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>
-                </li>
-                <li>
-                  <Checkbox v-model="collapseMessageWithSubject">
-                    {{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="streaming">
-                    {{ $t('settings.streaming') }}
-                  </Checkbox>
-                  <ul
-                    class="setting-list suboptions"
-                    :class="[{disabled: !streaming}]"
-                  >
-                    <li>
-                      <Checkbox
-                        v-model="pauseOnUnfocused"
-                        :disabled="!streaming"
-                      >
-                        {{ $t('settings.pause_on_unfocused') }}
-                      </Checkbox>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <Checkbox v-model="useStreamingApi">
-                    {{ $t('settings.useStreamingApi') }}
-                    <br>
-                    <small>
-                      {{ $t('settings.useStreamingApiWarning') }}
-                    </small>
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="autoLoad">
-                    {{ $t('settings.autoload') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="hoverPreview">
-                    {{ $t('settings.reply_link_preview') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="emojiReactionsOnTimeline">
-                    {{ $t('settings.emoji_reactions_on_timeline') }}
-                  </Checkbox>
-                </li>
-              </ul>
-            </div>
-
-            <div class="setting-item">
-              <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>
-                </li>
-                <li>
-                  <Checkbox v-model="alwaysShowSubjectInput">
-                    {{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <div>
-                    {{ $t('settings.subject_line_behavior') }}
-                    <label
-                      for="subjectLineBehavior"
-                      class="select"
-                    >
-                      <select
-                        id="subjectLineBehavior"
-                        v-model="subjectLineBehavior"
-                      >
-                        <option value="email">
-                          {{ $t('settings.subject_line_email') }}
-                          {{ subjectLineBehaviorDefaultValue == 'email' ? $t('settings.instance_default_simple') : '' }}
-                        </option>
-                        <option value="masto">
-                          {{ $t('settings.subject_line_mastodon') }}
-                          {{ subjectLineBehaviorDefaultValue == 'mastodon' ? $t('settings.instance_default_simple') : '' }}
-                        </option>
-                        <option value="noop">
-                          {{ $t('settings.subject_line_noop') }}
-                          {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
-                        </option>
-                      </select>
-                      <i class="icon-down-open" />
-                    </label>
-                  </div>
-                </li>
-                <li v-if="postFormats.length > 0">
-                  <div>
-                    {{ $t('settings.post_status_content_type') }}
-                    <label
-                      for="postContentType"
-                      class="select"
-                    >
-                      <select
-                        id="postContentType"
-                        v-model="postContentType"
-                      >
-                        <option
-                          v-for="postFormat in postFormats"
-                          :key="postFormat"
-                          :value="postFormat"
-                        >
-                          {{ $t(`post_status.content_type["${postFormat}"]`) }}
-                          {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
-                        </option>
-                      </select>
-                      <i class="icon-down-open" />
-                    </label>
-                  </div>
-                </li>
-                <li>
-                  <Checkbox v-model="minimalScopesMode">
-                    {{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="autohideFloatingPostButton">
-                    {{ $t('settings.autohide_floating_post_button') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="padEmoji">
-                    {{ $t('settings.pad_emoji') }}
-                  </Checkbox>
-                </li>
-              </ul>
-            </div>
-
-            <div class="setting-item">
-              <h2>{{ $t('settings.attachments') }}</h2>
-              <ul class="setting-list">
-                <li>
-                  <Checkbox v-model="hideAttachments">
-                    {{ $t('settings.hide_attachments_in_tl') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="hideAttachmentsInConv">
-                    {{ $t('settings.hide_attachments_in_convo') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <label for="maxThumbnails">
-                    {{ $t('settings.max_thumbnails') }}
-                  </label>
-                  <input
-                    id="maxThumbnails"
-                    v-model.number="maxThumbnails"
-                    class="number-input"
-                    type="number"
-                    min="0"
-                    step="1"
-                  >
-                </li>
-                <li>
-                  <Checkbox v-model="hideNsfw">
-                    {{ $t('settings.nsfw_clickthrough') }}
-                  </Checkbox>
-                </li>
-                <ul class="setting-list suboptions">
-                  <li>
-                    <Checkbox
-                      v-model="preloadImage"
-                      :disabled="!hideNsfw"
-                    >
-                      {{ $t('settings.preload_images') }}
-                    </Checkbox>
-                  </li>
-                  <li>
-                    <Checkbox
-                      v-model="useOneClickNsfw"
-                      :disabled="!hideNsfw"
-                    >
-                      {{ $t('settings.use_one_click_nsfw') }}
-                    </Checkbox>
-                  </li>
-                </ul>
-                <li>
-                  <Checkbox v-model="stopGifs">
-                    {{ $t('settings.stop_gifs') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="loopVideo">
-                    {{ $t('settings.loop_video') }}
-                  </Checkbox>
-                  <ul
-                    class="setting-list suboptions"
-                    :class="[{disabled: !streaming}]"
-                  >
-                    <li>
-                      <Checkbox
-                        v-model="loopVideoSilentOnly"
-                        :disabled="!loopVideo || !loopSilentAvailable"
-                      >
-                        {{ $t('settings.loop_video_silent_only') }}
-                      </Checkbox>
-                      <div
-                        v-if="!loopSilentAvailable"
-                        class="unavailable"
-                      >
-                        <i class="icon-globe" />! {{ $t('settings.limited_availability') }}
-                      </div>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <Checkbox v-model="playVideosInModal">
-                    {{ $t('settings.play_videos_in_modal') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="useContainFit">
-                    {{ $t('settings.use_contain_fit') }}
-                  </Checkbox>
-                </li>
-              </ul>
-            </div>
-
-            <div class="setting-item">
-              <h2>{{ $t('settings.notifications') }}</h2>
-              <ul class="setting-list">
-                <li>
-                  <Checkbox v-model="webPushNotifications">
-                    {{ $t('settings.enable_web_push_notifications') }}
-                  </Checkbox>
-                </li>
-              </ul>
-            </div>
-
-            <div class="setting-item">
-              <h2>{{ $t('settings.fun') }}</h2>
-              <ul class="setting-list">
-                <li>
-                  <Checkbox v-model="greentext">
-                    {{ $t('settings.greentext') }} {{ $t('settings.instance_default', { value: greentextLocalizedValue }) }}
-                  </Checkbox>
-                </li>
-              </ul>
-            </div>
-          </div>
-
-          <div :label="$t('settings.theme')">
-            <div class="setting-item">
-              <style-switcher />
-            </div>
-          </div>
-
-          <div :label="$t('settings.filtering')">
-            <div class="setting-item">
-              <div class="select-multiple">
-                <span class="label">{{ $t('settings.notification_visibility') }}</span>
-                <ul class="option-list">
-                  <li>
-                    <Checkbox v-model="notificationVisibility.likes">
-                      {{ $t('settings.notification_visibility_likes') }}
-                    </Checkbox>
-                  </li>
-                  <li>
-                    <Checkbox v-model="notificationVisibility.repeats">
-                      {{ $t('settings.notification_visibility_repeats') }}
-                    </Checkbox>
-                  </li>
-                  <li>
-                    <Checkbox v-model="notificationVisibility.follows">
-                      {{ $t('settings.notification_visibility_follows') }}
-                    </Checkbox>
-                  </li>
-                  <li>
-                    <Checkbox v-model="notificationVisibility.mentions">
-                      {{ $t('settings.notification_visibility_mentions') }}
-                    </Checkbox>
-                  </li>
-                  <li>
-                    <Checkbox v-model="notificationVisibility.moves">
-                      {{ $t('settings.notification_visibility_moves') }}
-                    </Checkbox>
-                  </li>
-                  <li>
-                    <Checkbox v-model="notificationVisibility.emojiReactions">
-                      {{ $t('settings.notification_visibility_emoji_reactions') }}
-                    </Checkbox>
-                  </li>
-                </ul>
-              </div>
-              <div>
-                {{ $t('settings.replies_in_timeline') }}
-                <label
-                  for="replyVisibility"
-                  class="select"
-                >
-                  <select
-                    id="replyVisibility"
-                    v-model="replyVisibility"
-                  >
-                    <option
-                      value="all"
-                      selected
-                    >{{ $t('settings.reply_visibility_all') }}</option>
-                    <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
-                    <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
-                  </select>
-                  <i class="icon-down-open" />
-                </label>
-              </div>
-              <div>
-                <Checkbox v-model="hidePostStats">
-                  {{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
-                </Checkbox>
-              </div>
-              <div>
-                <Checkbox v-model="hideUserStats">
-                  {{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
-                </Checkbox>
-              </div>
-            </div>
-            <div class="setting-item">
-              <div>
-                <p>{{ $t('settings.filtering_explanation') }}</p>
-                <textarea
-                  id="muteWords"
-                  v-model="muteWordsString"
-                />
-              </div>
-              <div>
-                <Checkbox v-model="hideFilteredStatuses">
-                  {{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
-                </Checkbox>
-              </div>
-            </div>
-          </div>
-          <div :label="$t('settings.version.title')">
-            <div class="setting-item">
-              <ul class="setting-list">
-                <li>
-                  <p>{{ $t('settings.version.backend_version') }}</p>
-                  <ul class="option-list">
-                    <li>
-                      <a
-                        :href="backendVersionLink"
-                        target="_blank"
-                      >{{ backendVersion }}</a>
-                    </li>
-                  </ul>
-                </li>
-                <li>
-                  <p>{{ $t('settings.version.frontend_version') }}</p>
-                  <ul class="option-list">
-                    <li>
-                      <a
-                        :href="frontendVersionLink"
-                        target="_blank"
-                      >{{ frontendVersion }}</a>
-                    </li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </tab-switcher>
-      </keep-alive>
-    </div>
-  </div>
-</template>
-
-<script src="./settings.js">
-</script>
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 1f4c038f..d60babf6 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -1,21 +1,30 @@
-import Modal from '../modal/modal.vue'
-import TabSwitcher from '../tab_switcher/tab_switcher.js'
+import Modal from 'src/components/modal/modal.vue'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
 
-import Profile from './tabs/profile.vue'
-import Security from './tabs/security.vue'
-import Notifications from './tabs/notifications.vue'
-import DataImportExport from './tabs/data_import_export.vue'
-import MutesAndBlocks from './tabs/mutes_and_blocks.vue'
+import DataImportExportTab from './tabs/data_import_export_tab.vue'
+import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
+import NotificationsTab from './tabs/notifications_tab.vue'
+import FilteringTab from './tabs/filtering_tab.vue'
+import SecurityTab from './tabs/security_tab/security_tab.vue'
+import ProfileTab from './tabs/profile_tab.vue'
+import GeneralTab from './tabs/general_tab.vue'
+import VersionTab from './tabs/version_tab.vue'
+import ThemeTab from './tabs/theme_tab/theme_tab.vue'
 
 const SettingsModal = {
   components: {
     Modal,
     TabSwitcher,
-    Profile,
-    Security,
-    Notifications,
-    DataImportExport,
-    MutesAndBlocks
+
+    DataImportExportTab,
+    MutesAndBlocksTab,
+    NotificationsTab,
+    FilteringTab,
+    SecurityTab,
+    ProfileTab,
+    GeneralTab,
+    VersionTab,
+    ThemeTab
   },
   data () {
     return {
@@ -28,11 +37,20 @@ const SettingsModal = {
     },
     modalActivated () {
       return this.$store.state.interface.settingsModalState !== 'hidden'
+    },
+    modalPeeked () {
+      return this.$store.state.interface.settingsModalState === 'minimized'
     }
   },
   watch: {
   },
   methods: {
+    closeModal () {
+      this.$store.dispatch('closeSettingsModal')
+    },
+    peekModal () {
+      this.$store.dispatch('togglePeekSettingsModal')
+    }
   }
 }
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 8cea52d2..3efbe205 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -1,14 +1,29 @@
-@import '../../_variables.scss';
+@import 'src/_variables.scss';
 .settings-modal {
+
   .settings_tab-switcher {
     height: 100%;
   }
+  &.peek {
+    .settings-modal-panel {
+      transform: translateY(calc(100% - 50px));
+    }
+  }
+
   .settings-modal-panel {
+    transition: transform;
+    transition-timing-function: ease-in-out;
+    transition-duration: 300ms;
     width: 1000px;
     max-width: 90vw;
     height: 90vh;
+    @media all and (max-width: 800px) {
+      max-width: 100vw;
+      height: 100vh;
+    }
   }
   .panel-body {
+    height: 100%;
     overflow-y: hidden;
   }
   .setting-item {
@@ -16,6 +31,12 @@
     margin: 1em 1em 1.4em;
     padding-bottom: 1.4em;
 
+    .btn {
+      min-height: 28px;
+      min-width: 10em;
+      padding: 0 2em;
+    }
+
     > div {
       margin-bottom: .5em;
       &:last-child {
@@ -33,7 +54,6 @@
       min-width: 10em;
     }
 
-
     textarea {
       width: 100%;
       max-width: 100%;
@@ -46,12 +66,6 @@
       color: $fallback--cRed;
     }
 
-    .btn {
-      min-height: 28px;
-      min-width: 10em;
-      padding: 0 2em;
-    }
-
     .number-input {
       max-width: 6em;
     }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 9e35d3f6..53481bdd 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -3,10 +3,20 @@
   v-if="isLoggedIn && !resettingForm"
   :is-open="modalActivated"
   class="settings-modal"
+  :class="{ peek: modalPeeked }"
+  :no-background="modalPeeked"
   >
   <div class="settings-modal-panel panel">
     <div class="panel-heading">
-      {{ $t('settings.settings') }}
+      <span class="title">
+        {{ $t('settings.settings') }}
+      </span>
+      <button class="btn" @click="peekModal">
+        {{ $t('general.peek') }}
+      </button>
+      <button class="btn" @click="closeModal">
+        {{ $t('general.close') }}
+      </button>
     </div>
     <div class="panel-body">
       <tab-switcher
@@ -15,11 +25,15 @@
         :scrollableTabs="true"
         ref="tabSwitcher"
         >
-        <div :label="$t('settings.profile_tab')"><Profile /></div>
-        <div :label="$t('settings.security_tab')"><Security /></div>
-        <div :label="$t('settings.notifications')"><Notifications /></div>
-        <div :label="$t('settings.data_import_export_tab')"><DataImportExport /></div>
-        <div :label="$t('settings.mutes_and_blocks')"><MutesAndBlocks /></div>
+        <div :label="$t('settings.general')"><GeneralTab /></div>
+        <div :label="$t('settings.profile_tab')"><ProfileTab /></div>
+        <div :label="$t('settings.security_tab')"><SecurityTab /></div>
+        <div :label="$t('settings.filtering')"><FilteringTab /></div>
+        <div :label="$t('settings.theme')"><ThemeTab /></div>
+        <div :label="$t('settings.notifications')"><NotificationsTab /></div>
+        <div :label="$t('settings.data_import_export_tab')"><DataImportExportTab /></div>
+        <div :label="$t('settings.mutes_and_blocks')"><MutesAndBlocksTab /></div>
+        <div :label="$t('settings.version.title')"><VersionTab /></div>
       </tab-switcher>
     </div>
   </div>
diff --git a/src/components/settings_modal/tabs/data_import_export.js b/src/components/settings_modal/tabs/data_import_export_tab.js
similarity index 86%
rename from src/components/settings_modal/tabs/data_import_export.js
rename to src/components/settings_modal/tabs/data_import_export_tab.js
index f68d12e9..168f89e1 100644
--- a/src/components/settings_modal/tabs/data_import_export.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -1,8 +1,8 @@
-import Importer from '../../importer/importer.vue'
-import Exporter from '../../exporter/exporter.vue'
-import Checkbox from '../../checkbox/checkbox.vue'
+import Importer from 'src/components/importer/importer.vue'
+import Exporter from 'src/components/exporter/exporter.vue'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
 
-const DataImportExport = {
+const DataImportExportTab = {
   data () {
     return {
       activeTab: 'profile',
@@ -62,4 +62,4 @@ const DataImportExport = {
   }
 }
 
-export default DataImportExport
+export default DataImportExportTab
diff --git a/src/components/settings_modal/tabs/data_import_export.vue b/src/components/settings_modal/tabs/data_import_export_tab.vue
similarity index 96%
rename from src/components/settings_modal/tabs/data_import_export.vue
rename to src/components/settings_modal/tabs/data_import_export_tab.vue
index 464df6d3..3ddc8b03 100644
--- a/src/components/settings_modal/tabs/data_import_export.vue
+++ b/src/components/settings_modal/tabs/data_import_export_tab.vue
@@ -39,5 +39,5 @@
 </div>
 </template>
 
-<script src="./data_import_export.js"></script>
+<script src="./data_import_export_tab.js"></script>
 <!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
new file mode 100644
index 00000000..ec330667
--- /dev/null
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -0,0 +1,26 @@
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+
+import SharedComputedObject from './helpers/shared_computed_object.js'
+
+const FilteringTab = {
+  components: {
+    Checkbox
+  },
+  computed: {
+    ...SharedComputedObject()
+  },
+  // Updating nested properties
+  watch: {
+    notificationVisibility: {
+      handler (value) {
+        this.$store.dispatch('setOption', {
+          name: 'notificationVisibility',
+          value: this.$store.getters.mergedConfig.notificationVisibility
+        })
+      },
+      deep: true
+    }
+  }
+}
+
+export default FilteringTab
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
new file mode 100644
index 00000000..647ec7b4
--- /dev/null
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -0,0 +1,86 @@
+<template>
+<div :label="$t('settings.filtering')">
+  <div class="setting-item">
+    <div class="select-multiple">
+      <span class="label">{{ $t('settings.notification_visibility') }}</span>
+      <ul class="option-list">
+        <li>
+          <Checkbox v-model="notificationVisibility.likes">
+            {{ $t('settings.notification_visibility_likes') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationVisibility.repeats">
+            {{ $t('settings.notification_visibility_repeats') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationVisibility.follows">
+            {{ $t('settings.notification_visibility_follows') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationVisibility.mentions">
+            {{ $t('settings.notification_visibility_mentions') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationVisibility.moves">
+            {{ $t('settings.notification_visibility_moves') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="notificationVisibility.emojiReactions">
+            {{ $t('settings.notification_visibility_emoji_reactions') }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
+    <div>
+      {{ $t('settings.replies_in_timeline') }}
+      <label
+        for="replyVisibility"
+        class="select"
+        >
+        <select
+          id="replyVisibility"
+          v-model="replyVisibility"
+          >
+          <option
+            value="all"
+            selected
+            >{{ $t('settings.reply_visibility_all') }}</option>
+          <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
+          <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
+        </select>
+        <i class="icon-down-open" />
+      </label>
+    </div>
+    <div>
+      <Checkbox v-model="hidePostStats">
+        {{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
+      </Checkbox>
+    </div>
+    <div>
+      <Checkbox v-model="hideUserStats">
+        {{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
+      </Checkbox>
+    </div>
+  </div>
+  <div class="setting-item">
+    <div>
+      <p>{{ $t('settings.filtering_explanation') }}</p>
+      <textarea
+        id="muteWords"
+        v-model="muteWordsString"
+        />
+    </div>
+    <div>
+      <Checkbox v-model="hideFilteredStatuses">
+        {{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
+      </Checkbox>
+    </div>
+  </div>
+</div>
+</template>
+<script src="./filtering_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
new file mode 100644
index 00000000..82bf6862
--- /dev/null
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -0,0 +1,32 @@
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
+
+import SharedComputedObject from './helpers/shared_computed_object.js'
+
+const GeneralTab = {
+  data () {
+    const instance = this.$store.state.instance
+    return {
+      loopSilentAvailable:
+      // Firefox
+      Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||
+      // Chrome-likes
+      Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') ||
+      // Future spec, still not supported in Nightly 63 as of 08/2018
+      Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
+    }
+  },
+  components: {
+    Checkbox,
+    InterfaceLanguageSwitcher
+  },
+  computed: {
+    postFormats () {
+      return this.$store.state.instance.postFormats || []
+    },
+    instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
+    ...SharedComputedObject()
+  }
+}
+
+export default GeneralTab
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
new file mode 100644
index 00000000..0d2da07a
--- /dev/null
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -0,0 +1,272 @@
+<template>
+<div :label="$t('settings.general')">
+  <div class="setting-item">
+    <h2>{{ $t('settings.interface') }}</h2>
+    <ul class="setting-list">
+      <li>
+        <interface-language-switcher />
+      </li>
+      <li v-if="instanceSpecificPanelPresent">
+        <Checkbox v-model="hideISP">
+          {{ $t('settings.hide_isp') }}
+        </Checkbox>
+      </li>
+    </ul>
+  </div>
+  <div class="setting-item">
+    <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>
+      </li>
+      <li>
+        <Checkbox v-model="collapseMessageWithSubject">
+          {{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
+        </Checkbox>
+      </li>
+      <li>
+        <Checkbox v-model="streaming">
+          {{ $t('settings.streaming') }}
+        </Checkbox>
+        <ul
+          class="setting-list suboptions"
+          :class="[{disabled: !streaming}]"
+          >
+          <li>
+            <Checkbox
+              v-model="pauseOnUnfocused"
+              :disabled="!streaming"
+              >
+              {{ $t('settings.pause_on_unfocused') }}
+            </Checkbox>
+          </li>
+        </ul>
+      </li>
+      <li>
+        <Checkbox v-model="useStreamingApi">
+          {{ $t('settings.useStreamingApi') }}
+          <br>
+          <small>
+            {{ $t('settings.useStreamingApiWarning') }}
+          </small>
+        </Checkbox>
+      </li>
+      <li>
+        <Checkbox v-model="autoLoad">
+          {{ $t('settings.autoload') }}
+        </Checkbox>
+      </li>
+      <li>
+        <Checkbox v-model="hoverPreview">
+          {{ $t('settings.reply_link_preview') }}
+        </Checkbox>
+      </li>
+      <li>
+        <Checkbox v-model="emojiReactionsOnTimeline">
+          {{ $t('settings.emoji_reactions_on_timeline') }}
+        </Checkbox>
+      </li>
+    </ul>
+  </div>
+
+  <div class="setting-item">
+    <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>
+      </li>
+      <li>
+        <Checkbox v-model="alwaysShowSubjectInput">
+          {{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
+        </Checkbox>
+      </li>
+      <li>
+        <div>
+          {{ $t('settings.subject_line_behavior') }}
+          <label
+            for="subjectLineBehavior"
+            class="select"
+            >
+            <select
+              id="subjectLineBehavior"
+              v-model="subjectLineBehavior"
+              >
+              <option value="email">
+                {{ $t('settings.subject_line_email') }}
+                {{ subjectLineBehaviorDefaultValue == 'email' ? $t('settings.instance_default_simple') : '' }}
+              </option>
+              <option value="masto">
+                {{ $t('settings.subject_line_mastodon') }}
+                {{ subjectLineBehaviorDefaultValue == 'mastodon' ? $t('settings.instance_default_simple') : '' }}
+              </option>
+              <option value="noop">
+                {{ $t('settings.subject_line_noop') }}
+                {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
+              </option>
+            </select>
+            <i class="icon-down-open" />
+          </label>
+        </div>
+      </li>
+      <li v-if="postFormats.length > 0">
+        <div>
+          {{ $t('settings.post_status_content_type') }}
+          <label
+            for="postContentType"
+            class="select"
+            >
+            <select
+              id="postContentType"
+              v-model="postContentType"
+              >
+              <option
+                v-for="postFormat in postFormats"
+                :key="postFormat"
+                :value="postFormat"
+                >
+                {{ $t(`post_status.content_type["${postFormat}"]`) }}
+                {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
+              </option>
+            </select>
+            <i class="icon-down-open" />
+          </label>
+        </div>
+      </li>
+      <li>
+        <Checkbox v-model="minimalScopesMode">
+          {{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
+        </Checkbox>
+      </li>
+      <li>
+        <Checkbox v-model="autohideFloatingPostButton">
+          {{ $t('settings.autohide_floating_post_button') }}
+        </Checkbox>
+      </li>
+      <li>
+        <Checkbox v-model="padEmoji">
+          {{ $t('settings.pad_emoji') }}
+        </Checkbox>
+      </li>
+    </ul>
+  </div>
+
+  <div class="setting-item">
+      <h2>{{ $t('settings.attachments') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <Checkbox v-model="hideAttachments">
+            {{ $t('settings.hide_attachments_in_tl') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="hideAttachmentsInConv">
+            {{ $t('settings.hide_attachments_in_convo') }}
+          </Checkbox>
+        </li>
+        <li>
+          <label for="maxThumbnails">
+            {{ $t('settings.max_thumbnails') }}
+          </label>
+          <input
+            id="maxThumbnails"
+            v-model.number="maxThumbnails"
+            class="number-input"
+            type="number"
+            min="0"
+            step="1"
+            >
+        </li>
+        <li>
+          <Checkbox v-model="hideNsfw">
+            {{ $t('settings.nsfw_clickthrough') }}
+          </Checkbox>
+        </li>
+        <ul class="setting-list suboptions">
+          <li>
+            <Checkbox
+              v-model="preloadImage"
+              :disabled="!hideNsfw"
+              >
+              {{ $t('settings.preload_images') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox
+              v-model="useOneClickNsfw"
+              :disabled="!hideNsfw"
+              >
+              {{ $t('settings.use_one_click_nsfw') }}
+            </Checkbox>
+          </li>
+        </ul>
+        <li>
+          <Checkbox v-model="stopGifs">
+            {{ $t('settings.stop_gifs') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="loopVideo">
+            {{ $t('settings.loop_video') }}
+          </Checkbox>
+          <ul
+            class="setting-list suboptions"
+            :class="[{disabled: !streaming}]"
+            >
+            <li>
+              <Checkbox
+                v-model="loopVideoSilentOnly"
+                :disabled="!loopVideo || !loopSilentAvailable"
+                >
+                {{ $t('settings.loop_video_silent_only') }}
+              </Checkbox>
+              <div
+                v-if="!loopSilentAvailable"
+                class="unavailable"
+                >
+                <i class="icon-globe" />! {{ $t('settings.limited_availability') }}
+              </div>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <Checkbox v-model="playVideosInModal">
+            {{ $t('settings.play_videos_in_modal') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="useContainFit">
+            {{ $t('settings.use_contain_fit') }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
+
+    <div class="setting-item">
+      <h2>{{ $t('settings.notifications') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <Checkbox v-model="webPushNotifications">
+            {{ $t('settings.enable_web_push_notifications') }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
+
+    <div class="setting-item">
+      <h2>{{ $t('settings.fun') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <Checkbox v-model="greentext">
+            {{ $t('settings.greentext') }} {{ $t('settings.instance_default', { value: greentextLocalizedValue }) }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script src="./general_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/helpers/shared_computed_object.js b/src/components/settings_modal/tabs/helpers/shared_computed_object.js
new file mode 100644
index 00000000..61643e3b
--- /dev/null
+++ b/src/components/settings_modal/tabs/helpers/shared_computed_object.js
@@ -0,0 +1,69 @@
+import { filter, trim } from 'lodash'
+import { instanceDefaultProperties, defaultState as configDefaultState } from 'src/modules/config.js'
+
+const multiChoiceProperties = [
+  'postContentType',
+  'subjectLineBehavior'
+]
+
+const SharedComputedObject = () => ({
+  user () {
+    return this.$store.state.users.currentUser
+  },
+  // Getting localized values for instance-default properties
+  ...instanceDefaultProperties
+    .filter(key => multiChoiceProperties.includes(key))
+    .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])
+      }
+    ])
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
+  // Generating computed values for vuex properties
+  ...Object.keys(configDefaultState)
+    .map(key => [key, {
+      get () { return this.$store.getters.mergedConfig[key] },
+      set (value) {
+        this.$store.dispatch('setOption', { name: key, value })
+      }
+    }])
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
+  // Special cases (need to transform values or perform actions first)
+  muteWordsString: {
+    get () { return this.$store.getters.mergedConfig.muteWords.join('\n') },
+    set (value) {
+      this.$store.dispatch('setOption', {
+        name: 'muteWords',
+        value: filter(value.split('\n'), (word) => trim(word).length > 0)
+      })
+    }
+  },
+  useStreamingApi: {
+    get () { return this.$store.getters.mergedConfig.useStreamingApi },
+    set (value) {
+      const promise = value
+        ? this.$store.dispatch('enableMastoSockets')
+        : this.$store.dispatch('disableMastoSockets')
+
+      promise.then(() => {
+        this.$store.dispatch('setOption', { name: 'useStreamingApi', value })
+      }).catch((e) => {
+        console.error('Failed starting MastoAPI Streaming socket', e)
+        this.$store.dispatch('disableMastoSockets')
+        this.$store.dispatch('setOption', { name: 'useStreamingApi', value: false })
+      })
+    }
+  }
+})
+
+export default SharedComputedObject
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
similarity index 83%
rename from src/components/settings_modal/tabs/mutes_and_blocks.js
rename to src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index 51895ddc..3f6b7205 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -1,15 +1,15 @@
 import get from 'lodash/get'
 import map from 'lodash/map'
 import reject from 'lodash/reject'
-import Autosuggest from '../../autosuggest/autosuggest.vue'
-import TabSwitcher from '../../tab_switcher/tab_switcher.js'
-import BlockCard from '../../block_card/block_card.vue'
-import MuteCard from '../../mute_card/mute_card.vue'
-import DomainMuteCard from '../../domain_mute_card/domain_mute_card.vue'
-import SelectableList from '../../selectable_list/selectable_list.vue'
-import ProgressButton from '../../progress_button/progress_button.vue'
-import withSubscription from '../../../hocs/with_subscription/with_subscription'
-import Checkbox from '../../checkbox/checkbox.vue'
+import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
+import BlockCard from 'src/components/block_card/block_card.vue'
+import MuteCard from 'src/components/mute_card/mute_card.vue'
+import DomainMuteCard from 'src/components/domain_mute_card/domain_mute_card.vue'
+import SelectableList from 'src/components/selectable_list/selectable_list.vue'
+import ProgressButton from 'src/components/progress_button/progress_button.vue'
+import withSubscription from 'src/components/../hocs/with_subscription/with_subscription'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
 
 const BlockList = withSubscription({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
similarity index 97%
rename from src/components/settings_modal/tabs/mutes_and_blocks.vue
rename to src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index 3aff47a0..7fce7b78 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -15,7 +15,7 @@
       </div>
       <BlockList
         :refresh="true"
-        :get-key="identity"
+        :get-key="i => i"
         >
         <template
           slot="header"
@@ -73,7 +73,7 @@
           </div>
           <MuteList
             :refresh="true"
-            :get-key="identity"
+            :get-key="i => i"
             >
             <template
               slot="header"
@@ -134,7 +134,7 @@
           </div>
           <DomainMuteList
             :refresh="true"
-            :get-key="identity"
+            :get-key="i => i"
             >
             <template
               slot="header"
@@ -169,5 +169,5 @@
   </tab-switcher>
 </template>
 
-<script src="./mutes_and_blocks.js"></script>
+<script src="./mutes_and_blocks_tab.js"></script>
 <!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/settings_modal/tabs/notifications.js b/src/components/settings_modal/tabs/notifications_tab.js
similarity index 80%
rename from src/components/settings_modal/tabs/notifications.js
rename to src/components/settings_modal/tabs/notifications_tab.js
index 0a870b3f..3e44c95d 100644
--- a/src/components/settings_modal/tabs/notifications.js
+++ b/src/components/settings_modal/tabs/notifications_tab.js
@@ -1,6 +1,6 @@
-import Checkbox from '../../checkbox/checkbox.vue'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
 
-const Notifications = {
+const NotificationsTab = {
   data () {
     return {
       activeTab: 'profile',
@@ -24,4 +24,4 @@ const Notifications = {
   }
 }
 
-export default Notifications
+export default NotificationsTab
diff --git a/src/components/settings_modal/tabs/notifications.vue b/src/components/settings_modal/tabs/notifications_tab.vue
similarity index 96%
rename from src/components/settings_modal/tabs/notifications.vue
rename to src/components/settings_modal/tabs/notifications_tab.vue
index f9a7c17b..ab33a6a5 100644
--- a/src/components/settings_modal/tabs/notifications.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -38,5 +38,5 @@
 </div>
 </template>
 
-<script src="./notifications.js"></script>
+<script src="./notifications_tab.js"></script>
 <!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/settings_modal/tabs/profile.js b/src/components/settings_modal/tabs/profile_tab.js
similarity index 90%
rename from src/components/settings_modal/tabs/profile.js
rename to src/components/settings_modal/tabs/profile_tab.js
index 18c44024..949b480b 100644
--- a/src/components/settings_modal/tabs/profile.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -1,12 +1,12 @@
 import unescape from 'lodash/unescape'
-import ImageCropper from '../../image_cropper/image_cropper.vue'
-import ScopeSelector from '../../scope_selector/scope_selector.vue'
-import fileSizeFormatService from '../../../services/file_size_format/file_size_format.js'
-import ProgressButton from '../../progress_button/progress_button.vue'
-import EmojiInput from '../../emoji_input/emoji_input.vue'
-import suggestor from '../../emoji_input/suggestor.js'
-import Autosuggest from '../../autosuggest/autosuggest.vue'
-import Checkbox from '../../checkbox/checkbox.vue'
+import ImageCropper from 'src/components/image_cropper/image_cropper.vue'
+import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
+import fileSizeFormatService from 'src/components/../services/file_size_format/file_size_format.js'
+import ProgressButton from 'src/components/progress_button/progress_button.vue'
+import EmojiInput from 'src/components/emoji_input/emoji_input.vue'
+import suggestor from 'src/components/emoji_input/suggestor.js'
+import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
 
 const ProfileTab = {
   data () {
diff --git a/src/components/settings_modal/tabs/profile.scss b/src/components/settings_modal/tabs/profile_tab.scss
similarity index 100%
rename from src/components/settings_modal/tabs/profile.scss
rename to src/components/settings_modal/tabs/profile_tab.scss
diff --git a/src/components/settings_modal/tabs/profile.vue b/src/components/settings_modal/tabs/profile_tab.vue
similarity index 98%
rename from src/components/settings_modal/tabs/profile.vue
rename to src/components/settings_modal/tabs/profile_tab.vue
index 335fc12e..9dd89b99 100644
--- a/src/components/settings_modal/tabs/profile.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -209,5 +209,5 @@
 </div>
 </template>
 
-<script src="./profile.js"></script>
-<style lang="scss" src="./profile.scss"></style>
+<script src="./profile_tab.js"></script>
+<style lang="scss" src="./profile_tab.scss"></style>
diff --git a/src/components/user_settings/confirm.js b/src/components/settings_modal/tabs/security_tab/confirm.js
similarity index 100%
rename from src/components/user_settings/confirm.js
rename to src/components/settings_modal/tabs/security_tab/confirm.js
diff --git a/src/components/user_settings/confirm.vue b/src/components/settings_modal/tabs/security_tab/confirm.vue
similarity index 100%
rename from src/components/user_settings/confirm.vue
rename to src/components/settings_modal/tabs/security_tab/confirm.vue
diff --git a/src/components/user_settings/mfa.js b/src/components/settings_modal/tabs/security_tab/mfa.js
similarity index 100%
rename from src/components/user_settings/mfa.js
rename to src/components/settings_modal/tabs/security_tab/mfa.js
diff --git a/src/components/user_settings/mfa.vue b/src/components/settings_modal/tabs/security_tab/mfa.vue
similarity index 97%
rename from src/components/user_settings/mfa.vue
rename to src/components/settings_modal/tabs/security_tab/mfa.vue
index 14ea10a1..25c4d1dc 100644
--- a/src/components/user_settings/mfa.vue
+++ b/src/components/settings_modal/tabs/security_tab/mfa.vue
@@ -137,11 +137,7 @@
 
 <script src="./mfa.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
-.warning {
-  color: $fallback--cOrange;
-  color: var(--cOrange, $fallback--cOrange);
-}
+@import '../../../../_variables.scss';
 .mfa-settings {
   .mfa-heading, .method-item {
     overflow: hidden;
@@ -151,6 +147,11 @@
     align-items: baseline;
   }
 
+  .warning {
+    color: $fallback--cOrange;
+    color: var(--cOrange, $fallback--cOrange);
+  }
+
   .setup-otp {
     display: flex;
     justify-content: center;
diff --git a/src/components/user_settings/mfa_backup_codes.js b/src/components/settings_modal/tabs/security_tab/mfa_backup_codes.js
similarity index 100%
rename from src/components/user_settings/mfa_backup_codes.js
rename to src/components/settings_modal/tabs/security_tab/mfa_backup_codes.js
diff --git a/src/components/user_settings/mfa_backup_codes.vue b/src/components/settings_modal/tabs/security_tab/mfa_backup_codes.vue
similarity index 69%
rename from src/components/user_settings/mfa_backup_codes.vue
rename to src/components/settings_modal/tabs/security_tab/mfa_backup_codes.vue
index e6c8ede2..d7e98b3c 100644
--- a/src/components/user_settings/mfa_backup_codes.vue
+++ b/src/components/settings_modal/tabs/security_tab/mfa_backup_codes.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="mfa-backup-codes">
     <h4 v-if="displayTitle">
       {{ $t('settings.mfa.recovery_codes') }}
     </h4>
@@ -21,13 +21,15 @@
 </template>
 <script src="./mfa_backup_codes.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
+@import '../../../../_variables.scss';
 
-.warning {
-  color: $fallback--cOrange;
-  color: var(--cOrange, $fallback--cOrange);
-}
-.backup-codes {
-  font-family: var(--postCodeFont, monospace);
+.mfa-backup-codes {
+  .warning {
+    color: $fallback--cOrange;
+    color: var(--cOrange, $fallback--cOrange);
+  }
+  .backup-codes {
+    font-family: var(--postCodeFont, monospace);
+  }
 }
 </style>
diff --git a/src/components/user_settings/mfa_totp.js b/src/components/settings_modal/tabs/security_tab/mfa_totp.js
similarity index 100%
rename from src/components/user_settings/mfa_totp.js
rename to src/components/settings_modal/tabs/security_tab/mfa_totp.js
diff --git a/src/components/user_settings/mfa_totp.vue b/src/components/settings_modal/tabs/security_tab/mfa_totp.vue
similarity index 100%
rename from src/components/user_settings/mfa_totp.vue
rename to src/components/settings_modal/tabs/security_tab/mfa_totp.vue
diff --git a/src/components/settings_modal/tabs/security.js b/src/components/settings_modal/tabs/security_tab/security_tab.js
similarity index 92%
rename from src/components/settings_modal/tabs/security.js
rename to src/components/settings_modal/tabs/security_tab/security_tab.js
index cc791b7a..811161a5 100644
--- a/src/components/settings_modal/tabs/security.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -1,8 +1,8 @@
-import ProgressButton from '../../progress_button/progress_button.vue'
-import Checkbox from '../../checkbox/checkbox.vue'
-import Mfa from '../../user_settings/mfa.vue'
+import ProgressButton from 'src/components/progress_button/progress_button.vue'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import Mfa from './mfa.vue'
 
-const Security = {
+const SecurityTab = {
   data () {
     return {
       newEmail: '',
@@ -103,4 +103,4 @@ const Security = {
   }
 }
 
-export default Security
+export default SecurityTab
diff --git a/src/components/settings_modal/tabs/security.vue b/src/components/settings_modal/tabs/security_tab/security_tab.vue
similarity index 98%
rename from src/components/settings_modal/tabs/security.vue
rename to src/components/settings_modal/tabs/security_tab/security_tab.vue
index 603c9a04..45bacec1 100644
--- a/src/components/settings_modal/tabs/security.vue
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.vue
@@ -139,5 +139,5 @@
 </div>
 </template>
 
-<script src="./security.js"></script>
+<script src="./security_tab.js"></script>
 <!-- <style lang="scss" src="./profile.scss"></style> -->
diff --git a/src/components/style_switcher/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
similarity index 100%
rename from src/components/style_switcher/preview.vue
rename to src/components/settings_modal/tabs/theme_tab/preview.vue
diff --git a/src/components/style_switcher/style_switcher.js b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
similarity index 96%
rename from src/components/style_switcher/style_switcher.js
rename to src/components/settings_modal/tabs/theme_tab/theme_tab.js
index a7f586f4..9d61b0c4 100644
--- a/src/components/style_switcher/style_switcher.js
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
@@ -3,7 +3,7 @@ import {
   rgb2hex,
   hex2rgb,
   getContrastRatioLayers
-} from '../../services/color_convert/color_convert.js'
+} from 'src/services/color_convert/color_convert.js'
 import {
   DEFAULT_SHADOWS,
   generateColors,
@@ -14,26 +14,27 @@ import {
   getThemes,
   shadows2to3,
   colors2to3
-} from '../../services/style_setter/style_setter.js'
+} from 'src/services/style_setter/style_setter.js'
 import {
   SLOT_INHERITANCE
-} from '../../services/theme_data/pleromafe.js'
+} from 'src/services/theme_data/pleromafe.js'
 import {
   CURRENT_VERSION,
   OPACITIES,
   getLayers,
   getOpacitySlot
-} from '../../services/theme_data/theme_data.service.js'
-import ColorInput from '../color_input/color_input.vue'
-import RangeInput from '../range_input/range_input.vue'
-import OpacityInput from '../opacity_input/opacity_input.vue'
-import ShadowControl from '../shadow_control/shadow_control.vue'
-import FontControl from '../font_control/font_control.vue'
-import ContrastRatio from '../contrast_ratio/contrast_ratio.vue'
-import TabSwitcher from '../tab_switcher/tab_switcher.js'
+} from 'src/services/theme_data/theme_data.service.js'
+import ColorInput from 'src/components/color_input/color_input.vue'
+import RangeInput from 'src/components/range_input/range_input.vue'
+import OpacityInput from 'src/components/opacity_input/opacity_input.vue'
+import ShadowControl from 'src/components/shadow_control/shadow_control.vue'
+import FontControl from 'src/components/font_control/font_control.vue'
+import ContrastRatio from 'src/components/contrast_ratio/contrast_ratio.vue'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
+import ExportImport from 'src/components/export_import/export_import.vue'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+
 import Preview from './preview.vue'
-import ExportImport from '../export_import/export_import.vue'
-import Checkbox from '../checkbox/checkbox.vue'
 
 // List of color values used in v1
 const v1OnlyNames = [
diff --git a/src/components/style_switcher/style_switcher.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
similarity index 97%
rename from src/components/style_switcher/style_switcher.scss
rename to src/components/settings_modal/tabs/theme_tab/theme_tab.scss
index d2a40d13..75b3017d 100644
--- a/src/components/style_switcher/style_switcher.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@@ -1,5 +1,5 @@
-@import '../../_variables.scss';
-.style-switcher {
+@import 'src/_variables.scss';
+.theme-tab {
   .theme-warning {
     display: flex;
     align-items: baseline;
@@ -54,10 +54,6 @@
     }
   }
 
-  .tab-switcher {
-    margin: 0 -1em;
-  }
-
   .reset-container {
     flex-wrap: wrap;
   }
@@ -161,7 +157,7 @@
     border-bottom: 1px dashed;
     border-color: $fallback--border;
     border-color: var(--border, $fallback--border);
-    margin: 1em -1em 0;
+    margin: 1em 0;
     padding: 1em;
     background: var(--body-background-image);
     background-size: cover;
@@ -328,6 +324,14 @@
     padding: 20px;
   }
 
+  .apply-container {
+    .btn {
+      min-height: 28px;
+      min-width: 10em;
+      padding: 0 2em;
+    }
+  }
+
   .btn {
     margin-left: .25em;
     margin-right: .25em;
diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
similarity index 92%
rename from src/components/style_switcher/style_switcher.vue
rename to src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 62c8e634..6f6cf1d6 100644
--- a/src/components/style_switcher/style_switcher.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -1,90 +1,90 @@
 <template>
-  <div class="style-switcher">
-    <div class="presets-container">
-      <div class="save-load">
-        <div
-          v-if="themeWarning"
-          class="theme-warning"
+<div class="theme-tab">
+  <div class="presets-container">
+    <div class="save-load">
+      <div
+        v-if="themeWarning"
+        class="theme-warning"
         >
-          <div class="alert warning">
-            {{ themeWarningHelp }}
-          </div>
-          <div class="buttons">
-            <template v-if="themeWarning.type === 'snapshot_source_mismatch'">
-              <button
-                class="btn"
-                @click="forceLoad"
-              >
-                {{ $t('settings.style.switcher.use_source') }}
-              </button>
-              <button
-                class="btn"
-                @click="forceSnapshot"
-              >
-                {{ $t('settings.style.switcher.use_snapshot') }}
-              </button>
-            </template>
-            <template v-else-if="themeWarning.noActionsPossible">
-              <button
-                class="btn"
-                @click="dismissWarning"
-              >
-                {{ $t('general.dismiss') }}
-              </button>
-            </template>
-            <template v-else>
-              <button
-                class="btn"
-                @click="forceLoad"
-              >
-                {{ $t('settings.style.switcher.load_theme') }}
-              </button>
-              <button
-                class="btn"
-                @click="dismissWarning"
-              >
-                {{ $t('settings.style.switcher.keep_as_is') }}
-              </button>
-            </template>
-          </div>
+        <div class="alert warning">
+          {{ themeWarningHelp }}
         </div>
-        <ExportImport
-          :export-object="exportedTheme"
-          :export-label="$t(&quot;settings.export_theme&quot;)"
-          :import-label="$t(&quot;settings.import_theme&quot;)"
-          :import-failed-text="$t(&quot;settings.invalid_theme_imported&quot;)"
-          :on-import="onImport"
-          :validator="importValidator"
-        >
-          <template slot="before">
-            <div class="presets">
-              {{ $t('settings.presets') }}
-              <label
-                for="preset-switcher"
-                class="select"
+        <div class="buttons">
+          <template v-if="themeWarning.type === 'snapshot_source_mismatch'">
+            <button
+              class="btn"
+              @click="forceLoad"
               >
-                <select
-                  id="preset-switcher"
-                  v-model="selected"
-                  class="preset-switcher"
-                >
-                  <option
-                    v-for="style in availableStyles"
-                    :key="style.name"
-                    :value="style"
-                    :style="{
-                      backgroundColor: style[1] || (style.theme || style.source).colors.bg,
-                      color: style[3] || (style.theme || style.source).colors.text
-                    }"
-                  >
-                    {{ style[0] || style.name }}
-                  </option>
-                </select>
-                <i class="icon-down-open" />
-              </label>
-            </div>
+              {{ $t('settings.style.switcher.use_source') }}
+            </button>
+            <button
+              class="btn"
+              @click="forceSnapshot"
+              >
+              {{ $t('settings.style.switcher.use_snapshot') }}
+            </button>
           </template>
-        </ExportImport>
+          <template v-else-if="themeWarning.noActionsPossible">
+            <button
+              class="btn"
+              @click="dismissWarning"
+              >
+              {{ $t('general.dismiss') }}
+            </button>
+          </template>
+          <template v-else>
+            <button
+              class="btn"
+              @click="forceLoad"
+              >
+              {{ $t('settings.style.switcher.load_theme') }}
+            </button>
+            <button
+              class="btn"
+              @click="dismissWarning"
+              >
+              {{ $t('settings.style.switcher.keep_as_is') }}
+            </button>
+          </template>
+        </div>
+      </div>
+      <ExportImport
+        :export-object="exportedTheme"
+        :export-label="$t(&quot;settings.export_theme&quot;)"
+        :import-label="$t(&quot;settings.import_theme&quot;)"
+        :import-failed-text="$t(&quot;settings.invalid_theme_imported&quot;)"
+        :on-import="onImport"
+        :validator="importValidator"
+        >
+        <template slot="before">
+          <div class="presets">
+            {{ $t('settings.presets') }}
+            <label
+              for="preset-switcher"
+              class="select"
+              >
+              <select
+                id="preset-switcher"
+                v-model="selected"
+                class="preset-switcher"
+                >
+                <option
+                  v-for="style in availableStyles"
+                  :key="style.name"
+                  :value="style"
+                  :style="{
+                          backgroundColor: style[1] || (style.theme || style.source).colors.bg,
+                          color: style[3] || (style.theme || style.source).colors.text
+                          }"
+                  >
+                  {{ style[0] || style.name }}
+                </option>
+              </select>
+              <i class="icon-down-open" />
+            </label>
+          </div>
+        </template>
+      </ExportImport>
       </div>
       <div class="save-load-options">
         <span class="keep-option">
@@ -951,6 +951,6 @@
   </div>
 </template>
 
-<script src="./style_switcher.js"></script>
+<script src="./theme_tab.js"></script>
 
-<style src="./style_switcher.scss" lang="scss"></style>
+<style src="./theme_tab.scss" lang="scss"></style>
diff --git a/src/components/settings_modal/tabs/version_tab.js b/src/components/settings_modal/tabs/version_tab.js
new file mode 100644
index 00000000..616bdadf
--- /dev/null
+++ b/src/components/settings_modal/tabs/version_tab.js
@@ -0,0 +1,24 @@
+import { extractCommit } from 'src/services/version/version.service'
+
+const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
+const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
+
+const VersionTab = {
+  data () {
+    const instance = this.$store.state.instance
+    return {
+      backendVersion: instance.backendVersion,
+      frontendVersion: instance.frontendVersion
+    }
+  },
+  computed: {
+    frontendVersionLink () {
+      return pleromaFeCommitUrl + this.frontendVersion
+    },
+    backendVersionLink () {
+      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
+    }
+  }
+}
+
+export default VersionTab
diff --git a/src/components/settings_modal/tabs/version_tab.vue b/src/components/settings_modal/tabs/version_tab.vue
new file mode 100644
index 00000000..acc43569
--- /dev/null
+++ b/src/components/settings_modal/tabs/version_tab.vue
@@ -0,0 +1,31 @@
+<template>
+<div :label="$t('settings.version.title')">
+  <div class="setting-item">
+    <ul class="setting-list">
+      <li>
+        <p>{{ $t('settings.version.backend_version') }}</p>
+        <ul class="option-list">
+          <li>
+            <a
+              :href="backendVersionLink"
+              target="_blank"
+              >{{ backendVersion }}</a>
+          </li>
+        </ul>
+      </li>
+      <li>
+        <p>{{ $t('settings.version.frontend_version') }}</p>
+        <ul class="option-list">
+          <li>
+            <a
+              :href="frontendVersionLink"
+              target="_blank"
+              >{{ frontendVersion }}</a>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</div>
+</template>
+<script src="./version_tab.js">
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index a443531e..a7b790a3 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -46,8 +46,14 @@
 
   &.side-tabs {
     flex-direction: row;
+    @media all and (max-width: 800px) {
+      overflow-x: auto;
+    }
     > .contents {
       flex: 0 1 80%;
+      @media all and (max-width: 800px) {
+        min-width: 96vw;
+      }
     }
     > .tabs {
       flex: 1 0 auto;
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 4ee040e8..b4f275d9 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -50,15 +50,6 @@
               >
                 {{ user.name }}
               </div>
-              <router-link
-                v-if="!isOtherUser"
-                :to="{ name: 'user-settings' }"
-              >
-                <i
-                  class="button-icon icon-wrench usersettings"
-                  :title="$t('tool_tip.user_settings')"
-                />
-              </router-link>
               <a
                 v-if="isOtherUser && !user.is_local"
                 :href="user.statusnet_profile_url"
@@ -117,7 +108,7 @@
               type="color"
             >
             <label
-              for="style-switcher"
+              for="theme_tab"
               class="userHighlightSel select"
             >
               <select
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
deleted file mode 100644
index e07d4e56..00000000
--- a/src/components/user_settings/user_settings.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import get from 'lodash/get'
-import map from 'lodash/map'
-import reject from 'lodash/reject'
-import Autosuggest from '../autosuggest/autosuggest.vue'
-import TabSwitcher from '../tab_switcher/tab_switcher.js'
-import BlockCard from '../block_card/block_card.vue'
-import MuteCard from '../mute_card/mute_card.vue'
-import DomainMuteCard from '../domain_mute_card/domain_mute_card.vue'
-import SelectableList from '../selectable_list/selectable_list.vue'
-import ProgressButton from '../progress_button/progress_button.vue'
-import Importer from '../importer/importer.vue'
-import Exporter from '../exporter/exporter.vue'
-import withSubscription from '../../hocs/with_subscription/with_subscription'
-import Checkbox from '../checkbox/checkbox.vue'
-
-const BlockList = withSubscription({
-  fetch: (props, $store) => $store.dispatch('fetchBlocks'),
-  select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
-  childPropName: 'items'
-})(SelectableList)
-
-const MuteList = withSubscription({
-  fetch: (props, $store) => $store.dispatch('fetchMutes'),
-  select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
-  childPropName: 'items'
-})(SelectableList)
-
-const DomainMuteList = withSubscription({
-  fetch: (props, $store) => $store.dispatch('fetchDomainMutes'),
-  select: (props, $store) => get($store.state.users.currentUser, 'domainMutes', []),
-  childPropName: 'items'
-})(SelectableList)
-
-const UserSettings = {
-  data () {
-    return {
-      activeTab: 'profile',
-      newDomainToMute: ''
-    }
-  },
-  created () {
-    this.$store.dispatch('fetchTokens')
-  },
-  components: {
-    TabSwitcher,
-    BlockList,
-    MuteList,
-    DomainMuteList,
-    BlockCard,
-    MuteCard,
-    DomainMuteCard,
-    ProgressButton,
-    Autosuggest,
-    Checkbox
-  },
-  computed: {
-    user () {
-      return this.$store.state.users.currentUser
-    },
-    pleromaBackend () {
-      return this.$store.state.instance.pleromaBackend
-    },
-    currentSaveStateNotice () {
-      return this.$store.state.interface.settings.currentSaveStateNotice
-    }
-  },
-  methods: {
-    importFollows (file) {
-      return this.$store.state.api.backendInteractor.importFollows({ file })
-        .then((status) => {
-          if (!status) {
-            throw new Error('failed')
-          }
-        })
-    },
-    importBlocks (file) {
-      return this.$store.state.api.backendInteractor.importBlocks({ file })
-        .then((status) => {
-          if (!status) {
-            throw new Error('failed')
-          }
-        })
-    },
-    generateExportableUsersContent (users) {
-      // Get addresses
-      return users.map((user) => {
-        // check is it's a local user
-        if (user && user.is_local) {
-          // append the instance address
-          // eslint-disable-next-line no-undef
-          return user.screen_name + '@' + location.hostname
-        }
-        return user.screen_name
-      }).join('\n')
-    },
-    activateTab (tabName) {
-      this.activeTab = tabName
-    },
-    filterUnblockedUsers (userIds) {
-      return reject(userIds, (userId) => {
-        const user = this.$store.getters.findUser(userId)
-        return !user || user.statusnet_blocking || user.id === this.$store.state.users.currentUser.id
-      })
-    },
-    filterUnMutedUsers (userIds) {
-      return reject(userIds, (userId) => {
-        const user = this.$store.getters.findUser(userId)
-        return !user || user.muted || user.id === this.$store.state.users.currentUser.id
-      })
-    },
-    queryUserIds (query) {
-      return this.$store.dispatch('searchUsers', query)
-        .then((users) => map(users, 'id'))
-    },
-    blockUsers (ids) {
-      return this.$store.dispatch('blockUsers', ids)
-    },
-    unblockUsers (ids) {
-      return this.$store.dispatch('unblockUsers', ids)
-    },
-    muteUsers (ids) {
-      return this.$store.dispatch('muteUsers', ids)
-    },
-    unmuteUsers (ids) {
-      return this.$store.dispatch('unmuteUsers', ids)
-    },
-    unmuteDomains (domains) {
-      return this.$store.dispatch('unmuteDomains', domains)
-    },
-    muteDomain () {
-      return this.$store.dispatch('muteDomain', this.newDomainToMute)
-        .then(() => { this.newDomainToMute = '' })
-    },
-    identity (value) {
-      return value
-    }
-  }
-}
-
-export default UserSettings
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
deleted file mode 100644
index 2a88714f..00000000
--- a/src/components/user_settings/user_settings.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <div class="settings panel panel-default">
-    <div class="panel-heading">
-      <div class="title">
-        {{ $t('settings.user_settings') }}
-      </div>
-      <transition name="fade">
-        <template v-if="currentSaveStateNotice">
-          <div
-            v-if="currentSaveStateNotice.error"
-            class="alert error"
-            @click.prevent
-          >
-            {{ $t('settings.saving_err') }}
-          </div>
-
-          <div
-            v-if="!currentSaveStateNotice.error"
-            class="alert transparent"
-            @click.prevent
-          >
-            {{ $t('settings.saving_ok') }}
-          </div>
-        </template>
-      </transition>
-    </div>
-    <div class="panel-body profile-edit">
-    </div>
-  </div>
-</template>
-
-<script src="./user_settings.js">
-</script>
-
-<style lang="scss">
-@import '../../_variables.scss';
-
-.profile-edit {
-  .bio {
-    margin: 0;
-  }
-
-  .visibility-tray {
-    padding-top: 5px;
-  }
-
-  input[type=file] {
-    padding: 5px;
-    height: auto;
-  }
-
-  .banner {
-    max-width: 100%;
-  }
-
-  .uploading {
-    font-size: 1.5em;
-    margin: 0.25em;
-  }
-
-  .name-changer {
-    width: 100%;
-  }
-
-  .bg {
-    max-width: 100%;
-  }
-
-  .current-avatar {
-    display: block;
-    width: 150px;
-    height: 150px;
-    border-radius: $fallback--avatarRadius;
-    border-radius: var(--avatarRadius, $fallback--avatarRadius);
-  }
-
-  .oauth-tokens {
-    width: 100%;
-
-    th {
-      text-align: left;
-    }
-
-    .actions {
-      text-align: right;
-    }
-  }
-
-  &-usersearch-wrapper {
-    padding: 1em;
-  }
-
-  &-bulk-actions {
-    text-align: right;
-    padding: 0 1em;
-    min-height: 28px;
-
-    button {
-      width: 10em;
-    }
-  }
-
-  &-domain-mute-form {
-    padding: 1em;
-    display: flex;
-    flex-direction: column;
-
-    button {
-      align-self: flex-end;
-      margin-top: 1em;
-      width: 10em;
-    }
-  }
-
-  .setting-subitem {
-    margin-left: 1.75em;
-  }
-}
-</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 312f7283..d42be00f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -68,7 +68,9 @@
     "disable": "Disable",
     "enable": "Enable",
     "confirm": "Confirm",
-    "verify": "Verify"
+    "verify": "Verify",
+    "close": "Close",
+    "peek": "Peek"
   },
   "image_cropper": {
     "crop_picture": "Crop picture",

From c412856716d0b16f9e3aac57a4bb6dad3755c9ae Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier"
 <contact+translate.pleroma.social@hacktivis.me>
Date: Mon, 11 May 2020 22:33:44 +0000
Subject: [PATCH 016/415] Translated using Weblate (French)

Currently translated at 97.3% (597 of 613 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: http://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
---
 src/i18n/fr.json | 215 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 197 insertions(+), 18 deletions(-)

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 5f0053d5..61877a3a 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -79,7 +79,9 @@
         "twkn": "Ensemble du réseau connu",
         "user_search": "Recherche d'utilisateur·ice",
         "who_to_follow": "Qui suivre",
-        "preferences": "Préférences"
+        "preferences": "Préférences",
+        "search": "Recherche",
+        "administration": "Administration"
     },
     "notifications": {
         "broken_favorite": "Chargement d'un message inconnu…",
@@ -89,12 +91,16 @@
         "notifications": "Notifications",
         "read": "Lu !",
         "repeated_you": "a partagé votre statut",
-        "no_more_notifications": "Aucune notification supplémentaire"
+        "no_more_notifications": "Aucune notification supplémentaire",
+        "migrated_to": "a migré à",
+        "reacted_with": "a réagi avec {0}",
+        "follow_request": "veut vous suivre"
     },
     "interactions": {
         "favs_repeats": "Partages et favoris",
-        "follows": "Nouveaux⋅elles abonné⋅e⋅s ?",
-        "load_older": "Chargez d'anciennes interactions"
+        "follows": "Nouveaux suivis",
+        "load_older": "Chargez d'anciennes interactions",
+        "moves": "Migrations de comptes"
     },
     "post_status": {
         "new_status": "Poster un nouveau statut",
@@ -170,7 +176,7 @@
                 "secret_code": "Clé"
             },
             "verify": {
-                "desc": "Pour activer la double authentification, entrez le code depuis votre application:"
+                "desc": "Pour activer la double authentification, entrez le code depuis votre application :"
             }
         },
         "attachmentRadius": "Pièces jointes",
@@ -185,7 +191,7 @@
         "block_export_button": "Export des comptes bloqués vers un fichier csv",
         "block_import": "Import des comptes bloqués",
         "block_import_error": "Erreur lors de l'import des comptes bloqués",
-        "blocks_imported": "Blocks importés! Le traitement va prendre un moment.",
+        "blocks_imported": "Blocks importés ! Le traitement va prendre un moment.",
         "blocks_tab": "Bloqué·e·s",
         "btnRadius": "Boutons",
         "cBlue": "Bleu (répondre, suivre)",
@@ -233,7 +239,7 @@
         "import_theme": "Charger le thème",
         "inputRadius": "Champs de texte",
         "checkboxRadius": "Cases à cocher",
-        "instance_default": "(default: {value})",
+        "instance_default": "(default : {value})",
         "instance_default_simple": "(default)",
         "interface": "Interface",
         "interfaceLanguage": "Langue de l'interface",
@@ -264,7 +270,7 @@
         "nsfw_clickthrough": "Masquer les images marquées comme contenu adulte ou sensible",
         "oauth_tokens": "Jetons OAuth",
         "token": "Jeton",
-        "refresh_token": "Refresh Token",
+        "refresh_token": "Rafraichir le jeton",
         "valid_until": "Valable jusque",
         "revoke_token": "Révoquer",
         "panelRadius": "Fenêtres",
@@ -293,8 +299,8 @@
         "settings": "Paramètres",
         "subject_input_always_show": "Toujours copier le champ de sujet",
         "subject_line_behavior": "Copier le sujet en répondant",
-        "subject_line_email": "Comme les mails: « re: sujet »",
-        "subject_line_mastodon": "Comme mastodon: copier tel quel",
+        "subject_line_email": "Similaire au courriel : « re : sujet »",
+        "subject_line_mastodon": "Comme mastodon : copier tel quel",
         "subject_line_noop": "Ne pas copier",
         "post_status_content_type": "Type de contenu du statuts",
         "stop_gifs": "N'animer les GIFS que lors du survol du curseur de la souris",
@@ -312,7 +318,7 @@
             "true": "oui"
         },
         "notifications": "Notifications",
-        "notification_setting": "Reçevoir les notifications de:",
+        "notification_setting": "Reçevoir les notifications de :",
         "notification_setting_follows": "Utilisateurs que vous suivez",
         "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
         "notification_setting_followers": "Utilisateurs qui vous suivent",
@@ -330,7 +336,17 @@
                 "save_load_hint": "L'option « Garder » préserve les options activés en cours lors de la séléction ou chargement des thèmes, il sauve aussi les dites options lors de l'export d'un thème. Quand toutes les cases sont décochés, exporter un thème sauvera tout.",
                 "reset": "Remise à zéro",
                 "clear_all": "Tout vider",
-                "clear_opacity": "Vider la transparence"
+                "clear_opacity": "Vider la transparence",
+                "load_theme": "Charger le thème",
+                "use_snapshot": "Ancienne version",
+                "help": {
+                    "upgraded_from_v2": "PleromaFE à été mis à jour, le thème peut être un peu différent que dans vos souvenirs.",
+                    "v2_imported": "Le fichier que vous avez importé vient d'un version antérieure. Nous essayons de maximizer la compatibilité mais il peu y avoir quelques incohérences.",
+                    "future_version_imported": "Le fichier importé viens d'une version postérieure de PleromaFE.",
+                    "older_version_imported": "Le fichier importé viens d'une version antérieure de PleromaFE."
+                },
+                "keep_as_is": "Garder tel-quel",
+                "use_source": "Nouvelle version"
             },
             "common": {
                 "color": "Couleur",
@@ -365,7 +381,18 @@
                 "borders": "Bordures",
                 "buttons": "Boutons",
                 "inputs": "Champs de saisie",
-                "faint_text": "Texte en fondu"
+                "faint_text": "Texte en fondu",
+                "underlay": "sous-calque",
+                "pressed": "Appuyé",
+                "alert_warning": "Avertissement",
+                "alert_neutral": "Neutre",
+                "post": "Messages/Bios des comptes",
+                "poll": "Graphique de Sondage",
+                "icons": "Icônes",
+                "selectedPost": "Message sélectionné",
+                "selectedMenu": "Objet sélectionné du menu",
+                "disabled": "Désactivé",
+                "tabs": "Onglets"
             },
             "radii": {
                 "_tab_label": "Rondeur"
@@ -398,7 +425,8 @@
                     "buttonPressed": "Bouton (cliqué)",
                     "buttonPressedHover": "Bouton (cliqué+survol)",
                     "input": "Champ de saisie"
-                }
+                },
+                "hintV3": "Pour les ombres vous pouvez aussi utiliser la notation {0} pour utiliser un autre emplacement de couleur."
             },
             "fonts": {
                 "_tab_label": "Polices",
@@ -433,7 +461,28 @@
             "title": "Version",
             "backend_version": "Version du Backend",
             "frontend_version": "Version du Frontend"
-        }
+        },
+        "change_email": "Changer de courriel",
+        "domain_mutes": "Domaines",
+        "pad_emoji": "Rajouter un espace autour de l'émoji après l’avoir choisit",
+        "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",
+        "fun": "Rigolo",
+        "greentext": "greentexting",
+        "allow_following_move": "Suivre automatiquement quand ce compte migre",
+        "change_email_error": "Il y a eu un problème pour charger votre courriel.",
+        "changed_email": "Courriel changé avec succès !",
+        "discoverable": "Permettre de découvrir ce compte dans les résultats de recherche web et autres services",
+        "emoji_reactions_on_timeline": "Montrer les émojis-réactions dans le flux",
+        "new_email": "Nouveau courriel",
+        "notification_visibility_moves": "Migrations de compte",
+        "user_mutes": "Comptes",
+        "useStreamingApi": "Recevoir les messages et notifications en temps réel",
+        "notification_setting_filters": "Filtres",
+        "notification_setting_privacy_option": "Masquer l'expéditeur et le contenu des notifications push",
+        "notification_setting_privacy": "Intimité"
     },
     "timeline": {
         "collapse": "Fermer",
@@ -456,7 +505,11 @@
         "pinned": "Agraffé",
         "delete_confirm": "Voulez-vous vraiment supprimer ce statuts ?",
         "reply_to": "Réponse à",
-        "replies_list": "Réponses:"
+        "replies_list": "Réponses :",
+        "mute_conversation": "Masquer la conversation",
+        "unmute_conversation": "Démasquer la conversation",
+        "status_unavailable": "Status indisponible",
+        "copy_link": "Copier le lien au status"
     },
     "user_card": {
         "approve": "Accepter",
@@ -505,7 +558,13 @@
             "quarantine": "Interdir les statuts de l'utilisateur à fédérer",
             "delete_user": "Supprimer l'utilisateur",
             "delete_user_confirmation": "Êtes-vous absolument-sûr⋅e ? Cette action ne peut être annulée."
-        }
+        },
+        "mention": "Mention",
+        "hidden": "Caché",
+        "subscribe": "Abonner",
+        "unsubscribe": "Désabonner",
+        "hide_repeats": "Cacher les partages",
+        "show_repeats": "Montrer les partages"
     },
     "user_profile": {
         "timeline_title": "Journal de l'utilisateur⋅ice",
@@ -530,7 +589,10 @@
         "repeat": "Répéter",
         "reply": "Répondre",
         "favorite": "Favoriser",
-        "user_settings": "Paramètres utilisateur"
+        "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"
     },
     "upload": {
         "error": {
@@ -545,5 +607,122 @@
             "GiB": "GiO",
             "TiB": "TiO"
         }
+    },
+    "about": {
+        "mrf": {
+            "keyword": {
+                "reject": "Rejeté",
+                "replace": "Remplacer",
+                "keyword_policies": "Politiques par mot-clés",
+                "ftl_removal": "Suppression du flux \"Ensemble du réseau connu\"",
+                "is_replaced_by": "→"
+            },
+            "simple": {
+                "simple_policies": "Politiques par instances",
+                "accept": "Accepter",
+                "accept_desc": "Cette instance accepte des messages seulement depuis ces instances :",
+                "reject": "Rejeter",
+                "reject_desc": "Cette instance n'acceptera pas de message de ces instances :",
+                "quarantine": "Quarantaine",
+                "quarantine_desc": "Cette instance enverras seulement des messages publics à ces instances :",
+                "ftl_removal_desc": "Cette instance supprime ces instance du flux fédéré :",
+                "media_removal": "Suppression multimédia",
+                "media_removal_desc": "Cette instance supprime le contenu multimédia des instances suivantes :",
+                "media_nsfw": "Force le contenu multimédia comme sensible",
+                "ftl_removal": "Suppression du flux fédéré",
+                "media_nsfw_desc": "Cette instance force le contenu multimédia comme sensible pour les messages des instances suivantes :"
+            },
+            "federation": "Fédération",
+            "mrf_policies": "Politiques MRF activées",
+            "mrf_policies_desc": "Les politiques MRF modifient la fédération entre les instances. Les politiques suivantes sont activées :"
+        },
+        "staff": "Staff"
+    },
+    "domain_mute_card": {
+        "mute": "Muet",
+        "mute_progress": "Masquage…",
+        "unmute": "Démasquer",
+        "unmute_progress": "Démasquage…"
+    },
+    "polls": {
+        "add_poll": "Ajouter un Sondage",
+        "add_option": "Ajouter une option",
+        "option": "Option",
+        "votes": "votes",
+        "type": "Type de Sondage",
+        "single_choice": "Choix unique",
+        "multiple_choices": "Choix multiples",
+        "expiry": "Age du sondage",
+        "expires_in": "Fin du sondage dans {0}",
+        "not_enough_options": "Trop peu d'options unique au sondage",
+        "vote": "Voter",
+        "expired": "Sondage terminé il y a {0}"
+    },
+    "emoji": {
+        "emoji": "Émoji",
+        "search_emoji": "Rechercher un émoji",
+        "add_emoji": "Insérer un émoji",
+        "custom": "émoji personnalisé",
+        "unicode": "émoji unicode",
+        "load_all": "Charger tout les {emojiAmount} émojis",
+        "load_all_hint": "{saneAmount} émojis chargé, charger tout les émojis peuvent causer des problèmes de performances.",
+        "stickers": "Stickers"
+    },
+    "remote_user_resolver": {
+        "error": "Non trouvé."
+    },
+    "time": {
+        "minutes_short": "{0}min",
+        "second_short": "{0}s",
+        "day": "{0} jour",
+        "days": "{0} jours",
+        "months": "{0} mois",
+        "month_short": "{0}m",
+        "months_short": "{0}m",
+        "now": "tout de suite",
+        "now_short": "maintenant",
+        "second": "{0} seconde",
+        "seconds": "{0} secondes",
+        "seconds_short": "{0}s",
+        "day_short": "{0}j",
+        "days_short": "{0}j",
+        "hour": "{0} heure",
+        "hours": "{0} heures",
+        "hour_short": "{0}h",
+        "hours_short": "{0}h",
+        "in_future": "dans {0}",
+        "in_past": "il y a {0}",
+        "minute": "{0} minute",
+        "minutes": "{0} minutes",
+        "minute_short": "{0}min",
+        "month": "{0} mois",
+        "week": "{0} semaine",
+        "weeks": "{0} semaines",
+        "week_short": "{0}s",
+        "weeks_short": "{0}s",
+        "year": "{0} année",
+        "years": "{0} années",
+        "year_short": "{0}a",
+        "years_short": "{0}a"
+    },
+    "search": {
+        "people": "Comptes",
+        "person_talking": "{count} personnes discutant",
+        "hashtags": "Mot-dièses",
+        "people_talking": "{count} personnes discutant",
+        "no_results": "Aucun résultats"
+    },
+    "password_reset": {
+        "forgot_password": "Mot de passe oublié ?",
+        "check_email": "Vérifiez vos courriels pour le lien permettant de changer votre mot de passe.",
+        "password_reset_disabled": "Le changement de mot de passe est désactivé. Veuillez contacter l'administration de votre instance.",
+        "password_reset_required_but_mailer_is_disabled": "Vous devez changer votre mot de passe mais sont changement est désactivé. Veuillez contacter l’administration de votre instance.",
+        "password_reset": "Nouveau mot de passe",
+        "instruction": "Entrer votre address de courriel ou votre nom utilisateur. Nous enverrons un lien pour changer votre mot de passe.",
+        "placeholder": "Votre email ou nom d'utilisateur",
+        "return_home": "Retourner à la page d'accueil",
+        "not_found": "Email ou nom d'utilisateur inconnu.",
+        "too_many_requests": "Vos avez atteint la limite d'essais, essayez plus tard.",
+        "password_reset_required": "Vous devez changer votre mot de passe pour vous authentifier."
     }
 }

From 26bcfea727d2fa8134fcc7e1f250695a5ffb886d Mon Sep 17 00:00:00 2001
From: Egor <egor@kislitsyn.com>
Date: Tue, 12 May 2020 11:39:08 +0000
Subject: [PATCH 017/415] Translated using Weblate (Russian)

Currently translated at 53.8% (330 of 613 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 4cb2d497..afaba444 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -1,414 +1,422 @@
 {
-  "chat": {
-    "title": "Чат"
-  },
-  "finder": {
-    "error_fetching_user": "Пользователь не найден",
-    "find_user": "Найти пользователя"
-  },
-  "general": {
-    "apply": "Применить",
-    "submit": "Отправить",
-    "cancel": "Отмена",
-    "disable": "Оключить",
-    "enable": "Включить",
-    "confirm": "Подтвердить",
-    "verify": "Проверить"
-  },
-  "login": {
-    "login": "Войти",
-    "logout": "Выйти",
-    "password": "Пароль",
-    "placeholder": "e.c. lain",
-    "register": "Зарегистрироваться",
-    "username": "Имя пользователя",
-    "authentication_code": "Код аутентификации",
-    "enter_recovery_code": "Ввести код восстановления",
-    "enter_two_factor_code": "Ввести код аутентификации",
-    "recovery_code": "Код восстановления",
-    "heading" : {
-      "TotpForm" : "Двухфакторная аутентификация",
-      "RecoveryForm" : "Two-factor recovery"
-    }
-  },
-  "nav": {
-    "back": "Назад",
-    "chat": "Локальный чат",
-    "mentions": "Упоминания",
-    "interactions": "Взаимодействия",
-    "public_tl": "Публичная лента",
-    "timeline": "Лента",
-    "twkn": "Федеративная лента",
-    "search": "Поиск"
-  },
-  "notifications": {
-    "broken_favorite": "Неизвестный статус, ищем...",
-    "favorited_you": "нравится ваш статус",
-    "followed_you": "начал(а) читать вас",
-    "load_older": "Загрузить старые уведомления",
-    "notifications": "Уведомления",
-    "read": "Прочесть",
-    "repeated_you": "повторил(а) ваш статус"
-  },
-  "interactions": {
-    "favs_repeats": "Повторы и фавориты",
-    "follows": "Новые подписки",
-    "load_older": "Загрузить старые взаимодействия"
-  },
-  "post_status": {
-    "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков",
-    "account_not_locked_warning_link": "залочен",
-    "attachments_sensitive": "Вложения содержат чувствительный контент",
-    "content_warning": "Тема (не обязательно)",
-    "default": "Что нового?",
-    "direct_warning": "Этот пост будет виден только упомянутым пользователям",
-    "posting": "Отправляется",
-    "scope_notice": {
-      "public": "Этот пост будет виден всем",
-      "private": "Этот пост будет виден только вашим подписчикам",
-      "unlisted": "Этот пост не будет виден в публичной и федеративной ленте"
+    "chat": {
+        "title": "Чат"
     },
-    "scope": {
-      "direct": "Личное - этот пост видят только те кто в нём упомянут",
-      "private": "Для подписчиков - этот пост видят только подписчики",
-      "public": "Публичный - этот пост виден всем",
-      "unlisted": "Непубличный - этот пост не виден на публичных лентах"
-    }
-  },
-  "registration": {
-    "bio": "Описание",
-    "email": "Email",
-    "fullname": "Отображаемое имя",
-    "password_confirm": "Подтверждение пароля",
-    "registration": "Регистрация",
-    "token": "Код приглашения",
-    "validations": {
-      "username_required": "не должно быть пустым",
-      "fullname_required": "не должно быть пустым",
-      "email_required": "не должен быть пустым",
-      "password_required": "не должен быть пустым",
-      "password_confirmation_required": "не должно быть пустым",
-      "password_confirmation_match": "должно совпадать с паролем"
-    }
-  },
-  "settings": {
-    "enter_current_password_to_confirm": "Введите свой текущий пароль",
-    "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "Настройка OTP",
-      "wait_pre_setup_otp" : "предварительная настройка OTP",
-      "confirm_and_enable" : "Подтвердить и включить OTP",
-      "title": "Двухфакторная аутентификация",
-      "generate_new_recovery_codes" : "Получить новые коды востановления",
-      "warning_of_generate_new_codes" : "После получения новых кодов восстановления, старые больше не будут работать.",
-      "recovery_codes" : "Коды восстановления.",
-      "waiting_a_recovery_codes": "Получение кодов восстановления ...",
-      "recovery_codes_warning" : "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
-      "authentication_methods" : "Методы аутентификации",
-      "scan": {
-        "title": "Сканирование",
-        "desc": "Используйте приложение для двухэтапной аутентификации для сканирования этого QR-код или введите текстовый ключ:",
-        "secret_code": "Ключ"
-      },
-      "verify": {
-        "desc": "Чтобы включить двухэтапную аутентификации, введите код из вашего приложение для двухэтапной аутентификации:"
-      }
+    "finder": {
+        "error_fetching_user": "Пользователь не найден",
+        "find_user": "Найти пользователя"
     },
-    "attachmentRadius": "Прикреплённые файлы",
-    "attachments": "Вложения",
-    "autoload": "Включить автоматическую загрузку при прокрутке вниз",
-    "avatar": "Аватар",
-    "avatarAltRadius": "Аватары в уведомлениях",
-    "avatarRadius": "Аватары",
-    "background": "Фон",
-    "bio": "Описание",
-    "btnRadius": "Кнопки",
-    "cBlue": "Ответить, читать",
-    "cGreen": "Повторить",
-    "cOrange": "Нравится",
-    "cRed": "Отменить",
-    "change_email": "Сменить email",
-    "change_email_error": "Произошла ошибка при попытке изменить email.",
-    "changed_email": "Email изменён успешно.",
-    "change_password": "Сменить пароль",
-    "change_password_error": "Произошла ошибка при попытке изменить пароль.",
-    "changed_password": "Пароль изменён успешно.",
-    "collapse_subject": "Сворачивать посты с темой",
-    "confirm_new_password": "Подтверждение нового пароля",
-    "current_avatar": "Текущий аватар",
-    "current_password": "Текущий пароль",
-    "current_profile_banner": "Текущий баннер профиля",
-    "data_import_export_tab": "Импорт / Экспорт данных",
-    "delete_account": "Удалить аккаунт",
-    "delete_account_description": "Удалить ваш аккаунт и все ваши сообщения.",
-    "delete_account_error": "Возникла ошибка в процессе удаления вашего аккаунта. Если это повторяется, свяжитесь с администратором вашего сервера.",
-    "delete_account_instructions": "Введите ваш пароль в поле ниже для подтверждения удаления.",
-    "export_theme": "Сохранить Тему",
-    "filtering": "Фильтрация",
-    "filtering_explanation": "Все статусы, содержащие данные слова, будут игнорироваться, по одному в строке",
-    "follow_export": "Экспортировать читаемых",
-    "follow_export_button": "Экспортировать читаемых в файл .csv",
-    "follow_export_processing": "Ведётся обработка, скоро вам будет предложено загрузить файл",
-    "follow_import": "Импортировать читаемых",
-    "follow_import_error": "Ошибка при импортировании читаемых.",
-    "follows_imported": "Список читаемых импортирован. Обработка займёт некоторое время..",
-    "foreground": "Передний план",
-    "general": "Общие",
-    "hide_attachments_in_convo": "Прятать вложения в разговорах",
-    "hide_attachments_in_tl": "Прятать вложения в ленте",
-    "hide_isp": "Скрыть серверную панель",
-    "import_followers_from_a_csv_file": "Импортировать читаемых из файла .csv",
-    "import_theme": "Загрузить Тему",
-    "inputRadius": "Поля ввода",
-    "checkboxRadius": "Чекбоксы",
-    "instance_default": "(по умолчанию: {value})",
-    "instance_default_simple": "(по умолчанию)",
-    "interface": "Интерфейс",
-    "interfaceLanguage": "Язык интерфейса",
-    "limited_availability": "Не доступно в вашем браузере",
-    "links": "Ссылки",
-    "lock_account_description": "Аккаунт доступен только подтверждённым подписчикам",
-    "loop_video": "Зациливать видео",
-    "loop_video_silent_only": "Зацикливать только беззвучные видео (т.е. \"гифки\" с Mastodon)",
-    "name": "Имя",
-    "name_bio": "Имя и описание",
-    "new_email": "Новый email",
-    "new_password": "Новый пароль",
-    "fun": "Потешное",
-    "greentext": "Мемные стрелочки",
-    "notification_visibility": "Показывать уведомления",
-    "notification_visibility_follows": "Подписки",
-    "notification_visibility_likes": "Лайки",
-    "notification_visibility_mentions": "Упоминания",
-    "notification_visibility_repeats": "Повторы",
-    "no_rich_text_description": "Убрать форматирование из всех постов",
-    "hide_follows_description": "Не показывать кого я читаю",
-    "hide_followers_description": "Не показывать кто читает меня",
-    "hide_follows_count_description": "Не показывать число читаемых пользователей",
-    "hide_followers_count_description": "Не показывать число моих подписчиков",
-    "show_admin_badge": "Показывать значок администратора в моем профиле",
-    "show_moderator_badge": "Показывать значок модератора в моем профиле",
-    "nsfw_clickthrough": "Включить скрытие NSFW вложений",
-    "oauth_tokens": "OAuth токены",
-    "token": "Токен",
-    "refresh_token": "Рефреш токен",
-    "valid_until": "Годен до",
-    "revoke_token": "Удалить",
-    "panelRadius": "Панели",
-    "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
-    "presets": "Пресеты",
-    "profile_background": "Фон профиля",
-    "profile_banner": "Баннер профиля",
-    "profile_tab": "Профиль",
-    "radii_help": "Скругление углов элементов интерфейса (в пикселях)",
-    "replies_in_timeline": "Ответы в ленте",
-    "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
-    "reply_visibility_all": "Показывать все ответы",
-    "reply_visibility_following": "Показывать только ответы мне и тех на кого я подписан",
-    "reply_visibility_self": "Показывать только ответы мне",
-    "autohide_floating_post_button": "Автоматически скрывать кнопку постинга (в мобильной версии)",
-    "saving_err": "Не удалось сохранить настройки",
-    "saving_ok": "Сохранено",
-    "security_tab": "Безопасность",
-    "scope_copy": "Копировать видимость поста при ответе (всегда включено для Личных Сообщений)",
-    "minimal_scopes_mode": "Минимизировать набор опций видимости поста",
-    "set_new_avatar": "Загрузить новый аватар",
-    "set_new_profile_background": "Загрузить новый фон профиля",
-    "set_new_profile_banner": "Загрузить новый баннер профиля",
-    "settings": "Настройки",
-    "subject_input_always_show": "Всегда показывать поле ввода темы",
-    "stop_gifs": "Проигрывать GIF анимации только при наведении",
-    "streaming": "Включить автоматическую загрузку новых сообщений при прокрутке вверх",
-    "useStreamingApi": "Получать сообщения и уведомления в реальном времени",
-    "useStreamingApiWarning": "(Не рекомендуется, экспериментально, сообщения могут пропадать)",
-    "text": "Текст",
-    "theme": "Тема",
-    "theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",
-    "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения",
-    "theme_help_v2_2": "Под некоторыми полями ввода это идикаторы контрастности, наведите на них мышью чтобы узнать больше. Приспользовании прозрачности контраст расчитывается для наихудшего варианта.",
-    "tooltipRadius": "Всплывающие подсказки/уведомления",
-    "user_settings": "Настройки пользователя",
-    "values": {
-      "false": "нет",
-      "true": "да"
+    "general": {
+        "apply": "Применить",
+        "submit": "Отправить",
+        "cancel": "Отмена",
+        "disable": "Оключить",
+        "enable": "Включить",
+        "confirm": "Подтвердить",
+        "verify": "Проверить"
     },
-    "style": {
-      "switcher": {
-        "keep_color": "Оставить цвета",
-        "keep_shadows": "Оставить тени",
-        "keep_opacity": "Оставить прозрачность",
-        "keep_roundness": "Оставить скругление",
-        "keep_fonts": "Оставить шрифты",
-        "save_load_hint": "Опции \"оставить...\" позволяют сохранить текущие настройки при выборе другой темы или импорта её из файла. Так же они влияют на то какие компоненты будут сохранены при экспорте темы. Когда все галочки сняты все компоненты будут экспортированы.",
-        "reset": "Сбросить",
-        "clear_all": "Очистить всё",
-        "clear_opacity": "Очистить прозрачность"
-      },
-      "common": {
-        "color": "Цвет",
-        "opacity": "Прозрачность",
-        "contrast": {
-          "hint": "Уровень контраста: {ratio}, что {level} {context}",
-          "level": {
-            "aa": "соответствует гайдлайну Level AA (минимальный)",
-            "aaa": "соответствует гайдлайну Level AAA (рекомендуемый)",
-            "bad": "не соответствует каким либо гайдлайнам"
-          },
-          "context": {
-            "18pt": "для крупного (18pt+) текста",
-            "text": "для текста"
-          }
+    "login": {
+        "login": "Войти",
+        "logout": "Выйти",
+        "password": "Пароль",
+        "placeholder": "e.c. lain",
+        "register": "Зарегистрироваться",
+        "username": "Имя пользователя",
+        "authentication_code": "Код аутентификации",
+        "enter_recovery_code": "Ввести код восстановления",
+        "enter_two_factor_code": "Ввести код аутентификации",
+        "recovery_code": "Код восстановления",
+        "heading": {
+            "TotpForm": "Двухфакторная аутентификация",
+            "RecoveryForm": "Two-factor recovery"
         }
-      },
-      "common_colors": {
-        "_tab_label": "Общие",
-        "main": "Общие цвета",
-        "foreground_hint": "См. вкладку \"Дополнительно\" для более детального контроля",
-        "rgbo": "Иконки, акценты, ярылки"
-      },
-      "advanced_colors": {
-        "_tab_label": "Дополнительно",
-        "alert": "Фон уведомлений",
-        "alert_error": "Ошибки",
-        "badge": "Фон значков",
-        "badge_notification": "Уведомления",
-        "panel_header": "Заголовок панели",
-        "top_bar": "Верняя полоска",
-        "borders": "Границы",
-        "buttons": "Кнопки",
-        "inputs": "Поля ввода",
-        "faint_text": "Маловажный текст"
-      },
-      "radii": {
-        "_tab_label": "Скругление"
-      },
-      "shadows": {
-        "_tab_label": "Светотень",
-        "component": "Компонент",
-        "override": "Переопределить",
-        "shadow_id": "Тень №{value}",
-        "blur": "Размытие",
-        "spread": "Разброс",
-        "inset": "Внутренняя",
-        "hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
-        "filter_hint": {
-          "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это",
-          "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}",
-          "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете",
-          "spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
-          "inset_classic": "Внутренние тени будут использовать {0}"
+    },
+    "nav": {
+        "back": "Назад",
+        "chat": "Локальный чат",
+        "mentions": "Упоминания",
+        "interactions": "Взаимодействия",
+        "public_tl": "Публичная лента",
+        "timeline": "Лента",
+        "twkn": "Федеративная лента",
+        "search": "Поиск"
+    },
+    "notifications": {
+        "broken_favorite": "Неизвестный статус, ищем...",
+        "favorited_you": "нравится ваш статус",
+        "followed_you": "начал(а) читать вас",
+        "load_older": "Загрузить старые уведомления",
+        "notifications": "Уведомления",
+        "read": "Прочесть",
+        "repeated_you": "повторил(а) ваш статус"
+    },
+    "interactions": {
+        "favs_repeats": "Повторы и фавориты",
+        "follows": "Новые подписки",
+        "load_older": "Загрузить старые взаимодействия"
+    },
+    "post_status": {
+        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков",
+        "account_not_locked_warning_link": "залочен",
+        "attachments_sensitive": "Вложения содержат чувствительный контент",
+        "content_warning": "Тема (не обязательно)",
+        "default": "Что нового?",
+        "direct_warning": "Этот пост будет виден только упомянутым пользователям",
+        "posting": "Отправляется",
+        "scope_notice": {
+            "public": "Этот пост будет виден всем",
+            "private": "Этот пост будет виден только вашим подписчикам",
+            "unlisted": "Этот пост не будет виден в публичной и федеративной ленте"
         },
-        "components": {
-          "panel": "Панель",
-          "panelHeader": "Заголовок панели",
-          "topBar": "Верхняя полоска",
-          "avatar": "Аватарка (профиль)",
-          "avatarStatus": "Аватарка (в ленте)",
-          "popup": "Всплывающие подсказки",
-          "button": "Кнопки",
-          "buttonHover": "Кнопки (наведен курсор)",
-          "buttonPressed": "Кнопки (нажата)",
-          "buttonPressedHover": "Кнопки (нажата+наведен курсор)",
-          "input": "Поля ввода"
+        "scope": {
+            "direct": "Личное - этот пост видят только те кто в нём упомянут",
+            "private": "Для подписчиков - этот пост видят только подписчики",
+            "public": "Публичный - этот пост виден всем",
+            "unlisted": "Непубличный - этот пост не виден на публичных лентах"
         }
-      },
-      "fonts": {
-        "_tab_label": "Шрифты",
-        "help": "Выберите тип шрифта для использования в интерфейсе. При выборе варианта \"другой\" надо ввести название шрифта в точности как он называется в системе.",
-        "components": {
-          "interface": "Интерфейс",
-          "input": "Поля ввода",
-          "post": "Текст постов",
-          "postCode": "Моноширинный текст в посте (форматирование)"
+    },
+    "registration": {
+        "bio": "Описание",
+        "email": "Email",
+        "fullname": "Отображаемое имя",
+        "password_confirm": "Подтверждение пароля",
+        "registration": "Регистрация",
+        "token": "Код приглашения",
+        "validations": {
+            "username_required": "не должно быть пустым",
+            "fullname_required": "не должно быть пустым",
+            "email_required": "не должен быть пустым",
+            "password_required": "не должен быть пустым",
+            "password_confirmation_required": "не должно быть пустым",
+            "password_confirmation_match": "должно совпадать с паролем"
+        }
+    },
+    "settings": {
+        "enter_current_password_to_confirm": "Введите свой текущий пароль",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "Настройка OTP",
+            "wait_pre_setup_otp": "предварительная настройка OTP",
+            "confirm_and_enable": "Подтвердить и включить OTP",
+            "title": "Двухфакторная аутентификация",
+            "generate_new_recovery_codes": "Получить новые коды востановления",
+            "warning_of_generate_new_codes": "После получения новых кодов восстановления, старые больше не будут работать.",
+            "recovery_codes": "Коды восстановления.",
+            "waiting_a_recovery_codes": "Получение кодов восстановления ...",
+            "recovery_codes_warning": "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
+            "authentication_methods": "Методы аутентификации",
+            "scan": {
+                "title": "Сканирование",
+                "desc": "Используйте приложение для двухэтапной аутентификации для сканирования этого QR-код или введите текстовый ключ:",
+                "secret_code": "Ключ"
+            },
+            "verify": {
+                "desc": "Чтобы включить двухэтапную аутентификации, введите код из вашего приложение для двухэтапной аутентификации:"
+            }
         },
-        "family": "Шрифт",
-        "size": "Размер (в пикселях)",
-        "weight": "Ширина",
-        "custom": "Другой"
-      },
-      "preview": {
-        "header": "Пример",
-        "content": "Контент",
-        "error": "Ошибка стоп 000",
-        "button": "Кнопка",
-        "text": "Еще немного {0} и масенькая {1}",
-        "mono": "контента",
-        "input": "Что нового?",
-        "faint_link": "Его придется убрать",
-        "fine_print": "Если проблемы остались — ваш гуртовщик мыши плохо стоит. {0}.",
-        "header_faint": "Все идет по плану",
-        "checkbox": "Я подтверждаю что не было ни единого разрыва",
-        "link": "ссылка"
-      }
+        "attachmentRadius": "Прикреплённые файлы",
+        "attachments": "Вложения",
+        "autoload": "Включить автоматическую загрузку при прокрутке вниз",
+        "avatar": "Аватар",
+        "avatarAltRadius": "Аватары в уведомлениях",
+        "avatarRadius": "Аватары",
+        "background": "Фон",
+        "bio": "Описание",
+        "btnRadius": "Кнопки",
+        "cBlue": "Ответить, читать",
+        "cGreen": "Повторить",
+        "cOrange": "Нравится",
+        "cRed": "Отменить",
+        "change_email": "Сменить email",
+        "change_email_error": "Произошла ошибка при попытке изменить email.",
+        "changed_email": "Email изменён успешно.",
+        "change_password": "Сменить пароль",
+        "change_password_error": "Произошла ошибка при попытке изменить пароль.",
+        "changed_password": "Пароль изменён успешно.",
+        "collapse_subject": "Сворачивать посты с темой",
+        "confirm_new_password": "Подтверждение нового пароля",
+        "current_avatar": "Текущий аватар",
+        "current_password": "Текущий пароль",
+        "current_profile_banner": "Текущий баннер профиля",
+        "data_import_export_tab": "Импорт / Экспорт данных",
+        "delete_account": "Удалить аккаунт",
+        "delete_account_description": "Удалить ваш аккаунт и все ваши сообщения.",
+        "delete_account_error": "Возникла ошибка в процессе удаления вашего аккаунта. Если это повторяется, свяжитесь с администратором вашего сервера.",
+        "delete_account_instructions": "Введите ваш пароль в поле ниже для подтверждения удаления.",
+        "export_theme": "Сохранить Тему",
+        "filtering": "Фильтрация",
+        "filtering_explanation": "Все статусы, содержащие данные слова, будут игнорироваться, по одному в строке",
+        "follow_export": "Экспортировать читаемых",
+        "follow_export_button": "Экспортировать читаемых в файл .csv",
+        "follow_export_processing": "Ведётся обработка, скоро вам будет предложено загрузить файл",
+        "follow_import": "Импортировать читаемых",
+        "follow_import_error": "Ошибка при импортировании читаемых.",
+        "follows_imported": "Список читаемых импортирован. Обработка займёт некоторое время..",
+        "foreground": "Передний план",
+        "general": "Общие",
+        "hide_attachments_in_convo": "Прятать вложения в разговорах",
+        "hide_attachments_in_tl": "Прятать вложения в ленте",
+        "hide_isp": "Скрыть серверную панель",
+        "import_followers_from_a_csv_file": "Импортировать читаемых из файла .csv",
+        "import_theme": "Загрузить Тему",
+        "inputRadius": "Поля ввода",
+        "checkboxRadius": "Чекбоксы",
+        "instance_default": "(по умолчанию: {value})",
+        "instance_default_simple": "(по умолчанию)",
+        "interface": "Интерфейс",
+        "interfaceLanguage": "Язык интерфейса",
+        "limited_availability": "Не доступно в вашем браузере",
+        "links": "Ссылки",
+        "lock_account_description": "Аккаунт доступен только подтверждённым подписчикам",
+        "loop_video": "Зациливать видео",
+        "loop_video_silent_only": "Зацикливать только беззвучные видео (т.е. \"гифки\" с Mastodon)",
+        "name": "Имя",
+        "name_bio": "Имя и описание",
+        "new_email": "Новый email",
+        "new_password": "Новый пароль",
+        "fun": "Потешное",
+        "greentext": "Мемные стрелочки",
+        "notification_visibility": "Показывать уведомления",
+        "notification_visibility_follows": "Подписки",
+        "notification_visibility_likes": "Лайки",
+        "notification_visibility_mentions": "Упоминания",
+        "notification_visibility_repeats": "Повторы",
+        "no_rich_text_description": "Убрать форматирование из всех постов",
+        "hide_follows_description": "Не показывать кого я читаю",
+        "hide_followers_description": "Не показывать кто читает меня",
+        "hide_follows_count_description": "Не показывать число читаемых пользователей",
+        "hide_followers_count_description": "Не показывать число моих подписчиков",
+        "show_admin_badge": "Показывать значок администратора в моем профиле",
+        "show_moderator_badge": "Показывать значок модератора в моем профиле",
+        "nsfw_clickthrough": "Включить скрытие NSFW вложений",
+        "oauth_tokens": "OAuth токены",
+        "token": "Токен",
+        "refresh_token": "Рефреш токен",
+        "valid_until": "Годен до",
+        "revoke_token": "Удалить",
+        "panelRadius": "Панели",
+        "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
+        "presets": "Пресеты",
+        "profile_background": "Фон профиля",
+        "profile_banner": "Баннер профиля",
+        "profile_tab": "Профиль",
+        "radii_help": "Скругление углов элементов интерфейса (в пикселях)",
+        "replies_in_timeline": "Ответы в ленте",
+        "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
+        "reply_visibility_all": "Показывать все ответы",
+        "reply_visibility_following": "Показывать только ответы мне и тех на кого я подписан",
+        "reply_visibility_self": "Показывать только ответы мне",
+        "autohide_floating_post_button": "Автоматически скрывать кнопку постинга (в мобильной версии)",
+        "saving_err": "Не удалось сохранить настройки",
+        "saving_ok": "Сохранено",
+        "security_tab": "Безопасность",
+        "scope_copy": "Копировать видимость поста при ответе (всегда включено для Личных Сообщений)",
+        "minimal_scopes_mode": "Минимизировать набор опций видимости поста",
+        "set_new_avatar": "Загрузить новый аватар",
+        "set_new_profile_background": "Загрузить новый фон профиля",
+        "set_new_profile_banner": "Загрузить новый баннер профиля",
+        "settings": "Настройки",
+        "subject_input_always_show": "Всегда показывать поле ввода темы",
+        "stop_gifs": "Проигрывать GIF анимации только при наведении",
+        "streaming": "Включить автоматическую загрузку новых сообщений при прокрутке вверх",
+        "useStreamingApi": "Получать сообщения и уведомления в реальном времени",
+        "useStreamingApiWarning": "(Не рекомендуется, экспериментально, сообщения могут пропадать)",
+        "text": "Текст",
+        "theme": "Тема",
+        "theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",
+        "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения",
+        "theme_help_v2_2": "Под некоторыми полями ввода это идикаторы контрастности, наведите на них мышью чтобы узнать больше. Приспользовании прозрачности контраст расчитывается для наихудшего варианта.",
+        "tooltipRadius": "Всплывающие подсказки/уведомления",
+        "user_settings": "Настройки пользователя",
+        "values": {
+            "false": "нет",
+            "true": "да"
+        },
+        "style": {
+            "switcher": {
+                "keep_color": "Оставить цвета",
+                "keep_shadows": "Оставить тени",
+                "keep_opacity": "Оставить прозрачность",
+                "keep_roundness": "Оставить скругление",
+                "keep_fonts": "Оставить шрифты",
+                "save_load_hint": "Опции \"оставить...\" позволяют сохранить текущие настройки при выборе другой темы или импорта её из файла. Так же они влияют на то какие компоненты будут сохранены при экспорте темы. Когда все галочки сняты все компоненты будут экспортированы.",
+                "reset": "Сбросить",
+                "clear_all": "Очистить всё",
+                "clear_opacity": "Очистить прозрачность"
+            },
+            "common": {
+                "color": "Цвет",
+                "opacity": "Прозрачность",
+                "contrast": {
+                    "hint": "Уровень контраста: {ratio}, что {level} {context}",
+                    "level": {
+                        "aa": "соответствует гайдлайну Level AA (минимальный)",
+                        "aaa": "соответствует гайдлайну Level AAA (рекомендуемый)",
+                        "bad": "не соответствует каким либо гайдлайнам"
+                    },
+                    "context": {
+                        "18pt": "для крупного (18pt+) текста",
+                        "text": "для текста"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Общие",
+                "main": "Общие цвета",
+                "foreground_hint": "См. вкладку \"Дополнительно\" для более детального контроля",
+                "rgbo": "Иконки, акценты, ярылки"
+            },
+            "advanced_colors": {
+                "_tab_label": "Дополнительно",
+                "alert": "Фон уведомлений",
+                "alert_error": "Ошибки",
+                "badge": "Фон значков",
+                "badge_notification": "Уведомления",
+                "panel_header": "Заголовок панели",
+                "top_bar": "Верняя полоска",
+                "borders": "Границы",
+                "buttons": "Кнопки",
+                "inputs": "Поля ввода",
+                "faint_text": "Маловажный текст"
+            },
+            "radii": {
+                "_tab_label": "Скругление"
+            },
+            "shadows": {
+                "_tab_label": "Светотень",
+                "component": "Компонент",
+                "override": "Переопределить",
+                "shadow_id": "Тень №{value}",
+                "blur": "Размытие",
+                "spread": "Разброс",
+                "inset": "Внутренняя",
+                "hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
+                "filter_hint": {
+                    "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это",
+                    "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}",
+                    "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете",
+                    "spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
+                    "inset_classic": "Внутренние тени будут использовать {0}"
+                },
+                "components": {
+                    "panel": "Панель",
+                    "panelHeader": "Заголовок панели",
+                    "topBar": "Верхняя полоска",
+                    "avatar": "Аватарка (профиль)",
+                    "avatarStatus": "Аватарка (в ленте)",
+                    "popup": "Всплывающие подсказки",
+                    "button": "Кнопки",
+                    "buttonHover": "Кнопки (наведен курсор)",
+                    "buttonPressed": "Кнопки (нажата)",
+                    "buttonPressedHover": "Кнопки (нажата+наведен курсор)",
+                    "input": "Поля ввода"
+                }
+            },
+            "fonts": {
+                "_tab_label": "Шрифты",
+                "help": "Выберите тип шрифта для использования в интерфейсе. При выборе варианта \"другой\" надо ввести название шрифта в точности как он называется в системе.",
+                "components": {
+                    "interface": "Интерфейс",
+                    "input": "Поля ввода",
+                    "post": "Текст постов",
+                    "postCode": "Моноширинный текст в посте (форматирование)"
+                },
+                "family": "Шрифт",
+                "size": "Размер (в пикселях)",
+                "weight": "Ширина",
+                "custom": "Другой"
+            },
+            "preview": {
+                "header": "Пример",
+                "content": "Контент",
+                "error": "Ошибка стоп 000",
+                "button": "Кнопка",
+                "text": "Еще немного {0} и масенькая {1}",
+                "mono": "контента",
+                "input": "Что нового?",
+                "faint_link": "Его придется убрать",
+                "fine_print": "Если проблемы остались — ваш гуртовщик мыши плохо стоит. {0}.",
+                "header_faint": "Все идет по плану",
+                "checkbox": "Я подтверждаю что не было ни единого разрыва",
+                "link": "ссылка"
+            }
+        }
+    },
+    "timeline": {
+        "collapse": "Свернуть",
+        "conversation": "Разговор",
+        "error_fetching": "Ошибка при обновлении",
+        "load_older": "Загрузить старые статусы",
+        "no_retweet_hint": "Пост помечен как \"только для подписчиков\" или \"личное\" и поэтому не может быть повторён",
+        "repeated": "повторил(а)",
+        "show_new": "Показать новые",
+        "up_to_date": "Обновлено"
+    },
+    "user_card": {
+        "block": "Заблокировать",
+        "blocked": "Заблокирован",
+        "favorites": "Понравившиеся",
+        "follow": "Читать",
+        "follow_sent": "Запрос отправлен!",
+        "follow_progress": "Запрашиваем…",
+        "follow_again": "Запросить еще заново?",
+        "follow_unfollow": "Перестать читать",
+        "followees": "Читаемые",
+        "followers": "Читатели",
+        "following": "Читаю",
+        "follows_you": "Читает вас",
+        "mute": "Игнорировать",
+        "muted": "Игнорирую",
+        "per_day": "в день",
+        "remote_follow": "Читать удалённо",
+        "statuses": "Статусы",
+        "admin_menu": {
+            "moderation": "Опции модератора",
+            "grant_admin": "Сделать администратором",
+            "revoke_admin": "Забрать права администратора",
+            "grant_moderator": "Сделать модератором",
+            "revoke_moderator": "Забрать права модератора",
+            "activate_account": "Активировать аккаунт",
+            "deactivate_account": "Деактивировать аккаунт",
+            "delete_account": "Удалить аккаунт",
+            "force_nsfw": "Отмечать посты пользователя как NSFW",
+            "strip_media": "Убирать вложения из постов пользователя",
+            "force_unlisted": "Не добавлять посты в публичные ленты",
+            "sandbox": "Посты доступны только для подписчиков",
+            "disable_remote_subscription": "Запретить подписываться с удаленных серверов",
+            "disable_any_subscription": "Запретить подписываться на пользователя",
+            "quarantine": "Не федерировать посты пользователя",
+            "delete_user": "Удалить пользователя",
+            "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
+        }
+    },
+    "user_profile": {
+        "timeline_title": "Лента пользователя"
+    },
+    "search": {
+        "people": "Люди",
+        "hashtags": "Хэштэги",
+        "person_talking": "Популярно у {count} человека",
+        "people_talking": "Популярно у {count} человек",
+        "no_results": "Ничего не найдено"
+    },
+    "password_reset": {
+        "forgot_password": "Забыли пароль?",
+        "password_reset": "Сброс пароля",
+        "instruction": "Введите ваш email или имя пользователя, и мы отправим вам ссылку для сброса пароля.",
+        "placeholder": "Ваш email или имя пользователя",
+        "check_email": "Проверьте ваш email и перейдите по ссылке для сброса пароля.",
+        "return_home": "Вернуться на главную страницу",
+        "not_found": "Мы не смогли найти аккаунт с таким email-ом или именем пользователя.",
+        "too_many_requests": "Вы исчерпали допустимое количество попыток, попробуйте позже.",
+        "password_reset_disabled": "Сброс пароля отключен. Cвяжитесь с администратором вашего сервера."
+    },
+    "about": {
+        "mrf": {
+            "federation": "Федерация",
+            "simple": {
+                "accept_desc": ""
+            }
+        }
     }
-  },
-  "timeline": {
-    "collapse": "Свернуть",
-    "conversation": "Разговор",
-    "error_fetching": "Ошибка при обновлении",
-    "load_older": "Загрузить старые статусы",
-    "no_retweet_hint": "Пост помечен как \"только для подписчиков\" или \"личное\" и поэтому не может быть повторён",
-    "repeated": "повторил(а)",
-    "show_new": "Показать новые",
-    "up_to_date": "Обновлено"
-  },
-  "user_card": {
-    "block": "Заблокировать",
-    "blocked": "Заблокирован",
-    "favorites": "Понравившиеся",
-    "follow": "Читать",
-    "follow_sent": "Запрос отправлен!",
-    "follow_progress": "Запрашиваем…",
-    "follow_again": "Запросить еще заново?",
-    "follow_unfollow": "Перестать читать",
-    "followees": "Читаемые",
-    "followers": "Читатели",
-    "following": "Читаю",
-    "follows_you": "Читает вас",
-    "mute": "Игнорировать",
-    "muted": "Игнорирую",
-    "per_day": "в день",
-    "remote_follow": "Читать удалённо",
-    "statuses": "Статусы",
-    "admin_menu": {
-      "moderation": "Опции модератора",
-      "grant_admin": "Сделать администратором",
-      "revoke_admin": "Забрать права администратора",
-      "grant_moderator": "Сделать модератором",
-      "revoke_moderator": "Забрать права модератора",
-      "activate_account": "Активировать аккаунт",
-      "deactivate_account": "Деактивировать аккаунт",
-      "delete_account": "Удалить аккаунт",
-      "force_nsfw": "Отмечать посты пользователя как NSFW",
-      "strip_media": "Убирать вложения из постов пользователя",
-      "force_unlisted": "Не добавлять посты в публичные ленты",
-      "sandbox": "Посты доступны только для подписчиков",
-      "disable_remote_subscription": "Запретить подписываться с удаленных серверов",
-      "disable_any_subscription": "Запретить подписываться на пользователя",
-      "quarantine": "Не федерировать посты пользователя",
-      "delete_user": "Удалить пользователя",
-      "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
-    }
-  },
-  "user_profile": {
-    "timeline_title": "Лента пользователя"
-  },
-  "search": {
-    "people": "Люди",
-    "hashtags": "Хэштэги",
-    "person_talking": "Популярно у {count} человека",
-    "people_talking": "Популярно у {count} человек",
-    "no_results": "Ничего не найдено"
-  },
-  "password_reset": {
-    "forgot_password": "Забыли пароль?",
-    "password_reset": "Сброс пароля",
-    "instruction": "Введите ваш email или имя пользователя, и мы отправим вам ссылку для сброса пароля.",
-    "placeholder": "Ваш email или имя пользователя",
-    "check_email": "Проверьте ваш email и перейдите по ссылке для сброса пароля.",
-    "return_home": "Вернуться на главную страницу",
-    "not_found": "Мы не смогли найти аккаунт с таким email-ом или именем пользователя.",
-    "too_many_requests": "Вы исчерпали допустимое количество попыток, попробуйте позже.",
-    "password_reset_disabled": "Сброс пароля отключен. Cвяжитесь с администратором вашего сервера."
-  }
 }

From bc5005b3ddddeb47d5160a1b79d2edb39e887b4b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 12 May 2020 13:59:52 -0500
Subject: [PATCH 018/415] Permit sidebar alignment with instance configuration
 option

---
 src/App.js              | 7 ++++++-
 src/App.vue             | 5 ++++-
 src/modules/instance.js | 1 +
 static/config.json      | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/App.js b/src/App.js
index 61b5eec1..bbb41409 100644
--- a/src/App.js
+++ b/src/App.js
@@ -99,7 +99,12 @@ export default {
     },
     showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
     isMobileLayout () { return this.$store.state.interface.mobileLayout },
-    privateMode () { return this.$store.state.instance.private }
+    privateMode () { return this.$store.state.instance.private },
+    sidebarAlign () {
+      return {
+        'order': this.$store.state.instance.sidebarRight ? 99 : 0
+      }
+    }
   },
   methods: {
     scrollToTop () {
diff --git a/src/App.vue b/src/App.vue
index ff62fc51..7018a5a4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -80,7 +80,10 @@
       id="content"
       class="container underlay"
     >
-      <div class="sidebar-flexer mobile-hidden">
+      <div
+        class="sidebar-flexer mobile-hidden"
+        :style="sidebarAlign"
+      >
         <div class="sidebar-bounds">
           <div class="sidebar-scroller">
             <div class="sidebar">
diff --git a/src/modules/instance.js b/src/modules/instance.js
index ffece311..869ceebd 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -36,6 +36,7 @@ const defaultState = {
   showFeaturesPanel: true,
   minimalScopesMode: false,
   greentext: false,
+  sidebarRight: false,
 
   // Nasty stuff
   pleromaBackend: true,
diff --git a/static/config.json b/static/config.json
index c8267869..a87ed853 100644
--- a/static/config.json
+++ b/static/config.json
@@ -19,5 +19,6 @@
   "noAttachmentLinks": false,
   "nsfwCensorImage": "",
   "showFeaturesPanel": true,
-  "minimalScopesMode": false
+  "minimalScopesMode": false,
+  "sidebarRight": false
 }

From 8e399710988dd874bd921a9ced76daf90034c29f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 13 May 2020 17:48:31 +0300
Subject: [PATCH 019/415] add with_relationships where necessary

---
 src/components/post_status_form/post_status_form.js |  2 +-
 src/components/user_settings/user_settings.js       |  4 ++--
 src/modules/users.js                                |  4 ++--
 src/services/api/api.service.js                     | 13 +++++++++----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 74067fef..a98e1e31 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -102,7 +102,7 @@ const PostStatusForm = {
           ...this.$store.state.instance.customEmoji
         ],
         users: this.$store.state.users.users,
-        updateUsersList: (input) => this.$store.dispatch('searchUsers', input)
+        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
       })
     },
     emojiSuggestor () {
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 5338c974..a1ec2997 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -112,7 +112,7 @@ const UserSettings = {
           ...this.$store.state.instance.customEmoji
         ],
         users: this.$store.state.users.users,
-        updateUsersList: (input) => this.$store.dispatch('searchUsers', input)
+        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
       })
     },
     emojiSuggestor () {
@@ -362,7 +362,7 @@ const UserSettings = {
       })
     },
     queryUserIds (query) {
-      return this.$store.dispatch('searchUsers', query)
+      return this.$store.dispatch('searchUsers', { query })
         .then((users) => map(users, 'id'))
     },
     blockUsers (ids) {
diff --git a/src/modules/users.js b/src/modules/users.js
index 1d1b415c..f377da75 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -428,8 +428,8 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers (store, query) {
-      return store.rootState.api.backendInteractor.searchUsers({ query })
+    searchUsers (store, { query, withRelationships }) {
+      return store.rootState.api.backendInteractor.searchUsers({ query, withRelationships })
         .then((users) => {
           store.commit('addNewUsers', users)
           return users
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 72c8874f..94ff4623 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -324,7 +324,8 @@ const fetchFriends = ({ id, maxId, sinceId, limit = 20, credentials }) => {
   const args = [
     maxId && `max_id=${maxId}`,
     sinceId && `since_id=${sinceId}`,
-    limit && `limit=${limit}`
+    limit && `limit=${limit}`,
+    `with_relationships=true`
   ].filter(_ => _).join('&')
 
   url = url + (args ? '?' + args : '')
@@ -358,7 +359,8 @@ const fetchFollowers = ({ id, maxId, sinceId, limit = 20, credentials }) => {
   const args = [
     maxId && `max_id=${maxId}`,
     sinceId && `since_id=${sinceId}`,
-    limit && `limit=${limit}`
+    limit && `limit=${limit}`,
+    `with_relationships=true`
   ].filter(_ => _).join('&')
 
   url += args ? '?' + args : ''
@@ -935,12 +937,13 @@ const reportUser = ({ credentials, userId, statusIds, comment, forward }) => {
   })
 }
 
-const searchUsers = ({ credentials, query }) => {
+const searchUsers = ({ credentials, query, withRelationships }) => {
   return promisedRequest({
     url: MASTODON_USER_SEARCH_URL,
     params: {
       q: query,
-      resolve: true
+      resolve: true,
+      with_relationships: withRelationships
     },
     credentials
   })
@@ -971,6 +974,8 @@ const search2 = ({ credentials, q, resolve, limit, offset, following }) => {
     params.push(['following', true])
   }
 
+  params.push(['with_relationships', true])
+
   let queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
   url += `?${queryString}`
 

From 355281081a044c950ce7d07fa1081149eb4aec0d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 13 May 2020 17:53:43 +0300
Subject: [PATCH 020/415] don't send undefined

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

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 94ff4623..37ccfd6b 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -943,7 +943,7 @@ const searchUsers = ({ credentials, query, withRelationships }) => {
     params: {
       q: query,
       resolve: true,
-      with_relationships: withRelationships
+      with_relationships: !!withRelationships
     },
     credentials
   })

From 9c7cb3a95431bbea44391f79da465f77565a4b49 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 13 May 2020 18:04:30 +0300
Subject: [PATCH 021/415] remove search1 with_relationships

---
 src/modules/users.js            | 4 ++--
 src/services/api/api.service.js | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index f377da75..f9329f2a 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -428,8 +428,8 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers (store, { query, withRelationships }) {
-      return store.rootState.api.backendInteractor.searchUsers({ query, withRelationships })
+    searchUsers (store, { query }) {
+      return store.rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
           store.commit('addNewUsers', users)
           return users
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 37ccfd6b..7f82d2fa 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -937,13 +937,12 @@ const reportUser = ({ credentials, userId, statusIds, comment, forward }) => {
   })
 }
 
-const searchUsers = ({ credentials, query, withRelationships }) => {
+const searchUsers = ({ credentials, query }) => {
   return promisedRequest({
     url: MASTODON_USER_SEARCH_URL,
     params: {
       q: query,
-      resolve: true,
-      with_relationships: !!withRelationships
+      resolve: true
     },
     credentials
   })

From fa403bbcbdd82770ff41d31295938e1f01c12604 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Wed, 13 May 2020 16:42:17 +0000
Subject: [PATCH 022/415] Translated using Weblate (Russian)

Currently translated at 54.4% (334 of 613 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index afaba444..22125853 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -56,7 +56,7 @@
         "load_older": "Загрузить старые взаимодействия"
     },
     "post_status": {
-        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков",
+        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков.",
         "account_not_locked_warning_link": "залочен",
         "attachments_sensitive": "Вложения содержат чувствительный контент",
         "content_warning": "Тема (не обязательно)",
@@ -129,10 +129,10 @@
         "cRed": "Отменить",
         "change_email": "Сменить email",
         "change_email_error": "Произошла ошибка при попытке изменить email.",
-        "changed_email": "Email изменён успешно.",
+        "changed_email": "Email изменён успешно!",
         "change_password": "Сменить пароль",
         "change_password_error": "Произошла ошибка при попытке изменить пароль.",
-        "changed_password": "Пароль изменён успешно.",
+        "changed_password": "Пароль изменён успешно!",
         "collapse_subject": "Сворачивать посты с темой",
         "confirm_new_password": "Подтверждение нового пароля",
         "current_avatar": "Текущий аватар",
@@ -150,7 +150,7 @@
         "follow_export_button": "Экспортировать читаемых в файл .csv",
         "follow_export_processing": "Ведётся обработка, скоро вам будет предложено загрузить файл",
         "follow_import": "Импортировать читаемых",
-        "follow_import_error": "Ошибка при импортировании читаемых.",
+        "follow_import_error": "Ошибка при импортировании читаемых",
         "follows_imported": "Список читаемых импортирован. Обработка займёт некоторое время..",
         "foreground": "Передний план",
         "general": "Общие",
@@ -224,7 +224,7 @@
         "text": "Текст",
         "theme": "Тема",
         "theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",
-        "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения",
+        "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения.",
         "theme_help_v2_2": "Под некоторыми полями ввода это идикаторы контрастности, наведите на них мышью чтобы узнать больше. Приспользовании прозрачности контраст расчитывается для наихудшего варианта.",
         "tooltipRadius": "Всплывающие подсказки/уведомления",
         "user_settings": "Настройки пользователя",
@@ -292,9 +292,9 @@
                 "inset": "Внутренняя",
                 "hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
                 "filter_hint": {
-                    "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это",
-                    "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}",
-                    "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете",
+                    "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это.",
+                    "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}.",
+                    "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете.",
                     "spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
                     "inset_classic": "Внутренние тени будут использовать {0}"
                 },

From 1a944efa33b00842f3f9d3fb01323b0d143903cf Mon Sep 17 00:00:00 2001
From: hj <spam@hjkos.com>
Date: Wed, 13 May 2020 16:48:47 +0000
Subject: [PATCH 023/415] Translated using Weblate (Russian)

Currently translated at 54.4% (334 of 613 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 22125853..e6fab7e8 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -416,7 +416,11 @@
             "federation": "Федерация",
             "simple": {
                 "accept_desc": ""
+            },
+            "keyword": {
+                "ftl_removal": "Убраны из федеративной ленты"
             }
-        }
+        },
+        "staff": "Администрация"
     }
 }

From 625d9b73208a614a20d3b9e05378fadf5b41f232 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@airmail.cc>
Date: Wed, 13 May 2020 17:14:53 +0000
Subject: [PATCH 024/415] Translated using Weblate (Russian)

Currently translated at 54.4% (334 of 613 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index e6fab7e8..a34c2e3f 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -418,7 +418,9 @@
                 "accept_desc": ""
             },
             "keyword": {
-                "ftl_removal": "Убраны из федеративной ленты"
+                "ftl_removal": "Убраны из федеративной ленты",
+                "reject": "Отклонить",
+                "keyword_policies": "Действия на ключевые слова"
             }
         },
         "staff": "Администрация"

From 433d64827d6c1cb0c8110f091bce08d71dd5719c Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 13 May 2020 17:40:57 +0000
Subject: [PATCH 025/415] Translated using Weblate (Italian)

Currently translated at 27.5% (169 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index f441292e..3a49d96f 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -1,206 +1,211 @@
 {
-  "general": {
-    "submit": "Invia",
-    "apply": "Applica"
-  },
-  "nav": {
-    "mentions": "Menzioni",
-    "public_tl": "Sequenza temporale pubblica",
-    "timeline": "Sequenza temporale",
-    "twkn": "L'intera rete conosciuta",
-    "chat": "Chat Locale",
-    "friend_requests": "Richieste di Seguirti"
-  },
-  "notifications": {
-    "followed_you": "ti segue",
-    "notifications": "Notifiche",
-    "read": "Leggi!",
-    "broken_favorite": "Stato sconosciuto, lo sto cercando...",
-    "favorited_you": "ha messo mi piace al tuo stato",
-    "load_older": "Carica notifiche più vecchie",
-    "repeated_you": "ha condiviso il tuo stato"
-  },
-  "settings": {
-    "attachments": "Allegati",
-    "autoload": "Abilita caricamento automatico quando si raggiunge fondo pagina",
-    "avatar": "Avatar",
-    "bio": "Introduzione",
-    "current_avatar": "Il tuo avatar attuale",
-    "current_profile_banner": "Il tuo banner attuale",
-    "filtering": "Filtri",
-    "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, uno per linea",
-    "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
-    "hide_attachments_in_tl": "Nascondi gli allegati presenti nella sequenza temporale",
-    "name": "Nome",
-    "name_bio": "Nome & Introduzione",
-    "nsfw_clickthrough": "Abilita il click per visualizzare gli allegati segnati come NSFW",
-    "profile_background": "Sfondo della tua pagina",
-    "profile_banner": "Banner del tuo profilo",
-    "reply_link_preview": "Abilita il link per la risposta al passaggio del mouse",
-    "set_new_avatar": "Scegli un nuovo avatar",
-    "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
-    "set_new_profile_banner": "Scegli un nuovo banner per il tuo profilo",
-    "settings": "Impostazioni",
-    "theme": "Tema",
-    "user_settings": "Impostazioni Utente",
-    "attachmentRadius": "Allegati",
-    "avatarAltRadius": "Avatar (Notifiche)",
-    "avatarRadius": "Avatar",
-    "background": "Sfondo",
-    "btnRadius": "Pulsanti",
-    "cBlue": "Blu (Rispondere, seguire)",
-    "cGreen": "Verde (Condividi)",
-    "cOrange": "Arancio (Mi piace)",
-    "cRed": "Rosso (Annulla)",
-    "change_password": "Cambia Password",
-    "change_password_error": "C'è stato un problema durante il cambiamento della password.",
-    "changed_password": "Password cambiata correttamente!",
-    "collapse_subject": "Riduci post che hanno un oggetto",
-    "confirm_new_password": "Conferma la nuova password",
-    "current_password": "Password attuale",
-    "data_import_export_tab": "Importa / Esporta Dati",
-    "default_vis": "Visibilità predefinita dei post",
-    "delete_account": "Elimina Account",
-    "delete_account_description": "Elimina definitivamente il tuo account e tutti i tuoi messaggi.",
-    "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo account. Se il problema persiste contatta l'amministratore della tua istanza.",
-    "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione dell'account.",
-    "export_theme": "Salva settaggi",
-    "follow_export": "Esporta la lista di chi segui",
-    "follow_export_button": "Esporta la lista di chi segui in un file csv",
-    "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
-    "follow_import": "Importa la lista di chi segui",
-    "follow_import_error": "Errore nell'importazione della lista di chi segui",
-    "follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.",
-    "foreground": "In primo piano",
-    "general": "Generale",
-    "hide_post_stats": "Nascondi statistiche dei post (es. il numero di mi piace)",
-    "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero di chi ti segue)",
-    "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file csv",
-    "import_theme": "Carica settaggi",
-    "inputRadius": "Campi di testo",
-    "instance_default": "(predefinito: {value})",
-    "interfaceLanguage": "Linguaggio dell'interfaccia",
-    "invalid_theme_imported": "Il file selezionato non è un file di tema per Pleroma supportato. Il tuo tema non è stato modificato.",
-    "limited_availability": "Non disponibile nel tuo browser",
-    "links": "Collegamenti",
-    "lock_account_description": "Limita il tuo account solo per contatti approvati",
-    "loop_video": "Riproduci video in ciclo continuo",
-    "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le gif di Mastodon)",
-    "new_password": "Nuova password",
-    "notification_visibility": "Tipi di notifiche da mostrare",
-    "notification_visibility_follows": "Nuove persone ti seguono",
-    "notification_visibility_likes": "Mi piace",
-    "notification_visibility_mentions": "Menzioni",
-    "notification_visibility_repeats": "Condivisioni",
-    "no_rich_text_description": "Togli la formattazione del testo da tutti i post",
-    "oauth_tokens": "Token OAuth",
-    "token": "Token",
-    "refresh_token": "Aggiorna token",
-    "valid_until": "Valido fino a",
-    "revoke_token": "Revocare",
-    "panelRadius": "Pannelli",
-    "pause_on_unfocused": "Metti in pausa l'aggiornamento continuo quando la scheda non è in primo piano",
-    "presets": "Valori predefiniti",
-    "profile_tab": "Profilo",
-    "radii_help": "Imposta l'arrotondamento dei bordi (in pixel)",
-    "replies_in_timeline": "Risposte nella sequenza temporale",
-    "reply_visibility_all": "Mostra tutte le risposte",
-    "reply_visibility_following": "Mostra solo le risposte dirette a me o agli utenti che seguo",
-    "reply_visibility_self": "Mostra solo risposte dirette a me",
-    "saving_err": "Errore nel salvataggio delle impostazioni",
-    "saving_ok": "Impostazioni salvate",
-    "security_tab": "Sicurezza",
-    "stop_gifs": "Riproduci GIF al passaggio del cursore del mouse",
-    "streaming": "Abilita aggiornamento automatico dei nuovi post quando si è in alto alla pagina",
-    "text": "Testo",
-    "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
-    "tooltipRadius": "Descrizioni/avvisi",
-    "values": {
-      "false": "no",
-      "true": "si"
-    }
-  },
-  "timeline": {
-    "error_fetching": "Errore nel prelievo aggiornamenti",
-    "load_older": "Carica messaggi più vecchi",
-    "show_new": "Mostra nuovi",
-    "up_to_date": "Aggiornato",
-    "collapse": "Riduci",
-    "conversation": "Conversazione",
-    "no_retweet_hint": "La visibilità del post è impostata solo per chi ti segue o messaggio diretto e non può essere condiviso",
-    "repeated": "condiviso"
-  },
-  "user_card": {
-    "follow": "Segui",
-    "followees": "Chi stai seguendo",
-    "followers": "Chi ti segue",
-    "following": "Lo stai seguendo!",
-    "follows_you": "Ti segue!",
-    "mute": "Silenzia",
-    "muted": "Silenziato",
-    "per_day": "al giorno",
-    "statuses": "Messaggi",
-    "approve": "Approva",
-    "block": "Blocca",
-    "blocked": "Bloccato!",
-    "deny": "Nega",
-    "remote_follow": "Segui da remoto"
-  },
-  "chat": {
-    "title": "Chat"
-  },
-  "features_panel": {
-    "chat": "Chat",
-    "gopher": "Gopher",
-    "media_proxy": "Media proxy",
-    "scope_options": "Opzioni di visibilità",
-    "text_limit": "Lunghezza limite",
-    "title": "Caratteristiche",
-    "who_to_follow": "Chi seguire"
-  },
-  "finder": {
-    "error_fetching_user": "Errore nel recupero dell'utente",
-    "find_user": "Trova utente"
-  },
-  "login": {
-    "login": "Accedi",
-    "logout": "Disconnettiti",
-    "password": "Password",
-    "placeholder": "es. lain",
-    "register": "Registrati",
-    "username": "Nome utente"
-  },
-  "post_status": {
-    "account_not_locked_warning": "Il tuo account non è {0}. Chiunque può seguirti e vedere i tuoi post riservati a chi ti segue.",
-    "account_not_locked_warning_link": "bloccato",
-    "attachments_sensitive": "Segna allegati come sensibili",
-    "content_type": {
-      "text/plain": "Testo normale"
+    "general": {
+        "submit": "Invia",
+        "apply": "Applica"
     },
-    "content_warning": "Oggetto (facoltativo)",
-    "default": "Appena atterrato in L.A.",
-    "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
-    "posting": "Pubblica",
-    "scope": {
-      "direct": "Diretto - Pubblicato solo per gli utenti menzionati",
-      "private": "Solo per chi ti segue - Visibile solo da chi ti segue",
-      "public": "Pubblico - Visibile sulla sequenza temporale pubblica",
-      "unlisted": "Non elencato - Non visibile sulla sequenza temporale pubblica"
+    "nav": {
+        "mentions": "Menzioni",
+        "public_tl": "Sequenza temporale pubblica",
+        "timeline": "Sequenza temporale",
+        "twkn": "L'intera rete conosciuta",
+        "chat": "Chat Locale",
+        "friend_requests": "Richieste di Seguirti"
+    },
+    "notifications": {
+        "followed_you": "ti segue",
+        "notifications": "Notifiche",
+        "read": "Leggi!",
+        "broken_favorite": "Stato sconosciuto, lo sto cercando...",
+        "favorited_you": "ha messo mi piace al tuo stato",
+        "load_older": "Carica notifiche più vecchie",
+        "repeated_you": "ha condiviso il tuo stato"
+    },
+    "settings": {
+        "attachments": "Allegati",
+        "autoload": "Abilita caricamento automatico quando si raggiunge fondo pagina",
+        "avatar": "Avatar",
+        "bio": "Introduzione",
+        "current_avatar": "Il tuo avatar attuale",
+        "current_profile_banner": "Il tuo banner attuale",
+        "filtering": "Filtri",
+        "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, uno per linea",
+        "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
+        "hide_attachments_in_tl": "Nascondi gli allegati presenti nella sequenza temporale",
+        "name": "Nome",
+        "name_bio": "Nome & Introduzione",
+        "nsfw_clickthrough": "Abilita il click per visualizzare gli allegati segnati come NSFW",
+        "profile_background": "Sfondo della tua pagina",
+        "profile_banner": "Banner del tuo profilo",
+        "reply_link_preview": "Abilita il link per la risposta al passaggio del mouse",
+        "set_new_avatar": "Scegli un nuovo avatar",
+        "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
+        "set_new_profile_banner": "Scegli un nuovo banner per il tuo profilo",
+        "settings": "Impostazioni",
+        "theme": "Tema",
+        "user_settings": "Impostazioni Utente",
+        "attachmentRadius": "Allegati",
+        "avatarAltRadius": "Avatar (Notifiche)",
+        "avatarRadius": "Avatar",
+        "background": "Sfondo",
+        "btnRadius": "Pulsanti",
+        "cBlue": "Blu (Rispondere, seguire)",
+        "cGreen": "Verde (Condividi)",
+        "cOrange": "Arancio (Mi piace)",
+        "cRed": "Rosso (Annulla)",
+        "change_password": "Cambia Password",
+        "change_password_error": "C'è stato un problema durante il cambiamento della password.",
+        "changed_password": "Password cambiata correttamente!",
+        "collapse_subject": "Riduci post che hanno un oggetto",
+        "confirm_new_password": "Conferma la nuova password",
+        "current_password": "Password attuale",
+        "data_import_export_tab": "Importa / Esporta Dati",
+        "default_vis": "Visibilità predefinita dei post",
+        "delete_account": "Elimina Account",
+        "delete_account_description": "Elimina definitivamente il tuo account e tutti i tuoi messaggi.",
+        "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo account. Se il problema persiste contatta l'amministratore della tua istanza.",
+        "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione dell'account.",
+        "export_theme": "Salva settaggi",
+        "follow_export": "Esporta la lista di chi segui",
+        "follow_export_button": "Esporta la lista di chi segui in un file csv",
+        "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
+        "follow_import": "Importa la lista di chi segui",
+        "follow_import_error": "Errore nell'importazione della lista di chi segui",
+        "follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.",
+        "foreground": "In primo piano",
+        "general": "Generale",
+        "hide_post_stats": "Nascondi statistiche dei post (es. il numero di mi piace)",
+        "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero di chi ti segue)",
+        "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file csv",
+        "import_theme": "Carica settaggi",
+        "inputRadius": "Campi di testo",
+        "instance_default": "(predefinito: {value})",
+        "interfaceLanguage": "Linguaggio dell'interfaccia",
+        "invalid_theme_imported": "Il file selezionato non è un file di tema per Pleroma supportato. Il tuo tema non è stato modificato.",
+        "limited_availability": "Non disponibile nel tuo browser",
+        "links": "Collegamenti",
+        "lock_account_description": "Limita il tuo account solo per contatti approvati",
+        "loop_video": "Riproduci video in ciclo continuo",
+        "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le gif di Mastodon)",
+        "new_password": "Nuova password",
+        "notification_visibility": "Tipi di notifiche da mostrare",
+        "notification_visibility_follows": "Nuove persone ti seguono",
+        "notification_visibility_likes": "Mi piace",
+        "notification_visibility_mentions": "Menzioni",
+        "notification_visibility_repeats": "Condivisioni",
+        "no_rich_text_description": "Togli la formattazione del testo da tutti i post",
+        "oauth_tokens": "Token OAuth",
+        "token": "Token",
+        "refresh_token": "Aggiorna token",
+        "valid_until": "Valido fino a",
+        "revoke_token": "Revocare",
+        "panelRadius": "Pannelli",
+        "pause_on_unfocused": "Metti in pausa l'aggiornamento continuo quando la scheda non è in primo piano",
+        "presets": "Valori predefiniti",
+        "profile_tab": "Profilo",
+        "radii_help": "Imposta l'arrotondamento dei bordi (in pixel)",
+        "replies_in_timeline": "Risposte nella sequenza temporale",
+        "reply_visibility_all": "Mostra tutte le risposte",
+        "reply_visibility_following": "Mostra solo le risposte dirette a me o agli utenti che seguo",
+        "reply_visibility_self": "Mostra solo risposte dirette a me",
+        "saving_err": "Errore nel salvataggio delle impostazioni",
+        "saving_ok": "Impostazioni salvate",
+        "security_tab": "Sicurezza",
+        "stop_gifs": "Riproduci GIF al passaggio del cursore del mouse",
+        "streaming": "Abilita aggiornamento automatico dei nuovi post quando si è in alto alla pagina",
+        "text": "Testo",
+        "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
+        "tooltipRadius": "Descrizioni/avvisi",
+        "values": {
+            "false": "no",
+            "true": "si"
+        }
+    },
+    "timeline": {
+        "error_fetching": "Errore nel prelievo aggiornamenti",
+        "load_older": "Carica messaggi più vecchi",
+        "show_new": "Mostra nuovi",
+        "up_to_date": "Aggiornato",
+        "collapse": "Riduci",
+        "conversation": "Conversazione",
+        "no_retweet_hint": "La visibilità del post è impostata solo per chi ti segue o messaggio diretto e non può essere condiviso",
+        "repeated": "condiviso"
+    },
+    "user_card": {
+        "follow": "Segui",
+        "followees": "Chi stai seguendo",
+        "followers": "Chi ti segue",
+        "following": "Lo stai seguendo!",
+        "follows_you": "Ti segue!",
+        "mute": "Silenzia",
+        "muted": "Silenziato",
+        "per_day": "al giorno",
+        "statuses": "Messaggi",
+        "approve": "Approva",
+        "block": "Blocca",
+        "blocked": "Bloccato!",
+        "deny": "Nega",
+        "remote_follow": "Segui da remoto"
+    },
+    "chat": {
+        "title": "Chat"
+    },
+    "features_panel": {
+        "chat": "Chat",
+        "gopher": "Gopher",
+        "media_proxy": "Media proxy",
+        "scope_options": "Opzioni di visibilità",
+        "text_limit": "Lunghezza limite",
+        "title": "Caratteristiche",
+        "who_to_follow": "Chi seguire"
+    },
+    "finder": {
+        "error_fetching_user": "Errore nel recupero dell'utente",
+        "find_user": "Trova utente"
+    },
+    "login": {
+        "login": "Accedi",
+        "logout": "Disconnettiti",
+        "password": "Password",
+        "placeholder": "es. lain",
+        "register": "Registrati",
+        "username": "Nome utente"
+    },
+    "post_status": {
+        "account_not_locked_warning": "Il tuo account non è {0}. Chiunque può seguirti e vedere i tuoi post riservati a chi ti segue.",
+        "account_not_locked_warning_link": "bloccato",
+        "attachments_sensitive": "Segna allegati come sensibili",
+        "content_type": {
+            "text/plain": "Testo normale"
+        },
+        "content_warning": "Oggetto (facoltativo)",
+        "default": "Appena atterrato in L.A.",
+        "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
+        "posting": "Pubblica",
+        "scope": {
+            "direct": "Diretto - Pubblicato solo per gli utenti menzionati",
+            "private": "Solo per chi ti segue - Visibile solo da chi ti segue",
+            "public": "Pubblico - Visibile sulla sequenza temporale pubblica",
+            "unlisted": "Non elencato - Non visibile sulla sequenza temporale pubblica"
+        }
+    },
+    "registration": {
+        "bio": "Introduzione",
+        "email": "Email",
+        "fullname": "Nome visualizzato",
+        "password_confirm": "Conferma password",
+        "registration": "Registrazione",
+        "token": "Codice d'invito"
+    },
+    "user_profile": {
+        "timeline_title": "Sequenza Temporale dell'Utente"
+    },
+    "who_to_follow": {
+        "more": "Più",
+        "who_to_follow": "Chi seguire"
+    },
+    "about": {
+        "mrf": {
+            "federation": "Federazione"
+        }
     }
-  },
-  "registration": {
-    "bio": "Introduzione",
-    "email": "Email",
-    "fullname": "Nome visualizzato",
-    "password_confirm": "Conferma password",
-    "registration": "Registrazione",
-    "token": "Codice d'invito"
-  },
-  "user_profile": {
-    "timeline_title": "Sequenza Temporale dell'Utente"
-  },
-  "who_to_follow": {
-    "more": "Più",
-    "who_to_follow": "Chi seguire"
-  }
 }

From c360a2384578b15664bc461dddb1a193d5e0b09f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 13 May 2020 16:47:13 +0000
Subject: [PATCH 026/415] Translated using Weblate (Finnish)

Currently translated at 78.7% (483 of 613 strings)

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

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 926e6087..386578fb 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -1,344 +1,589 @@
 {
-  "chat": {
-    "title": "Chat"
-  },
-  "features_panel": {
-    "chat": "Chat",
-    "gopher": "Gopher",
-    "media_proxy": "Media-välityspalvelin",
-    "scope_options": "Näkyvyyden rajaus",
-    "text_limit": "Tekstin pituusraja",
-    "title": "Ominaisuudet",
-    "who_to_follow": "Seurausehdotukset"
-  },
-  "finder": {
-    "error_fetching_user": "Virhe hakiessa käyttäjää",
-    "find_user": "Hae käyttäjä"
-  },
-  "general": {
-    "apply": "Aseta",
-    "submit": "Lähetä",
-    "more": "Lisää",
-    "generic_error": "Virhe tapahtui"
-  },
-  "login": {
-    "login": "Kirjaudu sisään",
-    "description": "Kirjaudu sisään OAuthilla",
-    "logout": "Kirjaudu ulos",
-    "password": "Salasana",
-    "placeholder": "esim. Seppo",
-    "register": "Rekisteröidy",
-    "username": "Käyttäjänimi"
-  },
-  "nav": {
-    "about": "Tietoja",
-    "back": "Takaisin",
-    "chat": "Paikallinen Chat",
-    "friend_requests": "Seurauspyynnöt",
-    "mentions": "Maininnat",
-    "interactions": "Interaktiot",
-    "dms": "Yksityisviestit",
-    "public_tl": "Julkinen Aikajana",
-    "timeline": "Aikajana",
-    "twkn": "Koko Tunnettu Verkosto",
-    "user_search": "Käyttäjähaku",
-    "who_to_follow": "Seurausehdotukset",
-    "preferences": "Asetukset"
-  },
-  "notifications": {
-    "broken_favorite": "Viestiä ei löydetty...",
-    "favorited_you": "tykkäsi viestistäsi",
-    "followed_you": "seuraa sinua",
-    "load_older": "Lataa vanhempia ilmoituksia",
-    "notifications": "Ilmoitukset",
-    "read": "Lue!",
-    "repeated_you": "toisti viestisi",
-    "no_more_notifications": "Ei enempää ilmoituksia",
-    "reacted_with": "lisäsi reaktion {0}"
-  },
-  "polls": {
-    "add_poll": "Lisää äänestys",
-    "add_option": "Lisää vaihtoehto",
-    "option": "Vaihtoehto",
-    "votes": "ääntä",
-    "vote": "Äänestä",
-    "type": "Äänestyksen tyyppi",
-    "single_choice": "Yksi valinta",
-    "multiple_choices": "Monivalinta",
-    "expiry": "Äänestyksen kesto",
-    "expires_in": "Päättyy {0} päästä",
-    "expired": "Päättyi {0} sitten",
-    "not_enough_option": "Liian vähän uniikkeja vaihtoehtoja äänestyksessä"
-  },
-  "interactions": {
-    "favs_repeats": "Toistot ja tykkäykset",
-    "follows": "Uudet seuraukset",
-    "load_older": "Lataa vanhempia interaktioita"
-  },
-  "post_status": {
-    "new_status": "Uusi viesti",
-    "account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
-    "account_not_locked_warning_link": "lukittu",
-    "attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
-    "content_type": {
-      "text/plain": "Tavallinen teksti"
+    "chat": {
+        "title": "Chat"
     },
-    "content_warning": "Aihe (valinnainen)",
-    "default": "Tulin juuri saunasta.",
-    "direct_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
-    "posting": "Lähetetään",
-    "scope": {
-      "direct": "Yksityisviesti - Näkyy vain mainituille käyttäjille",
-      "private": "Vain-seuraajille - Näkyy vain seuraajillesi",
-      "public": "Julkinen - Näkyy julkisilla aikajanoilla",
-      "unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
-    }
-  },
-  "registration": {
-    "bio": "Kuvaus",
-    "email": "Sähköposti",
-    "fullname": "Koko nimi",
-    "password_confirm": "Salasanan vahvistaminen",
-    "registration": "Rekisteröityminen",
-    "token": "Kutsuvaltuus",
-    "captcha": "Varmenne",
-    "new_captcha": "Paina kuvaa saadaksesi uuden varmenteen",
-    "validations": {
-      "username_required": "ei voi olla tyhjä",
-      "fullname_required": "ei voi olla tyhjä",
-      "email_required": "ei voi olla tyhjä",
-      "password_required": "ei voi olla tyhjä",
-      "password_confirmation_required": "ei voi olla tyhjä",
-      "password_confirmation_match": "pitää vastata salasanaa"
-    }
-  },
-  "settings": {
-    "attachmentRadius": "Liitteet",
-    "attachments": "Liitteet",
-    "autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
-    "avatar": "Profiilikuva",
-    "avatarAltRadius": "Profiilikuvat (ilmoitukset)",
-    "avatarRadius": "Profiilikuvat",
-    "background": "Tausta",
-    "bio": "Kuvaus",
-    "btnRadius": "Napit",
-    "cBlue": "Sininen (Vastaukset, seuraukset)",
-    "cGreen": "Vihreä (Toistot)",
-    "cOrange": "Oranssi (Tykkäykset)",
-    "cRed": "Punainen (Peruminen)",
-    "change_password": "Vaihda salasana",
-    "change_password_error": "Virhe vaihtaessa salasanaa.",
-    "changed_password": "Salasana vaihdettu!",
-    "collapse_subject": "Minimoi viestit, joille on asetettu aihe",
-    "composing": "Viestien laatiminen",
-    "confirm_new_password": "Vahvista uusi salasana",
-    "current_avatar": "Nykyinen profiilikuvasi",
-    "current_password": "Nykyinen salasana",
-    "current_profile_banner": "Nykyinen julisteesi",
-    "data_import_export_tab": "Tietojen tuonti / vienti",
-    "default_vis": "Oletusnäkyvyysrajaus",
-    "delete_account": "Poista tili",
-    "delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
-    "delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
-    "delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
-    "emoji_reactions_on_timeline": "Näytä emojireaktiot aikajanalla",
-    "export_theme": "Tallenna teema",
-    "filtering": "Suodatus",
-    "filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.",
-    "follow_export": "Seurausten vienti",
-    "follow_export_button": "Vie seurauksesi CSV-tiedostoon",
-    "follow_export_processing": "Käsitellään, sinua pyydetään lataamaan tiedosto hetken päästä",
-    "follow_import": "Seurausten tuonti",
-    "follow_import_error": "Virhe tuodessa seuraksia",
-    "follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
-    "foreground": "Korostus",
-    "general": "Yleinen",
-    "hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
-    "hide_attachments_in_tl": "Piilota liitteet aikajanalla",
-    "max_thumbnails": "Suurin sallittu määrä liitteitä esikatselussa",
-    "hide_isp": "Piilota palvelimenkohtainen ruutu",
-    "preload_images": "Esilataa kuvat",
-    "use_one_click_nsfw": "Avaa NSFW-liitteet yhdellä painalluksella",
-    "hide_post_stats": "Piilota viestien statistiikka (esim. tykkäysten määrä)",
-    "hide_user_stats": "Piilota käyttäjien statistiikka (esim. seuraajien määrä)",
-    "import_followers_from_a_csv_file": "Tuo seuraukset CSV-tiedostosta",
-    "import_theme": "Tuo tallennettu teema",
-    "inputRadius": "Syöttökentät",
-    "checkboxRadius": "Valintalaatikot",
-    "instance_default": "(oletus: {value})",
-    "instance_default_simple": "(oletus)",
-    "interface": "Käyttöliittymä",
-    "interfaceLanguage": "Käyttöliittymän kieli",
-    "invalid_theme_imported": "Tuotu tallennettu teema on epäkelpo, muutoksia ei tehty nykyiseen teemaasi.",
-    "limited_availability": "Ei saatavilla selaimessasi",
-    "links": "Linkit",
-    "lock_account_description": "Vain erikseen hyväksytyt käyttäjät voivat seurata tiliäsi",
-    "loop_video": "Uudelleentoista videot",
-    "loop_video_silent_only": "Uudelleentoista ainoastaan äänettömät videot (Video-\"giffit\")",
-    "play_videos_in_modal": "Toista videot modaalissa",
-    "use_contain_fit": "Älä rajaa liitteitä esikatselussa",
-    "name": "Nimi",
-    "name_bio": "Nimi ja kuvaus",
-    "new_password": "Uusi salasana",
-    "notification_visibility": "Ilmoitusten näkyvyys",
-    "notification_visibility_follows": "Seuraukset",
-    "notification_visibility_likes": "Tykkäykset",
-    "notification_visibility_mentions": "Maininnat",
-    "notification_visibility_repeats": "Toistot",
-    "notification_visibility_emoji_reactions": "Reaktiot",
-    "no_rich_text_description": "Älä näytä tekstin muotoilua.",
-    "hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
-    "nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
-    "oauth_tokens": "OAuth-merkit",
-    "token": "Token",
-    "refresh_token": "Päivitä token",
-    "valid_until": "Voimassa asti",
-    "revoke_token": "Peruuttaa",
-    "panelRadius": "Ruudut",
-    "pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
-    "presets": "Valmiit teemat",
-    "profile_background": "Taustakuva",
-    "profile_banner": "Juliste",
-    "profile_tab": "Profiili",
-    "radii_help": "Aseta reunojen pyöristys (pikseleinä)",
-    "replies_in_timeline": "Keskustelut aikajanalla",
-    "reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
-    "reply_visibility_all": "Näytä kaikki vastaukset",
-    "reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
-    "reply_visibility_self": "Näytä vain vastaukset minulle",
-    "saving_err": "Virhe tallentaessa asetuksia",
-    "saving_ok": "Asetukset tallennettu",
-    "security_tab": "Tietoturva",
-    "scope_copy": "Kopioi näkyvyysrajaus vastatessa (Yksityisviestit aina kopioivat)",
-    "set_new_avatar": "Aseta uusi profiilikuva",
-    "set_new_profile_background": "Aseta uusi taustakuva",
-    "set_new_profile_banner": "Aseta uusi juliste",
-    "settings": "Asetukset",
-    "subject_input_always_show": "Näytä aihe-kenttä",
-    "subject_line_behavior": "Aihe-kentän kopiointi",
-    "subject_line_email": "Kuten sähköposti: \"re: aihe\"",
-    "subject_line_mastodon": "Kopioi sellaisenaan",
-    "subject_line_noop": "Älä kopioi",
-    "stop_gifs": "Toista giffit vain kohdistaessa",
-    "streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla",
-    "text": "Teksti",
-    "theme": "Teema",
-    "theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.",
-    "theme_help_v2_1": "Voit asettaa tiettyjen osien värin tai läpinäkyvyyden täyttämällä valintalaatikon, käytä \"Tyhjennä kaikki\"-nappia tyhjentääksesi kaiken.",
-    "theme_help_v2_2": "Ikonit kenttien alla ovat kontrasti-indikaattoreita, lisätietoa kohdistamalla. Käyttäessä läpinäkyvyyttä ne näyttävät pahimman skenaarion.",
-    "tooltipRadius": "Ohje- tai huomioviestit",
-    "user_settings": "Käyttäjän asetukset",
-    "values": {
-      "false": "pois päältä",
-      "true": "päällä"
-    }
-  },
-  "time": {
-    "day": "{0} päivä",
-    "days": "{0} päivää",
-    "day_short": "{0}pv",
-    "days_short": "{0}pv",
-    "hour": "{0} tunti",
-    "hours": "{0} tuntia",
-    "hour_short": "{0}t",
-    "hours_short": "{0}t",
-    "in_future": "{0} tulevaisuudessa",
-    "in_past": "{0} sitten",
-    "minute": "{0} minuutti",
-    "minutes": "{0} minuuttia",
-    "minute_short": "{0}min",
-    "minutes_short": "{0}min",
-    "month": "{0} kuukausi",
-    "months": "{0} kuukautta",
-    "month_short": "{0}kk",
-    "months_short": "{0}kk",
-    "now": "nyt",
-    "now_short": "juuri nyt",
-    "second": "{0} sekunti",
-    "seconds": "{0} sekuntia",
-    "second_short": "{0}s",
-    "seconds_short": "{0}s",
-    "week": "{0} viikko",
-    "weeks": "{0} viikkoa",
-    "week_short": "{0}vk",
-    "weeks_short": "{0}vk",
-    "year": "{0} vuosi",
-    "years": "{0} vuotta",
-    "year_short": "{0}v",
-    "years_short": "{0}v"
-  },
-  "timeline": {
-    "collapse": "Sulje",
-    "conversation": "Keskustelu",
-    "error_fetching": "Virhe ladatessa viestejä",
-    "load_older": "Lataa vanhempia viestejä",
-    "no_retweet_hint": "Viesti ei ole julkinen, eikä sitä voi toistaa",
-    "repeated": "toisti",
-    "show_new": "Näytä uudet",
-    "up_to_date": "Ajantasalla",
-    "no_more_statuses": "Ei enempää viestejä"
-  },
-  "status": {
-    "favorites": "Tykkäykset",
-    "repeats": "Toistot",
-    "delete": "Poista",
-    "pin": "Kiinnitä profiiliisi",
-    "unpin": "Poista kiinnitys",
-    "pinned": "Kiinnitetty",
-    "delete_confirm": "Haluatko varmasti postaa viestin?",
-    "reply_to": "Vastaus",
-    "replies_list": "Vastaukset:",
-    "mute_conversation": "Hiljennä keskustelu",
-    "unmute_conversation": "Poista hiljennys",
-    "status_unavailable": "Viesti ei saatavissa"
-  },
-  "user_card": {
-    "approve": "Hyväksy",
-    "block": "Estä",
-    "blocked": "Estetty!",
-    "deny": "Älä hyväksy",
-    "follow": "Seuraa",
-    "follow_sent": "Pyyntö lähetetty!",
-    "follow_progress": "Pyydetään...",
-    "follow_again": "Lähetä pyyntö uudestaan",
-    "follow_unfollow": "Älä seuraa",
-    "followees": "Seuraa",
-    "followers": "Seuraajat",
-    "following": "Seuraat!",
-    "follows_you": "Seuraa sinua!",
-    "its_you": "Sinun tili!",
-    "mute": "Hiljennä",
-    "muted": "Hiljennetty",
-    "per_day": "päivässä",
-    "remote_follow": "Seuraa muualta",
-    "statuses": "Viestit"
-  },
-  "user_profile": {
-    "timeline_title": "Käyttäjän aikajana"
-  },
-  "who_to_follow": {
-    "more": "Lisää",
-    "who_to_follow": "Seurausehdotukset"
-  },
-  "tool_tip": {
-    "media_upload": "Lataa tiedosto",
-    "repeat": "Toista",
-    "reply": "Vastaa",
-    "favorite": "Tykkää",
-    "user_settings": "Käyttäjäasetukset"
-  },
-  "upload":{
-    "error": {
-      "base": "Lataus epäonnistui.",
-      "file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Yritä uudestaan myöhemmin"
+    "features_panel": {
+        "chat": "Chat",
+        "gopher": "Gopher",
+        "media_proxy": "Media-välityspalvelin",
+        "scope_options": "Näkyvyyden rajaus",
+        "text_limit": "Tekstin pituusraja",
+        "title": "Ominaisuudet",
+        "who_to_follow": "Seurausehdotukset"
     },
-    "file_size_units": {
-      "B": "tavua",
-      "KiB": "kt",
-      "MiB": "Mt",
-      "GiB": "Gt",
-      "TiB": "Tt"
+    "finder": {
+        "error_fetching_user": "Virhe hakiessa käyttäjää",
+        "find_user": "Hae käyttäjä"
+    },
+    "general": {
+        "apply": "Aseta",
+        "submit": "Lähetä",
+        "more": "Lisää",
+        "generic_error": "Virhe tapahtui",
+        "optional": "valinnainen",
+        "show_more": "Näytä lisää",
+        "show_less": "Näytä vähemmän",
+        "dismiss": "Sulje",
+        "cancel": "Peruuta",
+        "disable": "Poista käytöstä",
+        "confirm": "Hyväksy",
+        "verify": "Varmenna",
+        "enable": "Ota käyttöön"
+    },
+    "login": {
+        "login": "Kirjaudu sisään",
+        "description": "Kirjaudu sisään OAuthilla",
+        "logout": "Kirjaudu ulos",
+        "password": "Salasana",
+        "placeholder": "esim. Seppo",
+        "register": "Rekisteröidy",
+        "username": "Käyttäjänimi",
+        "hint": "Kirjaudu sisään liittyäksesi keskusteluun",
+        "authentication_code": "Todennuskoodi",
+        "enter_recovery_code": "Syötä palautuskoodi",
+        "recovery_code": "Palautuskoodi",
+        "heading": {
+            "totp": "Monivaihetodennus",
+            "recovery": "Monivaihepalautus"
+        },
+        "enter_two_factor_code": "Syötä monivaihetodennuskoodi"
+    },
+    "nav": {
+        "about": "Tietoja",
+        "back": "Takaisin",
+        "chat": "Paikallinen Chat",
+        "friend_requests": "Seurauspyynnöt",
+        "mentions": "Maininnat",
+        "interactions": "Interaktiot",
+        "dms": "Yksityisviestit",
+        "public_tl": "Julkinen Aikajana",
+        "timeline": "Aikajana",
+        "twkn": "Koko Tunnettu Verkosto",
+        "user_search": "Käyttäjähaku",
+        "who_to_follow": "Seurausehdotukset",
+        "preferences": "Asetukset",
+        "administration": "Ylläpito",
+        "search": "Haku"
+    },
+    "notifications": {
+        "broken_favorite": "Viestiä ei löydetty...",
+        "favorited_you": "tykkäsi viestistäsi",
+        "followed_you": "seuraa sinua",
+        "load_older": "Lataa vanhempia ilmoituksia",
+        "notifications": "Ilmoitukset",
+        "read": "Lue!",
+        "repeated_you": "toisti viestisi",
+        "no_more_notifications": "Ei enempää ilmoituksia",
+        "reacted_with": "lisäsi reaktion {0}",
+        "migrated_to": "siirtyi sivulle",
+        "follow_request": "haluaa seurata sinua"
+    },
+    "polls": {
+        "add_poll": "Lisää äänestys",
+        "add_option": "Lisää vaihtoehto",
+        "option": "Vaihtoehto",
+        "votes": "ääntä",
+        "vote": "Äänestä",
+        "type": "Äänestyksen tyyppi",
+        "single_choice": "Yksi valinta",
+        "multiple_choices": "Monivalinta",
+        "expiry": "Äänestyksen kesto",
+        "expires_in": "Päättyy {0} päästä",
+        "expired": "Päättyi {0} sitten",
+        "not_enough_option": "Liian vähän uniikkeja vaihtoehtoja äänestyksessä",
+        "not_enough_options": "Liian vähän ainutkertaisia vaihtoehtoja"
+    },
+    "interactions": {
+        "favs_repeats": "Toistot ja tykkäykset",
+        "follows": "Uudet seuraukset",
+        "load_older": "Lataa vanhempia interaktioita",
+        "moves": "Käyttäjien siirtymiset"
+    },
+    "post_status": {
+        "new_status": "Uusi viesti",
+        "account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
+        "account_not_locked_warning_link": "lukittu",
+        "attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
+        "content_type": {
+            "text/plain": "Tavallinen teksti",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
+        },
+        "content_warning": "Aihe (valinnainen)",
+        "default": "Tulin juuri saunasta.",
+        "direct_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
+        "posting": "Lähetetään",
+        "scope": {
+            "direct": "Yksityisviesti - Näkyy vain mainituille käyttäjille",
+            "private": "Vain-seuraajille - Näkyy vain seuraajillesi",
+            "public": "Julkinen - Näkyy julkisilla aikajanoilla",
+            "unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
+        },
+        "direct_warning_to_all": "Tämä viesti näkyy vain viestissä mainituille käyttäjille.",
+        "direct_warning_to_first_only": "Tämä viesti näkyy vain viestin alussa mainituille käyttäjille.",
+        "scope_notice": {
+            "public": "Tämä viesti näkyy kaikille",
+            "private": "Tämä viesti näkyy vain sinun seuraajillesi",
+            "unlisted": "Tämä viesti ei näy Julkisella Aikajanalla tai Koko Tunnettu Verkosto -aikajanalla"
+        }
+    },
+    "registration": {
+        "bio": "Kuvaus",
+        "email": "Sähköposti",
+        "fullname": "Koko nimi",
+        "password_confirm": "Salasanan vahvistaminen",
+        "registration": "Rekisteröityminen",
+        "token": "Kutsuvaltuus",
+        "captcha": "Varmenne",
+        "new_captcha": "Paina kuvaa saadaksesi uuden varmenteen",
+        "validations": {
+            "username_required": "ei voi olla tyhjä",
+            "fullname_required": "ei voi olla tyhjä",
+            "email_required": "ei voi olla tyhjä",
+            "password_required": "ei voi olla tyhjä",
+            "password_confirmation_required": "ei voi olla tyhjä",
+            "password_confirmation_match": "pitää vastata salasanaa"
+        },
+        "username_placeholder": "esim. peke",
+        "fullname_placeholder": "esim. Pekka Postaaja",
+        "bio_placeholder": "esim.\nHei, olen Pekka.\nOlen esimerkkikäyttäjä tässä verkostossa."
+    },
+    "settings": {
+        "attachmentRadius": "Liitteet",
+        "attachments": "Liitteet",
+        "autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
+        "avatar": "Profiilikuva",
+        "avatarAltRadius": "Profiilikuvat (ilmoitukset)",
+        "avatarRadius": "Profiilikuvat",
+        "background": "Tausta",
+        "bio": "Kuvaus",
+        "btnRadius": "Napit",
+        "cBlue": "Sininen (Vastaukset, seuraukset)",
+        "cGreen": "Vihreä (Toistot)",
+        "cOrange": "Oranssi (Tykkäykset)",
+        "cRed": "Punainen (Peruminen)",
+        "change_password": "Vaihda salasana",
+        "change_password_error": "Virhe vaihtaessa salasanaa.",
+        "changed_password": "Salasana vaihdettu!",
+        "collapse_subject": "Minimoi viestit, joille on asetettu aihe",
+        "composing": "Viestien laatiminen",
+        "confirm_new_password": "Vahvista uusi salasana",
+        "current_avatar": "Nykyinen profiilikuvasi",
+        "current_password": "Nykyinen salasana",
+        "current_profile_banner": "Nykyinen julisteesi",
+        "data_import_export_tab": "Tietojen tuonti / vienti",
+        "default_vis": "Oletusnäkyvyysrajaus",
+        "delete_account": "Poista tili",
+        "delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
+        "delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
+        "delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
+        "emoji_reactions_on_timeline": "Näytä emojireaktiot aikajanalla",
+        "export_theme": "Tallenna teema",
+        "filtering": "Suodatus",
+        "filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.",
+        "follow_export": "Seurausten vienti",
+        "follow_export_button": "Vie seurauksesi CSV-tiedostoon",
+        "follow_export_processing": "Käsitellään, sinua pyydetään lataamaan tiedosto hetken päästä",
+        "follow_import": "Seurausten tuonti",
+        "follow_import_error": "Virhe tuodessa seuraksia",
+        "follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
+        "foreground": "Etuala",
+        "general": "Yleinen",
+        "hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
+        "hide_attachments_in_tl": "Piilota liitteet aikajanalla",
+        "max_thumbnails": "Suurin sallittu määrä liitteitä esikatselussa",
+        "hide_isp": "Piilota palvelimenkohtainen ruutu",
+        "preload_images": "Esilataa kuvat",
+        "use_one_click_nsfw": "Avaa NSFW-liitteet yhdellä painalluksella",
+        "hide_post_stats": "Piilota viestien statistiikka (esim. tykkäysten määrä)",
+        "hide_user_stats": "Piilota käyttäjien statistiikka (esim. seuraajien määrä)",
+        "import_followers_from_a_csv_file": "Tuo seuraukset CSV-tiedostosta",
+        "import_theme": "Tuo tallennettu teema",
+        "inputRadius": "Syöttökentät",
+        "checkboxRadius": "Valintalaatikot",
+        "instance_default": "(oletus: {value})",
+        "instance_default_simple": "(oletus)",
+        "interface": "Käyttöliittymä",
+        "interfaceLanguage": "Käyttöliittymän kieli",
+        "invalid_theme_imported": "Tuotu tallennettu teema on epäkelpo, muutoksia ei tehty nykyiseen teemaasi.",
+        "limited_availability": "Ei saatavilla selaimessasi",
+        "links": "Linkit",
+        "lock_account_description": "Vain erikseen hyväksytyt käyttäjät voivat seurata tiliäsi",
+        "loop_video": "Uudelleentoista videot",
+        "loop_video_silent_only": "Uudelleentoista ainoastaan äänettömät videot (Video-\"giffit\")",
+        "play_videos_in_modal": "Toista videot modaalissa",
+        "use_contain_fit": "Älä rajaa liitteitä esikatselussa",
+        "name": "Nimi",
+        "name_bio": "Nimi ja kuvaus",
+        "new_password": "Uusi salasana",
+        "notification_visibility": "Ilmoitusten näkyvyys",
+        "notification_visibility_follows": "Seuraukset",
+        "notification_visibility_likes": "Tykkäykset",
+        "notification_visibility_mentions": "Maininnat",
+        "notification_visibility_repeats": "Toistot",
+        "notification_visibility_emoji_reactions": "Reaktiot",
+        "no_rich_text_description": "Älä näytä tekstin muotoilua",
+        "hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
+        "nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
+        "oauth_tokens": "OAuth-merkit",
+        "token": "Token",
+        "refresh_token": "Päivitä token",
+        "valid_until": "Voimassa asti",
+        "revoke_token": "Peruuta",
+        "panelRadius": "Ruudut",
+        "pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
+        "presets": "Valmiit teemat",
+        "profile_background": "Taustakuva",
+        "profile_banner": "Juliste",
+        "profile_tab": "Profiili",
+        "radii_help": "Aseta reunojen pyöristys (pikseleinä)",
+        "replies_in_timeline": "Keskustelut aikajanalla",
+        "reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
+        "reply_visibility_all": "Näytä kaikki vastaukset",
+        "reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
+        "reply_visibility_self": "Näytä vain vastaukset minulle",
+        "saving_err": "Virhe tallentaessa asetuksia",
+        "saving_ok": "Asetukset tallennettu",
+        "security_tab": "Tietoturva",
+        "scope_copy": "Kopioi näkyvyysrajaus vastatessa (Yksityisviestit aina kopioivat)",
+        "set_new_avatar": "Aseta uusi profiilikuva",
+        "set_new_profile_background": "Aseta uusi taustakuva",
+        "set_new_profile_banner": "Aseta uusi juliste",
+        "settings": "Asetukset",
+        "subject_input_always_show": "Näytä aihe-kenttä",
+        "subject_line_behavior": "Aihe-kentän kopiointi",
+        "subject_line_email": "Kuten sähköposti: \"re: aihe\"",
+        "subject_line_mastodon": "Kopioi sellaisenaan",
+        "subject_line_noop": "Älä kopioi",
+        "stop_gifs": "Toista giffit vain kohdistaessa",
+        "streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla",
+        "text": "Teksti",
+        "theme": "Teema",
+        "theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.",
+        "theme_help_v2_1": "Voit asettaa tiettyjen osien värin tai läpinäkyvyyden täyttämällä valintalaatikon, käytä \"Tyhjennä kaikki\"-nappia tyhjentääksesi kaiken.",
+        "theme_help_v2_2": "Ikonit kenttien alla ovat kontrasti-indikaattoreita, lisätietoa kohdistamalla. Käyttäessä läpinäkyvyyttä ne näyttävät pahimman skenaarion.",
+        "tooltipRadius": "Ohje- tai huomioviestit",
+        "user_settings": "Käyttäjän asetukset",
+        "values": {
+            "false": "pois päältä",
+            "true": "päällä"
+        },
+        "hide_follows_description": "Älä näytä ketä seuraan",
+        "show_moderator_badge": "Näytä Moderaattori-merkki profiilissani",
+        "useStreamingApi": "Vastaanota viestiejä ja ilmoituksia reaaliajassa",
+        "notification_setting_filters": "Suodattimet",
+        "notification_setting": "Vastaanota ilmoituksia seuraavista:",
+        "notification_setting_privacy_option": "Piilota lähettäjä ja sisältö sovelluksen ulkopuolisista ilmoituksista",
+        "enable_web_push_notifications": "Ota käyttöön sovelluksen ulkopuoliset ilmoitukset",
+        "app_name": "Sovelluksen nimi",
+        "security": "Turvallisuus",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "OTP-asetukset",
+            "wait_pre_setup_otp": "esiasetetaan OTP:ta",
+            "confirm_and_enable": "Hyväksy ja käytä OTP",
+            "title": "Monivaihetodennus",
+            "generate_new_recovery_codes": "Luo uudet palautuskoodit",
+            "authentication_methods": "Todennus",
+            "warning_of_generate_new_codes": "Luodessasi uudet palautuskoodit, vanhat koodisi lakkaavat toimimasta.",
+            "recovery_codes": "Palautuskoodit.",
+            "waiting_a_recovery_codes": "Odotetaan palautuskoodeja...",
+            "recovery_codes_warning": "Kirjoita koodit ylös tai tallenna ne turvallisesti, muuten et näe niitä uudestaan. Jos et voi käyttää monivaihetodennusta ja sinulla ei ole palautuskoodeja, et voi enää kirjautua sisään tilillesi."
+        },
+        "allow_following_move": "Salli automaattinen seuraaminen kun käyttäjä siirtää tilinsä",
+        "block_export": "Estojen vienti",
+        "block_export_button": "Vie estosi CSV-tiedostoon",
+        "block_import": "Estojen tuonti",
+        "block_import_error": "Virhe tuodessa estoja",
+        "blocks_imported": "Estot tuotu! Käsittely vie hetken.",
+        "blocks_tab": "Estot",
+        "change_email": "Vaihda sähköpostiosoite",
+        "change_email_error": "Virhe vaihtaessa sähköpostiosoitetta.",
+        "changed_email": "Sähköpostiosoite vaihdettu!",
+        "domain_mutes": "Sivut",
+        "avatar_size_instruction": "Suositeltu vähimmäiskoko profiilikuville on 150x150 pikseliä.",
+        "accent": "Korostus",
+        "hide_muted_posts": "Piilota mykistettyjen käyttäjien viestit",
+        "hide_filtered_statuses": "Piilota mykistetyt viestit",
+        "import_blocks_from_a_csv_file": "Tuo estot CSV-tiedostosta",
+        "no_blocks": "Ei estoja",
+        "no_mutes": "Ei mykistyksiä",
+        "notification_visibility_moves": "Käyttäjien siirtymiset",
+        "hide_followers_description": "Älä näytä ketkä seuraavat minua",
+        "hide_follows_count_description": "Älä näytä seurauksien määrää",
+        "hide_followers_count_description": "Älä näytä seuraajien määrää",
+        "show_admin_badge": "Näytä Ylläpitäjä-merkki proofilissani",
+        "autohide_floating_post_button": "Piilota Uusi Viesti -nappi automaattisesti (mobiili)",
+        "search_user_to_block": "Hae estettäviä käyttäjiä",
+        "search_user_to_mute": "Hae mykistettäviä käyttäjiä",
+        "minimal_scopes_mode": "Yksinkertaista näkyvyydenrajauksen vaihtoehdot",
+        "post_status_content_type": "Uuden viestin sisällön muoto",
+        "user_mutes": "Käyttäjät",
+        "useStreamingApiWarning": "(Kokeellinen)",
+        "type_domains_to_mute": "Syötä mykistettäviä sivustoja",
+        "upload_a_photo": "Lataa kuva",
+        "fun": "Hupi",
+        "greentext": "Meeminuolet",
+        "notifications": "Ilmoitukset",
+        "style": {
+            "switcher": {
+                "save_load_hint": "\"Säilytä\" asetukset säilyttävät tällä hetkellä asetetut asetukset valittaessa tai ladatessa teemaa, se myös tallentaa kyseiset asetukset viedessä teemaa. Kun kaikki laatikot ovat tyhjänä, viety teema tallentaa kaiken.",
+                "help": {
+                    "older_version_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla.",
+                    "fe_upgraded": "PleromaFE:n teemaus päivitetty versiopäivityksen yhteydessä.",
+                    "migration_snapshot_ok": "Varmuuden vuoksi teeman kaappaus ladattu. Voit koittaa ladata teeman sisällön.",
+                    "migration_napshot_gone": "Jostain syystä teeman kaappaus puuttuu, kaikki asiat eivät välttämättä näytä oikealta.",
+                    "snapshot_source_mismatch": "Versiot eivät täsmää: todennäköisesti versio vaihdettu vanhempaan ja päivitetty uudestaan, jos vaihdoit teemaa vanhalla versiolla, sinun tulisi käyttää vanhaa versiota, muutoin uutta.",
+                    "upgraded_from_v2": "PleromaFE on päivitetty, teemasi saattaa näyttää erilaiselta kuin muistat.",
+                    "v2_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla. Yhteensopivuus ei välttämättä ole täydellinen.",
+                    "future_version_imported": "Tuomasi tiedosto on luotu uudemmalla versiolla.",
+                    "snapshot_present": "Teeman kaappaus ladattu, joten kaikki arvot ovat ylikirjoitettu. Voit sen sijaan ladata teeman sisällön.",
+                    "snapshot_missing": "Teeman kaappausta ei tiedostossa, joten se voi näyttää erilaiselta kuin suunniteltu.",
+                    "fe_downgraded": "PleromaFE:n versio vaihtunut vanhempaan."
+                },
+                "keep_color": "Säilytä värit",
+                "keep_shadows": "Säilytä varjot",
+                "keep_opacity": "Säilytä läpinäkyvyys",
+                "keep_roundness": "Säilytä pyöristys",
+                "keep_fonts": "Säilytä fontit",
+                "reset": "Palauta",
+                "clear_all": "Tyhjennä kaikki",
+                "clear_opacity": "Tyhjennä läpinäkyvyys",
+                "load_theme": "Lataa teema",
+                "keep_as_is": "Pidä sellaisenaan",
+                "use_snapshot": "Vanha",
+                "use_source": "Uusi"
+            },
+            "advanced_colors": {
+                "selectedPost": "Valittu viesti",
+                "_tab_label": "Edistynyt",
+                "alert": "Varoituksen tausta",
+                "alert_error": "Virhe",
+                "alert_warning": "Varoitus",
+                "alert_neutral": "Neutraali",
+                "post": "Viestit/Käyttäjien kuvaukset",
+                "badge": "Merkin tausta",
+                "badge_notification": "Ilmoitus",
+                "panel_header": "Ruudun otsikko",
+                "top_bar": "Yläpalkki",
+                "borders": "Reunat",
+                "buttons": "Napit",
+                "inputs": "Syöttökentät",
+                "faint_text": "Häivytetty teksti",
+                "underlay": "Taustapeite",
+                "poll": "Äänestyksen kuvaaja",
+                "icons": "Ikonit",
+                "highlight": "Korostetut elementit",
+                "pressed": "Painettu"
+            },
+            "common": {
+                "color": "Väri",
+                "opacity": "Läpinäkyvyys",
+                "contrast": {
+                    "level": {
+                        "aaa": "saavuttaa AAA-tason (suositeltu)",
+                        "aa": "saavuttaa AA-tason (minimi)",
+                        "bad": "ei saavuta mitään helppokäyttöisyyssuosituksia"
+                    },
+                    "hint": "Kontrastisuhde on {ratio}, se {level} {context}",
+                    "context": {
+                        "18pt": "suurella (18pt+) tekstillä",
+                        "text": "tekstillä"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Yleinen",
+                "main": "Yleiset värit",
+                "foreground_hint": "Löydät \"Edistynyt\"-välilehdeltä tarkemmat asetukset",
+                "rgbo": "Ikonit, korostukset, merkit"
+            }
+        },
+        "enter_current_password_to_confirm": "Syötä nykyinen salasanasi todentaaksesi henkilöllisyytesi",
+        "discoverable": "Salli tilisi näkyvyys hakukoneisiin ja muihin palveluihin",
+        "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
+        "mutes_tab": "Mykistykset",
+        "new_email": "Uusi sähköpostiosoite",
+        "notification_setting_follows": "Käyttäjät joita seuraat",
+        "notification_setting_non_follows": "Käyttäjät joita et seuraa",
+        "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
+        "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
+        "notification_setting_privacy": "Yksityisyys",
+        "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
+        "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen."
+    },
+    "time": {
+        "day": "{0} päivä",
+        "days": "{0} päivää",
+        "day_short": "{0}pv",
+        "days_short": "{0}pv",
+        "hour": "{0} tunti",
+        "hours": "{0} tuntia",
+        "hour_short": "{0}t",
+        "hours_short": "{0}t",
+        "in_future": "{0} tulevaisuudessa",
+        "in_past": "{0} sitten",
+        "minute": "{0} minuutti",
+        "minutes": "{0} minuuttia",
+        "minute_short": "{0}min",
+        "minutes_short": "{0}min",
+        "month": "{0} kuukausi",
+        "months": "{0} kuukautta",
+        "month_short": "{0}kk",
+        "months_short": "{0}kk",
+        "now": "nyt",
+        "now_short": "juuri nyt",
+        "second": "{0} sekunti",
+        "seconds": "{0} sekuntia",
+        "second_short": "{0}s",
+        "seconds_short": "{0}s",
+        "week": "{0} viikko",
+        "weeks": "{0} viikkoa",
+        "week_short": "{0}vk",
+        "weeks_short": "{0}vk",
+        "year": "{0} vuosi",
+        "years": "{0} vuotta",
+        "year_short": "{0}v",
+        "years_short": "{0}v"
+    },
+    "timeline": {
+        "collapse": "Sulje",
+        "conversation": "Keskustelu",
+        "error_fetching": "Virhe ladatessa viestejä",
+        "load_older": "Lataa vanhempia viestejä",
+        "no_retweet_hint": "Viesti ei ole julkinen, eikä sitä voi toistaa",
+        "repeated": "toisti",
+        "show_new": "Näytä uudet",
+        "up_to_date": "Ajantasalla",
+        "no_more_statuses": "Ei enempää viestejä"
+    },
+    "status": {
+        "favorites": "Tykkäykset",
+        "repeats": "Toistot",
+        "delete": "Poista",
+        "pin": "Kiinnitä profiiliisi",
+        "unpin": "Poista kiinnitys",
+        "pinned": "Kiinnitetty",
+        "delete_confirm": "Haluatko varmasti postaa viestin?",
+        "reply_to": "Vastaus",
+        "replies_list": "Vastaukset:",
+        "mute_conversation": "Hiljennä keskustelu",
+        "unmute_conversation": "Poista hiljennys",
+        "status_unavailable": "Viesti ei saatavissa"
+    },
+    "user_card": {
+        "approve": "Hyväksy",
+        "block": "Estä",
+        "blocked": "Estetty!",
+        "deny": "Älä hyväksy",
+        "follow": "Seuraa",
+        "follow_sent": "Pyyntö lähetetty!",
+        "follow_progress": "Pyydetään...",
+        "follow_again": "Lähetä pyyntö uudestaan",
+        "follow_unfollow": "Älä seuraa",
+        "followees": "Seuraa",
+        "followers": "Seuraajat",
+        "following": "Seuraat!",
+        "follows_you": "Seuraa sinua!",
+        "its_you": "Sinun tili!",
+        "mute": "Hiljennä",
+        "muted": "Hiljennetty",
+        "per_day": "päivässä",
+        "remote_follow": "Seuraa muualta",
+        "statuses": "Viestit"
+    },
+    "user_profile": {
+        "timeline_title": "Käyttäjän aikajana"
+    },
+    "who_to_follow": {
+        "more": "Lisää",
+        "who_to_follow": "Seurausehdotukset"
+    },
+    "tool_tip": {
+        "media_upload": "Lataa tiedosto",
+        "repeat": "Toista",
+        "reply": "Vastaa",
+        "favorite": "Tykkää",
+        "user_settings": "Käyttäjäasetukset"
+    },
+    "upload": {
+        "error": {
+            "base": "Lataus epäonnistui.",
+            "file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "Yritä uudestaan myöhemmin"
+        },
+        "file_size_units": {
+            "B": "tavua",
+            "KiB": "kt",
+            "MiB": "Mt",
+            "GiB": "Gt",
+            "TiB": "Tt"
+        }
+    },
+    "about": {
+        "mrf": {
+            "keyword": {
+                "keyword_policies": "Avainsanasäännöt",
+                "ftl_removal": "Poistettu \"Koko Tunnettu Verkosto\" -aikajanalta",
+                "reject": "Hylkää",
+                "replace": "Korvaa",
+                "is_replaced_by": "→"
+            },
+            "simple": {
+                "accept": "Hyväksy",
+                "reject": "Hylkää",
+                "quarantine": "Karanteeni",
+                "ftl_removal": "Poisto \"Koko Tunnettu Verkosto\" -aikajanalta",
+                "media_removal": "Media-tiedostojen poisto"
+            },
+            "federation": "Federaatio",
+            "mrf_policies": "Aktivoidut MRF-säännöt"
+        },
+        "staff": "Henkilökunta"
+    },
+    "domain_mute_card": {
+        "mute": "Mykistä",
+        "unmute": "Poista mykistys",
+        "mute_progress": "Mykistetään...",
+        "unmute_progress": "Poistetaan mykistyst..."
+    },
+    "exporter": {
+        "export": "Vie",
+        "processing": "Käsitellään, hetken päästä voit tallentaa tiedoston"
+    },
+    "image_cropper": {
+        "crop_picture": "Rajaa kuva",
+        "save": "Tallenna",
+        "save_without_cropping": "Tallenna rajaamatta",
+        "cancel": "Peruuta"
+    },
+    "importer": {
+        "submit": "Hyväksy",
+        "error": "Virhe tapahtui tietoja tuodessa.",
+        "success": "Tuonti onnistui."
+    },
+    "media_modal": {
+        "previous": "Edellinen",
+        "next": "Seuraava"
+    },
+    "emoji": {
+        "stickers": "Tarrat",
+        "emoji": "Emoji",
+        "keep_open": "Pidä valitsin auki",
+        "search_emoji": "Hae emojia",
+        "add_emoji": "Lisää emoji",
+        "custom": "Custom-emoji",
+        "load_all": "Ladataan kaikkia {emojiAmount} emojia",
+        "unicode": "Unicode-emoji",
+        "load_all_hint": "Ensimmäiset {saneAmount} emojia ladattu, kaikkien emojien lataaminen voi aiheuttaa hidastelua."
+    },
+    "remote_user_resolver": {
+        "remote_user_resolver": "Ulkopuolinen käyttäjä",
+        "searching_for": "Etsitään käyttäjää",
+        "error": "Ei löytynyt."
+    },
+    "selectable_list": {
+        "select_all": "Valitse kaikki"
     }
-  }
 }

From a26731de300209ab3aa6a1e61fe6415f6facca94 Mon Sep 17 00:00:00 2001
From: Toro Mino <mail@dennisbuchholz.net>
Date: Wed, 13 May 2020 17:16:29 +0000
Subject: [PATCH 027/415] Translated using Weblate (German)

Currently translated at 66.7% (409 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index a4b4c16f..4037b4b3 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -1,413 +1,516 @@
 {
-  "chat": {
-    "title": "Chat"
-  },
-  "features_panel": {
-    "chat": "Chat",
-    "gopher": "Gopher",
-    "media_proxy": "Medienproxy",
-    "scope_options": "Reichweitenoptionen",
-    "text_limit": "Textlimit",
-    "title": "Features",
-    "who_to_follow": "Wem folgen?"
-  },
-  "finder": {
-    "error_fetching_user": "Fehler beim Suchen des Benutzers",
-    "find_user": "Finde Benutzer"
-  },
-  "general": {
-    "apply": "Anwenden",
-    "submit": "Absenden"
-  },
-  "login": {
-    "login": "Anmelden",
-    "description": "Mit OAuth anmelden",
-    "logout": "Abmelden",
-    "password": "Passwort",
-    "placeholder": "z.B. lain",
-    "register": "Registrieren",
-    "username": "Benutzername"
-  },
-  "nav": {
-    "about": "Über",
-    "back": "Zurück",
-    "chat": "Lokaler Chat",
-    "friend_requests": "Followanfragen",
-    "mentions": "Erwähnungen",
-    "interactions": "Interaktionen",
-    "dms": "Direktnachrichten",
-    "public_tl": "Öffentliche Zeitleiste",
-    "timeline": "Zeitleiste",
-    "twkn": "Das gesamte bekannte Netzwerk",
-    "user_search": "Benutzersuche",
-    "search": "Suche",
-    "preferences": "Voreinstellungen"
-  },
-  "notifications": {
-    "broken_favorite": "Unbekannte Nachricht, suche danach...",
-    "favorited_you": "favorisierte deine Nachricht",
-    "followed_you": "folgt dir",
-    "load_older": "Ältere Benachrichtigungen laden",
-    "notifications": "Benachrichtigungen",
-    "read": "Gelesen!",
-    "repeated_you": "wiederholte deine Nachricht"
-  },
-  "post_status": {
-    "new_status": "Neuen Status veröffentlichen",
-    "account_not_locked_warning": "Dein Profil ist nicht {0}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
-    "account_not_locked_warning_link": "gesperrt",
-    "attachments_sensitive": "Anhänge als heikel markieren",
-    "content_type": {
-      "text/plain": "Nur Text"
+    "chat": {
+        "title": "Chat"
     },
-    "content_warning": "Betreff (optional)",
-    "default": "Sitze gerade im Hofbräuhaus.",
-    "direct_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
-    "posting": "Veröffentlichen",
-    "scope": {
-      "direct": "Direkt - Beitrag nur an erwähnte Profile",
-      "private": "Nur Follower - Beitrag nur für Follower sichtbar",
-      "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
-      "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
-    }
-  },
-  "registration": {
-    "bio": "Bio",
-    "email": "Email",
-    "fullname": "Angezeigter Name",
-    "password_confirm": "Passwort bestätigen",
-    "registration": "Registrierung",
-    "token": "Einladungsschlüssel",
-    "captcha": "CAPTCHA",
-    "new_captcha": "Zum Erstellen eines neuen Captcha auf das Bild klicken.",
-    "validations": {
-      "username_required": "darf nicht leer sein",
-      "fullname_required": "darf nicht leer sein",
-      "email_required": "darf nicht leer sein",
-      "password_required": "darf nicht leer sein",
-      "password_confirmation_required": "darf nicht leer sein",
-      "password_confirmation_match": "sollte mit dem Passwort identisch sein."
-    }
-  },
-  "settings": {
-    "attachmentRadius": "Anhänge",
-    "attachments": "Anhänge",
-    "autoload": "Aktiviere automatisches Laden von älteren Beiträgen beim scrollen",
-    "avatar": "Avatar",
-    "avatarAltRadius": "Avatare (Benachrichtigungen)",
-    "avatarRadius": "Avatare",
-    "background": "Hintergrund",
-    "bio": "Bio",
-    "btnRadius": "Buttons",
-    "cBlue": "Blau (Antworten, Folgt dir)",
-    "cGreen": "Grün (Retweet)",
-    "cOrange": "Orange (Favorisieren)",
-    "cRed": "Rot (Abbrechen)",
-    "change_password": "Passwort ändern",
-    "change_password_error": "Es gab ein Problem bei der Änderung des Passworts.",
-    "changed_password": "Passwort erfolgreich geändert!",
-    "collapse_subject": "Beiträge mit Betreff einklappen",
-    "composing": "Verfassen",
-    "confirm_new_password": "Neues Passwort bestätigen",
-    "current_avatar": "Dein derzeitiger Avatar",
-    "current_password": "Aktuelles Passwort",
-    "current_profile_banner": "Der derzeitige Banner deines Profils",
-    "data_import_export_tab": "Datenimport/-export",
-    "default_vis": "Standard-Sichtbarkeitsumfang",
-    "delete_account": "Account löschen",
-    "delete_account_description": "Lösche deinen Account und alle deine Nachrichten unwiderruflich.",
-    "delete_account_error": "Es ist ein Fehler beim Löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.",
-    "delete_account_instructions": "Tippe dein Passwort unten in das Feld ein, um die Löschung deines Accounts zu bestätigen.",
-    "discoverable": "Erlaubnis für automatisches Suchen nach diesem Account",
-    "avatar_size_instruction": "Die empfohlene minimale Größe für Avatare ist 150x150 Pixel.",
-    "pad_emoji": "Emojis mit Leerzeichen umrahmen",
-    "export_theme": "Farbschema speichern",
-    "filtering": "Filtern",
-    "filtering_explanation": "Alle Beiträge die diese Wörter enthalten werden ausgeblendet. Ein Wort pro Zeile.",
-    "follow_export": "Follower exportieren",
-    "follow_export_button": "Exportiere deine Follows in eine csv-Datei",
-    "follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.",
-    "follow_import": "Followers importieren",
-    "follow_import_error": "Fehler beim importieren der Follower",
-    "follows_imported": "Followers importiert! Die Bearbeitung kann eine Zeit lang dauern.",
-    "foreground": "Vordergrund",
-    "general": "Allgemein",
-    "hide_attachments_in_convo": "Anhänge in Unterhaltungen ausblenden",
-    "hide_attachments_in_tl": "Anhänge in der Zeitleiste ausblenden",
-    "hide_muted_posts": "Verberge Beiträge stummgeschalteter Nutzer",
-    "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Beitrag",
-    "hide_isp": "Instanz-spezifisches Panel ausblenden",
-    "preload_images": "Bilder vorausladen",
-    "use_one_click_nsfw": "Heikle Anhänge mit nur einem Klick öffnen",
-    "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
-    "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
-    "hide_filtered_statuses": "Gefilterte Beiträge verbergen",
-    "import_followers_from_a_csv_file": "Importiere Follower, denen du folgen möchtest, aus einer CSV-Datei",
-    "import_theme": "Farbschema laden",
-    "inputRadius": "Eingabefelder",
-    "checkboxRadius": "Auswahlfelder",
-    "instance_default": "(Standard: {value})",
-    "instance_default_simple": "(Standard)",
-    "interface": "Oberfläche",
-    "interfaceLanguage": "Sprache der Oberfläche",
-    "invalid_theme_imported": "Die ausgewählte Datei ist kein unterstütztes Pleroma-Theme. Keine Änderungen wurden vorgenommen.",
-    "limited_availability": "In deinem Browser nicht verfügbar",
-    "links": "Links",
-    "lock_account_description": "Sperre deinen Account, um neue Follower zu genehmigen oder abzulehnen",
-    "loop_video": "Videos wiederholen",
-    "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
-    "mutes_tab": "Mutes",
-    "play_videos_in_modal": "Videos in größerem Medienfenster abspielen",
-    "use_contain_fit": "Vorschaubilder nicht zuschneiden",
-    "name": "Name",
-    "name_bio": "Name & Bio",
-    "new_password": "Neues Passwort",
-    "notification_visibility": "Benachrichtigungstypen, die angezeigt werden sollen",
-    "notification_visibility_follows": "Follows",
-    "notification_visibility_likes": "Favoriten",
-    "notification_visibility_mentions": "Erwähnungen",
-    "notification_visibility_repeats": "Wiederholungen",
-    "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
-    "hide_follows_description": "Zeige nicht, wem ich folge",
-    "hide_followers_description": "Zeige nicht, wer mir folgt",
-    "hide_follows_count_description": "Verberge die Anzahl deiner Gefolgten",
-    "hide_followers_count_description": "Verberge die Anzahl deiner Folgenden",
-    "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
-    "oauth_tokens": "OAuth-Token",
-    "token": "Zeichen",
-    "refresh_token": "Token aktualisieren",
-    "valid_until": "Gültig bis",
-    "revoke_token": "Widerrufen",
-    "panelRadius": "Panel",
-    "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
-    "presets": "Voreinstellungen",
-    "profile_background": "Profilhintergrund",
-    "profile_banner": "Profilbanner",
-    "profile_tab": "Profil",
-    "radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen",
-    "replies_in_timeline": "Antworten in der Zeitleiste",
-    "reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren",
-    "reply_visibility_all": "Alle Antworten zeigen",
-    "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
-    "reply_visibility_self": "Nur Antworten an mich anzeigen",
-    "autohide_floating_post_button": "Automatisches Verbergen des Knopfs für neue Beiträge (mobil)",
-    "saving_err": "Fehler beim Speichern der Einstellungen",
-    "saving_ok": "Einstellungen gespeichert",
-    "security_tab": "Sicherheit",
-    "scope_copy": "Reichweite beim Antworten übernehmen (Direktnachrichten werden immer kopiert)",
-    "minimal_scopes_mode": "Minimiere Reichweitenoptionen",
-    "set_new_avatar": "Setze einen neuen Avatar",
-    "set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil",
-    "set_new_profile_banner": "Setze einen neuen Banner für dein Profil",
-    "settings": "Einstellungen",
-    "subject_input_always_show": "Betreff-Feld immer anzeigen",
-    "subject_line_behavior": "Betreff beim Antworten kopieren",
-    "subject_line_email": "Wie Email: \"re: Betreff\"",
-    "subject_line_mastodon": "Wie Mastodon: unverändert kopieren",
-    "subject_line_noop": "Nicht kopieren",
-    "post_status_content_type": "Beitragsart",
-    "stop_gifs": "Animationen nur beim Darüberfahren abspielen",
-    "streaming": "Aktiviere automatisches Laden (Streaming) von neuen Beiträgen",
-    "text": "Text",
-    "theme": "Farbschema",
-    "theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen",
-    "theme_help_v2_1": "Du kannst auch die Farben und die Deckkraft bestimmter Komponenten überschreiben, indem du das Kontrollkästchen umschaltest. Verwende die Schaltfläche \"Alle löschen\", um alle Überschreibungen zurückzusetzen.",
-    "theme_help_v2_2": "Unter einigen Einträgen befinden sich Symbole für Hintergrund-/Textkontrastindikatoren, für detaillierte Informationen fahre mit der Maus darüber. Bitte beachte, dass bei der Verwendung von Transparenz Kontrastindikatoren den schlechtest möglichen Fall darstellen.",
-    "tooltipRadius": "Tooltips/Warnungen",
-    "user_settings": "Benutzereinstellungen",
-    "values": {
-      "false": "nein",
-      "true": "Ja"
+    "features_panel": {
+        "chat": "Chat",
+        "gopher": "Gopher",
+        "media_proxy": "Medienproxy",
+        "scope_options": "Reichweitenoptionen",
+        "text_limit": "Zeichenlimit",
+        "title": "Funktionen",
+        "who_to_follow": "Wem folgen?"
     },
-    "notifications": "Benachrichtigungen",
-    "enable_web_push_notifications": "Web-Pushbenachrichtigungen aktivieren",
+    "finder": {
+        "error_fetching_user": "Fehler beim Suchen des Benutzers",
+        "find_user": "Finde Benutzer"
+    },
+    "general": {
+        "apply": "Anwenden",
+        "submit": "Absenden",
+        "more": "Mehr",
+        "generic_error": "Ein Fehler ist aufgetreten",
+        "optional": "Optional",
+        "show_more": "Zeige mehr",
+        "show_less": "Zeige weniger",
+        "dismiss": "Ablehnen",
+        "cancel": "Abbrechen",
+        "disable": "Deaktivieren",
+        "enable": "Aktivieren",
+        "confirm": "Bestätigen",
+        "verify": "Verifizieren"
+    },
+    "login": {
+        "login": "Anmelden",
+        "description": "Mit OAuth anmelden",
+        "logout": "Abmelden",
+        "password": "Passwort",
+        "placeholder": "z.B. lain",
+        "register": "Registrieren",
+        "username": "Benutzername",
+        "authentication_code": "Authentifizierungscode",
+        "enter_recovery_code": "Gebe einen Wiederherstellungscode ein",
+        "recovery_code": "Wiederherstellungscode",
+        "heading": {
+            "totp": "Zwei-Faktor Authentifizierung",
+            "recovery": "Zwei-Faktor Wiederherstellung"
+        },
+        "hint": "Anmelden um an der Diskussion teilzunehmen",
+        "enter_two_factor_code": "Gebe einen Zwei-Faktor-Code ein"
+    },
+    "nav": {
+        "about": "Über",
+        "back": "Zurück",
+        "chat": "Lokaler Chat",
+        "friend_requests": "Followanfragen",
+        "mentions": "Erwähnungen",
+        "interactions": "Interaktionen",
+        "dms": "Direktnachrichten",
+        "public_tl": "Öffentliche Zeitleiste",
+        "timeline": "Zeitleiste",
+        "twkn": "Das gesamte bekannte Netzwerk",
+        "user_search": "Benutzersuche",
+        "search": "Suche",
+        "preferences": "Voreinstellungen",
+        "administration": "Administration",
+        "who_to_follow": "Wem folgen"
+    },
+    "notifications": {
+        "broken_favorite": "Unbekannte Nachricht, suche danach...",
+        "favorited_you": "favorisierte deine Nachricht",
+        "followed_you": "folgt dir",
+        "load_older": "Ältere Benachrichtigungen laden",
+        "notifications": "Benachrichtigungen",
+        "read": "Gelesen!",
+        "repeated_you": "wiederholte deine Nachricht",
+        "follow_request": "möchte dir folgen",
+        "migrated_to": "migrierte zu",
+        "reacted_with": "reagierte mit {0}",
+        "no_more_notifications": "Keine Benachrichtigungen mehr"
+    },
+    "post_status": {
+        "new_status": "Neuen Status veröffentlichen",
+        "account_not_locked_warning": "Dein Profil ist nicht {0}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
+        "account_not_locked_warning_link": "gesperrt",
+        "attachments_sensitive": "Anhänge als heikel markieren",
+        "content_type": {
+            "text/plain": "Nur Text"
+        },
+        "content_warning": "Betreff (optional)",
+        "default": "Sitze gerade im Hofbräuhaus.",
+        "direct_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
+        "posting": "Veröffentlichen",
+        "scope": {
+            "direct": "Direkt - Beitrag nur an erwähnte Profile",
+            "private": "Nur Follower - Beitrag nur für Follower sichtbar",
+            "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
+            "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
+        }
+    },
+    "registration": {
+        "bio": "Bio",
+        "email": "Email",
+        "fullname": "Angezeigter Name",
+        "password_confirm": "Passwort bestätigen",
+        "registration": "Registrierung",
+        "token": "Einladungsschlüssel",
+        "captcha": "CAPTCHA",
+        "new_captcha": "Zum Erstellen eines neuen Captcha auf das Bild klicken.",
+        "validations": {
+            "username_required": "darf nicht leer sein",
+            "fullname_required": "darf nicht leer sein",
+            "email_required": "darf nicht leer sein",
+            "password_required": "darf nicht leer sein",
+            "password_confirmation_required": "darf nicht leer sein",
+            "password_confirmation_match": "sollte mit dem Passwort identisch sein."
+        }
+    },
+    "settings": {
+        "attachmentRadius": "Anhänge",
+        "attachments": "Anhänge",
+        "autoload": "Aktiviere automatisches Laden von älteren Beiträgen beim scrollen",
+        "avatar": "Avatar",
+        "avatarAltRadius": "Avatare (Benachrichtigungen)",
+        "avatarRadius": "Avatare",
+        "background": "Hintergrund",
+        "bio": "Bio",
+        "btnRadius": "Buttons",
+        "cBlue": "Blau (Antworten, Folgt dir)",
+        "cGreen": "Grün (Retweet)",
+        "cOrange": "Orange (Favorisieren)",
+        "cRed": "Rot (Abbrechen)",
+        "change_password": "Passwort ändern",
+        "change_password_error": "Es gab ein Problem bei der Änderung des Passworts.",
+        "changed_password": "Passwort erfolgreich geändert!",
+        "collapse_subject": "Beiträge mit Betreff einklappen",
+        "composing": "Verfassen",
+        "confirm_new_password": "Neues Passwort bestätigen",
+        "current_avatar": "Dein derzeitiger Avatar",
+        "current_password": "Aktuelles Passwort",
+        "current_profile_banner": "Der derzeitige Banner deines Profils",
+        "data_import_export_tab": "Datenimport/-export",
+        "default_vis": "Standard-Sichtbarkeitsumfang",
+        "delete_account": "Account löschen",
+        "delete_account_description": "Lösche deinen Account und alle deine Nachrichten unwiderruflich.",
+        "delete_account_error": "Es ist ein Fehler beim Löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.",
+        "delete_account_instructions": "Tippe dein Passwort unten in das Feld ein, um die Löschung deines Accounts zu bestätigen.",
+        "discoverable": "Erlaubnis für automatisches Suchen nach diesem Account",
+        "avatar_size_instruction": "Die empfohlene minimale Größe für Avatare ist 150x150 Pixel.",
+        "pad_emoji": "Emojis mit Leerzeichen umrahmen",
+        "export_theme": "Farbschema speichern",
+        "filtering": "Filtern",
+        "filtering_explanation": "Alle Beiträge die diese Wörter enthalten werden ausgeblendet. Ein Wort pro Zeile.",
+        "follow_export": "Follower exportieren",
+        "follow_export_button": "Exportiere deine Follows in eine csv-Datei",
+        "follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.",
+        "follow_import": "Followers importieren",
+        "follow_import_error": "Fehler beim importieren der Follower",
+        "follows_imported": "Followers importiert! Die Bearbeitung kann eine Zeit lang dauern.",
+        "foreground": "Vordergrund",
+        "general": "Allgemein",
+        "hide_attachments_in_convo": "Anhänge in Unterhaltungen ausblenden",
+        "hide_attachments_in_tl": "Anhänge in der Zeitleiste ausblenden",
+        "hide_muted_posts": "Verberge Beiträge stummgeschalteter Nutzer",
+        "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Beitrag",
+        "hide_isp": "Instanz-spezifisches Panel ausblenden",
+        "preload_images": "Bilder vorausladen",
+        "use_one_click_nsfw": "Heikle Anhänge mit nur einem Klick öffnen",
+        "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
+        "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
+        "hide_filtered_statuses": "Gefilterte Beiträge verbergen",
+        "import_followers_from_a_csv_file": "Importiere Follower, denen du folgen möchtest, aus einer CSV-Datei",
+        "import_theme": "Farbschema laden",
+        "inputRadius": "Eingabefelder",
+        "checkboxRadius": "Auswahlfelder",
+        "instance_default": "(Standard: {value})",
+        "instance_default_simple": "(Standard)",
+        "interface": "Oberfläche",
+        "interfaceLanguage": "Sprache der Oberfläche",
+        "invalid_theme_imported": "Die ausgewählte Datei ist kein unterstütztes Pleroma-Theme. Keine Änderungen wurden vorgenommen.",
+        "limited_availability": "In deinem Browser nicht verfügbar",
+        "links": "Links",
+        "lock_account_description": "Sperre deinen Account, um neue Follower zu genehmigen oder abzulehnen",
+        "loop_video": "Videos wiederholen",
+        "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
+        "mutes_tab": "Mutes",
+        "play_videos_in_modal": "Videos in größerem Medienfenster abspielen",
+        "use_contain_fit": "Vorschaubilder nicht zuschneiden",
+        "name": "Name",
+        "name_bio": "Name & Bio",
+        "new_password": "Neues Passwort",
+        "notification_visibility": "Benachrichtigungstypen, die angezeigt werden sollen",
+        "notification_visibility_follows": "Follows",
+        "notification_visibility_likes": "Favoriten",
+        "notification_visibility_mentions": "Erwähnungen",
+        "notification_visibility_repeats": "Wiederholungen",
+        "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
+        "hide_follows_description": "Zeige nicht, wem ich folge",
+        "hide_followers_description": "Zeige nicht, wer mir folgt",
+        "hide_follows_count_description": "Verberge die Anzahl deiner Gefolgten",
+        "hide_followers_count_description": "Verberge die Anzahl deiner Folgenden",
+        "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
+        "oauth_tokens": "OAuth-Token",
+        "token": "Zeichen",
+        "refresh_token": "Token aktualisieren",
+        "valid_until": "Gültig bis",
+        "revoke_token": "Widerrufen",
+        "panelRadius": "Panel",
+        "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
+        "presets": "Voreinstellungen",
+        "profile_background": "Profilhintergrund",
+        "profile_banner": "Profilbanner",
+        "profile_tab": "Profil",
+        "radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen",
+        "replies_in_timeline": "Antworten in der Zeitleiste",
+        "reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren",
+        "reply_visibility_all": "Alle Antworten zeigen",
+        "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
+        "reply_visibility_self": "Nur Antworten an mich anzeigen",
+        "autohide_floating_post_button": "Automatisches Verbergen des Knopfs für neue Beiträge (mobil)",
+        "saving_err": "Fehler beim Speichern der Einstellungen",
+        "saving_ok": "Einstellungen gespeichert",
+        "security_tab": "Sicherheit",
+        "scope_copy": "Reichweite beim Antworten übernehmen (Direktnachrichten werden immer kopiert)",
+        "minimal_scopes_mode": "Minimiere Reichweitenoptionen",
+        "set_new_avatar": "Setze einen neuen Avatar",
+        "set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil",
+        "set_new_profile_banner": "Setze einen neuen Banner für dein Profil",
+        "settings": "Einstellungen",
+        "subject_input_always_show": "Betreff-Feld immer anzeigen",
+        "subject_line_behavior": "Betreff beim Antworten kopieren",
+        "subject_line_email": "Wie Email: \"re: Betreff\"",
+        "subject_line_mastodon": "Wie Mastodon: unverändert kopieren",
+        "subject_line_noop": "Nicht kopieren",
+        "post_status_content_type": "Beitragsart",
+        "stop_gifs": "Animationen nur beim Darüberfahren abspielen",
+        "streaming": "Aktiviere automatisches Laden (Streaming) von neuen Beiträgen",
+        "text": "Text",
+        "theme": "Farbschema",
+        "theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen",
+        "theme_help_v2_1": "Du kannst auch die Farben und die Deckkraft bestimmter Komponenten überschreiben, indem du das Kontrollkästchen umschaltest. Verwende die Schaltfläche \"Alle löschen\", um alle Überschreibungen zurückzusetzen.",
+        "theme_help_v2_2": "Unter einigen Einträgen befinden sich Symbole für Hintergrund-/Textkontrastindikatoren, für detaillierte Informationen fahre mit der Maus darüber. Bitte beachte, dass bei der Verwendung von Transparenz Kontrastindikatoren den schlechtest möglichen Fall darstellen.",
+        "tooltipRadius": "Tooltips/Warnungen",
+        "user_settings": "Benutzereinstellungen",
+        "values": {
+            "false": "nein",
+            "true": "Ja"
+        },
+        "notifications": "Benachrichtigungen",
+        "enable_web_push_notifications": "Web-Pushbenachrichtigungen aktivieren",
         "style": {
-      "switcher": {
-        "keep_color": "Farben beibehalten",
-        "keep_shadows": "Schatten beibehalten",
-        "keep_opacity": "Deckkraft beibehalten",
-        "keep_roundness": "Abrundungen beibehalten",
-        "keep_fonts": "Schriften beibehalten",
-        "save_load_hint": "Die \"Beibehalten\"-Optionen behalten die aktuell eingestellten Optionen beim Auswählen oder Laden von Designs bei, sie speichern diese Optionen auch beim Exportieren eines Designs. Wenn alle Kontrollkästchen deaktiviert sind, wird beim Exportieren des Designs alles gespeichert.",
-        "reset": "Zurücksetzen",
-        "clear_all": "Alles leeren",
-        "clear_opacity": "Deckkraft leeren"
-      },
-      "common": {
-        "color": "Farbe",
-        "opacity": "Deckkraft",
-        "contrast": {
-          "hint": "Das Kontrastverhältnis ist {ratio}, es {level} {context}",
-          "level": {
-            "aa": "entspricht Level AA Richtlinie (minimum)",
-            "aaa": "entspricht Level AAA Richtlinie (empfohlen)",
-            "bad": "entspricht keiner Richtlinien zur Barrierefreiheit"
-          },
-          "context": {
-            "18pt": "für großen (18pt+) Text",
-            "text": "für Text"
-          }
+            "switcher": {
+                "keep_color": "Farben beibehalten",
+                "keep_shadows": "Schatten beibehalten",
+                "keep_opacity": "Deckkraft beibehalten",
+                "keep_roundness": "Abrundungen beibehalten",
+                "keep_fonts": "Schriften beibehalten",
+                "save_load_hint": "Die \"Beibehalten\"-Optionen behalten die aktuell eingestellten Optionen beim Auswählen oder Laden von Designs bei, sie speichern diese Optionen auch beim Exportieren eines Designs. Wenn alle Kontrollkästchen deaktiviert sind, wird beim Exportieren des Designs alles gespeichert.",
+                "reset": "Zurücksetzen",
+                "clear_all": "Alles leeren",
+                "clear_opacity": "Deckkraft leeren"
+            },
+            "common": {
+                "color": "Farbe",
+                "opacity": "Deckkraft",
+                "contrast": {
+                    "hint": "Das Kontrastverhältnis ist {ratio}, es {level} {context}",
+                    "level": {
+                        "aa": "entspricht Level AA Richtlinie (minimum)",
+                        "aaa": "entspricht Level AAA Richtlinie (empfohlen)",
+                        "bad": "entspricht keiner Richtlinien zur Barrierefreiheit"
+                    },
+                    "context": {
+                        "18pt": "für großen (18pt+) Text",
+                        "text": "für Text"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Allgemein",
+                "main": "Allgemeine Farben",
+                "foreground_hint": "Siehe Reiter \"Erweitert\" für eine detailliertere Einstellungen",
+                "rgbo": "Symbole, Betonungen, Kennzeichnungen"
+            },
+            "advanced_colors": {
+                "_tab_label": "Erweitert",
+                "alert": "Warnhinweis-Hintergrund",
+                "alert_error": "Fehler",
+                "badge": "Kennzeichnungs-Hintergrund",
+                "badge_notification": "Benachrichtigung",
+                "panel_header": "Panel-Kopf",
+                "top_bar": "Obere Leiste",
+                "borders": "Rahmen",
+                "buttons": "Schaltflächen",
+                "inputs": "Eingabefelder",
+                "faint_text": "Verblasster Text"
+            },
+            "radii": {
+                "_tab_label": "Abrundungen"
+            },
+            "shadows": {
+                "_tab_label": "Schatten und Beleuchtung",
+                "component": "Komponente",
+                "override": "Überschreiben",
+                "shadow_id": "Schatten #{value}",
+                "blur": "Unschärfe",
+                "spread": "Streuung",
+                "inset": "Einsatz",
+                "hint": "Für Schatten kannst du auch --variable als Farbwert verwenden, um CSS3-Variablen zu verwenden. Bitte beachte, dass die Einstellung der Deckkraft in diesem Fall nicht funktioniert.",
+                "filter_hint": {
+                    "always_drop_shadow": "Achtung, dieser Schatten verwendet immer {0}, wenn der Browser dies unterstützt.",
+                    "drop_shadow_syntax": "{0} unterstützt Parameter {1} und Schlüsselwort {2} nicht.",
+                    "avatar_inset": "Bitte beachte, dass die Kombination von eingesetzten und nicht eingesetzten Schatten auf Avataren zu unerwarteten Ergebnissen bei transparenten Avataren führen kann.",
+                    "spread_zero": "Schatten mit einer Streuung > 0 erscheinen so, als ob sie auf Null gesetzt wären.",
+                    "inset_classic": "Eingesetzte Schatten werden mit {0} verwendet"
+                },
+                "components": {
+                    "panel": "Panel",
+                    "panelHeader": "Panel-Kopf",
+                    "topBar": "Obere Leiste",
+                    "avatar": "Benutzer-Avatar (in der Profilansicht)",
+                    "avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
+                    "popup": "Dialogfenster und Hinweistexte",
+                    "button": "Schaltfläche",
+                    "buttonHover": "Schaltfläche (hover)",
+                    "buttonPressed": "Schaltfläche (gedrückt)",
+                    "buttonPressedHover": "Schaltfläche (gedrückt+hover)",
+                    "input": "Input field"
+                }
+            },
+            "fonts": {
+                "_tab_label": "Schriften",
+                "help": "Wähl die Schriftart, die für Elemente der Benutzeroberfläche verwendet werden soll. Für \" Benutzerdefiniert\" musst du den genauen Schriftnamen eingeben, wie er im System angezeigt wird.",
+                "components": {
+                    "interface": "Oberfläche",
+                    "input": "Eingabefelder",
+                    "post": "Beitragstext",
+                    "postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
+                },
+                "family": "Schriftname",
+                "size": "Größe (in px)",
+                "weight": "Gewicht (Dicke)",
+                "custom": "Benutzerdefiniert"
+            },
+            "preview": {
+                "header": "Vorschau",
+                "content": "Inhalt",
+                "error": "Beispielfehler",
+                "button": "Schaltfläche",
+                "text": "Ein Haufen mehr von {0} und {1}",
+                "mono": "Inhalt",
+                "input": "Sitze gerade im Hofbräuhaus.",
+                "faint_link": "Hilfreiche Anleitung",
+                "fine_print": "Lies unser {0}, um nichts Nützliches zu lernen!",
+                "header_faint": "Das ist in Ordnung",
+                "checkbox": "Ich habe die Allgemeinen Geschäftsbedingungen überflogen",
+                "link": "ein netter kleiner Link"
+            }
         }
-      },
-      "common_colors": {
-        "_tab_label": "Allgemein",
-        "main": "Allgemeine Farben",
-        "foreground_hint": "Siehe Reiter \"Erweitert\" für eine detailliertere Einstellungen",
-        "rgbo": "Symbole, Betonungen, Kennzeichnungen"
-      },
-      "advanced_colors": {
-        "_tab_label": "Erweitert",
-        "alert": "Warnhinweis-Hintergrund",
-        "alert_error": "Fehler",
-        "badge": "Kennzeichnungs-Hintergrund",
-        "badge_notification": "Benachrichtigung",
-        "panel_header": "Panel-Kopf",
-        "top_bar": "Obere Leiste",
-        "borders": "Rahmen",
-        "buttons": "Schaltflächen",
-        "inputs": "Eingabefelder",
-        "faint_text": "Verblasster Text"
-      },
-      "radii": {
-        "_tab_label": "Abrundungen"
-      },
-      "shadows": {
-        "_tab_label": "Schatten und Beleuchtung",
-        "component": "Komponente",
-        "override": "Überschreiben",
-        "shadow_id": "Schatten #{value}",
-        "blur": "Unschärfe",
-        "spread": "Streuung",
-        "inset": "Einsatz",
-        "hint": "Für Schatten kannst du auch --variable als Farbwert verwenden, um CSS3-Variablen zu verwenden. Bitte beachte, dass die Einstellung der Deckkraft in diesem Fall nicht funktioniert.",
-        "filter_hint": {
-          "always_drop_shadow": "Achtung, dieser Schatten verwendet immer {0}, wenn der Browser dies unterstützt.",
-          "drop_shadow_syntax": "{0} unterstützt Parameter {1} und Schlüsselwort {2} nicht.",
-          "avatar_inset": "Bitte beachte, dass die Kombination von eingesetzten und nicht eingesetzten Schatten auf Avataren zu unerwarteten Ergebnissen bei transparenten Avataren führen kann.",
-          "spread_zero": "Schatten mit einer Streuung > 0 erscheinen so, als ob sie auf Null gesetzt wären.",
-          "inset_classic": "Eingesetzte Schatten werden mit {0} verwendet"
-        },
-        "components": {
-          "panel": "Panel",
-          "panelHeader": "Panel-Kopf",
-          "topBar": "Obere Leiste",
-          "avatar": "Benutzer-Avatar (in der Profilansicht)",
-          "avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
-          "popup": "Dialogfenster und Hinweistexte",
-          "button": "Schaltfläche",
-          "buttonHover": "Schaltfläche (hover)",
-          "buttonPressed": "Schaltfläche (gedrückt)",
-          "buttonPressedHover": "Schaltfläche (gedrückt+hover)",
-          "input": "Input field"
-        }
-      },
-      "fonts": {
-        "_tab_label": "Schriften",
-        "help": "Wähl die Schriftart, die für Elemente der Benutzeroberfläche verwendet werden soll. Für \" Benutzerdefiniert\" musst du den genauen Schriftnamen eingeben, wie er im System angezeigt wird.",
-        "components": {
-          "interface": "Oberfläche",
-          "input": "Eingabefelder",
-          "post": "Beitragstext",
-          "postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
-        },
-        "family": "Schriftname",
-        "size": "Größe (in px)",
-        "weight": "Gewicht (Dicke)",
-        "custom": "Benutzerdefiniert"
-      },
-      "preview": {
-        "header": "Vorschau",
-        "content": "Inhalt",
-        "error": "Beispielfehler",
-        "button": "Schaltfläche",
-        "text": "Ein Haufen mehr von {0} und {1}",
-        "mono": "Inhalt",
-        "input": "Sitze gerade im Hofbräuhaus.",
-        "faint_link": "Hilfreiche Anleitung",
-        "fine_print": "Lies unser {0}, um nichts Nützliches zu lernen!",
-        "header_faint": "Das ist in Ordnung",
-        "checkbox": "Ich habe die Allgemeinen Geschäftsbedingungen überflogen",
-        "link": "ein netter kleiner Link"
-      }
-    }
-  },
-  "timeline": {
-    "collapse": "Einklappen",
-    "conversation": "Unterhaltung",
-    "error_fetching": "Fehler beim Laden",
-    "load_older": "Lade ältere Beiträge",
-    "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden.",
-    "repeated": "wiederholte",
-    "show_new": "Zeige Neuere",
-    "up_to_date": "Aktuell"
-  },
-  "user_card": {
-    "approve": "Genehmigen",
-    "block": "Blockieren",
-    "blocked": "Blockiert!",
-    "deny": "Ablehnen",
-    "follow": "Folgen",
-    "follow_sent": "Anfrage gesendet!",
-    "follow_progress": "Anfragen…",
-    "follow_again": "Anfrage erneut senden?",
-    "follow_unfollow": "Folgen beenden",
-    "followees": "Folgt",
-    "followers": "Followers",
-    "following": "Folgst du!",
-    "follows_you": "Folgt dir!",
-    "its_you": "Das bist du!",
-    "mute": "Stummschalten",
-    "muted": "Stummgeschaltet",
-    "per_day": "pro Tag",
-    "remote_follow": "Folgen",
-    "statuses": "Beiträge"
-  },
-  "user_profile": {
-    "timeline_title": "Beiträge"
-  },
-  "who_to_follow": {
-    "more": "Mehr",
-    "who_to_follow": "Wem soll ich folgen"
-  },
-  "tool_tip": {
-    "media_upload": "Medien hochladen",
-    "repeat": "Wiederholen",
-    "reply": "Antworten",
-    "favorite": "Favorisieren",
-    "user_settings": "Benutzereinstellungen"
-  },
-  "upload":{
-    "error": {
-    "base": "Hochladen fehlgeschlagen.",
-    "file_too_big": "Datei ist zu groß [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-    "default": "Bitte versuche es später erneut"
     },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
+    "timeline": {
+        "collapse": "Einklappen",
+        "conversation": "Unterhaltung",
+        "error_fetching": "Fehler beim Laden",
+        "load_older": "Lade ältere Beiträge",
+        "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden.",
+        "repeated": "wiederholte",
+        "show_new": "Zeige Neuere",
+        "up_to_date": "Aktuell"
+    },
+    "user_card": {
+        "approve": "Genehmigen",
+        "block": "Blockieren",
+        "blocked": "Blockiert!",
+        "deny": "Ablehnen",
+        "follow": "Folgen",
+        "follow_sent": "Anfrage gesendet!",
+        "follow_progress": "Anfragen…",
+        "follow_again": "Anfrage erneut senden?",
+        "follow_unfollow": "Folgen beenden",
+        "followees": "Folgt",
+        "followers": "Followers",
+        "following": "Folgst du!",
+        "follows_you": "Folgt dir!",
+        "its_you": "Das bist du!",
+        "mute": "Stummschalten",
+        "muted": "Stummgeschaltet",
+        "per_day": "pro Tag",
+        "remote_follow": "Folgen",
+        "statuses": "Beiträge"
+    },
+    "user_profile": {
+        "timeline_title": "Beiträge"
+    },
+    "who_to_follow": {
+        "more": "Mehr",
+        "who_to_follow": "Wem soll ich folgen"
+    },
+    "tool_tip": {
+        "media_upload": "Medien hochladen",
+        "repeat": "Wiederholen",
+        "reply": "Antworten",
+        "favorite": "Favorisieren",
+        "user_settings": "Benutzereinstellungen"
+    },
+    "upload": {
+        "error": {
+            "base": "Hochladen fehlgeschlagen.",
+            "file_too_big": "Datei ist zu groß [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "Bitte versuche es später erneut"
+        },
+        "file_size_units": {
+            "B": "B",
+            "KiB": "KiB",
+            "MiB": "MiB",
+            "GiB": "GiB",
+            "TiB": "TiB"
+        }
+    },
+    "search": {
+        "people": "Leute",
+        "hashtags": "Hashtags",
+        "person_talking": "{count} Person spricht darüber",
+        "people_talking": "{count} Leute sprechen darüber",
+        "no_results": "Keine Ergebnisse"
+    },
+    "password_reset": {
+        "forgot_password": "Passwort vergessen?",
+        "password_reset": "Password zurücksetzen",
+        "instruction": "Wenn du hier deinen Benutznamen oder die zugehörige E-Mail-Adresse eingibst, kann dir der Server einen Link zum Passwortzurücksetzen zuschicken.",
+        "placeholder": "Dein Benutzername oder die zugehörige E-Mail-Adresse",
+        "check_email": "Im E-Mail-Posteingang des angebenen Kontos müsste sich jetzt (oder zumindest in Kürze) die E-Mail mit dem Link zum Passwortzurücksetzen befinden.",
+        "return_home": "Zurück zur Heimseite",
+        "not_found": "Benutzername/E-Mail-Adresse nicht gefunden. Vertippt?",
+        "too_many_requests": "Kurze Pause. Zu viele Versuche. Bitte, später nochmal probieren.",
+        "password_reset_disabled": "Passwortzurücksetzen deaktiviert. Bitte Administrator kontaktieren.",
+        "password_reset_required": "Passwortzurücksetzen erforderlich",
+        "password_reset_required_but_mailer_is_disabled": "Passwortzurücksetzen wäre erforderlich, ist aber deaktiviert. Bitte Administrator kontaktieren."
+    },
+    "about": {
+        "mrf": {
+            "federation": "Föderation",
+            "mrf_policies": "Aktivierte MRF Richtlinien",
+            "simple": {
+                "simple_policies": "Instanzspezifische Richtlinien",
+                "accept": "Akzeptieren",
+                "reject": "Ablehnen",
+                "reject_desc": "Diese Instanz akzeptiert keine Nachrichten der folgenden Instanzen:",
+                "quarantine": "Quarantäne",
+                "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen",
+                "media_removal": "Medienentfernung",
+                "media_removal_desc": "Diese Instanz entfernt Medien von den Beiträgen der folgenden Instanzen:",
+                "media_nsfw": "Erzwingen Medien als heikel zu makieren",
+                "media_nsfw_desc": "Diese Instanz makiert die Medien in Beiträgen der folgenden Instanzen als heikel:",
+                "accept_desc": "Diese Instanz akzeptiert nur Nachrichten von den folgenden Instanzen:",
+                "quarantine_desc": "Diese Instanz sendet nur öffentliche Beiträge zu den folgenden Instanzen:",
+                "ftl_removal_desc": "Dieser Instanz entfernt folgende Instanzen von der \"Das gesamte bekannte Netzwerk\" Zeitleiste:"
+            },
+            "keyword": {
+                "keyword_policies": "Keyword Richtlinien",
+                "reject": "Ablehnen",
+                "replace": "Ersetzen",
+                "is_replaced_by": "→",
+                "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen"
+            },
+            "mrf_policies_desc": "MRF Richtlinien manipulieren das Föderationsverhalten dieser Instanz. Die folgenden Richtlinien sind aktiv:"
+        },
+        "staff": "Mitarbeiter"
+    },
+    "domain_mute_card": {
+        "mute": "Stummschalten",
+        "mute_progress": "Wird stummgeschaltet..",
+        "unmute": "Stummschaltung aufheben",
+        "unmute_progress": "Stummschaltung wird aufgehoben.."
+    },
+    "exporter": {
+        "export": "Exportieren",
+        "processing": "Verarbeitung läuft, bald wird Du dazu aufgefordert, deine Datei herunterzuladen"
+    },
+    "image_cropper": {
+        "crop_picture": "Bild zuschneiden",
+        "save": "Speichern",
+        "cancel": "Abbrechen",
+        "save_without_cropping": "Ohne Zuschneiden speichern"
+    },
+    "importer": {
+        "submit": "Absenden",
+        "success": "Erfolgreich importiert.",
+        "error": "Ein Fehler ist beim Verabeiten der Datei aufgetreten."
+    },
+    "media_modal": {
+        "previous": "Zurück",
+        "next": "Weiter"
+    },
+    "polls": {
+        "add_poll": "Umfrage hinzufügen",
+        "add_option": "Option hinzufügen",
+        "option": "Option",
+        "votes": "Stimmen",
+        "vote": "Abstimmen",
+        "type": "Umfragetyp",
+        "multiple_choices": "Mehrere Auswahlmöglichkeiten",
+        "single_choice": "Eine Auswahlmöglichkeit",
+        "expiry": "Alter der Umfrage",
+        "expired": "Die Umfrage endete vor {0}",
+        "not_enough_options": "Zu wenig einzigartige Auswahlmöglichkeiten in der Umfrage",
+        "expires_in": "Die Umfrage endet in {0}"
+    },
+    "emoji": {
+        "stickers": "Sticker",
+        "emoji": "Emoji",
+        "search_emoji": "Nach einem Emoji suchen",
+        "custom": "Benutzerdefinierter Emoji",
+        "keep_open": "Auswahlfenster offen halten",
+        "add_emoji": "Emoji einfügen"
     }
-  },
-  "search": {
-    "people": "Leute",
-    "hashtags": "Hashtags",
-    "person_talking": "{count} Person spricht darüber",
-    "people_talking": "{count} Leute sprechen darüber",
-    "no_results": "Keine Ergebnisse"
-  },
-  "password_reset": {
-    "forgot_password": "Passwort vergessen?",
-    "password_reset": "Password zurücksetzen",
-    "instruction": "Wenn du hier deinen Benutznamen oder die zugehörige E-Mail-Adresse eingibst, kann dir der Server einen Link zum Passwortzurücksetzen zuschicken.",
-    "placeholder": "Dein Benutzername oder die zugehörige E-Mail-Adresse",
-    "check_email": "Im E-Mail-Posteingang des angebenen Kontos müsste sich jetzt (oder zumindest in Kürze) die E-Mail mit dem Link zum Passwortzurücksetzen befinden.",
-    "return_home": "Zurück zur Heimseite",
-    "not_found": "Benutzername/E-Mail-Adresse nicht gefunden. Vertippt?",
-    "too_many_requests": "Kurze Pause. Zu viele Versuche. Bitte, später nochmal probieren.",
-    "password_reset_disabled": "Passwortzurücksetzen deaktiviert. Bitte Administrator kontaktieren.",
-    "password_reset_required": "Passwortzurücksetzen erforderlich",
-    "password_reset_required_but_mailer_is_disabled": "Passwortzurücksetzen wäre erforderlich, ist aber deaktiviert. Bitte Administrator kontaktieren."
-  }
 }

From 21ecca4c62eb465d364155dd0ca415878ec28ab0 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Wed, 13 May 2020 17:42:56 +0000
Subject: [PATCH 028/415] Translated using Weblate (Italian)

Currently translated at 28.3% (174 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 3a49d96f..817a6465 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -5,34 +5,34 @@
     },
     "nav": {
         "mentions": "Menzioni",
-        "public_tl": "Sequenza temporale pubblica",
-        "timeline": "Sequenza temporale",
-        "twkn": "L'intera rete conosciuta",
-        "chat": "Chat Locale",
-        "friend_requests": "Richieste di Seguirti"
+        "public_tl": "Sequenza pubblica",
+        "timeline": "Sequenza personale",
+        "twkn": "Tutte le stanze accessibili",
+        "chat": "Chat della stanza",
+        "friend_requests": "Vogliono seguirti"
     },
     "notifications": {
         "followed_you": "ti segue",
         "notifications": "Notifiche",
-        "read": "Leggi!",
+        "read": "Letto!",
         "broken_favorite": "Stato sconosciuto, lo sto cercando...",
-        "favorited_you": "ha messo mi piace al tuo stato",
-        "load_older": "Carica notifiche più vecchie",
-        "repeated_you": "ha condiviso il tuo stato"
+        "favorited_you": "ha gradito il tuo messaggio",
+        "load_older": "Carica notifiche precedenti",
+        "repeated_you": "ha condiviso il tuo messaggio"
     },
     "settings": {
         "attachments": "Allegati",
-        "autoload": "Abilita caricamento automatico quando si raggiunge fondo pagina",
-        "avatar": "Avatar",
+        "autoload": "Abilita caricamento automatico quando si raggiunge il fondo pagina",
+        "avatar": "Icona utente",
         "bio": "Introduzione",
-        "current_avatar": "Il tuo avatar attuale",
-        "current_profile_banner": "Il tuo banner attuale",
+        "current_avatar": "La tua icona attuale",
+        "current_profile_banner": "Il tuo stendardo attuale",
         "filtering": "Filtri",
-        "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, uno per linea",
+        "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, una per linea",
         "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
-        "hide_attachments_in_tl": "Nascondi gli allegati presenti nella sequenza temporale",
+        "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
         "name": "Nome",
-        "name_bio": "Nome & Introduzione",
+        "name_bio": "Nome ed introduzione",
         "nsfw_clickthrough": "Abilita il click per visualizzare gli allegati segnati come NSFW",
         "profile_background": "Sfondo della tua pagina",
         "profile_banner": "Banner del tuo profilo",
@@ -44,55 +44,55 @@
         "theme": "Tema",
         "user_settings": "Impostazioni Utente",
         "attachmentRadius": "Allegati",
-        "avatarAltRadius": "Avatar (Notifiche)",
-        "avatarRadius": "Avatar",
+        "avatarAltRadius": "Icona utente (Notifiche)",
+        "avatarRadius": "Icone utente",
         "background": "Sfondo",
         "btnRadius": "Pulsanti",
-        "cBlue": "Blu (Rispondere, seguire)",
-        "cGreen": "Verde (Condividi)",
-        "cOrange": "Arancio (Mi piace)",
-        "cRed": "Rosso (Annulla)",
+        "cBlue": "Blu (risposte, seguire)",
+        "cGreen": "Verde (ripeti)",
+        "cOrange": "Arancio (gradire)",
+        "cRed": "Rosso (annulla)",
         "change_password": "Cambia Password",
         "change_password_error": "C'è stato un problema durante il cambiamento della password.",
         "changed_password": "Password cambiata correttamente!",
-        "collapse_subject": "Riduci post che hanno un oggetto",
+        "collapse_subject": "Collassa messaggi con Oggetto",
         "confirm_new_password": "Conferma la nuova password",
-        "current_password": "Password attuale",
-        "data_import_export_tab": "Importa / Esporta Dati",
-        "default_vis": "Visibilità predefinita dei post",
-        "delete_account": "Elimina Account",
-        "delete_account_description": "Elimina definitivamente il tuo account e tutti i tuoi messaggi.",
-        "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo account. Se il problema persiste contatta l'amministratore della tua istanza.",
-        "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione dell'account.",
-        "export_theme": "Salva settaggi",
+        "current_password": "La tua password attuale",
+        "data_import_export_tab": "Importa o esporta dati",
+        "default_vis": "Visibilità predefinita dei messaggi",
+        "delete_account": "Elimina profilo",
+        "delete_account_description": "Elimina definitivamente il tuo profilo e tutti i tuoi messaggi.",
+        "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo profilo. Se il problema persiste contatta l'amministratore della tua stanza.",
+        "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione del tuo profilo.",
+        "export_theme": "Salva impostazioni",
         "follow_export": "Esporta la lista di chi segui",
         "follow_export_button": "Esporta la lista di chi segui in un file csv",
         "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
         "follow_import": "Importa la lista di chi segui",
         "follow_import_error": "Errore nell'importazione della lista di chi segui",
         "follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.",
-        "foreground": "In primo piano",
+        "foreground": "Primo piano",
         "general": "Generale",
-        "hide_post_stats": "Nascondi statistiche dei post (es. il numero di mi piace)",
-        "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero di chi ti segue)",
+        "hide_post_stats": "Nascondi statistiche dei messaggi (es. il numero di preferenze)",
+        "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero dei tuoi seguaci)",
         "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file csv",
-        "import_theme": "Carica settaggi",
+        "import_theme": "Carica impostazioni",
         "inputRadius": "Campi di testo",
         "instance_default": "(predefinito: {value})",
-        "interfaceLanguage": "Linguaggio dell'interfaccia",
-        "invalid_theme_imported": "Il file selezionato non è un file di tema per Pleroma supportato. Il tuo tema non è stato modificato.",
+        "interfaceLanguage": "Lingua dell'interfaccia",
+        "invalid_theme_imported": "Il file selezionato non è un tema supportato da Pleroma. Il tuo tema non è stato modificato.",
         "limited_availability": "Non disponibile nel tuo browser",
         "links": "Collegamenti",
-        "lock_account_description": "Limita il tuo account solo per contatti approvati",
+        "lock_account_description": "Limita il tuo account solo a seguaci approvati",
         "loop_video": "Riproduci video in ciclo continuo",
-        "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le gif di Mastodon)",
+        "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le \"gif\" di Mastodon)",
         "new_password": "Nuova password",
         "notification_visibility": "Tipi di notifiche da mostrare",
         "notification_visibility_follows": "Nuove persone ti seguono",
-        "notification_visibility_likes": "Mi piace",
+        "notification_visibility_likes": "Preferiti",
         "notification_visibility_mentions": "Menzioni",
         "notification_visibility_repeats": "Condivisioni",
-        "no_rich_text_description": "Togli la formattazione del testo da tutti i post",
+        "no_rich_text_description": "Togli l'impaginazione del testo da tutti i messaggi",
         "oauth_tokens": "Token OAuth",
         "token": "Token",
         "refresh_token": "Aggiorna token",
@@ -152,9 +152,9 @@
     "features_panel": {
         "chat": "Chat",
         "gopher": "Gopher",
-        "media_proxy": "Media proxy",
-        "scope_options": "Opzioni di visibilità",
-        "text_limit": "Lunghezza limite",
+        "media_proxy": "Proxy multimedia",
+        "scope_options": "Opzioni raggio d'azione",
+        "text_limit": "Lunghezza massima",
         "title": "Caratteristiche",
         "who_to_follow": "Chi seguire"
     },
@@ -171,21 +171,21 @@
         "username": "Nome utente"
     },
     "post_status": {
-        "account_not_locked_warning": "Il tuo account non è {0}. Chiunque può seguirti e vedere i tuoi post riservati a chi ti segue.",
-        "account_not_locked_warning_link": "bloccato",
-        "attachments_sensitive": "Segna allegati come sensibili",
+        "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_link": "protetto",
+        "attachments_sensitive": "Nascondi gli allegati",
         "content_type": {
             "text/plain": "Testo normale"
         },
         "content_warning": "Oggetto (facoltativo)",
-        "default": "Appena atterrato in L.A.",
+        "default": "Sono appena atterrato a Fiumicino.",
         "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
-        "posting": "Pubblica",
+        "posting": "Sto pubblicando",
         "scope": {
-            "direct": "Diretto - Pubblicato solo per gli utenti menzionati",
-            "private": "Solo per chi ti segue - Visibile solo da chi ti segue",
-            "public": "Pubblico - Visibile sulla sequenza temporale pubblica",
-            "unlisted": "Non elencato - Non visibile sulla sequenza temporale pubblica"
+            "direct": "Diretto - Visibile solo agli utenti menzionati",
+            "private": "Solo per seguaci - Visibile solo dai tuoi seguaci",
+            "public": "Pubblico - Visibile sulla sequenza pubblica",
+            "unlisted": "Non elencato - Non visibile sulla sequenza pubblica"
         }
     },
     "registration": {
@@ -205,7 +205,16 @@
     },
     "about": {
         "mrf": {
-            "federation": "Federazione"
+            "federation": "Federazione",
+            "keyword": {
+                "reject": "Rifiuta",
+                "replace": "Sostituisci",
+                "is_replaced_by": "→"
+            },
+            "simple": {
+                "reject": "Rifiuta",
+                "accept": "Accetta"
+            }
         }
     }
 }

From 8ac78e92f8ce2306d03e922412183f0377dcbc01 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 13 May 2020 17:17:13 +0000
Subject: [PATCH 029/415] Translated using Weblate (Russian)

Currently translated at 59.3% (364 of 613 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index a34c2e3f..790f2f3c 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -13,7 +13,10 @@
         "disable": "Оключить",
         "enable": "Включить",
         "confirm": "Подтвердить",
-        "verify": "Проверить"
+        "verify": "Проверить",
+        "more": "Больше",
+        "generic_error": "Произошла ошибка",
+        "optional": "не обязательно"
     },
     "login": {
         "login": "Войти",
@@ -415,14 +418,47 @@
         "mrf": {
             "federation": "Федерация",
             "simple": {
-                "accept_desc": ""
+                "accept_desc": "Данный сервер принимает сообщения только со следующих серверов:",
+                "ftl_removal_desc": "Данный сервер скрывает следующие сервера с федеративной ленты:",
+                "media_nsfw_desc": "Данный сервер принужденно помечает вложения со следущих серверов как NSFW:",
+                "simple_policies": "Правила для определенных серверов",
+                "accept": "Принимаемые сообщения",
+                "reject": "Отклоняемые сообщения",
+                "reject_desc": "Данный сервер не принимает сообщения со следующих серверов:",
+                "quarantine": "Зона карантина",
+                "quarantine_desc": "Данный сервер отправляет только публичные посты следующим серверам:",
+                "ftl_removal": "Скрытие с федеративной ленты",
+                "media_removal": "Удаление вложений",
+                "media_removal_desc": "Данный сервер удаляет вложения со следующих серверов:",
+                "media_nsfw": "Принужденно помеченно как NSFW"
             },
             "keyword": {
-                "ftl_removal": "Убраны из федеративной ленты",
+                "ftl_removal": "Убрать из федеративной ленты",
                 "reject": "Отклонить",
-                "keyword_policies": "Действия на ключевые слова"
-            }
+                "keyword_policies": "Действия на ключевые слова",
+                "replace": "Заменить",
+                "is_replaced_by": "→"
+            },
+            "mrf_policies": "Активные правила MRF (модуль переписывания сообщений)",
+            "mrf_policies_desc": "Правила MRF (модуль переписывания сообщений) влияют на федерацию данного сервера. Следующие правила активны:"
         },
         "staff": "Администрация"
+    },
+    "domain_mute_card": {
+        "mute": "Игнорировать",
+        "mute_progress": "В процессе...",
+        "unmute": "Прекратить игнорирование",
+        "unmute_progress": "В процессе..."
+    },
+    "exporter": {
+        "export": "Экспорт",
+        "processing": "Запрос в обработке, вам скоро будет предложено загрузить файл"
+    },
+    "features_panel": {
+        "chat": "Чат",
+        "media_proxy": "Прокси для внешних вложений",
+        "text_limit": "Лимит символов",
+        "title": "Особенности",
+        "gopher": "Gopher"
     }
 }

From bc215d70f5047539bae2f61f1298e3c282970c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sidor?= <pleromeme@meekchopp.es>
Date: Wed, 13 May 2020 16:41:19 +0000
Subject: [PATCH 030/415] Translated using Weblate (Polish)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 4a4b1e31..89f2fdc2 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -1,735 +1,743 @@
 {
-  "about": {
-    "mrf": {
-      "federation": "Federacja",
-      "keyword": {
-        "keyword_policies": "Zasady słów kluczowych",
-        "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
-        "reject": "Odrzucanie",
-        "replace": "Zastąpienie",
-        "is_replaced_by": "→"
-      },
-      "mrf_policies": "Włączone zasady MRF",
-      "mrf_policies_desc": "Zasady MRF zmieniają zachowanie federowania instancji. Następujące zasady są włączone:",
-      "simple": {
-        "simple_policies": "Zasady specyficzne dla instancji",
-        "accept": "Akceptowanie",
-        "accept_desc": "Ta instancja akceptuje tylko posty z wymienionych instancji:",
-        "reject": "Odrzucanie",
-        "reject_desc": "Ta instancja odrzuca posty z wymienionych instancji:",
-        "quarantine": "Kwarantanna",
-        "quarantine_desc": "Ta instancja wysyła tylko publiczne posty do wymienionych instancji:",
-        "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
-        "ftl_removal_desc": "Ta instancja usuwa te instancje z \"Całej znanej sieci\"",
-        "media_removal": "Usuwanie multimediów",
-        "media_removal_desc": "Ta instancja usuwa multimedia z postów od wymienionych instancji:",
-        "media_nsfw": "Multimedia ustawione jako wrażliwe",
-        "media_nsfw_desc": "Ta instancja wymusza, by multimedia z wymienionych instancji były ustawione jako wrażliwe:"
-      }
-    },
-    "staff": "Obsługa"
-  },
-  "chat": {
-    "title": "Czat"
-  },
-  "domain_mute_card": {
-    "mute": "Wycisz",
-    "mute_progress": "Wyciszam...",
-    "unmute": "Odcisz",
-    "unmute_progress": "Odciszam..."
-  },
-  "exporter": {
-    "export": "Eksportuj",
-    "processing": "Przetwarzam, za chwilę zostaniesz zapytany o ściągnięcie pliku"
-  },
-  "features_panel": {
-    "chat": "Czat",
-    "gopher": "Gopher",
-    "media_proxy": "Proxy mediów",
-    "scope_options": "Ustawienia zakresu",
-    "text_limit": "Limit tekstu",
-    "title": "Funkcje",
-    "who_to_follow": "Propozycje obserwacji"
-  },
-  "finder": {
-    "error_fetching_user": "Błąd przy pobieraniu profilu",
-    "find_user": "Znajdź użytkownika"
-  },
-  "general": {
-    "apply": "Zastosuj",
-    "submit": "Wyślij",
-    "more": "Więcej",
-    "generic_error": "Wystąpił błąd",
-    "optional": "nieobowiązkowe",
-    "show_more": "Pokaż więcej",
-    "show_less": "Pokaż mniej",
-    "dismiss": "Odrzuć",
-    "cancel": "Anuluj",
-    "disable": "Wyłącz",
-    "enable": "Włącz",
-    "confirm": "Potwierdź",
-    "verify": "Zweryfikuj"
-  },
-  "image_cropper": {
-    "crop_picture": "Przytnij obrazek",
-    "save": "Zapisz",
-    "save_without_cropping": "Zapisz bez przycinania",
-    "cancel": "Anuluj"
-  },
-  "importer": {
-    "submit": "Wyślij",
-    "success": "Zaimportowano pomyślnie",
-    "error": "Wystąpił błąd podczas importowania pliku."
-  },
-  "login": {
-    "login": "Zaloguj",
-    "description": "Zaloguj używając OAuth",
-    "logout": "Wyloguj",
-    "password": "Hasło",
-    "placeholder": "n.p. lain",
-    "register": "Zarejestruj",
-    "username": "Użytkownik",
-    "hint": "Zaloguj się, aby dołączyć do dyskusji",
-    "authentication_code": "Kod weryfikacyjny",
-    "enter_recovery_code": "Wprowadź kod zapasowy",
-    "enter_two_factor_code": "Wprowadź kod weryfikacyjny",
-    "recovery_code": "Kod zapasowy",
-    "heading" : {
-      "totp" : "Weryfikacja dwuetapowa",
-      "recovery" : "Zapasowa weryfikacja dwuetapowa"
-    }
-  },
-  "media_modal": {
-    "previous": "Poprzednie",
-    "next": "Następne"
-  },
-  "nav": {
-    "about": "O nas",
-    "administration": "Administracja",
-    "back": "Wróć",
-    "chat": "Lokalny czat",
-    "friend_requests": "Prośby o możliwość obserwacji",
-    "mentions": "Wzmianki",
-    "interactions": "Interakcje",
-    "dms": "Wiadomości prywatne",
-    "public_tl": "Publiczna oś czasu",
-    "timeline": "Oś czasu",
-    "twkn": "Cała znana sieć",
-    "user_search": "Wyszukiwanie użytkowników",
-    "search": "Wyszukiwanie",
-    "who_to_follow": "Sugestie obserwacji",
-    "preferences": "Preferencje"
-  },
-  "notifications": {
-    "broken_favorite": "Nieznany status, szukam go…",
-    "favorited_you": "dodał(-a) twój status do ulubionych",
-    "followed_you": "obserwuje cię",
-    "load_older": "Załaduj starsze powiadomienia",
-    "notifications": "Powiadomienia",
-    "read": "Przeczytane!",
-    "repeated_you": "powtórzył(-a) twój status",
-    "no_more_notifications": "Nie masz więcej powiadomień",
-    "migrated_to": "wyemigrował do",
-    "reacted_with": "zareagował z {0}"
-  },
-  "polls": {
-    "add_poll": "Dodaj ankietę",
-    "add_option": "Dodaj opcję",
-    "option": "Opcja",
-    "votes": "głosów",
-    "vote": "Głosuj",
-    "type": "Typ ankiety",
-    "single_choice": "jednokrotnego wyboru",
-    "multiple_choices": "wielokrotnego wyboru",
-    "expiry": "Czas trwania ankiety",
-    "expires_in": "Ankieta kończy się za{0}",
-    "expired": "Ankieta skończyła się {0} temu",
-    "not_enough_options": "Zbyt mało unikalnych opcji w ankiecie"
-  },
-  "emoji": {
-    "stickers": "Naklejki",
-    "emoji": "Emoji",
-    "keep_open": "Zostaw selektor otwarty",
-    "search_emoji": "Wyszukaj emoji",
-    "add_emoji": "Wstaw emoji",
-    "custom": "Niestandardowe emoji",
-    "unicode": "Emoji unicode",
-    "load_all_hint": "Załadowano pierwsze {saneAmount} emoji, Załadowanie wszystkich emoji może spowodować problemy z wydajnością.",
-    "load_all": "Ładuję wszystkie {emojiAmount} emoji"
-  },
-  "interactions": {
-    "favs_repeats": "Powtórzenia i ulubione",
-    "follows": "Nowi obserwujący",
-    "moves": "Użytkownik migruje",
-    "load_older": "Załaduj starsze interakcje"
-  },
-  "post_status": {
-    "new_status": "Dodaj nowy status",
-    "account_not_locked_warning": "Twoje konto nie jest {0}. Każdy może cię zaobserwować aby zobaczyć wpisy tylko dla obserwujących.",
-    "account_not_locked_warning_link": "zablokowane",
-    "attachments_sensitive": "Oznacz załączniki jako wrażliwe",
-    "content_type": {
-      "text/plain": "Czysty tekst",
-      "text/html": "HTML",
-      "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
-    },
-    "content_warning": "Temat (nieobowiązkowy)",
-    "default": "Właśnie wróciłem z kościoła",
-    "direct_warning_to_all": "Ten wpis zobaczą wszystkie osoby, o których wspomniałeś(-aś).",
-    "direct_warning_to_first_only": "Ten wpis zobaczą tylko te osoby, o których wspomniałeś(-aś) na początku wiadomości.",
-    "posting": "Wysyłanie",
-    "scope_notice": {
-      "public": "Ten post będzie widoczny dla każdego",
-      "private": "Ten post będzie widoczny tylko dla twoich obserwujących",
-      "unlisted": "Ten post nie będzie widoczny na publicznej osi czasu i całej znanej sieci"
-    },
-    "scope": {
-      "direct": "Bezpośredni – Tylko dla wspomnianych użytkowników",
-      "private": "Tylko dla obserwujących – Umieść dla osób, które cię obserwują",
-      "public": "Publiczny – Umieść na publicznych osiach czasu",
-      "unlisted": "Niewidoczny – Nie umieszczaj na publicznych osiach czasu"
-    }
-  },
-  "registration": {
-    "bio": "Bio",
-    "email": "E-mail",
-    "fullname": "Wyświetlana nazwa profilu",
-    "password_confirm": "Potwierdzenie hasła",
-    "registration": "Rejestracja",
-    "token": "Token zaproszenia",
-    "captcha": "CAPTCHA",
-    "new_captcha": "Naciśnij na obrazek, aby dostać nowy kod captcha",
-    "username_placeholder": "np. lain",
-    "fullname_placeholder": "np. Lain Iwakura",
-    "bio_placeholder": "e.g.\nCześć, jestem Lain.\nJestem dziewczynką z anime żyjącą na peryferiach Japonii. Możesz znać mnie z Wired.",
-    "validations": {
-      "username_required": "nie może być pusta",
-      "fullname_required": "nie może być pusta",
-      "email_required": "nie może być pusty",
-      "password_required": "nie może być puste",
-      "password_confirmation_required": "nie może być puste",
-      "password_confirmation_match": "musi być takie jak hasło"
-    }
-  },
-  "remote_user_resolver": {
-    "remote_user_resolver": "Wyszukiwarka użytkowników nietutejszych",
-    "searching_for": "Szukam",
-    "error": "Nie znaleziono."
-  },
-  "selectable_list": {
-    "select_all": "Zaznacz wszystko"
-  },
-  "settings": {
-    "app_name": "Nazwa aplikacji",
-    "security": "Bezpieczeństwo",
-    "enter_current_password_to_confirm": "Wprowadź obecne hasło, by potwierdzić twoją tożsamość",
-    "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "Ustaw OTP",
-      "wait_pre_setup_otp" : "początkowe ustawianie OTP",
-      "confirm_and_enable" : "Potwierdź i włącz OTP",
-      "title": "Weryfikacja dwuetapowa",
-      "generate_new_recovery_codes" : "Wygeneruj nowe kody zapasowe",
-      "warning_of_generate_new_codes" : "Po tym gdy generujesz nowe kody zapasowe, stare przestaną działać.",
-      "recovery_codes" : "Kody zapasowe.",
-      "waiting_a_recovery_codes": "Otrzymuję kody zapasowe...",
-      "recovery_codes_warning" : "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał dostępu do swojego konta.",
-      "authentication_methods" : "Metody weryfikacji",
-      "scan": {
-        "title": "Skanuj",
-        "desc": "Zeskanuj ten kod QR używając twojej aplikacji 2FA albo wpisz ten klucz:",
-        "secret_code": "Klucz"
-      },
-      "verify": {
-        "desc": "By włączyć weryfikację dwuetapową, wpisz kod z twojej aplikacji 2FA:"
-      }
-    },
-    "allow_following_move": "Zezwalaj na automatyczną obserwację gdy obserwowane konto migruje",
-    "attachmentRadius": "Załączniki",
-    "attachments": "Załączniki",
-    "autoload": "Włącz automatyczne ładowanie po przewinięciu do końca strony",
-    "avatar": "Awatar",
-    "avatarAltRadius": "Awatary (powiadomienia)",
-    "avatarRadius": "Awatary",
-    "background": "Tło",
-    "bio": "Bio",
-    "block_export": "Eksport blokad",
-    "block_export_button": "Eksportuj twoje blokady do pliku .csv",
-    "block_import": "Import blokad",
-    "block_import_error": "Wystąpił błąd podczas importowania blokad",
-    "blocks_imported": "Zaimportowano blokady, przetwarzanie może zająć trochę czasu.",
-    "blocks_tab": "Bloki",
-    "btnRadius": "Przyciski",
-    "cBlue": "Niebieski (odpowiedz, obserwuj)",
-    "cGreen": "Zielony (powtórzenia)",
-    "cOrange": "Pomarańczowy (ulubione)",
-    "cRed": "Czerwony (anuluj)",
-    "change_email": "Zmień email",
-    "change_email_error": "Wystąpił problem podczas zmiany emaila.",
-    "changed_email": "Pomyślnie zmieniono email!",
-    "change_password": "Zmień hasło",
-    "change_password_error": "Podczas zmiany hasła wystąpił problem.",
-    "changed_password": "Pomyślnie zmieniono hasło!",
-    "collapse_subject": "Zwijaj posty z tematami",
-    "composing": "Pisanie",
-    "confirm_new_password": "Potwierdź nowe hasło",
-    "current_avatar": "Twój obecny awatar",
-    "current_password": "Obecne hasło",
-    "current_profile_banner": "Twój obecny banner profilu",
-    "data_import_export_tab": "Import/eksport danych",
-    "default_vis": "Domyślny zakres widoczności",
-    "delete_account": "Usuń konto",
-    "delete_account_description": "Trwale usuń konto i wszystkie posty.",
-    "delete_account_error": "Wystąpił problem z usuwaniem twojego konta. Jeżeli problem powtarza się, poinformuj administratora swojej instancji.",
-    "delete_account_instructions": "Wprowadź swoje hasło w poniższe pole aby potwierdzić usunięcie konta.",
-    "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługa.",
-    "domain_mutes": "Domeny",
-    "avatar_size_instruction": "Zalecany minimalny rozmiar awatarów to 150x150 pikseli.",
-    "pad_emoji": "Dodaj odstęp z obu stron emoji podczas dodawania selektorem",
-    "emoji_reactions_on_timeline": "Pokaż reakcje emoji na osi czasu",
-    "export_theme": "Zapisz motyw",
-    "filtering": "Filtrowanie",
-    "filtering_explanation": "Wszystkie statusy zawierające te słowa będą wyciszone. Jedno słowo na linijkę.",
-    "follow_export": "Eksport obserwowanych",
-    "follow_export_button": "Eksportuj swoją listę obserwowanych do pliku CSV",
-    "follow_import": "Import obserwowanych",
-    "follow_import_error": "Błąd przy importowaniu obserwowanych",
-    "follows_imported": "Obserwowani zaimportowani! Przetwarzanie może trochę potrwać.",
-    "accent": "Akcent",
-    "foreground": "Pierwszy plan",
-    "general": "Ogólne",
-    "hide_attachments_in_convo": "Ukrywaj załączniki w rozmowach",
-    "hide_attachments_in_tl": "Ukrywaj załączniki w osi czasu",
-    "hide_muted_posts": "Ukrywaj wpisy wyciszonych użytkowników",
-    "max_thumbnails": "Maksymalna liczba miniatur w poście",
-    "hide_isp": "Ukryj panel informacji o instancji",
-    "preload_images": "Ładuj wstępnie obrazy",
-    "use_one_click_nsfw": "Otwieraj załączniki NSFW jednym kliknięciem",
-    "hide_post_stats": "Ukrywaj statysyki postów (np. liczbę polubień)",
-    "hide_user_stats": "Ukrywaj statysyki użytkowników (np. liczbę obserwujących)",
-    "hide_filtered_statuses": "Ukrywaj filtrowane statusy",
-    "import_blocks_from_a_csv_file": "Importuj blokady z pliku CSV",
-    "import_followers_from_a_csv_file": "Importuj obserwowanych z pliku CSV",
-    "import_theme": "Załaduj motyw",
-    "inputRadius": "Pola tekstowe",
-    "checkboxRadius": "Pola wyboru",
-    "instance_default": "(domyślny: {value})",
-    "instance_default_simple": "(domyślny)",
-    "interface": "Interfejs",
-    "interfaceLanguage": "Język interfejsu",
-    "invalid_theme_imported": "Wybrany plik nie jest obsługiwanym motywem Pleromy. Nie dokonano zmian w twoim motywie.",
-    "limited_availability": "Niedostępne w twojej przeglądarce",
-    "links": "Łącza",
-    "lock_account_description": "Ogranicz swoje konto dla zatwierdzonych obserwowanych",
-    "loop_video": "Zapętlaj filmy",
-    "loop_video_silent_only": "Zapętlaj tylko filmy bez dźwięku (np. mastodonowe „gify”)",
-    "mutes_tab": "Wyciszenia",
-    "play_videos_in_modal": "Odtwarzaj filmy bezpośrednio w przeglądarce mediów",
-    "use_contain_fit": "Nie przycinaj załączników na miniaturach",
-    "name": "Imię",
-    "name_bio": "Imię i bio",
-    "new_email": "Nowy email",
-    "new_password": "Nowe hasło",
-    "notification_visibility": "Rodzaje powiadomień do wyświetlania",
-    "notification_visibility_follows": "Obserwacje",
-    "notification_visibility_likes": "Ulubione",
-    "notification_visibility_mentions": "Wzmianki",
-    "notification_visibility_repeats": "Powtórzenia",
-    "notification_visibility_moves": "Użytkownik migruje",
-    "notification_visibility_emoji_reactions": "Reakcje",
-    "no_rich_text_description": "Usuwaj formatowanie ze wszystkich postów",
-    "no_blocks": "Bez blokad",
-    "no_mutes": "Bez wyciszeń",
-    "hide_follows_description": "Nie pokazuj kogo obserwuję",
-    "hide_followers_description": "Nie pokazuj kto mnie obserwuje",
-    "hide_follows_count_description": "Nie pokazuj licznika obserwowanych",
-    "hide_followers_count_description": "Nie pokazuj licznika obserwujących",
-    "show_admin_badge": "Pokazuj odznakę Administrator na moim profilu",
-    "show_moderator_badge": "Pokazuj odznakę Moderator na moim profilu",
-    "nsfw_clickthrough": "Włącz domyślne ukrywanie załączników o treści nieprzyzwoitej (NSFW)",
-    "oauth_tokens": "Tokeny OAuth",
-    "token": "Token",
-    "refresh_token": "Odśwież token",
-    "valid_until": "Ważne do",
-    "revoke_token": "Odwołać",
-    "panelRadius": "Panele",
-    "pause_on_unfocused": "Wstrzymuj strumieniowanie kiedy karta nie jest aktywna",
-    "presets": "Gotowe motywy",
-    "profile_background": "Tło profilu",
-    "profile_banner": "Banner profilu",
-    "profile_tab": "Profil",
-    "radii_help": "Ustaw zaokrąglenie krawędzi interfejsu (w pikselach)",
-    "replies_in_timeline": "Odpowiedzi na osi czasu",
-    "reply_link_preview": "Włącz dymek z podglądem postu po najechaniu na znak odpowiedzi",
-    "reply_visibility_all": "Pokazuj wszystkie odpowiedzi",
-    "reply_visibility_following": "Pokazuj tylko odpowiedzi skierowane do mnie i osób które obserwuję",
-    "reply_visibility_self": "Pokazuj tylko odpowiedzi skierowane do mnie",
-    "autohide_floating_post_button": "Ukryj automatycznie przycisk \"Nowy post\" (mobile)",
-    "saving_err": "Nie udało się zapisać ustawień",
-    "saving_ok": "Zapisano ustawienia",
-    "search_user_to_block": "Wyszukaj kogo chcesz zablokować",
-    "search_user_to_mute": "Wyszukaj kogo chcesz wyciszyć",
-    "security_tab": "Bezpieczeństwo",
-    "scope_copy": "Kopiuj zakres podczas odpowiadania (DM-y zawsze są kopiowane)",
-    "minimal_scopes_mode": "Zminimalizuj opcje wyboru zakresu postów",
-    "set_new_avatar": "Ustaw nowy awatar",
-    "set_new_profile_background": "Ustaw nowe tło profilu",
-    "set_new_profile_banner": "Ustaw nowy banner profilu",
-    "settings": "Ustawienia",
-    "subject_input_always_show": "Zawsze pokazuj pole tematu",
-    "subject_line_behavior": "Kopiuj temat podczas odpowiedzi",
-    "subject_line_email": "Jak w mailach – „re: temat”",
-    "subject_line_mastodon": "Jak na Mastodonie – po prostu kopiuj",
-    "subject_line_noop": "Nie kopiuj",
-    "post_status_content_type": "Post status content type",
-    "stop_gifs": "Odtwarzaj GIFy po najechaniu kursorem",
-    "streaming": "Włącz automatycznie strumieniowanie nowych postów gdy jesteś na początku strony",
-    "user_mutes": "Users",
-    "useStreamingApi": "Otrzymuj posty i powiadomienia w czasie rzeczywistym",
-    "useStreamingApiWarning": "(Niezalecane, eksperymentalne, pomija posty)",
-    "text": "Tekst",
-    "theme": "Motyw",
-    "theme_help": "Użyj kolorów w notacji szesnastkowej (#rrggbb), by stworzyć swój motyw.",
-    "theme_help_v2_1": "Możesz też zastąpić kolory i widoczność poszczególnych komponentów przełączając pola wyboru, użyj „Wyczyść wszystko” aby usunąć wszystkie zastąpienia.",
-    "theme_help_v2_2": "Ikony pod niektórych wpisami są wskaźnikami kontrastu pomiędzy tłem a tekstem, po najechaniu na nie otrzymasz szczegółowe informacje. Zapamiętaj, że jeżeli używasz przezroczystości, wskaźniki pokazują najgorszy możliwy przypadek.",
-    "tooltipRadius": "Etykiety/alerty",
-    "type_domains_to_mute": "Wpisz domeny, które chcesz wyciszyć",
-    "upload_a_photo": "Wyślij zdjęcie",
-    "user_settings": "Ustawienia użytkownika",
-    "values": {
-      "false": "nie",
-      "true": "tak"
-    },
-    "fun": "Zabawa",
-    "greentext": "Memiczne strzałki",
-    "notifications": "Powiadomienia",
-    "notification_setting": "Otrzymuj powiadomienia od:",
-    "notification_setting_follows": "Ludzi których obserwujesz",
-    "notification_setting_non_follows": "Ludzi których nie obserwujesz",
-    "notification_setting_followers": "Ludzi którzy obserwują ciebie",
-    "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
-    "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go",
-    "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
-    "enable_web_push_notifications": "Włącz powiadomienia push",
-    "style": {
-      "switcher": {
-        "keep_color": "Zachowaj kolory",
-        "keep_shadows": "Zachowaj cienie",
-        "keep_opacity": "Zachowaj widoczność",
-        "keep_roundness": "Zachowaj zaokrąglenie",
-        "keep_fonts": "Zachowaj czcionki",
-        "save_load_hint": "Opcje „zachowaj” pozwalają na pozostanie przy obecnych opcjach po wybraniu lub załadowaniu motywu, jak i przechowywanie ich podczas eksportowania motywu. Jeżeli wszystkie są odznaczone, eksportowanie motywu spowoduje zapisanie wszystkiego.",
-        "reset": "Wyzeruj",
-        "clear_all": "Wyczyść wszystko",
-        "clear_opacity": "Wyczyść widoczność",
-        "load_theme": "Załaduj motyw",
-        "keep_as_is": "Zostaw po staremu",
-        "use_snapshot": "Stara wersja",
-        "use_source": "Nowa wersja",
-        "help": {
-          "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż sobie zapamiętałeś.",
-          "v2_imported": "Plik który zaimportowałeś został stworzony dla starszego FE. Próbujemy zwiększyć kompatybiliność, lecz wciąż mogą występować rozbieżności.",
-          "future_version_imported": "Plik który zaimportowałeś został stworzony w nowszej wersji FE.",
-          "older_version_imported": "Plik który zaimportowałeś został stworzony w starszej wersji FE.",
-          "snapshot_present": "Migawka motywu jest załadowana, więc wszystkie wartości zostały nadpisane. Zamiast tego, możesz załadować właściwe dane motywu",
-          "snapshot_missing": "Nie znaleziono migawki motywu w pliku, więc motyw może wyglądać inaczej niż pierwotnie zaplanowano.",
-          "fe_upgraded": "Silnik motywów PleromaFE został zaaktualizowany.",
-          "fe_downgraded": "Wersja PleromaFE została cofnięta.",
-          "migration_snapshot_ok": "Żeby być bezpiecznym, migawka motywu została załadowana. Możesz spróbować załadować dane motywu.",
-          "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż sobie zapamiętałeś.",
-          "snapshot_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaaktualizowane ponownie, jeśli zmieniłeś motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji."
-        }
-      },
-      "common": {
-        "color": "Kolor",
-        "opacity": "Widoczność",
-        "contrast": {
-          "hint": "Współczynnik kontrastu wynosi {ratio}, {level} {context}",
-          "level": {
-            "aa": "spełnia wymogi poziomu AA (minimalne)",
-            "aaa": "spełnia wymogi poziomu AAA (zalecane)",
-            "bad": "nie spełnia żadnych wymogów dostępności"
-          },
-          "context": {
-            "18pt": "dla dużego tekstu (18pt+)",
-            "text": "dla tekstu"
-          }
-        }
-      },
-      "common_colors": {
-        "_tab_label": "Ogólne",
-        "main": "Ogólne kolory",
-        "foreground_hint": "Zajrzyj do karty „Zaawansowane”, aby uzyskać dokładniejszą kontrolę",
-        "rgbo": "Ikony, wyróżnienia, odznaki"
-      },
-      "advanced_colors": {
-        "_tab_label": "Zaawansowane",
-        "alert": "Tło alertu",
-        "alert_error": "Błąd",
-        "alert_warning": "Ostrzeżenie",
-        "alert_neutral": "Neutralne",
-        "post": "Posty/Bio użytkowników",
-        "badge": "Tło odznaki",
-        "popover": "Etykiety, menu, popovery",
-        "badge_notification": "Powiadomienie",
-        "panel_header": "Nagłówek panelu",
-        "top_bar": "Górny pasek",
-        "borders": "Granice",
-        "buttons": "Przyciski",
-        "inputs": "Pola wejścia",
-        "faint_text": "Zanikający tekst",
-        "underlay": "Podkład",
-        "poll": "Wykres ankiety",
-        "icons": "Ikony",
-        "highlight": "Podświetlone elementy",
-        "pressed": "Naciśnięte",
-        "selectedPost": "Wybrany post",
-        "selectedMenu": "Wybrany element menu",
-        "disabled": "Wyłączone",
-        "toggled": "Przełączone",
-        "tabs": "Karty"
-      },
-      "radii": {
-        "_tab_label": "Zaokrąglenie"
-      },
-      "shadows": {
-        "_tab_label": "Cień i podświetlenie",
-        "component": "Komponent",
-        "override": "Zastąp",
-        "shadow_id": "Cień #{value}",
-        "blur": "Rozmycie",
-        "spread": "Szerokość",
-        "inset": "Inset",
-        "hintV3": "Dla cieni możesz również użyć notacji {0} by użyć inny slot koloru.",
-        "filter_hint": {
-          "always_drop_shadow": "Ostrzeżenie, ten cień zawsze używa {0} jeżeli to obsługiwane przez przeglądarkę.",
-          "drop_shadow_syntax": "{0} nie obsługuje parametru {1} i słowa kluczowego {2}.",
-          "avatar_inset": "Pamiętaj że użycie jednocześnie cieni inset i nie inset na awatarach może daćnieoczekiwane wyniki z przezroczystymi awatarami.",
-          "spread_zero": "Cienie o ujemnej szerokości będą widoczne tak, jakby wynosiła ona zero",
-          "inset_classic": "Cienie inset będą używały {0}"
+    "about": {
+        "mrf": {
+            "federation": "Federacja",
+            "keyword": {
+                "keyword_policies": "Zasady słów kluczowych",
+                "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
+                "reject": "Odrzucanie",
+                "replace": "Zastąpienie",
+                "is_replaced_by": "→"
+            },
+            "mrf_policies": "Włączone zasady MRF",
+            "mrf_policies_desc": "Zasady MRF zmieniają zachowanie federowania instancji. Następujące zasady są włączone:",
+            "simple": {
+                "simple_policies": "Zasady specyficzne dla instancji",
+                "accept": "Akceptowanie",
+                "accept_desc": "Ta instancja akceptuje tylko posty z wymienionych instancji:",
+                "reject": "Odrzucanie",
+                "reject_desc": "Ta instancja odrzuca posty z wymienionych instancji:",
+                "quarantine": "Kwarantanna",
+                "quarantine_desc": "Ta instancja wysyła tylko publiczne posty do wymienionych instancji:",
+                "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
+                "ftl_removal_desc": "Ta instancja usuwa wymienionych instancje z \"Całej znanej sieci\":",
+                "media_removal": "Usuwanie multimediów",
+                "media_removal_desc": "Ta instancja usuwa multimedia z postów od wymienionych instancji:",
+                "media_nsfw": "Multimedia ustawione jako wrażliwe",
+                "media_nsfw_desc": "Ta instancja wymusza, by multimedia z wymienionych instancji były ustawione jako wrażliwe:"
+            }
         },
-        "components": {
-          "panel": "Panel",
-          "panelHeader": "Nagłówek panelu",
-          "topBar": "Górny pasek",
-          "avatar": "Awatar użytkownika (w widoku profilu)",
-          "avatarStatus": "Awatar użytkownika (w widoku wpisu)",
-          "popup": "Wyskakujące okna i podpowiedzi",
-          "button": "Przycisk",
-          "buttonHover": "Przycisk (po najechaniu)",
-          "buttonPressed": "Przycisk (naciśnięty)",
-          "buttonPressedHover": "Przycisk(naciśnięty+najechany)",
-          "input": "Pole wejścia"
+        "staff": "Obsługa"
+    },
+    "chat": {
+        "title": "Czat"
+    },
+    "domain_mute_card": {
+        "mute": "Wycisz",
+        "mute_progress": "Wyciszam...",
+        "unmute": "Odcisz",
+        "unmute_progress": "Odciszam..."
+    },
+    "exporter": {
+        "export": "Eksportuj",
+        "processing": "Przetwarzam, za chwilę zostaniesz zapytany o ściągnięcie pliku"
+    },
+    "features_panel": {
+        "chat": "Czat",
+        "gopher": "Gopher",
+        "media_proxy": "Proxy mediów",
+        "scope_options": "Ustawienia zakresu",
+        "text_limit": "Limit tekstu",
+        "title": "Funkcje",
+        "who_to_follow": "Propozycje obserwacji"
+    },
+    "finder": {
+        "error_fetching_user": "Błąd przy pobieraniu profilu",
+        "find_user": "Znajdź użytkownika"
+    },
+    "general": {
+        "apply": "Zastosuj",
+        "submit": "Wyślij",
+        "more": "Więcej",
+        "generic_error": "Wystąpił błąd",
+        "optional": "nieobowiązkowe",
+        "show_more": "Pokaż więcej",
+        "show_less": "Pokaż mniej",
+        "dismiss": "Odrzuć",
+        "cancel": "Anuluj",
+        "disable": "Wyłącz",
+        "enable": "Włącz",
+        "confirm": "Potwierdź",
+        "verify": "Zweryfikuj"
+    },
+    "image_cropper": {
+        "crop_picture": "Przytnij obrazek",
+        "save": "Zapisz",
+        "save_without_cropping": "Zapisz bez przycinania",
+        "cancel": "Anuluj"
+    },
+    "importer": {
+        "submit": "Wyślij",
+        "success": "Zaimportowano pomyślnie.",
+        "error": "Wystąpił błąd podczas importowania pliku."
+    },
+    "login": {
+        "login": "Zaloguj",
+        "description": "Zaloguj używając OAuth",
+        "logout": "Wyloguj",
+        "password": "Hasło",
+        "placeholder": "n.p. lain",
+        "register": "Zarejestruj",
+        "username": "Użytkownik",
+        "hint": "Zaloguj się, aby dołączyć do dyskusji",
+        "authentication_code": "Kod weryfikacyjny",
+        "enter_recovery_code": "Wprowadź kod zapasowy",
+        "enter_two_factor_code": "Wprowadź kod weryfikacyjny",
+        "recovery_code": "Kod zapasowy",
+        "heading": {
+            "totp": "Weryfikacja dwuetapowa",
+            "recovery": "Zapasowa weryfikacja dwuetapowa"
         }
-      },
-      "fonts": {
-        "_tab_label": "Czcionki",
-        "help": "Wybierz czcionkę używaną przez elementy UI. Jeżeli wybierzesz niestandardową, musisz wpisać dokładnie tę nazwę, pod którą pojawia się w systemie.",
-        "components": {
-          "interface": "Interfejs",
-          "input": "Pola wejścia",
-          "post": "Tekst postu",
-          "postCode": "Tekst o stałej szerokości znaków w sformatowanym poście"
+    },
+    "media_modal": {
+        "previous": "Poprzednie",
+        "next": "Następne"
+    },
+    "nav": {
+        "about": "O nas",
+        "administration": "Administracja",
+        "back": "Wróć",
+        "chat": "Lokalny czat",
+        "friend_requests": "Prośby o możliwość obserwacji",
+        "mentions": "Wzmianki",
+        "interactions": "Interakcje",
+        "dms": "Wiadomości prywatne",
+        "public_tl": "Publiczna oś czasu",
+        "timeline": "Oś czasu",
+        "twkn": "Cała znana sieć",
+        "user_search": "Wyszukiwanie użytkowników",
+        "search": "Wyszukiwanie",
+        "who_to_follow": "Sugestie obserwacji",
+        "preferences": "Preferencje"
+    },
+    "notifications": {
+        "broken_favorite": "Nieznany status, szukam go…",
+        "favorited_you": "dodał(-a) twój status do ulubionych",
+        "followed_you": "obserwuje cię",
+        "load_older": "Załaduj starsze powiadomienia",
+        "notifications": "Powiadomienia",
+        "read": "Przeczytane!",
+        "repeated_you": "powtórzył(-a) twój status",
+        "no_more_notifications": "Nie masz więcej powiadomień",
+        "migrated_to": "wyemigrował do",
+        "reacted_with": "zareagował z {0}",
+        "follow_request": "chce cię obserwować"
+    },
+    "polls": {
+        "add_poll": "Dodaj ankietę",
+        "add_option": "Dodaj opcję",
+        "option": "Opcja",
+        "votes": "głosów",
+        "vote": "Głosuj",
+        "type": "Typ ankiety",
+        "single_choice": "jednokrotnego wyboru",
+        "multiple_choices": "wielokrotnego wyboru",
+        "expiry": "Czas trwania ankiety",
+        "expires_in": "Ankieta kończy się za{0}",
+        "expired": "Ankieta skończyła się {0} temu",
+        "not_enough_options": "Zbyt mało unikalnych opcji w ankiecie"
+    },
+    "emoji": {
+        "stickers": "Naklejki",
+        "emoji": "Emoji",
+        "keep_open": "Zostaw selektor otwarty",
+        "search_emoji": "Wyszukaj emoji",
+        "add_emoji": "Wstaw emoji",
+        "custom": "Niestandardowe emoji",
+        "unicode": "Emoji unicode",
+        "load_all_hint": "Załadowano pierwsze {saneAmount} emoji, Załadowanie wszystkich emoji może spowodować problemy z wydajnością.",
+        "load_all": "Ładuję wszystkie {emojiAmount} emoji"
+    },
+    "interactions": {
+        "favs_repeats": "Powtórzenia i ulubione",
+        "follows": "Nowi obserwujący",
+        "moves": "Użytkownik migruje",
+        "load_older": "Załaduj starsze interakcje"
+    },
+    "post_status": {
+        "new_status": "Dodaj nowy status",
+        "account_not_locked_warning": "Twoje konto nie jest {0}. Każdy może cię zaobserwować aby zobaczyć wpisy tylko dla obserwujących.",
+        "account_not_locked_warning_link": "zablokowane",
+        "attachments_sensitive": "Oznacz załączniki jako wrażliwe",
+        "content_type": {
+            "text/plain": "Czysty tekst",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
         },
-        "family": "Nazwa czcionki",
-        "size": "Rozmiar (w pikselach)",
-        "weight": "Grubość",
-        "custom": "Niestandardowa"
-      },
-      "preview": {
-        "header": "Podgląd",
-        "content": "Zawartość",
-        "error": "Przykładowy błąd",
-        "button": "Przycisk",
-        "text": "Trochę więcej {0} i {1}",
-        "mono": "treści",
-        "input": "Właśnie wróciłem z kościoła",
-        "faint_link": "pomocny podręcznik",
-        "fine_print": "Przeczytaj nasz {0}, aby nie nauczyć się niczego przydatnego!",
-        "header_faint": "W porządku",
-        "checkbox": "Przeleciałem przez zasady użytkowania",
-        "link": "i fajny mały odnośnik"
-      }
+        "content_warning": "Temat (nieobowiązkowy)",
+        "default": "Właśnie wróciłem z kościoła",
+        "direct_warning_to_all": "Ten wpis zobaczą wszystkie osoby, o których wspomniałeś(-aś).",
+        "direct_warning_to_first_only": "Ten wpis zobaczą tylko te osoby, o których wspomniałeś(-aś) na początku wiadomości.",
+        "posting": "Wysyłanie",
+        "scope_notice": {
+            "public": "Ten post będzie widoczny dla każdego",
+            "private": "Ten post będzie widoczny tylko dla twoich obserwujących",
+            "unlisted": "Ten post nie będzie widoczny na publicznej osi czasu i całej znanej sieci"
+        },
+        "scope": {
+            "direct": "Bezpośredni – Tylko dla wspomnianych użytkowników",
+            "private": "Tylko dla obserwujących – Umieść dla osób, które cię obserwują",
+            "public": "Publiczny – Umieść na publicznych osiach czasu",
+            "unlisted": "Niewidoczny – Nie umieszczaj na publicznych osiach czasu"
+        }
     },
-    "version": {
-      "title": "Wersja",
-      "backend_version": "Wersja back-endu",
-      "frontend_version": "Wersja front-endu"
-    }
-  },
-  "time": {
-    "day": "{0} dzień",
-    "days": "{0} dni",
-    "day_short": "{0}d",
-    "days_short": "{0}d",
-    "hour": "{0} godzina",
-    "hours": "{0} godzin",
-    "hour_short": "{0} godz.",
-    "hours_short": "{0} godz.",
-    "in_future": "za {0}",
-    "in_past": "{0} temu",
-    "minute": "{0} minuta",
-    "minutes": "{0} minut",
-    "minute_short": "{0}min",
-    "minutes_short": "{0}min",
-    "month": "{0} miesiąc",
-    "months": "{0} miesięcy",
-    "month_short": "{0} mies.",
-    "months_short": "{0} mies.",
-    "now": "teraz",
-    "now_short": "teraz",
-    "second": "{0} sekunda",
-    "seconds": "{0} sekund",
-    "second_short": "{0}s",
-    "seconds_short": "{0}s",
-    "week": "{0} tydzień",
-    "weeks": "{0} tygodni",
-    "week_short": "{0} tydz.",
-    "weeks_short": "{0} tyg.",
-    "year": "{0} rok",
-    "years": "{0} lata",
-    "year_short": "{0} r.",
-    "years_short": "{0} lata"
-  },
-  "timeline": {
-    "collapse": "Zwiń",
-    "conversation": "Rozmowa",
-    "error_fetching": "Błąd pobierania",
-    "load_older": "Załaduj starsze statusy",
-    "no_retweet_hint": "Wpis oznaczony jako tylko dla obserwujących lub bezpośredni nie może zostać powtórzony",
-    "repeated": "powtórzył(-a)",
-    "show_new": "Pokaż nowe",
-    "up_to_date": "Na bieżąco",
-    "no_more_statuses": "Brak kolejnych statusów",
-    "no_statuses": "Brak statusów"
-  },
-  "status": {
-    "favorites": "Ulubione",
-    "repeats": "Powtórzenia",
-    "delete": "Usuń status",
-    "pin": "Przypnij na profilu",
-    "unpin": "Odepnij z profilu",
-    "pinned": "Przypnięte",
-    "delete_confirm": "Czy naprawdę chcesz usunąć ten status?",
-    "reply_to": "Odpowiedź dla",
-    "replies_list": "Odpowiedzi:",
-    "mute_conversation": "Wycisz konwersację",
-    "unmute_conversation": "Odcisz konwersację"
-  },
-  "user_card": {
-    "approve": "Przyjmij",
-    "block": "Zablokuj",
-    "blocked": "Zablokowany!",
-    "deny": "Odrzuć",
-    "favorites": "Ulubione",
-    "follow": "Obserwuj",
-    "follow_sent": "Wysłano prośbę!",
-    "follow_progress": "Wysyłam prośbę…",
-    "follow_again": "Wysłać prośbę ponownie?",
-    "follow_unfollow": "Przestań obserwować",
-    "followees": "Obserwowani",
-    "followers": "Obserwujący",
-    "following": "Obserwowany!",
-    "follows_you": "Obserwuje cię!",
-    "hidden": "Ukryte",
-    "its_you": "To ty!",
-    "media": "Media",
-    "mention": "Wspomnienie",
-    "mute": "Wycisz",
-    "muted": "Wyciszony(-a)",
-    "per_day": "dziennie",
-    "remote_follow": "Zdalna obserwacja",
-    "report": "Raportuj",
-    "statuses": "Statusy",
-    "subscribe": "Subskrybuj",
-    "unsubscribe": "Odsubskrybuj",
-    "unblock": "Odblokuj",
-    "unblock_progress": "Odblokowuję…",
-    "block_progress": "Blokuję…",
-    "unmute": "Cofnij wyciszenie",
-    "unmute_progress": "Cofam wyciszenie…",
-    "mute_progress": "Wyciszam…",
-    "hide_repeats": "Ukryj powtórzenia",
-    "show_repeats": "Pokaż powtórzenia",
-    "admin_menu": {
-      "moderation": "Moderacja",
-      "grant_admin": "Przyznaj admina",
-      "revoke_admin": "Odwołaj admina",
-      "grant_moderator": "Przyznaj moderatora",
-      "revoke_moderator": "Odwołaj moderatora",
-      "activate_account": "Aktywuj konto",
-      "deactivate_account": "Dezaktywuj konto",
-      "delete_account": "Usuń konto",
-      "force_nsfw": "Oznacz wszystkie posty jako NSFW",
-      "strip_media": "Usuń multimedia z postów",
-      "force_unlisted": "Wymuś posty na niepubliczne",
-      "sandbox": "Wymuś by posty były tylko dla obserwujących",
-      "disable_remote_subscription": "Zakaż obserwowania użytkownika ze zdalnych instancji",
-      "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika",
-      "quarantine": "Zakaż federowania postów od tego użytkownika",
-      "delete_user": "Usuń użytkownika",
-      "delete_user_confirmation": "Czy jesteś absolutnie pewny? Ta operacja nie może być cofnięta."
-    }
-  },
-  "user_profile": {
-    "timeline_title": "Oś czasu użytkownika",
-    "profile_does_not_exist": "Przepraszamy, ten profil nie istnieje.",
-    "profile_loading_error": "Przepraszamy, wystąpił błąd podczas ładowania tego profilu."
-  },
-  "user_reporting": {
-    "title": "Raportowanie {0}",
-    "add_comment_description": "Raport zostanie wysłany do moderatorów instancji. Możesz dodać powód dlaczego raportujesz to konto poniżej:",
-    "additional_comments": "Dodatkowe komentarze",
-    "forward_description": "To konto jest z innego serwera. Wysłać również tam kopię raportu?",
-    "forward_to": "Przekaż do{0}",
-    "submit": "Wyślij",
-    "generic_error": "Wystąpił błąd podczas przetwarzania twojej prośby."
-  },
-  "who_to_follow": {
-    "more": "Więcej",
-    "who_to_follow": "Propozycje obserwacji"
-  },
-  "tool_tip": {
-    "media_upload": "Wyślij media",
-    "repeat": "Powtórz",
-    "reply": "Odpowiedz",
-    "favorite": "Dodaj do ulubionych",
-    "add_reaction": "Dodaj reakcję",
-    "user_settings": "Ustawienia użytkownika"
-  },
-  "upload":{
-    "error": {
-      "base": "Wysyłanie nie powiodło się.",
-      "file_too_big": "Zbyt duży plik [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Spróbuj ponownie później"
+    "registration": {
+        "bio": "Bio",
+        "email": "E-mail",
+        "fullname": "Wyświetlana nazwa profilu",
+        "password_confirm": "Potwierdzenie hasła",
+        "registration": "Rejestracja",
+        "token": "Token zaproszenia",
+        "captcha": "CAPTCHA",
+        "new_captcha": "Naciśnij na obrazek, aby dostać nowy kod captcha",
+        "username_placeholder": "np. lain",
+        "fullname_placeholder": "np. Lain Iwakura",
+        "bio_placeholder": "e.g.\nCześć, jestem Lain.\nJestem dziewczynką z anime żyjącą na peryferiach Japonii. Możesz znać mnie z Wired.",
+        "validations": {
+            "username_required": "nie może być pusta",
+            "fullname_required": "nie może być pusta",
+            "email_required": "nie może być pusty",
+            "password_required": "nie może być puste",
+            "password_confirmation_required": "nie może być puste",
+            "password_confirmation_match": "musi być takie jak hasło"
+        }
     },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
+    "remote_user_resolver": {
+        "remote_user_resolver": "Wyszukiwarka użytkowników nietutejszych",
+        "searching_for": "Szukam",
+        "error": "Nie znaleziono."
+    },
+    "selectable_list": {
+        "select_all": "Zaznacz wszystko"
+    },
+    "settings": {
+        "app_name": "Nazwa aplikacji",
+        "security": "Bezpieczeństwo",
+        "enter_current_password_to_confirm": "Wprowadź obecne hasło, by potwierdzić twoją tożsamość",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "Ustaw OTP",
+            "wait_pre_setup_otp": "początkowe ustawianie OTP",
+            "confirm_and_enable": "Potwierdź i włącz OTP",
+            "title": "Weryfikacja dwuetapowa",
+            "generate_new_recovery_codes": "Wygeneruj nowe kody zapasowe",
+            "warning_of_generate_new_codes": "Po tym gdy generujesz nowe kody zapasowe, stare przestaną działać.",
+            "recovery_codes": "Kody zapasowe.",
+            "waiting_a_recovery_codes": "Otrzymuję kody zapasowe...",
+            "recovery_codes_warning": "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał dostępu do swojego konta.",
+            "authentication_methods": "Metody weryfikacji",
+            "scan": {
+                "title": "Skanuj",
+                "desc": "Zeskanuj ten kod QR używając twojej aplikacji 2FA albo wpisz ten klucz:",
+                "secret_code": "Klucz"
+            },
+            "verify": {
+                "desc": "By włączyć weryfikację dwuetapową, wpisz kod z twojej aplikacji 2FA:"
+            }
+        },
+        "allow_following_move": "Zezwalaj na automatyczną obserwację gdy obserwowane konto migruje",
+        "attachmentRadius": "Załączniki",
+        "attachments": "Załączniki",
+        "autoload": "Włącz automatyczne ładowanie po przewinięciu do końca strony",
+        "avatar": "Awatar",
+        "avatarAltRadius": "Awatary (powiadomienia)",
+        "avatarRadius": "Awatary",
+        "background": "Tło",
+        "bio": "Bio",
+        "block_export": "Eksport blokad",
+        "block_export_button": "Eksportuj twoje blokady do pliku .csv",
+        "block_import": "Import blokad",
+        "block_import_error": "Wystąpił błąd podczas importowania blokad",
+        "blocks_imported": "Zaimportowano blokady, przetwarzanie może zająć trochę czasu.",
+        "blocks_tab": "Bloki",
+        "btnRadius": "Przyciski",
+        "cBlue": "Niebieski (odpowiedz, obserwuj)",
+        "cGreen": "Zielony (powtórzenia)",
+        "cOrange": "Pomarańczowy (ulubione)",
+        "cRed": "Czerwony (anuluj)",
+        "change_email": "Zmień email",
+        "change_email_error": "Wystąpił problem podczas zmiany emaila.",
+        "changed_email": "Pomyślnie zmieniono email!",
+        "change_password": "Zmień hasło",
+        "change_password_error": "Podczas zmiany hasła wystąpił problem.",
+        "changed_password": "Pomyślnie zmieniono hasło!",
+        "collapse_subject": "Zwijaj posty z tematami",
+        "composing": "Pisanie",
+        "confirm_new_password": "Potwierdź nowe hasło",
+        "current_avatar": "Twój obecny awatar",
+        "current_password": "Obecne hasło",
+        "current_profile_banner": "Twój obecny banner profilu",
+        "data_import_export_tab": "Import/eksport danych",
+        "default_vis": "Domyślny zakres widoczności",
+        "delete_account": "Usuń konto",
+        "delete_account_description": "Trwale usuń konto i wszystkie posty.",
+        "delete_account_error": "Wystąpił problem z usuwaniem twojego konta. Jeżeli problem powtarza się, poinformuj administratora swojej instancji.",
+        "delete_account_instructions": "Wprowadź swoje hasło w poniższe pole aby potwierdzić usunięcie konta.",
+        "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługach",
+        "domain_mutes": "Domeny",
+        "avatar_size_instruction": "Zalecany minimalny rozmiar awatarów to 150x150 pikseli.",
+        "pad_emoji": "Dodaj odstęp z obu stron emoji podczas dodawania selektorem",
+        "emoji_reactions_on_timeline": "Pokaż reakcje emoji na osi czasu",
+        "export_theme": "Zapisz motyw",
+        "filtering": "Filtrowanie",
+        "filtering_explanation": "Wszystkie statusy zawierające te słowa będą wyciszone. Jedno słowo na linijkę.",
+        "follow_export": "Eksport obserwowanych",
+        "follow_export_button": "Eksportuj swoją listę obserwowanych do pliku CSV",
+        "follow_import": "Import obserwowanych",
+        "follow_import_error": "Błąd przy importowaniu obserwowanych",
+        "follows_imported": "Obserwowani zaimportowani! Przetwarzanie może trochę potrwać.",
+        "accent": "Akcent",
+        "foreground": "Pierwszy plan",
+        "general": "Ogólne",
+        "hide_attachments_in_convo": "Ukrywaj załączniki w rozmowach",
+        "hide_attachments_in_tl": "Ukrywaj załączniki w osi czasu",
+        "hide_muted_posts": "Ukrywaj wpisy wyciszonych użytkowników",
+        "max_thumbnails": "Maksymalna liczba miniatur w poście",
+        "hide_isp": "Ukryj panel informacji o instancji",
+        "preload_images": "Ładuj wstępnie obrazy",
+        "use_one_click_nsfw": "Otwieraj załączniki NSFW jednym kliknięciem",
+        "hide_post_stats": "Ukrywaj statysyki postów (np. liczbę polubień)",
+        "hide_user_stats": "Ukrywaj statysyki użytkowników (np. liczbę obserwujących)",
+        "hide_filtered_statuses": "Ukrywaj filtrowane statusy",
+        "import_blocks_from_a_csv_file": "Importuj blokady z pliku CSV",
+        "import_followers_from_a_csv_file": "Importuj obserwowanych z pliku CSV",
+        "import_theme": "Załaduj motyw",
+        "inputRadius": "Pola tekstowe",
+        "checkboxRadius": "Pola wyboru",
+        "instance_default": "(domyślny: {value})",
+        "instance_default_simple": "(domyślny)",
+        "interface": "Interfejs",
+        "interfaceLanguage": "Język interfejsu",
+        "invalid_theme_imported": "Wybrany plik nie jest obsługiwanym motywem Pleromy. Nie dokonano zmian w twoim motywie.",
+        "limited_availability": "Niedostępne w twojej przeglądarce",
+        "links": "Łącza",
+        "lock_account_description": "Ogranicz swoje konto dla zatwierdzonych obserwowanych",
+        "loop_video": "Zapętlaj filmy",
+        "loop_video_silent_only": "Zapętlaj tylko filmy bez dźwięku (np. mastodonowe „gify”)",
+        "mutes_tab": "Wyciszenia",
+        "play_videos_in_modal": "Odtwarzaj filmy bezpośrednio w przeglądarce mediów",
+        "use_contain_fit": "Nie przycinaj załączników na miniaturach",
+        "name": "Imię",
+        "name_bio": "Imię i bio",
+        "new_email": "Nowy email",
+        "new_password": "Nowe hasło",
+        "notification_visibility": "Rodzaje powiadomień do wyświetlania",
+        "notification_visibility_follows": "Obserwacje",
+        "notification_visibility_likes": "Ulubione",
+        "notification_visibility_mentions": "Wzmianki",
+        "notification_visibility_repeats": "Powtórzenia",
+        "notification_visibility_moves": "Użytkownik migruje",
+        "notification_visibility_emoji_reactions": "Reakcje",
+        "no_rich_text_description": "Usuwaj formatowanie ze wszystkich postów",
+        "no_blocks": "Bez blokad",
+        "no_mutes": "Bez wyciszeń",
+        "hide_follows_description": "Nie pokazuj kogo obserwuję",
+        "hide_followers_description": "Nie pokazuj kto mnie obserwuje",
+        "hide_follows_count_description": "Nie pokazuj licznika obserwowanych",
+        "hide_followers_count_description": "Nie pokazuj licznika obserwujących",
+        "show_admin_badge": "Pokazuj odznakę Administrator na moim profilu",
+        "show_moderator_badge": "Pokazuj odznakę Moderator na moim profilu",
+        "nsfw_clickthrough": "Włącz domyślne ukrywanie załączników o treści nieprzyzwoitej (NSFW)",
+        "oauth_tokens": "Tokeny OAuth",
+        "token": "Token",
+        "refresh_token": "Odśwież token",
+        "valid_until": "Ważne do",
+        "revoke_token": "Odwołać",
+        "panelRadius": "Panele",
+        "pause_on_unfocused": "Wstrzymuj strumieniowanie kiedy karta nie jest aktywna",
+        "presets": "Gotowe motywy",
+        "profile_background": "Tło profilu",
+        "profile_banner": "Banner profilu",
+        "profile_tab": "Profil",
+        "radii_help": "Ustaw zaokrąglenie krawędzi interfejsu (w pikselach)",
+        "replies_in_timeline": "Odpowiedzi na osi czasu",
+        "reply_link_preview": "Włącz dymek z podglądem postu po najechaniu na znak odpowiedzi",
+        "reply_visibility_all": "Pokazuj wszystkie odpowiedzi",
+        "reply_visibility_following": "Pokazuj tylko odpowiedzi skierowane do mnie i osób które obserwuję",
+        "reply_visibility_self": "Pokazuj tylko odpowiedzi skierowane do mnie",
+        "autohide_floating_post_button": "Ukryj automatycznie przycisk \"Nowy post\" (mobile)",
+        "saving_err": "Nie udało się zapisać ustawień",
+        "saving_ok": "Zapisano ustawienia",
+        "search_user_to_block": "Wyszukaj kogo chcesz zablokować",
+        "search_user_to_mute": "Wyszukaj kogo chcesz wyciszyć",
+        "security_tab": "Bezpieczeństwo",
+        "scope_copy": "Kopiuj zakres podczas odpowiadania (DM-y zawsze są kopiowane)",
+        "minimal_scopes_mode": "Zminimalizuj opcje wyboru zakresu postów",
+        "set_new_avatar": "Ustaw nowy awatar",
+        "set_new_profile_background": "Ustaw nowe tło profilu",
+        "set_new_profile_banner": "Ustaw nowy banner profilu",
+        "settings": "Ustawienia",
+        "subject_input_always_show": "Zawsze pokazuj pole tematu",
+        "subject_line_behavior": "Kopiuj temat podczas odpowiedzi",
+        "subject_line_email": "Jak w mailach – „re: temat”",
+        "subject_line_mastodon": "Jak na Mastodonie – po prostu kopiuj",
+        "subject_line_noop": "Nie kopiuj",
+        "post_status_content_type": "Post status content type",
+        "stop_gifs": "Odtwarzaj GIFy po najechaniu kursorem",
+        "streaming": "Włącz automatycznie strumieniowanie nowych postów gdy jesteś na początku strony",
+        "user_mutes": "Użytkownicy",
+        "useStreamingApi": "Otrzymuj posty i powiadomienia w czasie rzeczywistym",
+        "useStreamingApiWarning": "(Niezalecane, eksperymentalne, pomija posty)",
+        "text": "Tekst",
+        "theme": "Motyw",
+        "theme_help": "Użyj kolorów w notacji szesnastkowej (#rrggbb), by stworzyć swój motyw.",
+        "theme_help_v2_1": "Możesz też zastąpić kolory i widoczność poszczególnych komponentów przełączając pola wyboru, użyj „Wyczyść wszystko” aby usunąć wszystkie zastąpienia.",
+        "theme_help_v2_2": "Ikony pod niektórych wpisami są wskaźnikami kontrastu pomiędzy tłem a tekstem, po najechaniu na nie otrzymasz szczegółowe informacje. Zapamiętaj, że jeżeli używasz przezroczystości, wskaźniki pokazują najgorszy możliwy przypadek.",
+        "tooltipRadius": "Etykiety/alerty",
+        "type_domains_to_mute": "Wpisz domeny, które chcesz wyciszyć",
+        "upload_a_photo": "Wyślij zdjęcie",
+        "user_settings": "Ustawienia użytkownika",
+        "values": {
+            "false": "nie",
+            "true": "tak"
+        },
+        "fun": "Zabawa",
+        "greentext": "Memiczne strzałki",
+        "notifications": "Powiadomienia",
+        "notification_setting": "Otrzymuj powiadomienia od:",
+        "notification_setting_follows": "Ludzi których obserwujesz",
+        "notification_setting_non_follows": "Ludzi których nie obserwujesz",
+        "notification_setting_followers": "Ludzi którzy obserwują ciebie",
+        "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
+        "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
+        "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
+        "enable_web_push_notifications": "Włącz powiadomienia push",
+        "style": {
+            "switcher": {
+                "keep_color": "Zachowaj kolory",
+                "keep_shadows": "Zachowaj cienie",
+                "keep_opacity": "Zachowaj widoczność",
+                "keep_roundness": "Zachowaj zaokrąglenie",
+                "keep_fonts": "Zachowaj czcionki",
+                "save_load_hint": "Opcje „zachowaj” pozwalają na pozostanie przy obecnych opcjach po wybraniu lub załadowaniu motywu, jak i przechowywanie ich podczas eksportowania motywu. Jeżeli wszystkie są odznaczone, eksportowanie motywu spowoduje zapisanie wszystkiego.",
+                "reset": "Wyzeruj",
+                "clear_all": "Wyczyść wszystko",
+                "clear_opacity": "Wyczyść widoczność",
+                "load_theme": "Załaduj motyw",
+                "keep_as_is": "Zostaw po staremu",
+                "use_snapshot": "Stara wersja",
+                "use_source": "Nowa wersja",
+                "help": {
+                    "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż sobie zapamiętałeś.",
+                    "v2_imported": "Plik który zaimportowałeś został stworzony dla starszego FE. Próbujemy zwiększyć kompatybiliność, lecz wciąż mogą występować rozbieżności.",
+                    "future_version_imported": "Plik który zaimportowałeś został stworzony w nowszej wersji FE.",
+                    "older_version_imported": "Plik który zaimportowałeś został stworzony w starszej wersji FE.",
+                    "snapshot_present": "Migawka motywu jest załadowana, więc wszystkie wartości zostały nadpisane. Zamiast tego możesz załadować właściwe dane motywu.",
+                    "snapshot_missing": "Nie znaleziono migawki motywu w pliku, więc motyw może wyglądać inaczej niż pierwotnie zaplanowano.",
+                    "fe_upgraded": "Silnik motywów PleromaFE został zaaktualizowany.",
+                    "fe_downgraded": "Wersja PleromaFE została cofnięta.",
+                    "migration_snapshot_ok": "Żeby być bezpiecznym, migawka motywu została załadowana. Możesz spróbować załadować dane motywu.",
+                    "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż sobie zapamiętałeś.",
+                    "snapshot_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaaktualizowane ponownie, jeśli zmieniłeś motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji."
+                }
+            },
+            "common": {
+                "color": "Kolor",
+                "opacity": "Widoczność",
+                "contrast": {
+                    "hint": "Współczynnik kontrastu wynosi {ratio}, {level} {context}",
+                    "level": {
+                        "aa": "spełnia wymogi poziomu AA (minimalne)",
+                        "aaa": "spełnia wymogi poziomu AAA (zalecane)",
+                        "bad": "nie spełnia żadnych wymogów dostępności"
+                    },
+                    "context": {
+                        "18pt": "dla dużego tekstu (18pt+)",
+                        "text": "dla tekstu"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Ogólne",
+                "main": "Ogólne kolory",
+                "foreground_hint": "Zajrzyj do karty „Zaawansowane”, aby uzyskać dokładniejszą kontrolę",
+                "rgbo": "Ikony, wyróżnienia, odznaki"
+            },
+            "advanced_colors": {
+                "_tab_label": "Zaawansowane",
+                "alert": "Tło alertu",
+                "alert_error": "Błąd",
+                "alert_warning": "Ostrzeżenie",
+                "alert_neutral": "Neutralne",
+                "post": "Posty/Bio użytkowników",
+                "badge": "Tło odznaki",
+                "popover": "Etykiety, menu, popovery",
+                "badge_notification": "Powiadomienie",
+                "panel_header": "Nagłówek panelu",
+                "top_bar": "Górny pasek",
+                "borders": "Granice",
+                "buttons": "Przyciski",
+                "inputs": "Pola wejścia",
+                "faint_text": "Zanikający tekst",
+                "underlay": "Podkład",
+                "poll": "Wykres ankiety",
+                "icons": "Ikony",
+                "highlight": "Podświetlone elementy",
+                "pressed": "Naciśnięte",
+                "selectedPost": "Wybrany post",
+                "selectedMenu": "Wybrany element menu",
+                "disabled": "Wyłączone",
+                "toggled": "Przełączone",
+                "tabs": "Karty"
+            },
+            "radii": {
+                "_tab_label": "Zaokrąglenie"
+            },
+            "shadows": {
+                "_tab_label": "Cień i podświetlenie",
+                "component": "Komponent",
+                "override": "Zastąp",
+                "shadow_id": "Cień #{value}",
+                "blur": "Rozmycie",
+                "spread": "Szerokość",
+                "inset": "Inset",
+                "hintV3": "Dla cieni możesz również użyć notacji {0} by użyć inny slot koloru.",
+                "filter_hint": {
+                    "always_drop_shadow": "Ostrzeżenie, ten cień zawsze używa {0} jeżeli to obsługiwane przez przeglądarkę.",
+                    "drop_shadow_syntax": "{0} nie obsługuje parametru {1} i słowa kluczowego {2}.",
+                    "avatar_inset": "Pamiętaj że użycie jednocześnie cieni inset i nie inset na awatarach może daćnieoczekiwane wyniki z przezroczystymi awatarami.",
+                    "spread_zero": "Cienie o ujemnej szerokości będą widoczne tak, jakby wynosiła ona zero",
+                    "inset_classic": "Cienie inset będą używały {0}"
+                },
+                "components": {
+                    "panel": "Panel",
+                    "panelHeader": "Nagłówek panelu",
+                    "topBar": "Górny pasek",
+                    "avatar": "Awatar użytkownika (w widoku profilu)",
+                    "avatarStatus": "Awatar użytkownika (w widoku wpisu)",
+                    "popup": "Wyskakujące okna i podpowiedzi",
+                    "button": "Przycisk",
+                    "buttonHover": "Przycisk (po najechaniu)",
+                    "buttonPressed": "Przycisk (naciśnięty)",
+                    "buttonPressedHover": "Przycisk(naciśnięty+najechany)",
+                    "input": "Pole wejścia"
+                }
+            },
+            "fonts": {
+                "_tab_label": "Czcionki",
+                "help": "Wybierz czcionkę używaną przez elementy UI. Jeżeli wybierzesz niestandardową, musisz wpisać dokładnie tę nazwę, pod którą pojawia się w systemie.",
+                "components": {
+                    "interface": "Interfejs",
+                    "input": "Pola wejścia",
+                    "post": "Tekst postu",
+                    "postCode": "Tekst o stałej szerokości znaków w sformatowanym poście"
+                },
+                "family": "Nazwa czcionki",
+                "size": "Rozmiar (w pikselach)",
+                "weight": "Grubość",
+                "custom": "Niestandardowa"
+            },
+            "preview": {
+                "header": "Podgląd",
+                "content": "Zawartość",
+                "error": "Przykładowy błąd",
+                "button": "Przycisk",
+                "text": "Trochę więcej {0} i {1}",
+                "mono": "treści",
+                "input": "Właśnie wróciłem z kościoła",
+                "faint_link": "pomocny podręcznik",
+                "fine_print": "Przeczytaj nasz {0}, aby nie nauczyć się niczego przydatnego!",
+                "header_faint": "W porządku",
+                "checkbox": "Przeleciałem przez zasady użytkowania",
+                "link": "i fajny mały odnośnik"
+            }
+        },
+        "version": {
+            "title": "Wersja",
+            "backend_version": "Wersja back-endu",
+            "frontend_version": "Wersja front-endu"
+        },
+        "notification_setting_privacy": "Prywatność",
+        "notification_setting_filters": "Filtry",
+        "notification_setting_privacy_option": "Ukryj nadawcę i zawartość powiadomień push"
+    },
+    "time": {
+        "day": "{0} dzień",
+        "days": "{0} dni",
+        "day_short": "{0}d",
+        "days_short": "{0}d",
+        "hour": "{0} godzina",
+        "hours": "{0} godzin",
+        "hour_short": "{0} godz.",
+        "hours_short": "{0} godz.",
+        "in_future": "za {0}",
+        "in_past": "{0} temu",
+        "minute": "{0} minuta",
+        "minutes": "{0} minut",
+        "minute_short": "{0}min",
+        "minutes_short": "{0}min",
+        "month": "{0} miesiąc",
+        "months": "{0} miesięcy",
+        "month_short": "{0} mies.",
+        "months_short": "{0} mies.",
+        "now": "teraz",
+        "now_short": "teraz",
+        "second": "{0} sekunda",
+        "seconds": "{0} sekund",
+        "second_short": "{0}s",
+        "seconds_short": "{0}s",
+        "week": "{0} tydzień",
+        "weeks": "{0} tygodni",
+        "week_short": "{0} tydz.",
+        "weeks_short": "{0} tyg.",
+        "year": "{0} rok",
+        "years": "{0} lata",
+        "year_short": "{0} r.",
+        "years_short": "{0} lata"
+    },
+    "timeline": {
+        "collapse": "Zwiń",
+        "conversation": "Rozmowa",
+        "error_fetching": "Błąd pobierania",
+        "load_older": "Załaduj starsze statusy",
+        "no_retweet_hint": "Wpis oznaczony jako tylko dla obserwujących lub bezpośredni nie może zostać powtórzony",
+        "repeated": "powtórzył(-a)",
+        "show_new": "Pokaż nowe",
+        "up_to_date": "Na bieżąco",
+        "no_more_statuses": "Brak kolejnych statusów",
+        "no_statuses": "Brak statusów"
+    },
+    "status": {
+        "favorites": "Ulubione",
+        "repeats": "Powtórzenia",
+        "delete": "Usuń status",
+        "pin": "Przypnij na profilu",
+        "unpin": "Odepnij z profilu",
+        "pinned": "Przypnięte",
+        "delete_confirm": "Czy naprawdę chcesz usunąć ten status?",
+        "reply_to": "Odpowiedź dla",
+        "replies_list": "Odpowiedzi:",
+        "mute_conversation": "Wycisz konwersację",
+        "unmute_conversation": "Odcisz konwersację",
+        "status_unavailable": "Status niedostępny",
+        "copy_link": "Kopiuj link do statusu"
+    },
+    "user_card": {
+        "approve": "Przyjmij",
+        "block": "Zablokuj",
+        "blocked": "Zablokowany!",
+        "deny": "Odrzuć",
+        "favorites": "Ulubione",
+        "follow": "Obserwuj",
+        "follow_sent": "Wysłano prośbę!",
+        "follow_progress": "Wysyłam prośbę…",
+        "follow_again": "Wysłać prośbę ponownie?",
+        "follow_unfollow": "Przestań obserwować",
+        "followees": "Obserwowani",
+        "followers": "Obserwujący",
+        "following": "Obserwowany!",
+        "follows_you": "Obserwuje cię!",
+        "hidden": "Ukryte",
+        "its_you": "To ty!",
+        "media": "Media",
+        "mention": "Wspomnienie",
+        "mute": "Wycisz",
+        "muted": "Wyciszony(-a)",
+        "per_day": "dziennie",
+        "remote_follow": "Zdalna obserwacja",
+        "report": "Raportuj",
+        "statuses": "Statusy",
+        "subscribe": "Subskrybuj",
+        "unsubscribe": "Odsubskrybuj",
+        "unblock": "Odblokuj",
+        "unblock_progress": "Odblokowuję…",
+        "block_progress": "Blokuję…",
+        "unmute": "Cofnij wyciszenie",
+        "unmute_progress": "Cofam wyciszenie…",
+        "mute_progress": "Wyciszam…",
+        "hide_repeats": "Ukryj powtórzenia",
+        "show_repeats": "Pokaż powtórzenia",
+        "admin_menu": {
+            "moderation": "Moderacja",
+            "grant_admin": "Przyznaj admina",
+            "revoke_admin": "Odwołaj admina",
+            "grant_moderator": "Przyznaj moderatora",
+            "revoke_moderator": "Odwołaj moderatora",
+            "activate_account": "Aktywuj konto",
+            "deactivate_account": "Dezaktywuj konto",
+            "delete_account": "Usuń konto",
+            "force_nsfw": "Oznacz wszystkie posty jako NSFW",
+            "strip_media": "Usuń multimedia z postów",
+            "force_unlisted": "Wymuś posty na niepubliczne",
+            "sandbox": "Wymuś by posty były tylko dla obserwujących",
+            "disable_remote_subscription": "Zakaż obserwowania użytkownika ze zdalnych instancji",
+            "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika",
+            "quarantine": "Zakaż federowania postów od tego użytkownika",
+            "delete_user": "Usuń użytkownika",
+            "delete_user_confirmation": "Czy jesteś absolutnie pewny? Ta operacja nie może być cofnięta."
+        }
+    },
+    "user_profile": {
+        "timeline_title": "Oś czasu użytkownika",
+        "profile_does_not_exist": "Przepraszamy, ten profil nie istnieje.",
+        "profile_loading_error": "Przepraszamy, wystąpił błąd podczas ładowania tego profilu."
+    },
+    "user_reporting": {
+        "title": "Raportowanie {0}",
+        "add_comment_description": "Raport zostanie wysłany do moderatorów instancji. Możesz dodać powód dlaczego raportujesz to konto poniżej:",
+        "additional_comments": "Dodatkowe komentarze",
+        "forward_description": "To konto jest z innego serwera. Wysłać również tam kopię raportu?",
+        "forward_to": "Przekaż do{0}",
+        "submit": "Wyślij",
+        "generic_error": "Wystąpił błąd podczas przetwarzania twojej prośby."
+    },
+    "who_to_follow": {
+        "more": "Więcej",
+        "who_to_follow": "Propozycje obserwacji"
+    },
+    "tool_tip": {
+        "media_upload": "Wyślij media",
+        "repeat": "Powtórz",
+        "reply": "Odpowiedz",
+        "favorite": "Dodaj do ulubionych",
+        "add_reaction": "Dodaj reakcję",
+        "user_settings": "Ustawienia użytkownika",
+        "accept_follow_request": "Akceptuj prośbę o możliwość obserwacji",
+        "reject_follow_request": "Odrzuć prośbę o możliwość obserwacji"
+    },
+    "upload": {
+        "error": {
+            "base": "Wysyłanie nie powiodło się.",
+            "file_too_big": "Zbyt duży plik [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "Spróbuj ponownie później"
+        },
+        "file_size_units": {
+            "B": "B",
+            "KiB": "KiB",
+            "MiB": "MiB",
+            "GiB": "GiB",
+            "TiB": "TiB"
+        }
+    },
+    "search": {
+        "people": "Ludzie",
+        "hashtags": "Hasztagi",
+        "person_talking": "{count} osoba rozmawia o tym",
+        "people_talking": "{count} osób rozmawia o tym",
+        "no_results": "Brak wyników"
+    },
+    "password_reset": {
+        "forgot_password": "Zapomniałeś hasła?",
+        "password_reset": "Reset hasła",
+        "instruction": "Wprowadź swój adres email lub nazwę użytkownika. Wyślemy ci link z którym możesz zresetować hasło.",
+        "placeholder": "Twój email lub nazwa użytkownika",
+        "check_email": "Sprawdź pocztę, aby uzyskać link do zresetowania hasła.",
+        "return_home": "Wróć do strony głównej",
+        "not_found": "Nie mogliśmy znaleźć tego emaila lub nazwy użytkownika.",
+        "too_many_requests": "Przekroczyłeś limit prób, spróbuj ponownie później.",
+        "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
+        "password_reset_required": "Musisz zresetować hasło, by się zalogować.",
+        "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji."
     }
-  },
-  "search": {
-    "people": "Ludzie",
-    "hashtags": "Hasztagi",
-    "person_talking": "{count} osoba rozmawia o tym",
-    "people_talking": "{count} osób rozmawia o tym",
-    "no_results": "Brak wyników"
-  },
-  "password_reset": {
-    "forgot_password": "Zapomniałeś hasła?",
-    "password_reset": "Reset hasła",
-    "instruction": "Wprowadź swój adres email lub nazwę użytkownika. Wyślemy ci link z którym możesz zresetować hasło.",
-    "placeholder": "Twój email lub nazwa użytkownika",
-    "check_email": "Sprawdź pocztę, aby uzyskać link do zresetowania hasła.",
-    "return_home": "Wróć do strony głównej",
-    "not_found": "Nie mogliśmy znaleźć tego emaila lub nazwy użytkownika.",
-    "too_many_requests": "Przekroczyłeś limit prób, spróbuj ponownie później.",
-    "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
-    "password_reset_required": "Musisz zresetować hasło, by się zalogować.",
-    "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji."
-  }
 }

From c2bba3f5addf4c6b851bd2d2e7e53d7e897c0115 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:28:35 -0500
Subject: [PATCH 031/415] Remove unused noAttachmentLinks option

---
 src/boot/after_store.js | 1 -
 src/modules/instance.js | 1 -
 static/config.json      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 34f6d6e7..abdba305 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -108,7 +108,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('subjectLineBehavior')
   copyInstanceOption('postContentType')
   copyInstanceOption('alwaysShowSubjectInput')
-  copyInstanceOption('noAttachmentLinks')
   copyInstanceOption('showFeaturesPanel')
   copyInstanceOption('hideSitename')
 
diff --git a/src/modules/instance.js b/src/modules/instance.js
index ffece311..0f430e81 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -32,7 +32,6 @@ const defaultState = {
   hideSitename: false,
   nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
-  noAttachmentLinks: false,
   showFeaturesPanel: true,
   minimalScopesMode: false,
   greentext: false,
diff --git a/static/config.json b/static/config.json
index c8267869..0ce85f99 100644
--- a/static/config.json
+++ b/static/config.json
@@ -16,7 +16,6 @@
   "hideUserStats": false,
   "loginMethod": "password",
   "webPushNotifications": false,
-  "noAttachmentLinks": false,
   "nsfwCensorImage": "",
   "showFeaturesPanel": true,
   "minimalScopesMode": false

From eea6d772ad53665ea926d714ed2df6059dec197d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:31:00 -0500
Subject: [PATCH 032/415] Also remove from docs

---
 docs/CONFIGURATION.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 0a9bbd7a..f9de664d 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -68,9 +68,6 @@ Hide counters for posts and users respectively, i.e. hiding repeats/favorites co
 ### `webPushNotifications`
 Enables [PushAPI](https://developer.mozilla.org/en-US/docs/Web/API/Push_API) - based notifications for users. Instance-default.
 
-### `noAttachmentLinks`
-**TODO Currently doesn't seem to be doing anything code-wise**, but implication is to disable adding links for attachments, which looks nicer but breaks compatibility with old GNU/Social servers.
-
 ### `nsfwCensorImage`
 Use custom image for NSFW'd images
 

From 98d332793ccb8b73a8b5f6ec8893d0459412b242 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:40:46 -0500
Subject: [PATCH 033/415] alpha sort

---
 src/modules/instance.js | 47 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/modules/instance.js b/src/modules/instance.js
index ffece311..eeee115c 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -5,37 +5,36 @@ import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
   // Stuff from static/config.json and apiConfig
+  alwaysShowSubjectInput: true,
+  background: '/static/aurora_borealis.jpg',
+  collapseMessageWithSubject: false,
+  disableChat: false,
+  greentext: false,
+  hideFilteredStatuses: false,
+  hideMutedPosts: false,
+  hidePostStats: false,
+  hideSitename: false,
+  hideUserStats: false,
+  logo: '/static/logo.png',
+  logoMargin: '.2em',
+  logoMask: true,
+  minimalScopesMode: false,
   name: 'Pleroma FE',
+  nsfwCensorImage: undefined,
+  postContentType: 'text/plain',
+  redirectRootLogin: '/main/friends',
+  redirectRootNoLogin: '/main/all',
   registrationOpen: true,
   safeDM: true,
-  textlimit: 5000,
+  scopeCopy: true,
   server: 'http://localhost:4040/',
+  showFeaturesPanel: true,
+  showInstanceSpecificPanel: false,
+  subjectLineBehavior: 'email',
+  textlimit: 5000,
   theme: 'pleroma-dark',
   themeData: undefined,
-  background: '/static/aurora_borealis.jpg',
-  logo: '/static/logo.png',
-  logoMask: true,
-  logoMargin: '.2em',
-  redirectRootNoLogin: '/main/all',
-  redirectRootLogin: '/main/friends',
-  showInstanceSpecificPanel: false,
-  alwaysShowSubjectInput: true,
-  hideMutedPosts: false,
-  collapseMessageWithSubject: false,
-  hidePostStats: false,
-  hideUserStats: false,
-  hideFilteredStatuses: false,
-  disableChat: false,
-  scopeCopy: true,
-  subjectLineBehavior: 'email',
-  postContentType: 'text/plain',
-  hideSitename: false,
-  nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
-  noAttachmentLinks: false,
-  showFeaturesPanel: true,
-  minimalScopesMode: false,
-  greentext: false,
 
   // Nasty stuff
   pleromaBackend: true,

From a4a25105babae42b04d173b44dcb8a2d797b87fc Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:43:36 -0500
Subject: [PATCH 034/415] Separate the user configurable section

---
 src/modules/instance.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/instance.js b/src/modules/instance.js
index eeee115c..1b04032b 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -4,6 +4,9 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
+  // not user configurable
+  name: 'Pleroma FE',
+
   // Stuff from static/config.json and apiConfig
   alwaysShowSubjectInput: true,
   background: '/static/aurora_borealis.jpg',
@@ -19,7 +22,6 @@ const defaultState = {
   logoMargin: '.2em',
   logoMask: true,
   minimalScopesMode: false,
-  name: 'Pleroma FE',
   nsfwCensorImage: undefined,
   postContentType: 'text/plain',
   redirectRootLogin: '/main/friends',

From 62e0fda5978c8cf592fb0cdf28e485e87378f467 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:46:31 -0500
Subject: [PATCH 035/415] loginMethod was missing

---
 src/modules/instance.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 1b04032b..8be8ba63 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -18,6 +18,7 @@ const defaultState = {
   hidePostStats: false,
   hideSitename: false,
   hideUserStats: false,
+  loginMethod: 'password',
   logo: '/static/logo.png',
   logoMargin: '.2em',
   logoMask: true,

From 1db2fc3f41207c2af363c2017efb633a60e9a042 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:52:21 -0500
Subject: [PATCH 036/415] alpha sort

---
 static/config.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/static/config.json b/static/config.json
index c8267869..9aeed8f1 100644
--- a/static/config.json
+++ b/static/config.json
@@ -1,23 +1,23 @@
 {
-  "theme": "pleroma-dark",
-  "background": "/static/aurora_borealis.jpg",
-  "logo": "/static/logo.png",
-  "logoMask": true,
-  "logoMargin": ".1em",
-  "redirectRootNoLogin": "/main/all",
-  "redirectRootLogin": "/main/friends",
-  "showInstanceSpecificPanel": false,
-  "collapseMessageWithSubject": false,
-  "scopeCopy": true,
-  "subjectLineBehavior": "email",
-  "postContentType": "text/plain",
   "alwaysShowSubjectInput": true,
+  "background": "/static/aurora_borealis.jpg",
+  "collapseMessageWithSubject": false,
   "hidePostStats": false,
   "hideUserStats": false,
   "loginMethod": "password",
-  "webPushNotifications": false,
+  "logo": "/static/logo.png",
+  "logoMargin": ".1em",
+  "logoMask": true,
+  "minimalScopesMode": false,
   "noAttachmentLinks": false,
   "nsfwCensorImage": "",
+  "postContentType": "text/plain",
+  "redirectRootLogin": "/main/friends",
+  "redirectRootNoLogin": "/main/all",
+  "scopeCopy": true,
   "showFeaturesPanel": true,
-  "minimalScopesMode": false
+  "showInstanceSpecificPanel": false,
+  "subjectLineBehavior": "email",
+  "theme": "pleroma-dark",
+  "webPushNotifications": false
 }

From 0ef5965b3bfb6e9f8a305714f60a54b43066473a Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:52:48 -0500
Subject: [PATCH 037/415] Add missing settings: disableChat, greentext,
 hideFilteredStatuses, hideMutedPosts, hidePostStats, hideSitename

---
 static/config.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/config.json b/static/config.json
index 9aeed8f1..727dde73 100644
--- a/static/config.json
+++ b/static/config.json
@@ -2,7 +2,12 @@
   "alwaysShowSubjectInput": true,
   "background": "/static/aurora_borealis.jpg",
   "collapseMessageWithSubject": false,
+  "disableChat": false,
+  "greentext": false,
+  "hideFilteredStatuses": false,
+  "hideMutedPosts": false,
   "hidePostStats": false,
+  "hideSitename": false,
   "hideUserStats": false,
   "loginMethod": "password",
   "logo": "/static/logo.png",

From fc12f44f7a13581ec08d6440f1cebbb230cfc32f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 13 May 2020 18:41:08 +0000
Subject: [PATCH 038/415] Translated using Weblate (Finnish)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 386578fb..7248c049 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -289,7 +289,15 @@
             "warning_of_generate_new_codes": "Luodessasi uudet palautuskoodit, vanhat koodisi lakkaavat toimimasta.",
             "recovery_codes": "Palautuskoodit.",
             "waiting_a_recovery_codes": "Odotetaan palautuskoodeja...",
-            "recovery_codes_warning": "Kirjoita koodit ylös tai tallenna ne turvallisesti, muuten et näe niitä uudestaan. Jos et voi käyttää monivaihetodennusta ja sinulla ei ole palautuskoodeja, et voi enää kirjautua sisään tilillesi."
+            "recovery_codes_warning": "Kirjoita koodit ylös tai tallenna ne turvallisesti, muuten et näe niitä uudestaan. Jos et voi käyttää monivaihetodennusta ja sinulla ei ole palautuskoodeja, et voi enää kirjautua sisään tilillesi.",
+            "scan": {
+                "title": "Skannaa",
+                "secret_code": "Avain",
+                "desc": "Käytä monivaihetodennus-sovellusta skannakksesi tämän QR-kooding, tai syötä avain:"
+            },
+            "verify": {
+                "desc": "Kytkeäksesi päälle monivaihetodennuksen, syötä koodi monivaihetodennussovellksesta:"
+            }
         },
         "allow_following_move": "Salli automaattinen seuraaminen kun käyttäjä siirtää tilinsä",
         "block_export": "Estojen vienti",
@@ -375,7 +383,12 @@
                 "poll": "Äänestyksen kuvaaja",
                 "icons": "Ikonit",
                 "highlight": "Korostetut elementit",
-                "pressed": "Painettu"
+                "pressed": "Painettu",
+                "selectedMenu": "Valikon valinta",
+                "disabled": "Pois käytöstä",
+                "toggled": "Kytketty",
+                "tabs": "Välilehdet",
+                "popover": "Työkaluvinkit, valikot, ponnahdusviestit"
             },
             "common": {
                 "color": "Väri",
@@ -398,6 +411,67 @@
                 "main": "Yleiset värit",
                 "foreground_hint": "Löydät \"Edistynyt\"-välilehdeltä tarkemmat asetukset",
                 "rgbo": "Ikonit, korostukset, merkit"
+            },
+            "shadows": {
+                "filter_hint": {
+                    "always_drop_shadow": "Varoitus, tämä varjo käyttää aina {0} kun selain tukee sitä.",
+                    "avatar_inset": "Huom. sisennettyjen ja ei-sisennettyjen varjojen yhdistelmät saattavat luoda ei-odotettuja lopputuloksia läpinäkyvillä profiilikuvilla.",
+                    "drop_shadow_syntax": "{0} ei tue {1} parametria ja {2} avainsanaa.",
+                    "spread_zero": "Varjot joiden levitys > 0 näyttävät samalta kuin se olisi nolla",
+                    "inset_classic": "Sisennetyt varjot käyttävät {0}"
+                },
+                "components": {
+                    "buttonPressedHover": "Nappi (painettu ja kohdistettu)",
+                    "panel": "Ruutu",
+                    "panelHeader": "Ruudun otsikko",
+                    "topBar": "Yläpalkki",
+                    "avatar": "Profiilikuva (profiilinäkymässä)",
+                    "avatarStatus": "Profiilikuva (viestin yhtyedessä)",
+                    "popup": "Ponnahdusviestit ja työkaluvinkit",
+                    "button": "Nappi",
+                    "buttonHover": "Nappi (kohdistus)",
+                    "buttonPressed": "Nappi (painettu)",
+                    "input": "Syöttökenttä"
+                },
+                "hintV3": "Voit käyttää {0} merkintää varjoille käyttääksesi väriä toisesta asetuksesta.",
+                "_tab_label": "Valo ja varjostus",
+                "component": "Komponentti",
+                "override": "Ylikirjoita",
+                "shadow_id": "Varjo #{value}",
+                "blur": "Sumennus",
+                "spread": "Levitys",
+                "inset": "Sisennys"
+            },
+            "fonts": {
+                "help": "Valitse fontti käyttöliittymälle. \"Oma\"-vaihtohdolle on syötettävä fontin nimi tarkalleen samana kuin se on järjestelmässäsi.",
+                "_tab_label": "Fontit",
+                "components": {
+                    "interface": "Käyttöliittymä",
+                    "input": "Syöttökentät",
+                    "post": "Viestin teksti",
+                    "postCode": "Tasavälistetty teksti viestissä"
+                },
+                "family": "Fontin nimi",
+                "size": "Koko (pikseleissä)",
+                "weight": "Painostus (paksuus)",
+                "custom": "Oma"
+            },
+            "preview": {
+                "input": "Tulin juuri saunasta.",
+                "header": "Esikatselu",
+                "content": "Sisältö",
+                "error": "Esimerkkivirhe",
+                "button": "Nappi",
+                "text": "Vähän lisää {0} ja {1}",
+                "mono": "sisältöä",
+                "faint_link": "manuaali",
+                "fine_print": "Lue meidän {0} vaikka huvin vuoksi!",
+                "header_faint": "Tämä on OK",
+                "checkbox": "Olen silmäillyt käyttöehdot",
+                "link": "kiva linkki"
+            },
+            "radii": {
+                "_tab_label": "Pyöristys"
             }
         },
         "enter_current_password_to_confirm": "Syötä nykyinen salasanasi todentaaksesi henkilöllisyytesi",
@@ -411,7 +485,12 @@
         "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
         "notification_setting_privacy": "Yksityisyys",
         "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
-        "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen."
+        "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
+        "version": {
+            "title": "Versio",
+            "backend_version": "Palvelimen versio",
+            "frontend_version": "Käyttöliittymän versio"
+        }
     },
     "time": {
         "day": "{0} päivä",
@@ -432,8 +511,8 @@
         "months": "{0} kuukautta",
         "month_short": "{0}kk",
         "months_short": "{0}kk",
-        "now": "nyt",
-        "now_short": "juuri nyt",
+        "now": "juuri nyt",
+        "now_short": "nyt",
         "second": "{0} sekunti",
         "seconds": "{0} sekuntia",
         "second_short": "{0}s",
@@ -456,7 +535,8 @@
         "repeated": "toisti",
         "show_new": "Näytä uudet",
         "up_to_date": "Ajantasalla",
-        "no_more_statuses": "Ei enempää viestejä"
+        "no_more_statuses": "Ei enempää viestejä",
+        "no_statuses": "Ei viestejä"
     },
     "status": {
         "favorites": "Tykkäykset",
@@ -468,9 +548,10 @@
         "delete_confirm": "Haluatko varmasti postaa viestin?",
         "reply_to": "Vastaus",
         "replies_list": "Vastaukset:",
-        "mute_conversation": "Hiljennä keskustelu",
-        "unmute_conversation": "Poista hiljennys",
-        "status_unavailable": "Viesti ei saatavissa"
+        "mute_conversation": "Mykistä keskustelu",
+        "unmute_conversation": "Poista mykistys",
+        "status_unavailable": "Viesti ei saatavissa",
+        "copy_link": "Kopioi linkki"
     },
     "user_card": {
         "approve": "Hyväksy",
@@ -479,7 +560,7 @@
         "deny": "Älä hyväksy",
         "follow": "Seuraa",
         "follow_sent": "Pyyntö lähetetty!",
-        "follow_progress": "Pyydetään...",
+        "follow_progress": "Pyydetään…",
         "follow_again": "Lähetä pyyntö uudestaan",
         "follow_unfollow": "Älä seuraa",
         "followees": "Seuraa",
@@ -487,14 +568,50 @@
         "following": "Seuraat!",
         "follows_you": "Seuraa sinua!",
         "its_you": "Sinun tili!",
-        "mute": "Hiljennä",
-        "muted": "Hiljennetty",
+        "mute": "Mykistä",
+        "muted": "Mykistetty",
         "per_day": "päivässä",
         "remote_follow": "Seuraa muualta",
-        "statuses": "Viestit"
+        "statuses": "Viestit",
+        "hidden": "Piilotettu",
+        "media": "Media",
+        "block_progress": "Estetään...",
+        "admin_menu": {
+            "grant_admin": "Anna Ylläpitöoikeudet",
+            "force_nsfw": "Merkitse kaikki viestit NSFW:nä",
+            "disable_any_subscription": "Estä käyttäjän seuraaminen",
+            "moderation": "Moderaatio",
+            "revoke_admin": "Poista Ylläpitöoikeudet",
+            "grant_moderator": "Anna Moderaattorioikeudet",
+            "revoke_moderator": "Poista Moderaattorioikeudet",
+            "activate_account": "Aktivoi tili",
+            "deactivate_account": "Deaktivoi tili",
+            "delete_account": "Poista tili",
+            "strip_media": "Poista media viesteistä",
+            "force_unlisted": "Pakota viestit listaamattomiksi",
+            "sandbox": "Pakota viestit vain seuraajille",
+            "disable_remote_subscription": "Estä seuraaminen ulkopuolisilta sivuilta",
+            "quarantine": "Estä käyttäjän viestin federoituminen",
+            "delete_user": "Poista käyttäjä",
+            "delete_user_confirmation": "Oletko aivan varma? Tätä ei voi kumota."
+        },
+        "favorites": "Tykkäykset",
+        "mention": "Mainitse",
+        "report": "Ilmianna",
+        "subscribe": "Tilaa",
+        "unsubscribe": "Poista tilaus",
+        "unblock": "Poista esto",
+        "unblock_progress": "Postetaan estoa...",
+        "unmute": "Poista mykistys",
+        "unmute_progress": "Poistetaan mykistystä...",
+        "mute_progress": "Mykistetään...",
+        "hide_repeats": "Piilota toistot",
+        "show_repeats": "Näytä toistot"
     },
     "user_profile": {
-        "timeline_title": "Käyttäjän aikajana"
+        "timeline_title": "Käyttäjän aikajana",
+        "profile_does_not_exist": "Tätä profiilia ei ole.",
+        "profile_loading_error": "Virhe ladatessa profiilia."
     },
     "who_to_follow": {
         "more": "Lisää",
@@ -505,7 +622,10 @@
         "repeat": "Toista",
         "reply": "Vastaa",
         "favorite": "Tykkää",
-        "user_settings": "Käyttäjäasetukset"
+        "user_settings": "Käyttäjäasetukset",
+        "add_reaction": "Lisää Reaktio",
+        "accept_follow_request": "Hyväksy seurauspyyntö",
+        "reject_follow_request": "Hylkää seurauspyyntö"
     },
     "upload": {
         "error": {
@@ -535,10 +655,19 @@
                 "reject": "Hylkää",
                 "quarantine": "Karanteeni",
                 "ftl_removal": "Poisto \"Koko Tunnettu Verkosto\" -aikajanalta",
-                "media_removal": "Media-tiedostojen poisto"
+                "media_removal": "Media-tiedostojen poisto",
+                "simple_policies": "Palvelinkohtaiset Säännöt",
+                "accept_desc": "Tämä palvelin hyväksyy viestit vain seuraavilta palvelimilta:",
+                "reject_desc": "Tämä palvelin ei hyväksy viestejä seuraavilta palvelimilta:",
+                "quarantine_desc": "Tämä palvelin lähettää vain julkisia viestejä seuraaville palvelimille:",
+                "ftl_removal_desc": "Tämä palvelin poistaa nämä palvelimet \"Koko Tunnettu Verkosto\"-aikajanalta:",
+                "media_removal_desc": "Tämä palvelin postaa mediatiedostot viesteistä seuraavilta palvelimilta:",
+                "media_nsfw": "Pakota Media Arkaluontoiseksi",
+                "media_nsfw_desc": "Tämä palvelin pakottaa mediatiedostot arkaluonteisiksi seuraavilta palvelimilta:"
             },
             "federation": "Federaatio",
-            "mrf_policies": "Aktivoidut MRF-säännöt"
+            "mrf_policies": "Aktivoidut MRF-säännöt",
+            "mrf_policies_desc": "MRF-säännöt muuttavat federaation toimintaa sivulla. Seuraavat säännöt ovat kytketty päälle:"
         },
         "staff": "Henkilökunta"
     },
@@ -585,5 +714,34 @@
     },
     "selectable_list": {
         "select_all": "Valitse kaikki"
+    },
+    "password_reset": {
+        "check_email": "Tarkista sähköpostisi salasanannollausta varten.",
+        "instruction": "Syötä sähköpostiosoite tai käyttäjänimi. Lähetämme linkin salasanan nollausta varten.",
+        "password_reset_disabled": "Salasanan nollaus ei käytössä. Ota yhteyttä sivun ylläpitäjään.",
+        "password_reset_required_but_mailer_is_disabled": "Sinun täytyy vaihtaa salasana, mutta salasanan nollaus on pois käytöstä. Ota yhteyttä sivun ylläpitäjään.",
+        "forgot_password": "Unohditko salasanan?",
+        "password_reset": "Salasanan nollaus",
+        "placeholder": "Sähköpostiosoite tai käyttäjänimi",
+        "return_home": "Palaa etusivulle",
+        "not_found": "Sähköpostiosoitetta tai käyttäjänimeä ei löytynyt.",
+        "too_many_requests": "Olet käyttänyt kaikki yritykset, yritä uudelleen myöhemmin.",
+        "password_reset_required": "Sinun täytyy vaihtaa salasana kirjautuaksesi."
+    },
+    "user_reporting": {
+        "add_comment_description": "Tämä raportti lähetetään sivun moderaattoreille. Voit antaa selityksen miksi ilmiannoit tilin:",
+        "title": "Ilmiannetaan {0}",
+        "additional_comments": "Lisäkommentit",
+        "forward_description": "Tämä tili on toiselta palvelimelta. Lähetä kopio ilmiannosta sinnekin?",
+        "forward_to": "Lähetä eteenpäin: {0}",
+        "submit": "Lähetä",
+        "generic_error": "Virhe käsitellessä pyyntöä."
+    },
+    "search": {
+        "people": "Käyttäjät",
+        "hashtags": "Aihetunnisteet",
+        "people_talking": "{0} käyttäjää puhuvat",
+        "person_talking": "{0} käyttäjä puhuu",
+        "no_results": "Ei tuloksia"
     }
 }

From 1f53f0a844eed940d40005fe64bc88d7434031d7 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Wed, 13 May 2020 18:43:07 +0000
Subject: [PATCH 039/415] Translated using Weblate (Italian)

Currently translated at 28.3% (174 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 817a6465..8e35d4f9 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -33,13 +33,13 @@
         "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
         "name": "Nome",
         "name_bio": "Nome ed introduzione",
-        "nsfw_clickthrough": "Abilita il click per visualizzare gli allegati segnati come NSFW",
+        "nsfw_clickthrough": "Fai click per visualizzare gli allegati nascosti",
         "profile_background": "Sfondo della tua pagina",
-        "profile_banner": "Banner del tuo profilo",
-        "reply_link_preview": "Abilita il link per la risposta al passaggio del mouse",
-        "set_new_avatar": "Scegli un nuovo avatar",
+        "profile_banner": "Stendardo del tuo profilo",
+        "reply_link_preview": "Visualizza le risposte al passaggio del cursore",
+        "set_new_avatar": "Scegli una nuova icona",
         "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
-        "set_new_profile_banner": "Scegli un nuovo banner per il tuo profilo",
+        "set_new_profile_banner": "Scegli un nuovo stendardo per il tuo profilo",
         "settings": "Impostazioni",
         "theme": "Tema",
         "user_settings": "Impostazioni Utente",
@@ -92,48 +92,48 @@
         "notification_visibility_likes": "Preferiti",
         "notification_visibility_mentions": "Menzioni",
         "notification_visibility_repeats": "Condivisioni",
-        "no_rich_text_description": "Togli l'impaginazione del testo da tutti i messaggi",
+        "no_rich_text_description": "Togli la formattazione del testo da tutti i messaggi",
         "oauth_tokens": "Token OAuth",
         "token": "Token",
         "refresh_token": "Aggiorna token",
         "valid_until": "Valido fino a",
-        "revoke_token": "Revocare",
+        "revoke_token": "Revoca",
         "panelRadius": "Pannelli",
-        "pause_on_unfocused": "Metti in pausa l'aggiornamento continuo quando la scheda non è in primo piano",
+        "pause_on_unfocused": "Interrompi l'aggiornamento continuo mentre la scheda è in secondo piano",
         "presets": "Valori predefiniti",
         "profile_tab": "Profilo",
-        "radii_help": "Imposta l'arrotondamento dei bordi (in pixel)",
-        "replies_in_timeline": "Risposte nella sequenza temporale",
+        "radii_help": "Imposta il raggio dei bordi (in pixel)",
+        "replies_in_timeline": "Risposte nella sequenza personale",
         "reply_visibility_all": "Mostra tutte le risposte",
-        "reply_visibility_following": "Mostra solo le risposte dirette a me o agli utenti che seguo",
-        "reply_visibility_self": "Mostra solo risposte dirette a me",
+        "reply_visibility_following": "Mostra solo le risposte rivolte a me o agli utenti che seguo",
+        "reply_visibility_self": "Mostra solo risposte rivolte a me",
         "saving_err": "Errore nel salvataggio delle impostazioni",
         "saving_ok": "Impostazioni salvate",
         "security_tab": "Sicurezza",
-        "stop_gifs": "Riproduci GIF al passaggio del cursore del mouse",
-        "streaming": "Abilita aggiornamento automatico dei nuovi post quando si è in alto alla pagina",
+        "stop_gifs": "Riproduci GIF al passaggio del cursore",
+        "streaming": "Mostra automaticamente i nuovi messaggi quando sei in cima alla pagina",
         "text": "Testo",
         "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
         "tooltipRadius": "Descrizioni/avvisi",
         "values": {
             "false": "no",
-            "true": "si"
+            "true": "sì"
         }
     },
     "timeline": {
-        "error_fetching": "Errore nel prelievo aggiornamenti",
+        "error_fetching": "Errore nell'aggiornamento",
         "load_older": "Carica messaggi più vecchi",
         "show_new": "Mostra nuovi",
         "up_to_date": "Aggiornato",
         "collapse": "Riduci",
         "conversation": "Conversazione",
-        "no_retweet_hint": "La visibilità del post è impostata solo per chi ti segue o messaggio diretto e non può essere condiviso",
+        "no_retweet_hint": "Il messaggio è diretto o solo per seguaci e non può essere condiviso",
         "repeated": "condiviso"
     },
     "user_card": {
         "follow": "Segui",
         "followees": "Chi stai seguendo",
-        "followers": "Chi ti segue",
+        "followers": "Seguaci",
         "following": "Lo stai seguendo!",
         "follows_you": "Ti segue!",
         "mute": "Silenzia",
@@ -197,10 +197,10 @@
         "token": "Codice d'invito"
     },
     "user_profile": {
-        "timeline_title": "Sequenza Temporale dell'Utente"
+        "timeline_title": "Sequenza dell'Utente"
     },
     "who_to_follow": {
-        "more": "Più",
+        "more": "Altro",
         "who_to_follow": "Chi seguire"
     },
     "about": {

From 346f3a285abe2b0f548b9eef7b393305a9b5f63b Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 13 May 2020 18:43:12 +0000
Subject: [PATCH 040/415] Translated using Weblate (Russian)

Currently translated at 61.0% (374 of 613 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 790f2f3c..3c52416c 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -42,7 +42,8 @@
         "public_tl": "Публичная лента",
         "timeline": "Лента",
         "twkn": "Федеративная лента",
-        "search": "Поиск"
+        "search": "Поиск",
+        "friend_requests": "Запросы на чтение"
     },
     "notifications": {
         "broken_favorite": "Неизвестный статус, ищем...",
@@ -51,7 +52,8 @@
         "load_older": "Загрузить старые уведомления",
         "notifications": "Уведомления",
         "read": "Прочесть",
-        "repeated_you": "повторил(а) ваш статус"
+        "repeated_you": "повторил(а) ваш статус",
+        "follow_request": "хочет читать вас"
     },
     "interactions": {
         "favs_repeats": "Повторы и фавориты",
@@ -59,7 +61,7 @@
         "load_older": "Загрузить старые взаимодействия"
     },
     "post_status": {
-        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков.",
+        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может начать читать вас чтобы видеть посты только для подписчиков.",
         "account_not_locked_warning_link": "залочен",
         "attachments_sensitive": "Вложения содержат чувствительный контент",
         "content_warning": "Тема (не обязательно)",
@@ -207,7 +209,7 @@
         "replies_in_timeline": "Ответы в ленте",
         "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
         "reply_visibility_all": "Показывать все ответы",
-        "reply_visibility_following": "Показывать только ответы мне и тех на кого я подписан",
+        "reply_visibility_following": "Показывать только ответы мне или тех на кого я подписан",
         "reply_visibility_self": "Показывать только ответы мне",
         "autohide_floating_post_button": "Автоматически скрывать кнопку постинга (в мобильной версии)",
         "saving_err": "Не удалось сохранить настройки",
@@ -343,7 +345,13 @@
                 "checkbox": "Я подтверждаю что не было ни единого разрыва",
                 "link": "ссылка"
             }
-        }
+        },
+        "notification_setting_non_followers": "Не читающие вас",
+        "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
+        "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
+        "notification_setting_followers": "Читающие вас",
+        "notification_setting_follows": "Читаемые вами",
+        "notification_setting_non_follows": "Не читаемые вами"
     },
     "timeline": {
         "collapse": "Свернуть",
@@ -362,12 +370,12 @@
         "follow": "Читать",
         "follow_sent": "Запрос отправлен!",
         "follow_progress": "Запрашиваем…",
-        "follow_again": "Запросить еще заново?",
+        "follow_again": "Запросить еще раз?",
         "follow_unfollow": "Перестать читать",
         "followees": "Читаемые",
         "followers": "Читатели",
-        "following": "Читаю",
-        "follows_you": "Читает вас",
+        "following": "Читаю!",
+        "follows_you": "Читает вас!",
         "mute": "Игнорировать",
         "muted": "Игнорирую",
         "per_day": "в день",
@@ -385,9 +393,9 @@
             "force_nsfw": "Отмечать посты пользователя как NSFW",
             "strip_media": "Убирать вложения из постов пользователя",
             "force_unlisted": "Не добавлять посты в публичные ленты",
-            "sandbox": "Посты доступны только для подписчиков",
-            "disable_remote_subscription": "Запретить подписываться с удаленных серверов",
-            "disable_any_subscription": "Запретить подписываться на пользователя",
+            "sandbox": "Принудить видимость постов только читателям",
+            "disable_remote_subscription": "Запретить читать с удаленных серверов",
+            "disable_any_subscription": "Запретить читать пользователя",
             "quarantine": "Не федерировать посты пользователя",
             "delete_user": "Удалить пользователя",
             "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
@@ -460,5 +468,9 @@
         "text_limit": "Лимит символов",
         "title": "Особенности",
         "gopher": "Gopher"
+    },
+    "tool_tip": {
+        "accept_follow_request": "Принять запрос на чтение",
+        "reject_follow_request": "Отклонить запрос на чтение"
     }
 }

From cad40133d2919d012c30ba728bfd02b3491d478f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 15:29:38 -0500
Subject: [PATCH 041/415] Alpha sort docs, add missing options

---
 docs/CONFIGURATION.md | 78 +++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 0a9bbd7a..d6a66d0b 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -19,32 +19,66 @@ There's currently no mechanism for user-settings synchronization across several
 
 ## Options
 
-### `theme`
-Default theme used for new users. De-facto instance-default, user can change theme.
+### `alwaysShowSubjectInput`
+`true` - will always show subject line input, `false` - only show when it's not empty (i.e. replying). To hide subject line input completely, set it to `false` and `subjectLineBehavior` to `"noop"`
 
 ### `background`
 Default image background. Be aware of using too big images as they may take longer to load. Currently image is fitted with `background-size: cover` which means "scaled and cropped", currently left-aligned. De-facto instance default, user can choose their own background, if they remove their own background, instance default will be used instead.
 
+### `collapseMessageWithSubject`
+Collapse post content when post has a subject line (content warning). Instance-default.
+
+### `disableChat`
+hides the chat (TODO: even if it's enabled on backend)
+
+### `greentext`
+Changes lines prefixed with the `>` character to have a green text color
+
+### `hideFilteredStatuses`
+Removes filtered statuses from timelines.
+
+### `hideMutedPosts`
+Removes muted statuses from timelines.
+
+### `hidePostStats`
+Hide repeats/favorites counters for posts.
+
+### `hideSitename`
+Hide instance name in header.
+
+### `hideUserStats`
+Hide followers/friends counters for users.
+
+### `loginMethod`
+`"password"` - show simple password field
+`"token"` - show button to log in with external method (will redirect to login form, more details in BE documentation)
+
 ### `logo`, `logoMask`, `logoMargin`
 Instance `logo`, could be any image, including svg. By default it assumes logo used will be monochrome-with-alpha one, this is done to be compatible with both light and dark themes, so that white logo designed with dark theme in mind won't be invisible over light theme, this is done via [CSS3 Masking](https://www.html5rocks.com/en/tutorials/masking/adobe/). Basically - it will take alpha channel of the image and fill non-transparent areas of it with solid color. If you really want colorful logo - it can be done by setting `logoMask` to `false`.
 
 `logoMargin` allows you to adjust vertical margins between logo boundary and navbar borders. The idea is that to have logo's image without any extra margins and instead adjust them to your need in layout.
 
+### `minimalScopesMode`
+Limit scope selection to *Direct*, *User default* and *Scope of post replying to*. This also makes it impossible to reply to a DM with a non-DM post from PleromaFE.
+
+### `nsfwCensorImage`
+Use custom image for NSFW'd images
+
+### `postContentType`
+Default post formatting option (markdown/bbcode/plaintext/etc...)
+
 ### `redirectRootNoLogin`, `redirectRootLogin`
 These two settings should point to where FE should redirect visitor when they login/open up website root
 
-### `chatDisabled`
-hides the chat (TODO: even if it's enabled on backend)
+### `scopeCopy`
+Copy post scope (visibility) when replying to a post. Instance-default.
+
+### `showFeaturesPanel`
+Show panel showcasing instance features/settings to logged-out visitors
 
 ### `showInstanceSpecificPanel`
 This allows you to include arbitrary HTML content in a panel below navigation menu. PleromaFE looks for an html page `instance/panel.html`, by default it's not provided in FE, but BE bundles some [default one](https://git.pleroma.social/pleroma/pleroma/blob/develop/priv/static/instance/panel.html). De-facto instance-defaults, since user can hide instance-specific panel.
 
-### `collapseMessageWithSubject`
-Collapse post content when post has a subject line (content warning). Instance-default.
-
-### `scopeCopy`
-Copy post scope (visibility) when replying to a post. Instance-default.
-
 ### `subjectLineBehavior`
 How to handle subject line (CW) when replying to a post.
 * `"email"` - like EMail - prepend `re: ` to subject line if it doesn't already start with it.
@@ -52,33 +86,13 @@ How to handle subject line (CW) when replying to a post.
 * `"noop"` - do not copy
 Instance-default.
 
-### `postContentType`
-Default post formatting option (markdown/bbcode/plaintext/etc...)
-
-### `alwaysShowSubjectInput`
-`true` - will always show subject line input, `false` - only show when it's not empty (i.e. replying). To hide subject line input completely, set it to `false` and `subjectLineBehavior` to `"noop"`
-
-### `hidePostStats` and `hideUserStats`
-Hide counters for posts and users respectively, i.e. hiding repeats/favorites counts for posts, hiding followers/friends counts for users. This is just cosmetic and aimed to ease pressure and bias imposed by stat numbers of people and/or posts. (as an example: so that people care less about how many followers someone has since they can't see that info)
-
-### `loginMethod`
-`"password"` - show simple password field
-`"token"` - show button to log in with external method (will redirect to login form, more details in BE documentation)
+### `theme`
+Default theme used for new users. De-facto instance-default, user can change theme.
 
 ### `webPushNotifications`
 Enables [PushAPI](https://developer.mozilla.org/en-US/docs/Web/API/Push_API) - based notifications for users. Instance-default.
 
-### `noAttachmentLinks`
-**TODO Currently doesn't seem to be doing anything code-wise**, but implication is to disable adding links for attachments, which looks nicer but breaks compatibility with old GNU/Social servers.
 
-### `nsfwCensorImage`
-Use custom image for NSFW'd images
-
-### `showFeaturesPanel`
-Show panel showcasing instance features/settings to logged-out visitors
-
-### `hideSitename`
-Hide instance name in header
 
 ## Indirect configuration
 Some features are configured depending on how backend is configured. In general the approach is "if backend allows it there's no need to hide it, if backend doesn't allow it there's no need to show it.

From 55fe6e4703fd8587744ee0ef5a8e3b4213f08432 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 15:30:54 -0500
Subject: [PATCH 042/415] Alpha sort indirect section

---
 docs/CONFIGURATION.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index d6a66d0b..003efc7a 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -100,12 +100,12 @@ Some features are configured depending on how backend is configured. In general
 ### Chat
 **TODO somewhat broken, see: chatDisabled** chat can be disabled by disabling it in backend
 
+### Private Mode
+If the `private` instance setting is enabled in the backend, features that are not accessible without authentication, such as the timelines and search will be disabled for unauthenticated users.
+
 ### Rich text formatting in post formatting
 Rich text formatting options are displayed depending on how many formatting options are enabled on backend, if you don't want your users to use rich text at all you can only allow "text/plain" one, frontend then will only display post text format as a label instead of dropdown (just so that users know for example if you only allow Markdown, only BBCode or only Plain text)
 
-### Who to follow
-This is a panel intended for users to find people to follow based on randomness or on post contents. Being potentially privacy unfriendly feature it needs to be enabled and configured in backend to be enabled.
-
 ### Safe DM message display
 
 Setting this will change the warning text that is displayed for direct messages.
@@ -114,5 +114,6 @@ ATTENTION: If you actually want the behavior to change. You will need to set the
 
 DO NOT activate this without checking the backend configuration first!
 
-### Private Mode
-If the `private` instance setting is enabled in the backend, features that are not accessible without authentication, such as the timelines and search will be disabled for unauthenticated users.
+### Who to follow
+This is a panel intended for users to find people to follow based on randomness or on post contents. Being potentially privacy unfriendly feature it needs to be enabled and configured in backend to be enabled.
+

From 0ebf1bebb4aac0800a57f9d4be64dda0a2a07e61 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 15:32:02 -0500
Subject: [PATCH 043/415] SafeDM is enabled by default and won't take effect if
 BE not enabled anyway.

---
 docs/CONFIGURATION.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 003efc7a..7100d260 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -106,14 +106,6 @@ If the `private` instance setting is enabled in the backend, features that are n
 ### Rich text formatting in post formatting
 Rich text formatting options are displayed depending on how many formatting options are enabled on backend, if you don't want your users to use rich text at all you can only allow "text/plain" one, frontend then will only display post text format as a label instead of dropdown (just so that users know for example if you only allow Markdown, only BBCode or only Plain text)
 
-### Safe DM message display
-
-Setting this will change the warning text that is displayed for direct messages.
-
-ATTENTION: If you actually want the behavior to change. You will need to set the appropriate option at the backend. See the backend documentation for information about that.
-
-DO NOT activate this without checking the backend configuration first!
-
 ### Who to follow
 This is a panel intended for users to find people to follow based on randomness or on post contents. Being potentially privacy unfriendly feature it needs to be enabled and configured in backend to be enabled.
 

From d91f5189ef6bf540e9ba34a5650be52afb746235 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 15:33:01 -0500
Subject: [PATCH 044/415] Config setting is actually called disableChat

---
 docs/CONFIGURATION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 7100d260..39a2840d 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -98,7 +98,7 @@ Enables [PushAPI](https://developer.mozilla.org/en-US/docs/Web/API/Push_API) - b
 Some features are configured depending on how backend is configured. In general the approach is "if backend allows it there's no need to hide it, if backend doesn't allow it there's no need to show it.
 
 ### Chat
-**TODO somewhat broken, see: chatDisabled** chat can be disabled by disabling it in backend
+**TODO somewhat broken, see: disableChat** chat can be disabled by disabling it in backend
 
 ### Private Mode
 If the `private` instance setting is enabled in the backend, features that are not accessible without authentication, such as the timelines and search will be disabled for unauthenticated users.

From e80fa3ff6d620dfe09ca373e7761b6c2f1775a12 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 15:40:13 -0500
Subject: [PATCH 045/415] Split apiConfig options from static/config.json
 options; Move safeDM to nasty section, alpha sort things

---
 src/modules/instance.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 8be8ba63..a8029dc1 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -4,10 +4,16 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
-  // not user configurable
+  // not configurable
   name: 'Pleroma FE',
 
-  // Stuff from static/config.json and apiConfig
+  // Stuff from apiConfig
+  server: 'http://localhost:4040/',
+  textlimit: 5000,
+  themeData: undefined,
+  vapidPublicKey: undefined,
+
+  // Stuff from static/config.json
   alwaysShowSubjectInput: true,
   background: '/static/aurora_borealis.jpg',
   collapseMessageWithSubject: false,
@@ -28,29 +34,25 @@ const defaultState = {
   redirectRootLogin: '/main/friends',
   redirectRootNoLogin: '/main/all',
   registrationOpen: true,
-  safeDM: true,
   scopeCopy: true,
-  server: 'http://localhost:4040/',
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
   subjectLineBehavior: 'email',
-  textlimit: 5000,
   theme: 'pleroma-dark',
-  themeData: undefined,
-  vapidPublicKey: undefined,
 
   // Nasty stuff
-  pleromaBackend: true,
-  emoji: [],
-  emojiFetched: false,
   customEmoji: [],
   customEmojiFetched: false,
-  restrictedNicknames: [],
+  emoji: [],
+  emojiFetched: false,
+  pleromaBackend: true,
   postFormats: [],
+  restrictedNicknames: [],
+  safeDM: true,
 
   // Feature-set, apparently, not everything here is reported...
-  mediaProxyAvailable: false,
   chatAvailable: false,
+  mediaProxyAvailable: false,
   gopherAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',

From 03318b64aacbbb48d15c94ada5ade4b38752a734 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 15:48:21 -0500
Subject: [PATCH 046/415] Really alpha sort this

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

diff --git a/src/modules/instance.js b/src/modules/instance.js
index a8029dc1..278a93ab 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -52,8 +52,8 @@ const defaultState = {
 
   // Feature-set, apparently, not everything here is reported...
   chatAvailable: false,
-  mediaProxyAvailable: false,
   gopherAvailable: false,
+  mediaProxyAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',
 

From 79c53b849ed8d5abac978ed675488bf53ea8fb06 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 16:46:58 -0500
Subject: [PATCH 047/415] registrationOpen is not an FE setting

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

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 278a93ab..beea424b 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -8,6 +8,7 @@ const defaultState = {
   name: 'Pleroma FE',
 
   // Stuff from apiConfig
+  registrationOpen: true,
   server: 'http://localhost:4040/',
   textlimit: 5000,
   themeData: undefined,
@@ -33,7 +34,6 @@ const defaultState = {
   postContentType: 'text/plain',
   redirectRootLogin: '/main/friends',
   redirectRootNoLogin: '/main/all',
-  registrationOpen: true,
   scopeCopy: true,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,

From 229bf79d9016d19e1482f5e02f2f03e5d8b078e2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 17:20:35 -0500
Subject: [PATCH 048/415] name setting should be with apiConfig section

---
 src/modules/instance.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/modules/instance.js b/src/modules/instance.js
index beea424b..94d4176b 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -4,10 +4,8 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
-  // not configurable
-  name: 'Pleroma FE',
-
   // Stuff from apiConfig
+  name: 'Pleroma FE',
   registrationOpen: true,
   server: 'http://localhost:4040/',
   textlimit: 5000,

From e50857d0ffecf7639f14c7dba150e55ef9d2fe74 Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Wed, 13 May 2020 22:58:08 +0200
Subject: [PATCH 049/415] Show "it's you" label and hide follow btn for current
 user

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

diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index 76a70730..fe2d8ab8 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -2,7 +2,7 @@
   <basic-user-card :user="user">
     <div class="follow-card-content-container">
       <span
-        v-if="!noFollowsYou && relationship.followed_by"
+        v-if="isMe || !noFollowsYou && relationship.followed_by"
         class="faint"
       >
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
@@ -15,7 +15,7 @@
           <RemoteFollow :user="user" />
         </div>
       </template>
-      <template v-else>
+      <template v-else-if="!isMe">
         <FollowButton
           :relationship="relationship"
           :label-following="$t('user_card.follow_unfollow')"

From db8dd1223c124e8461806a219d77817ba495794c Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Thu, 14 May 2020 09:27:58 +0200
Subject: [PATCH 050/415] Make a condition clear and unambiguous

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

diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index fe2d8ab8..b503783f 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -2,7 +2,7 @@
   <basic-user-card :user="user">
     <div class="follow-card-content-container">
       <span
-        v-if="isMe || !noFollowsYou && relationship.followed_by"
+        v-if="isMe || (!noFollowsYou && relationship.followed_by)"
         class="faint"
       >
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}

From 9d2935e72f5244f078d3ebb95957b024dad22643 Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Thu, 14 May 2020 07:59:08 +0000
Subject: [PATCH 051/415] Translated using Weblate (Dutch)

Currently translated at 77.6% (476 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 7e2f0604..e5cf8bf8 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -1,377 +1,596 @@
 {
-  "chat": {
-    "title": "Chat"
-  },
-  "features_panel": {
-    "chat": "Chat",
-    "gopher": "Gopher",
-    "media_proxy": "Media proxy",
-    "scope_options": "Zichtbaarheidsopties",
-    "text_limit": "Tekst limiet",
-    "title": "Features",
-    "who_to_follow": "Wie te volgen"
-  },
-  "finder": {
-    "error_fetching_user": "Fout tijdens ophalen gebruiker",
-    "find_user": "Gebruiker zoeken"
-  },
-  "general": {
-    "apply": "toepassen",
-    "submit": "Verzend"
-  },
-  "login": {
-    "login": "Log in",
-    "description": "Log in met OAuth",
-    "logout": "Log uit",
-    "password": "Wachtwoord",
-    "placeholder": "bv. lain",
-    "register": "Registreer",
-    "username": "Gebruikersnaam"
-  },
-  "nav": {
-    "about": "Over",
-    "back": "Terug",
-    "chat": "Locale Chat",
-    "friend_requests": "Volgverzoek",
-    "mentions": "Vermeldingen",
-    "dms": "Directe Berichten",
-    "public_tl": "Publieke Tijdlijn",
-    "timeline": "Tijdlijn",
-    "twkn": "Het Geheel Gekende Netwerk",
-    "user_search": "Zoek Gebruiker",
-    "who_to_follow": "Wie te volgen",
-    "preferences": "Voorkeuren"
-  },
-  "notifications": {
-    "broken_favorite": "Onbekende status, aan het zoeken...",
-    "favorited_you": "vond je status leuk",
-    "followed_you": "volgt jou",
-    "load_older": "Laad oudere meldingen",
-    "notifications": "Meldingen",
-    "read": "Gelezen!",
-    "repeated_you": "Herhaalde je status"
-  },
-  "post_status": {
-    "new_status": "Post nieuwe status",
-    "account_not_locked_warning": "Je account is niet {0}. Iedereen die je volgt kan enkel-volgers posts lezen.",
-    "account_not_locked_warning_link": "gesloten",
-    "attachments_sensitive": "Markeer bijlage als gevoelig",
-    "content_type": {
-      "text/plain": "Gewone tekst"
+    "chat": {
+        "title": "Chat"
     },
-    "content_warning": "Onderwerp (optioneel)",
-    "default": "Tijd voor een pauze!",
-    "direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
-    "posting": "Plaatsen",
-    "scope": {
-      "direct": "Direct - Post enkel naar genoemde gebruikers",
-      "private": "Enkel volgers - Post enkel naar volgers",
-      "public": "Publiek - Post op publieke tijdlijnen",
-      "unlisted": "Unlisted - Toon niet op publieke tijdlijnen"
-    }
-  },
-  "registration": {
-    "bio": "Bio",
-    "email": "Email",
-    "fullname": "Weergave naam",
-    "password_confirm": "Wachtwoord bevestiging",
-    "registration": "Registratie",
-    "token": "Uitnodigingstoken",
-    "captcha": "CAPTCHA",
-    "new_captcha": "Klik op de afbeelding voor een nieuwe captcha",
-    "validations": {
-      "username_required": "moet ingevuld zijn",
-      "fullname_required": "moet ingevuld zijn",
-      "email_required": "moet ingevuld zijn",
-      "password_required": "moet ingevuld zijn",
-      "password_confirmation_required": "moet ingevuld zijn",
-      "password_confirmation_match": "komt niet overeen met het wachtwoord"
-    }
-  },
-  "settings": {
-    "attachmentRadius": "Bijlages",
-    "attachments": "Bijlages",
-    "autoload": "Automatisch laden wanneer tot de bodem gescrold inschakelen",
-    "avatar": "Avatar",
-    "avatarAltRadius": "Avatars (Meldingen)",
-    "avatarRadius": "Avatars",
-    "background": "Achtergrond",
-    "bio": "Bio",
-    "btnRadius": "Knoppen",
-    "cBlue": "Blauw (Antwoord, volgen)",
-    "cGreen": "Groen (Herhaal)",
-    "cOrange": "Oranje (Vind ik leuk)",
-    "cRed": "Rood (Annuleer)",
-    "change_password": "Verander Wachtwoord",
-    "change_password_error": "Er was een probleem bij het aanpassen van je wachtwoord.",
-    "changed_password": "Wachtwoord succesvol aangepast!",
-    "collapse_subject": "Klap posts met onderwerp in",
-    "composing": "Samenstellen",
-    "confirm_new_password": "Bevestig nieuw wachtwoord",
-    "current_avatar": "Je huidige avatar",
-    "current_password": "Huidig wachtwoord",
-    "current_profile_banner": "Je huidige profiel banner",
-    "data_import_export_tab": "Data Import / Export",
-    "default_vis": "Standaard zichtbaarheidsscope",
-    "delete_account": "Verwijder Account",
-    "delete_account_description": "Verwijder je account en berichten permanent.",
-    "delete_account_error": "Er was een probleem bij het verwijderen van je account. Indien dit probleem blijft, gelieve de administratie van deze instantie te verwittigen.",
-    "delete_account_instructions": "Typ je wachtwoord in de input hieronder om het verwijderen van je account te bevestigen.",
-    "export_theme": "Sla preset op",
-    "filtering": "Filtering",
-    "filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn.",
-    "follow_export": "Volgers export",
-    "follow_export_button": "Exporteer je volgers naar een csv file",
-    "follow_export_processing": "Aan het verwerken, binnen enkele ogenblikken wordt je gevraagd je bestand te downloaden",
-    "follow_import": "Volgers import",
-    "follow_import_error": "Fout bij importeren volgers",
-    "follows_imported": "Volgers geïmporteerd! Het kan even duren om ze allemaal te verwerken.",
-    "foreground": "Voorgrond",
-    "general": "Algemeen",
-    "hide_attachments_in_convo": "Verberg bijlages in conversaties",
-    "hide_attachments_in_tl": "Verberg bijlages in de tijdlijn",
-    "hide_isp": "Verberg instantie-specifiek paneel",
-    "preload_images": "Afbeeldingen voorladen",
-    "hide_post_stats": "Verberg post statistieken (bv. het aantal vind-ik-leuks)",
-    "hide_user_stats": "Verberg post statistieken (bv. het aantal volgers)",
-    "import_followers_from_a_csv_file": "Importeer volgers uit een csv file",
-    "import_theme": "Laad preset",
-    "inputRadius": "Invoer velden",
-    "checkboxRadius": "Checkboxen",
-    "instance_default": "(standaard: {value})",
-    "instance_default_simple": "(standaard)",
-    "interface": "Interface",
-    "interfaceLanguage": "Interface taal",
-    "invalid_theme_imported": "Het geselecteerde thema is geen door Pleroma ondersteund thema. Er zijn geen aanpassingen gedaan.",
-    "limited_availability": "Onbeschikbaar in je browser",
-    "links": "Links",
-    "lock_account_description": "Laat volgers enkel toe na expliciete toestemming",
-    "loop_video": "Speel videos af in een lus",
-    "loop_video_silent_only": "Speel enkel videos zonder geluid af in een lus (bv. Mastodon's \"gifs\")",
-    "name": "Naam",
-    "name_bio": "Naam & Bio",
-    "new_password": "Nieuw wachtwoord",
-    "notification_visibility": "Type meldingen die getoond worden",
-    "notification_visibility_follows": "Volgers",
-    "notification_visibility_likes": "Vind-ik-leuks",
-    "notification_visibility_mentions": "Vermeldingen",
-    "notification_visibility_repeats": "Herhalingen",
-    "no_rich_text_description": "Strip rich text formattering van alle posts",
-    "hide_network_description": "Toon niet wie mij volgt en wie ik volg.",
-    "nsfw_clickthrough": "Schakel doorklikbaar verbergen van NSFW bijlages in",
-    "oauth_tokens": "OAuth-tokens",
-    "token": "Token",
-    "refresh_token": "Token vernieuwen",
-    "valid_until": "Geldig tot",
-    "revoke_token": "Intrekken",
-    "panelRadius": "Panelen",
-    "pause_on_unfocused": "Pauzeer streamen wanneer de tab niet gefocused is",
-    "presets": "Presets",
-    "profile_background": "Profiel Achtergrond",
-    "profile_banner": "Profiel Banner",
-    "profile_tab": "Profiel",
-    "radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
-    "replies_in_timeline": "Antwoorden in tijdlijn",
-    "reply_link_preview": "Schakel antwoordlink preview in bij over zweven met muisaanwijzer",
-    "reply_visibility_all": "Toon alle antwoorden",
-    "reply_visibility_following": "Toon enkel antwoorden naar mij of andere gebruikers gericht",
-    "reply_visibility_self": "Toon enkel antwoorden naar mij gericht",
-    "saving_err": "Fout tijdens opslaan van instellingen",
-    "saving_ok": "Instellingen opgeslagen",
-    "security_tab": "Veiligheid",
-    "scope_copy": "Neem scope over bij antwoorden (Directe Berichten blijven altijd Direct)",
-    "set_new_avatar": "Zet nieuwe avatar",
-    "set_new_profile_background": "Zet nieuwe profiel achtergrond",
-    "set_new_profile_banner": "Zet nieuwe profiel banner",
-    "settings": "Instellingen",
-    "subject_input_always_show": "Maak onderwerpveld altijd zichtbaar",
-    "subject_line_behavior": "Kopieer onderwerp bij antwoorden",
-    "subject_line_email": "Zoals email: \"re: onderwerp\"",
-    "subject_line_mastodon": "Zoals Mastodon: kopieer zoals het is",
-    "subject_line_noop": "Kopieer niet",
-    "stop_gifs": "Speel GIFs af bij zweven",
-    "streaming": "Schakel automatisch streamen van posts in wanneer tot boven gescrold.",
-    "text": "Tekst",
-    "theme": "Thema",
-    "theme_help": "Gebruik hex color codes (#rrggbb) om je kleurschema te wijzigen.",
-    "theme_help_v2_1": "Je kan ook de kleur en transparantie van bepaalde componenten overschrijven door de checkbox aan te vinken, gebruik de \"Wis alles\" knop om alle overschrijvingen te annuleren.",
-    "theme_help_v2_2": "Iconen onder sommige items zijn achtergrond/tekst contrast indicators, zweef er over voor gedetailleerde info. Hou er rekening mee dat bij doorzichtigheid de ergst mogelijke situatie wordt weer gegeven.",
-    "tooltipRadius": "Gereedschapstips/alarmen",
-    "user_settings": "Gebruikers Instellingen",
-    "values": {
-      "false": "nee",
-      "true": "ja"
+    "features_panel": {
+        "chat": "Chat",
+        "gopher": "Gopher",
+        "media_proxy": "Media proxy",
+        "scope_options": "Zichtbaarheidsopties",
+        "text_limit": "Tekst limiet",
+        "title": "Features",
+        "who_to_follow": "Wie te volgen"
     },
-    "notifications": "Meldingen",
-    "enable_web_push_notifications": "Schakel web push meldingen in",
-    "style": {
-      "switcher": {
-        "keep_color": "Behoud kleuren",
-        "keep_shadows": "Behoud schaduwen",
-        "keep_opacity": "Behoud transparantie",
-        "keep_roundness": "Behoud afrondingen",
-        "keep_fonts": "Behoud lettertypes",
-        "save_load_hint": "\"Behoud\" opties behouden de momenteel ingestelde opties bij het selecteren of laden van thema's, maar slaan ook de genoemde opties op bij het exporteren van een thema. Wanneer alle selectievakjes zijn uitgeschakeld, zal het exporteren van thema's alles opslaan.",
-        "reset": "Reset",
-        "clear_all": "Wis alles",
-        "clear_opacity": "Wis transparantie"
-      },
-      "common": {
-        "color": "Kleur",
-        "opacity": "Transparantie",
-        "contrast": {
-          "hint": "Contrast ratio is {ratio}, {level} {context}",
-          "level": {
-            "aa": "voldoet aan de richtlijn van niveau AA (minimum)",
-            "aaa": "voldoet aan de richtlijn van niveau AAA (aangeraden)",
-            "bad": "voldoet aan geen enkele toegankelijkheidsrichtlijn"
-          },
-          "context": {
-            "18pt": "voor grote (18pt+) tekst",
-            "text": "voor tekst"
-          }
+    "finder": {
+        "error_fetching_user": "Fout tijdens ophalen gebruiker",
+        "find_user": "Gebruiker zoeken"
+    },
+    "general": {
+        "apply": "toepassen",
+        "submit": "Verzend",
+        "more": "Meer",
+        "optional": "optioneel",
+        "show_more": "Bekijk meer",
+        "show_less": "Bekijk minder",
+        "dismiss": "Opheffen",
+        "cancel": "Annuleren",
+        "disable": "Uitschakelen",
+        "enable": "Inschakelen",
+        "confirm": "Bevestigen",
+        "verify": "Verifiëren",
+        "generic_error": "Er is een fout opgetreden"
+    },
+    "login": {
+        "login": "Log in",
+        "description": "Log in met OAuth",
+        "logout": "Log uit",
+        "password": "Wachtwoord",
+        "placeholder": "bv. lain",
+        "register": "Registreer",
+        "username": "Gebruikersnaam",
+        "hint": "Log in om deel te nemen aan de discussie",
+        "authentication_code": "Authenticatie code",
+        "enter_recovery_code": "Voer een herstelcode in",
+        "enter_two_factor_code": "Voer een twee-factor code in",
+        "recovery_code": "Herstelcode",
+        "heading": {
+            "totp": "Twee-factor authenticatie",
+            "recovery": "Twee-factor herstelling"
         }
-      },
-      "common_colors": {
-        "_tab_label": "Gemeenschappelijk",
-        "main": "Gemeenschappelijke kleuren",
-        "foreground_hint": "Zie \"Geavanceerd\" tab voor meer gedetailleerde controle",
-        "rgbo": "Iconen, accenten, badges"
-      },
-      "advanced_colors": {
-        "_tab_label": "Geavanceerd",
-        "alert": "Alarm achtergrond",
-        "alert_error": "Fout",
-        "badge": "Badge achtergrond",
-        "badge_notification": "Meldingen",
-        "panel_header": "Paneel hoofding",
-        "top_bar": "Top bar",
-        "borders": "Randen",
-        "buttons": "Knoppen",
-        "inputs": "Invoervelden",
-        "faint_text": "Vervaagde tekst"
-      },
-      "radii": {
-        "_tab_label": "Rondheid"
-      },
-      "shadows": {
-        "_tab_label": "Schaduw en belichting",
-        "component": "Component",
-        "override": "Overschrijven",
-        "shadow_id": "Schaduw #{value}",
-        "blur": "Vervagen",
-        "spread": "Spreid",
-        "inset": "Inzet",
-        "hint": "Voor schaduw kan je ook --variable gebruiken als een kleur waarde om CSS3 variabelen te gebruiken. Houd er rekening mee dat het instellen van opaciteit in dit geval niet werkt.",
-        "filter_hint": {
-          "always_drop_shadow": "Waarschuwing, deze schaduw gebruikt altijd {0} als de browser dit ondersteund.",
-          "drop_shadow_syntax": "{0} ondersteund niet de {1} parameter en {2} sleutelwoord.",
-          "avatar_inset": "Houd er rekening mee dat het combineren van zowel inzet and niet-inzet schaduwen op transparante avatars onverwachte resultaten kan opleveren.",
-          "spread_zero": "Schaduw met spreiding > 0 worden weergegeven alsof ze op nul staan",
-          "inset_classic": "Inzet schaduw zal {0} gebruiken"
-        },
-        "components": {
-          "panel": "Paneel",
-          "panelHeader": "Paneel hoofding",
-          "topBar": "Top bar",
-          "avatar": "Gebruiker avatar (in profiel weergave)",
-          "avatarStatus": "Gebruiker avatar  (in post weergave)",
-          "popup": "Popups en gereedschapstips",
-          "button": "Knop",
-          "buttonHover": "Knop (zweven)",
-          "buttonPressed": "Knop (ingedrukt)",
-          "buttonPressedHover": "Knop (ingedrukt+zweven)",
-          "input": "Invoerveld"
-        }
-      },
-      "fonts": {
-        "_tab_label": "Lettertypes",
-        "help": "Selecteer het lettertype om te gebruiken voor elementen van de UI.Voor \"aangepast\" moet je de exacte naam van het lettertype invoeren zoals die in het systeem wordt weergegeven.",
-        "components": {
-          "interface": "Interface",
-          "input": "Invoervelden",
-          "post": "Post tekst",
-          "postCode": "Monospaced tekst in een post (rich text)"
-        },
-        "family": "Naam lettertype",
-        "size": "Grootte (in px)",
-        "weight": "Gewicht (vetheid)",
-        "custom": "Aangepast"
-      },
-      "preview": {
-        "header": "Voorvertoning",
-        "content": "Inhoud",
-        "error": "Voorbeeld fout",
-        "button": "Knop",
-        "text": "Nog een boel andere {0} en {1}",
-        "mono": "inhoud",
-        "input": "Tijd voor een pauze!",
-        "faint_link": "handige gebruikershandleiding",
-        "fine_print": "Lees onze {0} om niets nuttig te leren!",
-        "header_faint": "Alles komt goed",
-        "checkbox": "Ik heb de gebruikersvoorwaarden eens van ver bekeken",
-        "link": "een link"
-      }
-    }
-  },
-  "timeline": {
-    "collapse": "Inklappen",
-    "conversation": "Conversatie",
-    "error_fetching": "Fout bij ophalen van updates",
-    "load_older": "Laad oudere Statussen",
-    "no_retweet_hint": "Post is gemarkeerd als enkel volgers of direct en kan niet worden herhaald",
-    "repeated": "herhaalde",
-    "show_new": "Toon nieuwe",
-    "up_to_date": "Up-to-date"
-  },
-  "user_card": {
-    "approve": "Goedkeuren",
-    "block": "Blokkeren",
-    "blocked": "Geblokkeerd!",
-    "deny": "Ontzeggen",
-    "favorites": "Vind-ik-leuks",
-    "follow": "Volgen",
-    "follow_sent": "Aanvraag verzonden!",
-    "follow_progress": "Aanvragen…",
-    "follow_again": "Aanvraag opnieuw zenden?",
-    "follow_unfollow": "Stop volgen",
-    "followees": "Aan het volgen",
-    "followers": "Volgers",
-    "following": "Aan het volgen!",
-    "follows_you": "Volgt jou!",
-    "its_you": "'t is jij!",
-    "mute": "Dempen",
-    "muted": "Gedempt",
-    "per_day": "per dag",
-    "remote_follow": "Volg vanop afstand",
-    "statuses": "Statussen"
-  },
-  "user_profile": {
-    "timeline_title": "Gebruikers Tijdlijn"
-  },
-  "who_to_follow": {
-    "more": "Meer",
-    "who_to_follow": "Wie te volgen"
-  },
-  "tool_tip": {
-    "media_upload": "Upload Media",
-    "repeat": "Herhaal",
-    "reply": "Antwoord",
-    "favorite": "Vind-ik-leuk",
-    "user_settings": "Gebruikers Instellingen"
-  },
-  "upload":{
-    "error": {
-    "base": "Upload gefaald.",
-    "file_too_big": "Bestand is te groot [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-    "default": "Probeer later opnieuw"
     },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
+    "nav": {
+        "about": "Over",
+        "back": "Terug",
+        "chat": "Locale Chat",
+        "friend_requests": "Volgverzoek",
+        "mentions": "Vermeldingen",
+        "dms": "Directe Berichten",
+        "public_tl": "Publieke Tijdlijn",
+        "timeline": "Tijdlijn",
+        "twkn": "Het Geheel Gekende Netwerk",
+        "user_search": "Zoek Gebruiker",
+        "who_to_follow": "Wie te volgen",
+        "preferences": "Voorkeuren",
+        "administration": "Administratie",
+        "search": "Zoeken",
+        "interactions": "Interacties"
+    },
+    "notifications": {
+        "broken_favorite": "Onbekende status, aan het zoeken...",
+        "favorited_you": "vond je status leuk",
+        "followed_you": "volgt jou",
+        "load_older": "Laad oudere meldingen",
+        "notifications": "Meldingen",
+        "read": "Gelezen!",
+        "repeated_you": "Herhaalde je status",
+        "no_more_notifications": "Geen notificaties meer",
+        "migrated_to": "is gemigreerd naar",
+        "follow_request": "wil je volgen",
+        "reacted_with": "reageerde met {0}"
+    },
+    "post_status": {
+        "new_status": "Post nieuwe status",
+        "account_not_locked_warning": "Je account is niet {0}. Iedereen die je volgt kan enkel-volgers posts lezen.",
+        "account_not_locked_warning_link": "gesloten",
+        "attachments_sensitive": "Markeer bijlage als gevoelig",
+        "content_type": {
+            "text/plain": "Gewone tekst",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
+        },
+        "content_warning": "Onderwerp (optioneel)",
+        "default": "Tijd voor een pauze!",
+        "direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
+        "posting": "Plaatsen",
+        "scope": {
+            "direct": "Direct - Post enkel naar genoemde gebruikers",
+            "private": "Enkel volgers - Post enkel naar volgers",
+            "public": "Publiek - Post op publieke tijdlijnen",
+            "unlisted": "Unlisted - Toon niet op publieke tijdlijnen"
+        },
+        "direct_warning_to_all": "Dit bericht zal zichtbaar zijn voor alle vermelde gebruikers.",
+        "direct_warning_to_first_only": "Dit bericht zal alleen zichtbaar zijn voor de vermelde gebruikers aan het begin van het bericht.",
+        "scope_notice": {
+            "public": "Dit bericht zal voor iedereen zichtbaar zijn",
+            "unlisted": "Dit bericht zal niet zichtbaar zijn in de Publieke Tijdlijn en Het Geheel Gekende Netwerk",
+            "private": "Dit bericht zal voor alleen je volgers zichtbaar zijn"
+        }
+    },
+    "registration": {
+        "bio": "Bio",
+        "email": "Email",
+        "fullname": "Weergave naam",
+        "password_confirm": "Wachtwoord bevestiging",
+        "registration": "Registratie",
+        "token": "Uitnodigingstoken",
+        "captcha": "CAPTCHA",
+        "new_captcha": "Klik op de afbeelding voor een nieuwe captcha",
+        "validations": {
+            "username_required": "moet ingevuld zijn",
+            "fullname_required": "moet ingevuld zijn",
+            "email_required": "moet ingevuld zijn",
+            "password_required": "moet ingevuld zijn",
+            "password_confirmation_required": "moet ingevuld zijn",
+            "password_confirmation_match": "komt niet overeen met het wachtwoord"
+        },
+        "username_placeholder": "bijv. lain",
+        "fullname_placeholder": "bijv. Lain Iwakura",
+        "bio_placeholder": "bijv.\nHallo, ik ben Lain.\nIk ben een anime meisje woonachtig in een buitenwijk in Japan. Je kent me misschien van the Wired."
+    },
+    "settings": {
+        "attachmentRadius": "Bijlages",
+        "attachments": "Bijlages",
+        "autoload": "Automatisch laden wanneer tot de bodem gescrold inschakelen",
+        "avatar": "Avatar",
+        "avatarAltRadius": "Avatars (Meldingen)",
+        "avatarRadius": "Avatars",
+        "background": "Achtergrond",
+        "bio": "Bio",
+        "btnRadius": "Knoppen",
+        "cBlue": "Blauw (Antwoord, volgen)",
+        "cGreen": "Groen (Herhaal)",
+        "cOrange": "Oranje (Vind ik leuk)",
+        "cRed": "Rood (Annuleer)",
+        "change_password": "Verander Wachtwoord",
+        "change_password_error": "Er was een probleem bij het aanpassen van je wachtwoord.",
+        "changed_password": "Wachtwoord succesvol aangepast!",
+        "collapse_subject": "Klap posts met onderwerp in",
+        "composing": "Samenstellen",
+        "confirm_new_password": "Bevestig nieuw wachtwoord",
+        "current_avatar": "Je huidige avatar",
+        "current_password": "Huidig wachtwoord",
+        "current_profile_banner": "Je huidige profiel banner",
+        "data_import_export_tab": "Data Import / Export",
+        "default_vis": "Standaard zichtbaarheidsscope",
+        "delete_account": "Verwijder Account",
+        "delete_account_description": "Verwijder je account en berichten permanent.",
+        "delete_account_error": "Er was een probleem bij het verwijderen van je account. Indien dit probleem blijft, gelieve de administratie van deze instantie te verwittigen.",
+        "delete_account_instructions": "Typ je wachtwoord in de input hieronder om het verwijderen van je account te bevestigen.",
+        "export_theme": "Sla preset op",
+        "filtering": "Filtering",
+        "filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn.",
+        "follow_export": "Volgers exporteren",
+        "follow_export_button": "Exporteer je volgers naar een csv file",
+        "follow_export_processing": "Aan het verwerken, binnen enkele ogenblikken wordt je gevraagd je bestand te downloaden",
+        "follow_import": "Volgers importeren",
+        "follow_import_error": "Fout bij importeren volgers",
+        "follows_imported": "Volgers geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
+        "foreground": "Voorgrond",
+        "general": "Algemeen",
+        "hide_attachments_in_convo": "Verberg bijlages in conversaties",
+        "hide_attachments_in_tl": "Verberg bijlages in de tijdlijn",
+        "hide_isp": "Verberg instantie-specifiek paneel",
+        "preload_images": "Afbeeldingen voorladen",
+        "hide_post_stats": "Verberg post statistieken (bv. het aantal vind-ik-leuks)",
+        "hide_user_stats": "Verberg post statistieken (bv. het aantal volgers)",
+        "import_followers_from_a_csv_file": "Importeer volgers uit een csv file",
+        "import_theme": "Laad preset",
+        "inputRadius": "Invoer velden",
+        "checkboxRadius": "Checkboxen",
+        "instance_default": "(standaard: {value})",
+        "instance_default_simple": "(standaard)",
+        "interface": "Interface",
+        "interfaceLanguage": "Interface taal",
+        "invalid_theme_imported": "Het geselecteerde thema is geen door Pleroma ondersteund thema. Er zijn geen aanpassingen gedaan.",
+        "limited_availability": "Onbeschikbaar in je browser",
+        "links": "Links",
+        "lock_account_description": "Laat volgers enkel toe na expliciete toestemming",
+        "loop_video": "Speel videos af in een lus",
+        "loop_video_silent_only": "Speel enkel videos zonder geluid af in een lus (bv. Mastodon's \"gifs\")",
+        "name": "Naam",
+        "name_bio": "Naam & Bio",
+        "new_password": "Nieuw wachtwoord",
+        "notification_visibility": "Type meldingen die getoond worden",
+        "notification_visibility_follows": "Volgers",
+        "notification_visibility_likes": "Vind-ik-leuks",
+        "notification_visibility_mentions": "Vermeldingen",
+        "notification_visibility_repeats": "Herhalingen",
+        "no_rich_text_description": "Strip rich text formattering van alle posts",
+        "hide_network_description": "Toon niet wie mij volgt en wie ik volg.",
+        "nsfw_clickthrough": "Schakel doorklikbaar verbergen van NSFW bijlages in",
+        "oauth_tokens": "OAuth-tokens",
+        "token": "Token",
+        "refresh_token": "Token vernieuwen",
+        "valid_until": "Geldig tot",
+        "revoke_token": "Intrekken",
+        "panelRadius": "Panelen",
+        "pause_on_unfocused": "Pauzeer streamen wanneer de tab niet gefocused is",
+        "presets": "Presets",
+        "profile_background": "Profiel Achtergrond",
+        "profile_banner": "Profiel Banner",
+        "profile_tab": "Profiel",
+        "radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
+        "replies_in_timeline": "Antwoorden in tijdlijn",
+        "reply_link_preview": "Schakel antwoordlink preview in bij over zweven met muisaanwijzer",
+        "reply_visibility_all": "Toon alle antwoorden",
+        "reply_visibility_following": "Toon enkel antwoorden naar mij of andere gebruikers gericht",
+        "reply_visibility_self": "Toon enkel antwoorden naar mij gericht",
+        "saving_err": "Fout tijdens opslaan van instellingen",
+        "saving_ok": "Instellingen opgeslagen",
+        "security_tab": "Veiligheid",
+        "scope_copy": "Neem scope over bij antwoorden (Directe Berichten blijven altijd Direct)",
+        "set_new_avatar": "Zet nieuwe avatar",
+        "set_new_profile_background": "Zet nieuwe profiel achtergrond",
+        "set_new_profile_banner": "Zet nieuwe profiel banner",
+        "settings": "Instellingen",
+        "subject_input_always_show": "Maak onderwerpveld altijd zichtbaar",
+        "subject_line_behavior": "Kopieer onderwerp bij antwoorden",
+        "subject_line_email": "Zoals email: \"re: onderwerp\"",
+        "subject_line_mastodon": "Zoals Mastodon: kopieer zoals het is",
+        "subject_line_noop": "Kopieer niet",
+        "stop_gifs": "Speel GIFs af bij zweven",
+        "streaming": "Schakel automatisch streamen van posts in wanneer tot boven gescrold.",
+        "text": "Tekst",
+        "theme": "Thema",
+        "theme_help": "Gebruik hex color codes (#rrggbb) om je kleurschema te wijzigen.",
+        "theme_help_v2_1": "Je kan ook de kleur en transparantie van bepaalde componenten overschrijven door de checkbox aan te vinken, gebruik de \"Wis alles\" knop om alle overschrijvingen te annuleren.",
+        "theme_help_v2_2": "Iconen onder sommige items zijn achtergrond/tekst contrast indicators, zweef er over voor gedetailleerde info. Hou er rekening mee dat bij doorzichtigheid de ergst mogelijke situatie wordt weer gegeven.",
+        "tooltipRadius": "Gereedschapstips/alarmen",
+        "user_settings": "Gebruikers Instellingen",
+        "values": {
+            "false": "nee",
+            "true": "ja"
+        },
+        "notifications": "Meldingen",
+        "enable_web_push_notifications": "Schakel web push meldingen in",
+        "style": {
+            "switcher": {
+                "keep_color": "Behoud kleuren",
+                "keep_shadows": "Behoud schaduwen",
+                "keep_opacity": "Behoud transparantie",
+                "keep_roundness": "Behoud afrondingen",
+                "keep_fonts": "Behoud lettertypes",
+                "save_load_hint": "\"Behoud\" opties behouden de momenteel ingestelde opties bij het selecteren of laden van thema's, maar slaan ook de genoemde opties op bij het exporteren van een thema. Wanneer alle selectievakjes zijn uitgeschakeld, zal het exporteren van thema's alles opslaan.",
+                "reset": "Reset",
+                "clear_all": "Wis alles",
+                "clear_opacity": "Wis transparantie",
+                "keep_as_is": "Houdt zoals het is",
+                "use_snapshot": "Oude versie",
+                "use_source": "Nieuwe versie",
+                "help": {
+                    "future_version_imported": "Het geïmporteerde bestand is gemaakt voor een nieuwere versie van FE.",
+                    "older_version_imported": "Het geïmporteerde bestand is gemaakt voor een oudere versie van FE.",
+                    "upgraded_from_v2": "PleromaFE is bijgewerkt, het thema kan iets anders uitzien dan dat je gewend bent.",
+                    "v2_imported": "Het geïmporteerde bestand is gemaakt voor een oudere FE. We proberen compatibiliteit te maximaliseren, maar het kan toch voorkomen dat er inconsistenties zijn."
+                },
+                "load_theme": "Thema laden"
+            },
+            "common": {
+                "color": "Kleur",
+                "opacity": "Transparantie",
+                "contrast": {
+                    "hint": "Contrast ratio is {ratio}, {level} {context}",
+                    "level": {
+                        "aa": "voldoet aan de richtlijn van niveau AA (minimum)",
+                        "aaa": "voldoet aan de richtlijn van niveau AAA (aangeraden)",
+                        "bad": "voldoet aan geen enkele toegankelijkheidsrichtlijn"
+                    },
+                    "context": {
+                        "18pt": "voor grote (18pt+) tekst",
+                        "text": "voor tekst"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Gemeenschappelijk",
+                "main": "Gemeenschappelijke kleuren",
+                "foreground_hint": "Zie \"Geavanceerd\" tab voor meer gedetailleerde controle",
+                "rgbo": "Iconen, accenten, badges"
+            },
+            "advanced_colors": {
+                "_tab_label": "Geavanceerd",
+                "alert": "Alarm achtergrond",
+                "alert_error": "Fout",
+                "badge": "Badge achtergrond",
+                "badge_notification": "Meldingen",
+                "panel_header": "Paneel hoofding",
+                "top_bar": "Top bar",
+                "borders": "Randen",
+                "buttons": "Knoppen",
+                "inputs": "Invoervelden",
+                "faint_text": "Vervaagde tekst"
+            },
+            "radii": {
+                "_tab_label": "Rondheid"
+            },
+            "shadows": {
+                "_tab_label": "Schaduw en belichting",
+                "component": "Component",
+                "override": "Overschrijven",
+                "shadow_id": "Schaduw #{value}",
+                "blur": "Vervagen",
+                "spread": "Spreid",
+                "inset": "Inzet",
+                "hint": "Voor schaduw kan je ook --variable gebruiken als een kleur waarde om CSS3 variabelen te gebruiken. Houd er rekening mee dat het instellen van opaciteit in dit geval niet werkt.",
+                "filter_hint": {
+                    "always_drop_shadow": "Waarschuwing, deze schaduw gebruikt altijd {0} als de browser dit ondersteund.",
+                    "drop_shadow_syntax": "{0} ondersteund niet de {1} parameter en {2} sleutelwoord.",
+                    "avatar_inset": "Houd er rekening mee dat het combineren van zowel inzet and niet-inzet schaduwen op transparante avatars onverwachte resultaten kan opleveren.",
+                    "spread_zero": "Schaduw met spreiding > 0 worden weergegeven alsof ze op nul staan",
+                    "inset_classic": "Inzet schaduw zal {0} gebruiken"
+                },
+                "components": {
+                    "panel": "Paneel",
+                    "panelHeader": "Paneel hoofding",
+                    "topBar": "Top bar",
+                    "avatar": "Gebruiker avatar (in profiel weergave)",
+                    "avatarStatus": "Gebruiker avatar  (in post weergave)",
+                    "popup": "Popups en gereedschapstips",
+                    "button": "Knop",
+                    "buttonHover": "Knop (zweven)",
+                    "buttonPressed": "Knop (ingedrukt)",
+                    "buttonPressedHover": "Knop (ingedrukt+zweven)",
+                    "input": "Invoerveld"
+                }
+            },
+            "fonts": {
+                "_tab_label": "Lettertypes",
+                "help": "Selecteer het lettertype om te gebruiken voor elementen van de UI.Voor \"aangepast\" moet je de exacte naam van het lettertype invoeren zoals die in het systeem wordt weergegeven.",
+                "components": {
+                    "interface": "Interface",
+                    "input": "Invoervelden",
+                    "post": "Post tekst",
+                    "postCode": "Monospaced tekst in een post (rich text)"
+                },
+                "family": "Naam lettertype",
+                "size": "Grootte (in px)",
+                "weight": "Gewicht (vetheid)",
+                "custom": "Aangepast"
+            },
+            "preview": {
+                "header": "Voorvertoning",
+                "content": "Inhoud",
+                "error": "Voorbeeld fout",
+                "button": "Knop",
+                "text": "Nog een boel andere {0} en {1}",
+                "mono": "inhoud",
+                "input": "Tijd voor een pauze!",
+                "faint_link": "handige gebruikershandleiding",
+                "fine_print": "Lees onze {0} om niets nuttig te leren!",
+                "header_faint": "Alles komt goed",
+                "checkbox": "Ik heb de gebruikersvoorwaarden eens van ver bekeken",
+                "link": "een link"
+            }
+        },
+        "notification_setting_follows": "Gebruikers die je volgt",
+        "notification_setting_non_follows": "Gebruikers die je niet volgt",
+        "notification_setting_followers": "Gebruikers die je volgen",
+        "notification_setting_privacy": "Privacy",
+        "notification_setting_privacy_option": "Verberg de afzender en inhoud van push notificaties",
+        "notification_mutes": "Om niet langer notificaties te ontvangen van een specifieke gebruiker, kun je deze dempen.",
+        "app_name": "App naam",
+        "security": "Beveiliging",
+        "enter_current_password_to_confirm": "Voer je huidige wachtwoord in om je identiteit te bevestigen",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "OTP instellen",
+            "wait_pre_setup_otp": "OTP voorinstellen",
+            "confirm_and_enable": "Bevestig en schakel OTP in",
+            "title": "Twee-factor Authenticatie",
+            "generate_new_recovery_codes": "Genereer nieuwe herstelcodes",
+            "recovery_codes": "Herstelcodes.",
+            "waiting_a_recovery_codes": "Backup codes ontvangen...",
+            "authentication_methods": "Authenticatie methodes",
+            "scan": {
+                "title": "Scannen",
+                "desc": "Scan de QR code of voer een sleutel in met je twee-factor applicatie:",
+                "secret_code": "Sleutel"
+            },
+            "verify": {
+                "desc": "Voer de code van je twee-factor applicatie in om twee-factor authenticatie in te schakelen:"
+            },
+            "warning_of_generate_new_codes": "Wanneer je nieuwe herstelcodes genereert, zullen je oude code niet langer werken.",
+            "recovery_codes_warning": "Schrijf de codes op of sla ze op een veilige locatie op - anders kun je ze niet meer inzien. Als je toegang tot je 2FA app en herstelcodes verliest, zal je buitengesloten zijn uit je account."
+        },
+        "allow_following_move": "Auto-volgen toestaan wanneer een gevolgd account migreert",
+        "block_export": "Geblokkeerde gebruikers exporteren",
+        "block_import": "Geblokkeerde gebruikers importeren",
+        "blocks_imported": "Geblokkeerde gebruikers geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
+        "blocks_tab": "Geblokkeerde gebruikers",
+        "change_email": "Email wijzigen",
+        "change_email_error": "Er is een probleem opgetreden tijdens het wijzigen van je email.",
+        "changed_email": "Email succesvol gewijzigd!",
+        "domain_mutes": "Domeinen",
+        "avatar_size_instruction": "De aangeraden minimale afmeting voor avatar afbeeldingen is 150x150 pixels.",
+        "pad_emoji": "Vul emoji op met spaties wanneer deze met de picker ingevoegd worden",
+        "emoji_reactions_on_timeline": "Toon emoji reacties op de tijdlijn",
+        "accent": "Accent",
+        "hide_muted_posts": "Verberg berichten van gedempte gebruikers",
+        "max_thumbnails": "Maximaal aantal miniaturen per bericht",
+        "use_one_click_nsfw": "Open gevoelige bijlagen met slechts één klik",
+        "hide_filtered_statuses": "Verberg gefilterde statussen",
+        "import_blocks_from_a_csv_file": "Importeer geblokkeerde gebruikers van een csv bestand",
+        "mutes_tab": "Gedempte gebruikers",
+        "play_videos_in_modal": "Speel video's af in een popup frame",
+        "new_email": "Nieuwe Email",
+        "notification_visibility_emoji_reactions": "Reacties",
+        "no_blocks": "Geen geblokkeerde gebruikers",
+        "no_mutes": "Geen gedempte gebruikers",
+        "hide_followers_description": "Niet tonen wie mij volgt",
+        "hide_followers_count_description": "Niet mijn volgers aantal tonen",
+        "hide_follows_count_description": "Niet mijn gevolgde aantal tonen",
+        "show_admin_badge": "Admin badge tonen in mijn profiel",
+        "autohide_floating_post_button": "Nieuw Bericht knop automatisch verbergen (mobiel)",
+        "search_user_to_block": "Zoek wie je wilt blokkeren",
+        "search_user_to_mute": "Zoek wie je wilt dempen",
+        "minimal_scopes_mode": "Bericht bereik-opties minimaliseren",
+        "post_status_content_type": "Bericht status content type",
+        "user_mutes": "Gebruikers",
+        "useStreamingApi": "Berichten en notificatie in real-time ontvangen",
+        "useStreamingApiWarning": "(Afgeraden, experimenteel, kan berichten overslaan)",
+        "type_domains_to_mute": "Voer domeinen in om te dempen",
+        "upload_a_photo": "Upload een foto",
+        "fun": "Plezier",
+        "greentext": "Meme pijlen",
+        "notification_setting": "Ontvang notificaties van:",
+        "block_export_button": "Exporteer je geblokkeerde gebruikers naar een csv bestand",
+        "block_import_error": "Fout bij importeren geblokkeerde gebruikers",
+        "discoverable": "Sta toe dat dit account ontdekt kan worden in zoekresultaten en andere diensten",
+        "use_contain_fit": "Bijlage in miniaturen niet bijsnijden",
+        "notification_visibility_moves": "Gebruiker Migraties",
+        "hide_follows_description": "Niet tonen wie ik volg",
+        "show_moderator_badge": "Moderator badge tonen in mijn profiel",
+        "notification_setting_filters": "Filters",
+        "notification_setting_non_followers": "Gebruikers die je niet volgen",
+        "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen notificaties meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven."
+    },
+    "timeline": {
+        "collapse": "Inklappen",
+        "conversation": "Conversatie",
+        "error_fetching": "Fout bij ophalen van updates",
+        "load_older": "Laad oudere Statussen",
+        "no_retweet_hint": "Post is gemarkeerd als enkel volgers of direct en kan niet worden herhaald",
+        "repeated": "herhaalde",
+        "show_new": "Toon nieuwe",
+        "up_to_date": "Up-to-date"
+    },
+    "user_card": {
+        "approve": "Goedkeuren",
+        "block": "Blokkeren",
+        "blocked": "Geblokkeerd!",
+        "deny": "Ontzeggen",
+        "favorites": "Vind-ik-leuks",
+        "follow": "Volgen",
+        "follow_sent": "Aanvraag verzonden!",
+        "follow_progress": "Aanvragen…",
+        "follow_again": "Aanvraag opnieuw zenden?",
+        "follow_unfollow": "Stop volgen",
+        "followees": "Aan het volgen",
+        "followers": "Volgers",
+        "following": "Aan het volgen!",
+        "follows_you": "Volgt jou!",
+        "its_you": "'t is jij!",
+        "mute": "Dempen",
+        "muted": "Gedempt",
+        "per_day": "per dag",
+        "remote_follow": "Volg vanop afstand",
+        "statuses": "Statussen"
+    },
+    "user_profile": {
+        "timeline_title": "Gebruikers Tijdlijn"
+    },
+    "who_to_follow": {
+        "more": "Meer",
+        "who_to_follow": "Wie te volgen"
+    },
+    "tool_tip": {
+        "media_upload": "Upload Media",
+        "repeat": "Herhaal",
+        "reply": "Antwoord",
+        "favorite": "Vind-ik-leuk",
+        "user_settings": "Gebruikers Instellingen"
+    },
+    "upload": {
+        "error": {
+            "base": "Upload gefaald.",
+            "file_too_big": "Bestand is te groot [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "Probeer later opnieuw"
+        },
+        "file_size_units": {
+            "B": "B",
+            "KiB": "KiB",
+            "MiB": "MiB",
+            "GiB": "GiB",
+            "TiB": "TiB"
+        }
+    },
+    "about": {
+        "mrf": {
+            "federation": "Federatie",
+            "keyword": {
+                "reject": "Afwijzen",
+                "replace": "Vervangen",
+                "is_replaced_by": "→",
+                "keyword_policies": "Zoekwoord Beleid"
+            },
+            "mrf_policies_desc": "MRF beleidsregels beïnvloeden het federatie gedrag van de instantie. De volgende beleidsregels zijn ingeschakeld:",
+            "mrf_policies": "Ingeschakelde MRF Beleidsregels",
+            "simple": {
+                "simple_policies": "Instantie-specifieke Beleidsregels",
+                "accept": "Accepteren",
+                "accept_desc": "Deze instantie accepteert alleen berichten van de volgende instanties:",
+                "reject": "Afwijzen",
+                "reject_desc": "Deze instantie zal geen berichten accepteren van de volgende instanties:",
+                "quarantine": "Quarantaine",
+                "quarantine_desc": "Deze instantie zal alleen publieke berichten sturen naar de volgende instanties:",
+                "ftl_removal_desc": "Deze instantie verwijdert de volgende instanties van \"Het Geheel Gekende Netwerk\" tijdlijn:",
+                "media_removal_desc": "Deze instantie verwijdert media van berichten van de volgende instanties:",
+                "media_nsfw_desc": "Deze instantie stelt media in als gevoelig in berichten van de volgende instanties:"
+            }
+        },
+        "staff": "Personeel"
+    },
+    "domain_mute_card": {
+        "mute": "Dempen",
+        "mute_progress": "Dempen...",
+        "unmute": "Dempen opheffen",
+        "unmute_progress": "Dempen wordt opgeheven..."
+    },
+    "exporter": {
+        "export": "Exporteren",
+        "processing": "Verwerken, er wordt zo gevraagd om je bestand te downloaden"
+    },
+    "image_cropper": {
+        "save": "Opslaan",
+        "save_without_cropping": "Opslaan zonder bijsnijden",
+        "cancel": "Annuleren",
+        "crop_picture": "Afbeelding bijsnijden"
+    },
+    "importer": {
+        "submit": "Verzenden",
+        "success": "Succesvol geïmporteerd.",
+        "error": "Er is een fout opgetreden bij het importeren van dit bestand."
+    },
+    "media_modal": {
+        "previous": "Vorige",
+        "next": "Volgende"
+    },
+    "polls": {
+        "add_poll": "Poll Toevoegen",
+        "add_option": "Optie Toevoegen",
+        "option": "Optie",
+        "votes": "stemmen",
+        "vote": "Stem",
+        "single_choice": "Enkelkeuze",
+        "multiple_choices": "Meerkeuze",
+        "expiry": "Poll leeftijd",
+        "expires_in": "Poll eindigt in {0}",
+        "expired": "Poll is {0} geleden beëindigd",
+        "not_enough_options": "Te weinig opties in poll",
+        "type": "Poll type"
+    },
+    "emoji": {
+        "emoji": "Emoji",
+        "keep_open": "Houdt picker open",
+        "search_emoji": "Zoek voor een emoji",
+        "add_emoji": "Emoji invoegen",
+        "unicode": "Unicode emoji",
+        "load_all": "Alle {emojiAmount} emoji worden geladen",
+        "stickers": "Stickers",
+        "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan prestatie problemen veroorzaken."
+    },
+    "interactions": {
+        "favs_repeats": "Herhalingen en Favorieten",
+        "follows": "Nieuwe volgers",
+        "moves": "Gebruiker migreert",
+        "load_older": "Oudere interacties laden"
+    },
+    "remote_user_resolver": {
+        "searching_for": "Zoeken naar",
+        "error": "Niet gevonden."
+    },
+    "selectable_list": {
+        "select_all": "Alles selecteren"
     }
-  }
 }

From f2bcaec8dcfe7474409430d9fcf42a7ee94d6253 Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Thu, 14 May 2020 16:30:29 +0000
Subject: [PATCH 052/415] Translated using Weblate (Dutch)

Currently translated at 77.8% (477 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index e5cf8bf8..7c87dadd 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -514,10 +514,10 @@
                 "is_replaced_by": "→",
                 "keyword_policies": "Zoekwoord Beleid"
             },
-            "mrf_policies_desc": "MRF beleidsregels beïnvloeden het federatie gedrag van de instantie. De volgende beleidsregels zijn ingeschakeld:",
-            "mrf_policies": "Ingeschakelde MRF Beleidsregels",
+            "mrf_policies_desc": "MRF regels beïnvloeden het federatie gedrag van de instantie. De volgende regels zijn ingeschakeld:",
+            "mrf_policies": "Ingeschakelde MRF Regels",
             "simple": {
-                "simple_policies": "Instantie-specifieke Beleidsregels",
+                "simple_policies": "Instantie-specifieke Regels",
                 "accept": "Accepteren",
                 "accept_desc": "Deze instantie accepteert alleen berichten van de volgende instanties:",
                 "reject": "Afwijzen",
@@ -526,7 +526,9 @@
                 "quarantine_desc": "Deze instantie zal alleen publieke berichten sturen naar de volgende instanties:",
                 "ftl_removal_desc": "Deze instantie verwijdert de volgende instanties van \"Het Geheel Gekende Netwerk\" tijdlijn:",
                 "media_removal_desc": "Deze instantie verwijdert media van berichten van de volgende instanties:",
-                "media_nsfw_desc": "Deze instantie stelt media in als gevoelig in berichten van de volgende instanties:"
+                "media_nsfw_desc": "Deze instantie stelt media in als gevoelig in berichten van de volgende instanties:",
+                "ftl_removal": "Verwijderen van \"Het Geheel Bekende Netwerk\" Tijdlijn",
+                "media_removal": "Media Verwijdering"
             }
         },
         "staff": "Personeel"

From 9c62b90212e1915bc0bb60adfc8b2da4bf37bf46 Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Thu, 14 May 2020 16:49:22 +0000
Subject: [PATCH 053/415] Translated using Weblate (Dutch)

Currently translated at 77.8% (477 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 7c87dadd..bac7e62c 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -8,7 +8,7 @@
         "media_proxy": "Media proxy",
         "scope_options": "Zichtbaarheidsopties",
         "text_limit": "Tekst limiet",
-        "title": "Features",
+        "title": "Kenmerken",
         "who_to_follow": "Wie te volgen"
     },
     "finder": {

From 7a0f27f3b06eb73dc974e3cededddbc6ac3c5902 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Wed, 13 May 2020 23:17:23 +0000
Subject: [PATCH 054/415] Translated using Weblate (Italian)

Currently translated at 35.0% (215 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 8e35d4f9..6fc2be74 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -1,13 +1,24 @@
 {
     "general": {
         "submit": "Invia",
-        "apply": "Applica"
+        "apply": "Applica",
+        "more": "Altro",
+        "generic_error": "Errore",
+        "optional": "facoltativo",
+        "show_more": "Mostra tutto",
+        "show_less": "Ripiega",
+        "dismiss": "Chiudi",
+        "cancel": "Annulla",
+        "disable": "Disabilita",
+        "enable": "Abilita",
+        "confirm": "Conferma",
+        "verify": "Verifica"
     },
     "nav": {
         "mentions": "Menzioni",
         "public_tl": "Sequenza pubblica",
         "timeline": "Sequenza personale",
-        "twkn": "Tutte le stanze accessibili",
+        "twkn": "Sequenza globale",
         "chat": "Chat della stanza",
         "friend_requests": "Vogliono seguirti"
     },
@@ -22,13 +33,13 @@
     },
     "settings": {
         "attachments": "Allegati",
-        "autoload": "Abilita caricamento automatico quando si raggiunge il fondo pagina",
+        "autoload": "Abilita caricamento automatico quando raggiungi il fondo pagina",
         "avatar": "Icona utente",
         "bio": "Introduzione",
         "current_avatar": "La tua icona attuale",
         "current_profile_banner": "Il tuo stendardo attuale",
         "filtering": "Filtri",
-        "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, una per linea",
+        "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, una per riga",
         "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
         "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
         "name": "Nome",
@@ -44,18 +55,18 @@
         "theme": "Tema",
         "user_settings": "Impostazioni Utente",
         "attachmentRadius": "Allegati",
-        "avatarAltRadius": "Icona utente (Notifiche)",
+        "avatarAltRadius": "Icone utente (Notifiche)",
         "avatarRadius": "Icone utente",
         "background": "Sfondo",
         "btnRadius": "Pulsanti",
         "cBlue": "Blu (risposte, seguire)",
         "cGreen": "Verde (ripeti)",
-        "cOrange": "Arancio (gradire)",
+        "cOrange": "Arancione (gradire)",
         "cRed": "Rosso (annulla)",
-        "change_password": "Cambia Password",
+        "change_password": "Cambia password",
         "change_password_error": "C'è stato un problema durante il cambiamento della password.",
         "changed_password": "Password cambiata correttamente!",
-        "collapse_subject": "Collassa messaggi con Oggetto",
+        "collapse_subject": "Ripiega messaggi con Oggetto",
         "confirm_new_password": "Conferma la nuova password",
         "current_password": "La tua password attuale",
         "data_import_export_tab": "Importa o esporta dati",
@@ -66,7 +77,7 @@
         "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione del tuo profilo.",
         "export_theme": "Salva impostazioni",
         "follow_export": "Esporta la lista di chi segui",
-        "follow_export_button": "Esporta la lista di chi segui in un file csv",
+        "follow_export_button": "Esporta la lista di chi segui in un file CSV",
         "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
         "follow_import": "Importa la lista di chi segui",
         "follow_import_error": "Errore nell'importazione della lista di chi segui",
@@ -75,7 +86,7 @@
         "general": "Generale",
         "hide_post_stats": "Nascondi statistiche dei messaggi (es. il numero di preferenze)",
         "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero dei tuoi seguaci)",
-        "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file csv",
+        "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file CSV",
         "import_theme": "Carica impostazioni",
         "inputRadius": "Campi di testo",
         "instance_default": "(predefinito: {value})",
@@ -102,7 +113,7 @@
         "pause_on_unfocused": "Interrompi l'aggiornamento continuo mentre la scheda è in secondo piano",
         "presets": "Valori predefiniti",
         "profile_tab": "Profilo",
-        "radii_help": "Imposta il raggio dei bordi (in pixel)",
+        "radii_help": "Imposta il raggio degli angoli (in pixel)",
         "replies_in_timeline": "Risposte nella sequenza personale",
         "reply_visibility_all": "Mostra tutte le risposte",
         "reply_visibility_following": "Mostra solo le risposte rivolte a me o agli utenti che seguo",
@@ -134,7 +145,7 @@
         "follow": "Segui",
         "followees": "Chi stai seguendo",
         "followers": "Seguaci",
-        "following": "Lo stai seguendo!",
+        "following": "Seguìto!",
         "follows_you": "Ti segue!",
         "mute": "Silenzia",
         "muted": "Silenziato",
@@ -153,7 +164,7 @@
         "chat": "Chat",
         "gopher": "Gopher",
         "media_proxy": "Proxy multimedia",
-        "scope_options": "Opzioni raggio d'azione",
+        "scope_options": "Opzioni visibilità",
         "text_limit": "Lunghezza massima",
         "title": "Caratteristiche",
         "who_to_follow": "Chi seguire"
@@ -166,9 +177,10 @@
         "login": "Accedi",
         "logout": "Disconnettiti",
         "password": "Password",
-        "placeholder": "es. lain",
+        "placeholder": "es. Lupo Lucio",
         "register": "Registrati",
-        "username": "Nome utente"
+        "username": "Nome utente",
+        "description": "Accedi con OAuth"
     },
     "post_status": {
         "account_not_locked_warning": "Il tuo profilo non è {0}. Chiunque può seguirti e vedere i tuoi messaggi riservati ai tuoi seguaci.",
@@ -209,12 +221,49 @@
             "keyword": {
                 "reject": "Rifiuta",
                 "replace": "Sostituisci",
-                "is_replaced_by": "→"
+                "is_replaced_by": "→",
+                "keyword_policies": "Regole per parole chiave",
+                "ftl_removal": "Rimozione dalla sequenza globale"
             },
             "simple": {
                 "reject": "Rifiuta",
-                "accept": "Accetta"
-            }
-        }
+                "accept": "Accetta",
+                "simple_policies": "Regole specifiche alla stanza",
+                "accept_desc": "Questa stanza accetta messaggi solo dalle seguenti stanze:",
+                "reject_desc": "Questa stanza non accetterà messaggi dalle stanze seguenti:",
+                "quarantine": "Quarantena",
+                "quarantine_desc": "Questa stanza inoltrerà solo messaggi pubblici alle seguenti stanze:",
+                "ftl_removal": "Rimozione dalla sequenza globale",
+                "ftl_removal_desc": "Questa stanza rimuove le seguenti stanze dalla sequenza globale:",
+                "media_removal": "Rimozione multimedia",
+                "media_removal_desc": "Questa istanza rimuove gli allegati dalle seguenti stanze:",
+                "media_nsfw": "Allegati oscurati forzatamente",
+                "media_nsfw_desc": "Questa stanza oscura gli allegati dei messaggi provenienti da queste stanze:"
+            },
+            "mrf_policies": "Regole RM abilitate",
+            "mrf_policies_desc": "Le regole RM cambiano il comportamento federativo della stanza. Vigono le seguenti regole:"
+        },
+        "staff": "Equipaggio"
+    },
+    "domain_mute_card": {
+        "mute": "Zittisci",
+        "mute_progress": "Zittisco...",
+        "unmute": "Ascolta",
+        "unmute_progress": "Procedo..."
+    },
+    "exporter": {
+        "export": "Esporta",
+        "processing": "In elaborazione, il tuo file sarà scaricabile a breve"
+    },
+    "image_cropper": {
+        "crop_picture": "Ritaglia immagine",
+        "save": "Salva",
+        "save_without_cropping": "Salva senza ritagliare",
+        "cancel": "Annulla"
+    },
+    "importer": {
+        "submit": "Invia",
+        "success": "Importato.",
+        "error": "L'importazione non è andata a buon fine."
     }
 }

From 8db7cba9e16cbacf7ae180e90c9b6bacbe277345 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 14 May 2020 11:09:26 +0000
Subject: [PATCH 055/415] Translated using Weblate (English)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/en.json b/src/i18n/en.json
index d5748719..4ae81bfa 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1,743 +1,743 @@
 {
-  "about": {
-    "mrf": {
-      "federation": "Federation",
-      "keyword": {
-        "keyword_policies": "Keyword Policies",
-        "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
-        "reject": "Reject",
-        "replace": "Replace",
-        "is_replaced_by": "→"
-      },
-      "mrf_policies": "Enabled MRF Policies",
-      "mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance.  The following policies are enabled:",
-      "simple": {
-        "simple_policies": "Instance-specific Policies",
-        "accept": "Accept",
-        "accept_desc": "This instance only accepts messages from the following instances:",
-        "reject": "Reject",
-        "reject_desc": "This instance will not accept messages from the following instances:",
-        "quarantine": "Quarantine",
-        "quarantine_desc": "This instance will send only public posts to the following instances:",
-        "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
-        "ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
-        "media_removal": "Media Removal",
-        "media_removal_desc": "This instance removes media from posts on the following instances:",
-        "media_nsfw": "Media Force-set As Sensitive",
-        "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
-      }
-    },
-    "staff": "Staff"
-  },
-  "chat": {
-    "title": "Chat"
-  },
-  "domain_mute_card": {
-    "mute": "Mute",
-    "mute_progress": "Muting...",
-    "unmute": "Unmute",
-    "unmute_progress": "Unmuting..."
-  },
-  "exporter": {
-    "export": "Export",
-    "processing": "Processing, you'll soon be asked to download your file"
-  },
-  "features_panel": {
-    "chat": "Chat",
-    "gopher": "Gopher",
-    "media_proxy": "Media proxy",
-    "scope_options": "Scope options",
-    "text_limit": "Text limit",
-    "title": "Features",
-    "who_to_follow": "Who to follow"
-  },
-  "finder": {
-    "error_fetching_user": "Error fetching user",
-    "find_user": "Find user"
-  },
-  "general": {
-    "apply": "Apply",
-    "submit": "Submit",
-    "more": "More",
-    "generic_error": "An error occured",
-    "optional": "optional",
-    "show_more": "Show more",
-    "show_less": "Show less",
-    "dismiss": "Dismiss",
-    "cancel": "Cancel",
-    "disable": "Disable",
-    "enable": "Enable",
-    "confirm": "Confirm",
-    "verify": "Verify"
-  },
-  "image_cropper": {
-    "crop_picture": "Crop picture",
-    "save": "Save",
-    "save_without_cropping": "Save without cropping",
-    "cancel": "Cancel"
-  },
-  "importer": {
-    "submit": "Submit",
-    "success": "Imported successfully.",
-    "error": "An error occured while importing this file."
-  },
-  "login": {
-    "login": "Log in",
-    "description": "Log in with OAuth",
-    "logout": "Log out",
-    "password": "Password",
-    "placeholder": "e.g. lain",
-    "register": "Register",
-    "username": "Username",
-    "hint": "Log in to join the discussion",
-    "authentication_code": "Authentication code",
-    "enter_recovery_code": "Enter a recovery code",
-    "enter_two_factor_code": "Enter a two-factor code",
-    "recovery_code": "Recovery code",
-    "heading" : {
-      "totp" : "Two-factor authentication",
-      "recovery" : "Two-factor recovery"
-    }
-  },
-  "media_modal": {
-    "previous": "Previous",
-    "next": "Next"
-  },
-  "nav": {
-    "about": "About",
-    "administration": "Administration",
-    "back": "Back",
-    "chat": "Local Chat",
-    "friend_requests": "Follow Requests",
-    "mentions": "Mentions",
-    "interactions": "Interactions",
-    "dms": "Direct Messages",
-    "public_tl": "Public Timeline",
-    "timeline": "Timeline",
-    "twkn": "The Whole Known Network",
-    "user_search": "User Search",
-    "search": "Search",
-    "who_to_follow": "Who to follow",
-    "preferences": "Preferences"
-  },
-  "notifications": {
-    "broken_favorite": "Unknown status, searching for it...",
-    "favorited_you": "favorited your status",
-    "followed_you": "followed you",
-    "follow_request": "wants to follow you",
-    "load_older": "Load older notifications",
-    "notifications": "Notifications",
-    "read": "Read!",
-    "repeated_you": "repeated your status",
-    "no_more_notifications": "No more notifications",
-    "migrated_to": "migrated to",
-    "reacted_with": "reacted with {0}"
-  },
-  "polls": {
-    "add_poll": "Add Poll",
-    "add_option": "Add Option",
-    "option": "Option",
-    "votes": "votes",
-    "vote": "Vote",
-    "type": "Poll type",
-    "single_choice": "Single choice",
-    "multiple_choices": "Multiple choices",
-    "expiry": "Poll age",
-    "expires_in": "Poll ends in {0}",
-    "expired": "Poll ended {0} ago",
-    "not_enough_options": "Too few unique options in poll"
-  },
-  "emoji": {
-    "stickers": "Stickers",
-    "emoji": "Emoji",
-    "keep_open": "Keep picker open",
-    "search_emoji": "Search for an emoji",
-    "add_emoji": "Insert emoji",
-    "custom": "Custom emoji",
-    "unicode": "Unicode emoji",
-    "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
-    "load_all": "Loading all {emojiAmount} emoji"
-  },
-  "interactions": {
-    "favs_repeats": "Repeats and Favorites",
-    "follows": "New follows",
-    "moves": "User migrates",
-    "load_older": "Load older interactions"
-  },
-  "post_status": {
-    "new_status": "Post new status",
-    "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
-    "account_not_locked_warning_link": "locked",
-    "attachments_sensitive": "Mark attachments as sensitive",
-    "content_type": {
-      "text/plain": "Plain text",
-      "text/html": "HTML",
-      "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
-    },
-    "content_warning": "Subject (optional)",
-    "default": "Just landed in L.A.",
-    "direct_warning_to_all": "This post will be visible to all the mentioned users.",
-    "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
-    "posting": "Posting",
-    "scope_notice": {
-      "public": "This post will be visible to everyone",
-      "private": "This post will be visible to your followers only",
-      "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
-    },
-    "scope": {
-      "direct": "Direct - Post to mentioned users only",
-      "private": "Followers-only - Post to followers only",
-      "public": "Public - Post to public timelines",
-      "unlisted": "Unlisted - Do not post to public timelines"
-    }
-  },
-  "registration": {
-    "bio": "Bio",
-    "email": "Email",
-    "fullname": "Display name",
-    "password_confirm": "Password confirmation",
-    "registration": "Registration",
-    "token": "Invite token",
-    "captcha": "CAPTCHA",
-    "new_captcha": "Click the image to get a new captcha",
-    "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.",
-    "validations": {
-      "username_required": "cannot be left blank",
-      "fullname_required": "cannot be left blank",
-      "email_required": "cannot be left blank",
-      "password_required": "cannot be left blank",
-      "password_confirmation_required": "cannot be left blank",
-      "password_confirmation_match": "should be the same as password"
-    }
-  },
-  "remote_user_resolver": {
-    "remote_user_resolver": "Remote user resolver",
-    "searching_for": "Searching for",
-    "error": "Not found."
-  },
-  "selectable_list": {
-    "select_all": "Select all"
-  },
-  "settings": {
-    "app_name": "App name",
-    "security": "Security",
-    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
-    "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "Setup OTP",
-      "wait_pre_setup_otp" : "presetting OTP",
-      "confirm_and_enable" : "Confirm & enable OTP",
-      "title": "Two-factor Authentication",
-      "generate_new_recovery_codes" : "Generate new recovery codes",
-      "warning_of_generate_new_codes" : "When you generate new recovery codes, your old codes won’t work anymore.",
-      "recovery_codes" : "Recovery codes.",
-      "waiting_a_recovery_codes": "Receiving backup codes...",
-      "recovery_codes_warning" : "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
-      "authentication_methods" : "Authentication methods",
-      "scan": {
-        "title": "Scan",
-        "desc": "Using your two-factor app, scan this QR code or enter text key:",
-        "secret_code": "Key"
-      },
-      "verify": {
-        "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
-      }
-    },
-    "allow_following_move": "Allow auto-follow when following account moves",
-    "attachmentRadius": "Attachments",
-    "attachments": "Attachments",
-    "autoload": "Enable automatic loading when scrolled to the bottom",
-    "avatar": "Avatar",
-    "avatarAltRadius": "Avatars (Notifications)",
-    "avatarRadius": "Avatars",
-    "background": "Background",
-    "bio": "Bio",
-    "block_export": "Block export",
-    "block_export_button": "Export your blocks to a csv file",
-    "block_import": "Block import",
-    "block_import_error": "Error importing blocks",
-    "blocks_imported": "Blocks imported! Processing them will take a while.",
-    "blocks_tab": "Blocks",
-    "btnRadius": "Buttons",
-    "cBlue": "Blue (Reply, follow)",
-    "cGreen": "Green (Retweet)",
-    "cOrange": "Orange (Favorite)",
-    "cRed": "Red (Cancel)",
-    "change_email": "Change Email",
-    "change_email_error": "There was an issue changing your email.",
-    "changed_email": "Email changed successfully!",
-    "change_password": "Change Password",
-    "change_password_error": "There was an issue changing your password.",
-    "changed_password": "Password changed successfully!",
-    "collapse_subject": "Collapse posts with subjects",
-    "composing": "Composing",
-    "confirm_new_password": "Confirm new password",
-    "current_avatar": "Your current avatar",
-    "current_password": "Current password",
-    "current_profile_banner": "Your current profile banner",
-    "data_import_export_tab": "Data Import / Export",
-    "default_vis": "Default visibility scope",
-    "delete_account": "Delete Account",
-    "delete_account_description": "Permanently delete your account and all your messages.",
-    "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
-    "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
-    "discoverable": "Allow discovery of this account in search results and other services",
-    "domain_mutes": "Domains",
-    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
-    "pad_emoji": "Pad emoji with spaces when adding from picker",
-    "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
-    "export_theme": "Save preset",
-    "filtering": "Filtering",
-    "filtering_explanation": "All statuses containing these words will be muted, one per line",
-    "follow_export": "Follow export",
-    "follow_export_button": "Export your follows to a csv file",
-    "follow_import": "Follow import",
-    "follow_import_error": "Error importing followers",
-    "follows_imported": "Follows imported! Processing them will take a while.",
-    "accent": "Accent",
-    "foreground": "Foreground",
-    "general": "General",
-    "hide_attachments_in_convo": "Hide attachments in conversations",
-    "hide_attachments_in_tl": "Hide attachments in timeline",
-    "hide_muted_posts": "Hide posts of muted users",
-    "max_thumbnails": "Maximum amount of thumbnails per post",
-    "hide_isp": "Hide instance-specific panel",
-    "preload_images": "Preload images",
-    "use_one_click_nsfw": "Open NSFW attachments with just one click",
-    "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
-    "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
-    "hide_filtered_statuses": "Hide filtered statuses",
-    "import_blocks_from_a_csv_file": "Import blocks from a csv file",
-    "import_followers_from_a_csv_file": "Import follows from a csv file",
-    "import_theme": "Load preset",
-    "inputRadius": "Input fields",
-    "checkboxRadius": "Checkboxes",
-    "instance_default": "(default: {value})",
-    "instance_default_simple": "(default)",
-    "interface": "Interface",
-    "interfaceLanguage": "Interface language",
-    "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
-    "limited_availability": "Unavailable in your browser",
-    "links": "Links",
-    "lock_account_description": "Restrict your account to approved followers only",
-    "loop_video": "Loop videos",
-    "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
-    "mutes_tab": "Mutes",
-    "play_videos_in_modal": "Play videos in a popup frame",
-    "use_contain_fit": "Don't crop the attachment in thumbnails",
-    "name": "Name",
-    "name_bio": "Name & Bio",
-    "new_email": "New Email",
-    "new_password": "New password",
-    "notification_visibility": "Types of notifications to show",
-    "notification_visibility_follows": "Follows",
-    "notification_visibility_likes": "Likes",
-    "notification_visibility_mentions": "Mentions",
-    "notification_visibility_repeats": "Repeats",
-    "notification_visibility_moves": "User Migrates",
-    "notification_visibility_emoji_reactions": "Reactions",
-    "no_rich_text_description": "Strip rich text formatting from all posts",
-    "no_blocks": "No blocks",
-    "no_mutes": "No mutes",
-    "hide_follows_description": "Don't show who I'm following",
-    "hide_followers_description": "Don't show who's following me",
-    "hide_follows_count_description": "Don't show follow count",
-    "hide_followers_count_description": "Don't show follower count",
-    "show_admin_badge": "Show Admin badge in my profile",
-    "show_moderator_badge": "Show Moderator badge in my profile",
-    "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
-    "oauth_tokens": "OAuth tokens",
-    "token": "Token",
-    "refresh_token": "Refresh Token",
-    "valid_until": "Valid Until",
-    "revoke_token": "Revoke",
-    "panelRadius": "Panels",
-    "pause_on_unfocused": "Pause streaming when tab is not focused",
-    "presets": "Presets",
-    "profile_background": "Profile Background",
-    "profile_banner": "Profile Banner",
-    "profile_tab": "Profile",
-    "radii_help": "Set up interface edge rounding (in pixels)",
-    "replies_in_timeline": "Replies in timeline",
-    "reply_link_preview": "Enable reply-link preview on mouse hover",
-    "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",
-    "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
-    "saving_err": "Error saving settings",
-    "saving_ok": "Settings saved",
-    "search_user_to_block": "Search whom you want to block",
-    "search_user_to_mute": "Search whom you want to mute",
-    "security_tab": "Security",
-    "scope_copy": "Copy scope when replying (DMs are always copied)",
-    "minimal_scopes_mode": "Minimize post scope selection options",
-    "set_new_avatar": "Set new avatar",
-    "set_new_profile_background": "Set new profile background",
-    "set_new_profile_banner": "Set new profile banner",
-    "settings": "Settings",
-    "subject_input_always_show": "Always show subject field",
-    "subject_line_behavior": "Copy subject when replying",
-    "subject_line_email": "Like email: \"re: subject\"",
-    "subject_line_mastodon": "Like mastodon: copy as is",
-    "subject_line_noop": "Do not copy",
-    "post_status_content_type": "Post status content type",
-    "stop_gifs": "Play-on-hover GIFs",
-    "streaming": "Enable automatic streaming of new posts when scrolled to the top",
-    "user_mutes": "Users",
-    "useStreamingApi": "Receive posts and notifications real-time",
-    "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)",
-    "text": "Text",
-    "theme": "Theme",
-    "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
-    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
-    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
-    "tooltipRadius": "Tooltips/alerts",
-    "type_domains_to_mute": "Type in domains to mute",
-    "upload_a_photo": "Upload a photo",
-    "user_settings": "User Settings",
-    "values": {
-      "false": "no",
-      "true": "yes"
-    },
-    "fun": "Fun",
-    "greentext": "Meme arrows",
-    "notifications": "Notifications",
-    "notification_setting_filters": "Filters",
-    "notification_setting": "Receive notifications from:",
-    "notification_setting_follows": "Users you follow",
-    "notification_setting_non_follows": "Users you do not follow",
-    "notification_setting_followers": "Users who follow you",
-    "notification_setting_non_followers": "Users who do not follow you",
-    "notification_setting_privacy": "Privacy",
-    "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
-    "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",
-    "style": {
-      "switcher": {
-        "keep_color": "Keep colors",
-        "keep_shadows": "Keep shadows",
-        "keep_opacity": "Keep opacity",
-        "keep_roundness": "Keep roundness",
-        "keep_fonts": "Keep fonts",
-        "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
-        "reset": "Reset",
-        "clear_all": "Clear all",
-        "clear_opacity": "Clear opacity",
-        "load_theme": "Load theme",
-        "keep_as_is": "Keep as is",
-        "use_snapshot": "Old version",
-        "use_source": "New version",
-        "help": {
-          "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
-          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsitencies.",
-          "future_version_imported": "File you imported was made in newer version of FE.",
-          "older_version_imported": "File you imported was made in older version of FE.",
-          "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
-          "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
-          "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
-          "fe_downgraded": "PleromaFE's version rolled back.",
-          "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
-          "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
-          "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
-        }
-      },
-      "common": {
-        "color": "Color",
-        "opacity": "Opacity",
-        "contrast": {
-          "hint": "Contrast ratio is {ratio}, it {level} {context}",
-          "level": {
-            "aa": "meets Level AA guideline (minimal)",
-            "aaa": "meets Level AAA guideline (recommended)",
-            "bad": "doesn't meet any accessibility guidelines"
-          },
-          "context": {
-            "18pt": "for large (18pt+) text",
-            "text": "for text"
-          }
-        }
-      },
-      "common_colors": {
-        "_tab_label": "Common",
-        "main": "Common colors",
-        "foreground_hint": "See \"Advanced\" tab for more detailed control",
-        "rgbo": "Icons, accents, badges"
-      },
-      "advanced_colors": {
-        "_tab_label": "Advanced",
-        "alert": "Alert background",
-        "alert_error": "Error",
-        "alert_warning": "Warning",
-        "alert_neutral": "Neutral",
-        "post": "Posts/User bios",
-        "badge": "Badge background",
-        "popover": "Tooltips, menus, popovers",
-        "badge_notification": "Notification",
-        "panel_header": "Panel header",
-        "top_bar": "Top bar",
-        "borders": "Borders",
-        "buttons": "Buttons",
-        "inputs": "Input fields",
-        "faint_text": "Faded text",
-        "underlay": "Underlay",
-        "poll": "Poll graph",
-        "icons": "Icons",
-        "highlight": "Highlighted elements",
-        "pressed": "Pressed",
-        "selectedPost": "Selected post",
-        "selectedMenu": "Selected menu item",
-        "disabled": "Disabled",
-        "toggled": "Toggled",
-        "tabs": "Tabs"
-      },
-      "radii": {
-        "_tab_label": "Roundness"
-      },
-      "shadows": {
-        "_tab_label": "Shadow and lighting",
-        "component": "Component",
-        "override": "Override",
-        "shadow_id": "Shadow #{value}",
-        "blur": "Blur",
-        "spread": "Spread",
-        "inset": "Inset",
-        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
-        "filter_hint": {
-          "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
-          "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
-          "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
-          "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
-          "inset_classic": "Inset shadows will be using {0}"
+    "about": {
+        "mrf": {
+            "federation": "Federation",
+            "keyword": {
+                "keyword_policies": "Keyword Policies",
+                "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
+                "reject": "Reject",
+                "replace": "Replace",
+                "is_replaced_by": "→"
+            },
+            "mrf_policies": "Enabled MRF Policies",
+            "mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance.  The following policies are enabled:",
+            "simple": {
+                "simple_policies": "Instance-specific Policies",
+                "accept": "Accept",
+                "accept_desc": "This instance only accepts messages from the following instances:",
+                "reject": "Reject",
+                "reject_desc": "This instance will not accept messages from the following instances:",
+                "quarantine": "Quarantine",
+                "quarantine_desc": "This instance will send only public posts to the following instances:",
+                "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
+                "ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
+                "media_removal": "Media Removal",
+                "media_removal_desc": "This instance removes media from posts on the following instances:",
+                "media_nsfw": "Media Force-set As Sensitive",
+                "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
+            }
         },
-        "components": {
-          "panel": "Panel",
-          "panelHeader": "Panel header",
-          "topBar": "Top bar",
-          "avatar": "User avatar (in profile view)",
-          "avatarStatus": "User avatar (in post display)",
-          "popup": "Popups and tooltips",
-          "button": "Button",
-          "buttonHover": "Button (hover)",
-          "buttonPressed": "Button (pressed)",
-          "buttonPressedHover": "Button (pressed+hover)",
-          "input": "Input field"
+        "staff": "Staff"
+    },
+    "chat": {
+        "title": "Chat"
+    },
+    "domain_mute_card": {
+        "mute": "Mute",
+        "mute_progress": "Muting...",
+        "unmute": "Unmute",
+        "unmute_progress": "Unmuting..."
+    },
+    "exporter": {
+        "export": "Export",
+        "processing": "Processing, you'll soon be asked to download your file"
+    },
+    "features_panel": {
+        "chat": "Chat",
+        "gopher": "Gopher",
+        "media_proxy": "Media proxy",
+        "scope_options": "Scope options",
+        "text_limit": "Text limit",
+        "title": "Features",
+        "who_to_follow": "Who to follow"
+    },
+    "finder": {
+        "error_fetching_user": "Error fetching user",
+        "find_user": "Find user"
+    },
+    "general": {
+        "apply": "Apply",
+        "submit": "Submit",
+        "more": "More",
+        "generic_error": "An error occured",
+        "optional": "optional",
+        "show_more": "Show more",
+        "show_less": "Show less",
+        "dismiss": "Dismiss",
+        "cancel": "Cancel",
+        "disable": "Disable",
+        "enable": "Enable",
+        "confirm": "Confirm",
+        "verify": "Verify"
+    },
+    "image_cropper": {
+        "crop_picture": "Crop picture",
+        "save": "Save",
+        "save_without_cropping": "Save without cropping",
+        "cancel": "Cancel"
+    },
+    "importer": {
+        "submit": "Submit",
+        "success": "Imported successfully.",
+        "error": "An error occured while importing this file."
+    },
+    "login": {
+        "login": "Log in",
+        "description": "Log in with OAuth",
+        "logout": "Log out",
+        "password": "Password",
+        "placeholder": "e.g. lain",
+        "register": "Register",
+        "username": "Username",
+        "hint": "Log in to join the discussion",
+        "authentication_code": "Authentication code",
+        "enter_recovery_code": "Enter a recovery code",
+        "enter_two_factor_code": "Enter a two-factor code",
+        "recovery_code": "Recovery code",
+        "heading": {
+            "totp": "Two-factor authentication",
+            "recovery": "Two-factor recovery"
         }
-      },
-      "fonts": {
-        "_tab_label": "Fonts",
-        "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
-        "components": {
-          "interface": "Interface",
-          "input": "Input fields",
-          "post": "Post text",
-          "postCode": "Monospaced text in a post (rich text)"
+    },
+    "media_modal": {
+        "previous": "Previous",
+        "next": "Next"
+    },
+    "nav": {
+        "about": "About",
+        "administration": "Administration",
+        "back": "Back",
+        "chat": "Local Chat",
+        "friend_requests": "Follow Requests",
+        "mentions": "Mentions",
+        "interactions": "Interactions",
+        "dms": "Direct Messages",
+        "public_tl": "Public Timeline",
+        "timeline": "Timeline",
+        "twkn": "The Whole Known Network",
+        "user_search": "User Search",
+        "search": "Search",
+        "who_to_follow": "Who to follow",
+        "preferences": "Preferences"
+    },
+    "notifications": {
+        "broken_favorite": "Unknown status, searching for it...",
+        "favorited_you": "favorited your status",
+        "followed_you": "followed you",
+        "follow_request": "wants to follow you",
+        "load_older": "Load older notifications",
+        "notifications": "Notifications",
+        "read": "Read!",
+        "repeated_you": "repeated your status",
+        "no_more_notifications": "No more notifications",
+        "migrated_to": "migrated to",
+        "reacted_with": "reacted with {0}"
+    },
+    "polls": {
+        "add_poll": "Add Poll",
+        "add_option": "Add Option",
+        "option": "Option",
+        "votes": "votes",
+        "vote": "Vote",
+        "type": "Poll type",
+        "single_choice": "Single choice",
+        "multiple_choices": "Multiple choices",
+        "expiry": "Poll age",
+        "expires_in": "Poll ends in {0}",
+        "expired": "Poll ended {0} ago",
+        "not_enough_options": "Too few unique options in poll"
+    },
+    "emoji": {
+        "stickers": "Stickers",
+        "emoji": "Emoji",
+        "keep_open": "Keep picker open",
+        "search_emoji": "Search for an emoji",
+        "add_emoji": "Insert emoji",
+        "custom": "Custom emoji",
+        "unicode": "Unicode emoji",
+        "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
+        "load_all": "Loading all {emojiAmount} emoji"
+    },
+    "interactions": {
+        "favs_repeats": "Repeats and Favorites",
+        "follows": "New follows",
+        "moves": "User migrates",
+        "load_older": "Load older interactions"
+    },
+    "post_status": {
+        "new_status": "Post new status",
+        "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
+        "account_not_locked_warning_link": "locked",
+        "attachments_sensitive": "Mark attachments as sensitive",
+        "content_type": {
+            "text/plain": "Plain text",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
         },
-        "family": "Font name",
-        "size": "Size (in px)",
-        "weight": "Weight (boldness)",
-        "custom": "Custom"
-      },
-      "preview": {
-        "header": "Preview",
-        "content": "Content",
-        "error": "Example error",
-        "button": "Button",
-        "text": "A bunch of more {0} and {1}",
-        "mono": "content",
-        "input": "Just landed in L.A.",
-        "faint_link": "helpful manual",
-        "fine_print": "Read our {0} to learn nothing useful!",
-        "header_faint": "This is fine",
-        "checkbox": "I have skimmed over terms and conditions",
-        "link": "a nice lil' link"
-      }
+        "content_warning": "Subject (optional)",
+        "default": "Just landed in L.A.",
+        "direct_warning_to_all": "This post will be visible to all the mentioned users.",
+        "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
+        "posting": "Posting",
+        "scope_notice": {
+            "public": "This post will be visible to everyone",
+            "private": "This post will be visible to your followers only",
+            "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
+        },
+        "scope": {
+            "direct": "Direct - Post to mentioned users only",
+            "private": "Followers-only - Post to followers only",
+            "public": "Public - Post to public timelines",
+            "unlisted": "Unlisted - Do not post to public timelines"
+        }
     },
-    "version": {
-      "title": "Version",
-      "backend_version": "Backend Version",
-      "frontend_version": "Frontend Version"
-    }
-  },
-  "time": {
-    "day": "{0} day",
-    "days": "{0} days",
-    "day_short": "{0}d",
-    "days_short": "{0}d",
-    "hour": "{0} hour",
-    "hours": "{0} hours",
-    "hour_short": "{0}h",
-    "hours_short": "{0}h",
-    "in_future": "in {0}",
-    "in_past": "{0} ago",
-    "minute": "{0} minute",
-    "minutes": "{0} minutes",
-    "minute_short": "{0}min",
-    "minutes_short": "{0}min",
-    "month": "{0} month",
-    "months": "{0} months",
-    "month_short": "{0}mo",
-    "months_short": "{0}mo",
-    "now": "just now",
-    "now_short": "now",
-    "second": "{0} second",
-    "seconds": "{0} seconds",
-    "second_short": "{0}s",
-    "seconds_short": "{0}s",
-    "week": "{0} week",
-    "weeks": "{0} weeks",
-    "week_short": "{0}w",
-    "weeks_short": "{0}w",
-    "year": "{0} year",
-    "years": "{0} years",
-    "year_short": "{0}y",
-    "years_short": "{0}y"
-  },
-  "timeline": {
-    "collapse": "Collapse",
-    "conversation": "Conversation",
-    "error_fetching": "Error fetching updates",
-    "load_older": "Load older statuses",
-    "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
-    "repeated": "repeated",
-    "show_new": "Show new",
-    "up_to_date": "Up-to-date",
-    "no_more_statuses": "No more statuses",
-    "no_statuses": "No statuses"
-  },
-  "status": {
-    "favorites": "Favorites",
-    "repeats": "Repeats",
-    "delete": "Delete status",
-    "pin": "Pin on profile",
-    "unpin": "Unpin from profile",
-    "pinned": "Pinned",
-    "delete_confirm": "Do you really want to delete this status?",
-    "reply_to": "Reply to",
-    "replies_list": "Replies:",
-    "mute_conversation": "Mute conversation",
-    "unmute_conversation": "Unmute conversation",
-    "status_unavailable": "Status unavailable",
-    "copy_link": "Copy link to status"
-  },
-  "user_card": {
-    "approve": "Approve",
-    "block": "Block",
-    "blocked": "Blocked!",
-    "deny": "Deny",
-    "favorites": "Favorites",
-    "follow": "Follow",
-    "follow_sent": "Request sent!",
-    "follow_progress": "Requesting…",
-    "follow_again": "Send request again?",
-    "follow_unfollow": "Unfollow",
-    "followees": "Following",
-    "followers": "Followers",
-    "following": "Following!",
-    "follows_you": "Follows you!",
-    "hidden": "Hidden",
-    "its_you": "It's you!",
-    "media": "Media",
-    "mention": "Mention",
-    "mute": "Mute",
-    "muted": "Muted",
-    "per_day": "per day",
-    "remote_follow": "Remote follow",
-    "report": "Report",
-    "statuses": "Statuses",
-    "subscribe": "Subscribe",
-    "unsubscribe": "Unsubscribe",
-    "unblock": "Unblock",
-    "unblock_progress": "Unblocking...",
-    "block_progress": "Blocking...",
-    "unmute": "Unmute",
-    "unmute_progress": "Unmuting...",
-    "mute_progress": "Muting...",
-    "hide_repeats": "Hide repeats",
-    "show_repeats": "Show repeats",
-    "admin_menu": {
-      "moderation": "Moderation",
-      "grant_admin": "Grant Admin",
-      "revoke_admin": "Revoke Admin",
-      "grant_moderator": "Grant Moderator",
-      "revoke_moderator": "Revoke Moderator",
-      "activate_account": "Activate account",
-      "deactivate_account": "Deactivate account",
-      "delete_account": "Delete account",
-      "force_nsfw": "Mark all posts as NSFW",
-      "strip_media": "Remove media from posts",
-      "force_unlisted": "Force posts to be unlisted",
-      "sandbox": "Force posts to be followers-only",
-      "disable_remote_subscription": "Disallow following user from remote instances",
-      "disable_any_subscription": "Disallow following user at all",
-      "quarantine": "Disallow user posts from federating",
-      "delete_user": "Delete user",
-      "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
-    }
-  },
-  "user_profile": {
-    "timeline_title": "User Timeline",
-    "profile_does_not_exist": "Sorry, this profile does not exist.",
-    "profile_loading_error": "Sorry, there was an error loading this profile."
-  },
-  "user_reporting": {
-    "title": "Reporting {0}",
-    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
-    "additional_comments": "Additional comments",
-    "forward_description": "The account is from another server. Send a copy of the report there as well?",
-    "forward_to": "Forward to {0}",
-    "submit": "Submit",
-    "generic_error": "An error occurred while processing your request."
-  },
-  "who_to_follow": {
-    "more": "More",
-    "who_to_follow": "Who to follow"
-  },
-  "tool_tip": {
-    "media_upload": "Upload Media",
-    "repeat": "Repeat",
-    "reply": "Reply",
-    "favorite": "Favorite",
-    "add_reaction": "Add Reaction",
-    "user_settings": "User Settings",
-    "accept_follow_request": "Accept follow request",
-    "reject_follow_request": "Reject follow request"
-  },
-  "upload":{
-    "error": {
-      "base": "Upload failed.",
-      "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Try again later"
+    "registration": {
+        "bio": "Bio",
+        "email": "Email",
+        "fullname": "Display name",
+        "password_confirm": "Password confirmation",
+        "registration": "Registration",
+        "token": "Invite token",
+        "captcha": "CAPTCHA",
+        "new_captcha": "Click the image to get a new captcha",
+        "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.",
+        "validations": {
+            "username_required": "cannot be left blank",
+            "fullname_required": "cannot be left blank",
+            "email_required": "cannot be left blank",
+            "password_required": "cannot be left blank",
+            "password_confirmation_required": "cannot be left blank",
+            "password_confirmation_match": "should be the same as password"
+        }
     },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
+    "remote_user_resolver": {
+        "remote_user_resolver": "Remote user resolver",
+        "searching_for": "Searching for",
+        "error": "Not found."
+    },
+    "selectable_list": {
+        "select_all": "Select all"
+    },
+    "settings": {
+        "app_name": "App name",
+        "security": "Security",
+        "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "Setup OTP",
+            "wait_pre_setup_otp": "presetting OTP",
+            "confirm_and_enable": "Confirm & enable OTP",
+            "title": "Two-factor Authentication",
+            "generate_new_recovery_codes": "Generate new recovery codes",
+            "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
+            "recovery_codes": "Recovery codes.",
+            "waiting_a_recovery_codes": "Receiving backup codes...",
+            "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
+            "authentication_methods": "Authentication methods",
+            "scan": {
+                "title": "Scan",
+                "desc": "Using your two-factor app, scan this QR code or enter text key:",
+                "secret_code": "Key"
+            },
+            "verify": {
+                "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
+            }
+        },
+        "allow_following_move": "Allow auto-follow when following account moves",
+        "attachmentRadius": "Attachments",
+        "attachments": "Attachments",
+        "autoload": "Enable automatic loading when scrolled to the bottom",
+        "avatar": "Avatar",
+        "avatarAltRadius": "Avatars (Notifications)",
+        "avatarRadius": "Avatars",
+        "background": "Background",
+        "bio": "Bio",
+        "block_export": "Block export",
+        "block_export_button": "Export your blocks to a csv file",
+        "block_import": "Block import",
+        "block_import_error": "Error importing blocks",
+        "blocks_imported": "Blocks imported! Processing them will take a while.",
+        "blocks_tab": "Blocks",
+        "btnRadius": "Buttons",
+        "cBlue": "Blue (Reply, follow)",
+        "cGreen": "Green (Retweet)",
+        "cOrange": "Orange (Favorite)",
+        "cRed": "Red (Cancel)",
+        "change_email": "Change Email",
+        "change_email_error": "There was an issue changing your email.",
+        "changed_email": "Email changed successfully!",
+        "change_password": "Change Password",
+        "change_password_error": "There was an issue changing your password.",
+        "changed_password": "Password changed successfully!",
+        "collapse_subject": "Collapse posts with subjects",
+        "composing": "Composing",
+        "confirm_new_password": "Confirm new password",
+        "current_avatar": "Your current avatar",
+        "current_password": "Current password",
+        "current_profile_banner": "Your current profile banner",
+        "data_import_export_tab": "Data Import / Export",
+        "default_vis": "Default visibility scope",
+        "delete_account": "Delete Account",
+        "delete_account_description": "Permanently delete your account and all your messages.",
+        "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
+        "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
+        "discoverable": "Allow discovery of this account in search results and other services",
+        "domain_mutes": "Domains",
+        "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
+        "pad_emoji": "Pad emoji with spaces when adding from picker",
+        "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
+        "export_theme": "Save preset",
+        "filtering": "Filtering",
+        "filtering_explanation": "All statuses containing these words will be muted, one per line",
+        "follow_export": "Follow export",
+        "follow_export_button": "Export your follows to a csv file",
+        "follow_import": "Follow import",
+        "follow_import_error": "Error importing followers",
+        "follows_imported": "Follows imported! Processing them will take a while.",
+        "accent": "Accent",
+        "foreground": "Foreground",
+        "general": "General",
+        "hide_attachments_in_convo": "Hide attachments in conversations",
+        "hide_attachments_in_tl": "Hide attachments in timeline",
+        "hide_muted_posts": "Hide posts of muted users",
+        "max_thumbnails": "Maximum amount of thumbnails per post",
+        "hide_isp": "Hide instance-specific panel",
+        "preload_images": "Preload images",
+        "use_one_click_nsfw": "Open NSFW attachments with just one click",
+        "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
+        "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+        "hide_filtered_statuses": "Hide filtered statuses",
+        "import_blocks_from_a_csv_file": "Import blocks from a csv file",
+        "import_followers_from_a_csv_file": "Import follows from a csv file",
+        "import_theme": "Load preset",
+        "inputRadius": "Input fields",
+        "checkboxRadius": "Checkboxes",
+        "instance_default": "(default: {value})",
+        "instance_default_simple": "(default)",
+        "interface": "Interface",
+        "interfaceLanguage": "Interface language",
+        "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
+        "limited_availability": "Unavailable in your browser",
+        "links": "Links",
+        "lock_account_description": "Restrict your account to approved followers only",
+        "loop_video": "Loop videos",
+        "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
+        "mutes_tab": "Mutes",
+        "play_videos_in_modal": "Play videos in a popup frame",
+        "use_contain_fit": "Don't crop the attachment in thumbnails",
+        "name": "Name",
+        "name_bio": "Name & Bio",
+        "new_email": "New Email",
+        "new_password": "New password",
+        "notification_visibility": "Types of notifications to show",
+        "notification_visibility_follows": "Follows",
+        "notification_visibility_likes": "Likes",
+        "notification_visibility_mentions": "Mentions",
+        "notification_visibility_repeats": "Repeats",
+        "notification_visibility_moves": "User Migrates",
+        "notification_visibility_emoji_reactions": "Reactions",
+        "no_rich_text_description": "Strip rich text formatting from all posts",
+        "no_blocks": "No blocks",
+        "no_mutes": "No mutes",
+        "hide_follows_description": "Don't show who I'm following",
+        "hide_followers_description": "Don't show who's following me",
+        "hide_follows_count_description": "Don't show follow count",
+        "hide_followers_count_description": "Don't show follower count",
+        "show_admin_badge": "Show Admin badge in my profile",
+        "show_moderator_badge": "Show Moderator badge in my profile",
+        "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
+        "oauth_tokens": "OAuth tokens",
+        "token": "Token",
+        "refresh_token": "Refresh Token",
+        "valid_until": "Valid Until",
+        "revoke_token": "Revoke",
+        "panelRadius": "Panels",
+        "pause_on_unfocused": "Pause streaming when tab is not focused",
+        "presets": "Presets",
+        "profile_background": "Profile Background",
+        "profile_banner": "Profile Banner",
+        "profile_tab": "Profile",
+        "radii_help": "Set up interface edge rounding (in pixels)",
+        "replies_in_timeline": "Replies in timeline",
+        "reply_link_preview": "Enable reply-link preview on mouse hover",
+        "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",
+        "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
+        "saving_err": "Error saving settings",
+        "saving_ok": "Settings saved",
+        "search_user_to_block": "Search whom you want to block",
+        "search_user_to_mute": "Search whom you want to mute",
+        "security_tab": "Security",
+        "scope_copy": "Copy scope when replying (DMs are always copied)",
+        "minimal_scopes_mode": "Minimize post scope selection options",
+        "set_new_avatar": "Set new avatar",
+        "set_new_profile_background": "Set new profile background",
+        "set_new_profile_banner": "Set new profile banner",
+        "settings": "Settings",
+        "subject_input_always_show": "Always show subject field",
+        "subject_line_behavior": "Copy subject when replying",
+        "subject_line_email": "Like email: \"re: subject\"",
+        "subject_line_mastodon": "Like mastodon: copy as is",
+        "subject_line_noop": "Do not copy",
+        "post_status_content_type": "Post status content type",
+        "stop_gifs": "Play-on-hover GIFs",
+        "streaming": "Enable automatic streaming of new posts when scrolled to the top",
+        "user_mutes": "Users",
+        "useStreamingApi": "Receive posts and notifications real-time",
+        "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)",
+        "text": "Text",
+        "theme": "Theme",
+        "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
+        "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
+        "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
+        "tooltipRadius": "Tooltips/alerts",
+        "type_domains_to_mute": "Type in domains to mute",
+        "upload_a_photo": "Upload a photo",
+        "user_settings": "User Settings",
+        "values": {
+            "false": "no",
+            "true": "yes"
+        },
+        "fun": "Fun",
+        "greentext": "Meme arrows",
+        "notifications": "Notifications",
+        "notification_setting_filters": "Filters",
+        "notification_setting": "Receive notifications from:",
+        "notification_setting_follows": "Users you follow",
+        "notification_setting_non_follows": "Users you do not follow",
+        "notification_setting_followers": "Users who follow you",
+        "notification_setting_non_followers": "Users who do not follow you",
+        "notification_setting_privacy": "Privacy",
+        "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
+        "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",
+        "style": {
+            "switcher": {
+                "keep_color": "Keep colors",
+                "keep_shadows": "Keep shadows",
+                "keep_opacity": "Keep opacity",
+                "keep_roundness": "Keep roundness",
+                "keep_fonts": "Keep fonts",
+                "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
+                "reset": "Reset",
+                "clear_all": "Clear all",
+                "clear_opacity": "Clear opacity",
+                "load_theme": "Load theme",
+                "keep_as_is": "Keep as is",
+                "use_snapshot": "Old version",
+                "use_source": "New version",
+                "help": {
+                    "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
+                    "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
+                    "future_version_imported": "File you imported was made in newer version of FE.",
+                    "older_version_imported": "File you imported was made in older version of FE.",
+                    "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
+                    "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
+                    "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
+                    "fe_downgraded": "PleromaFE's version rolled back.",
+                    "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
+                    "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
+                    "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
+                }
+            },
+            "common": {
+                "color": "Color",
+                "opacity": "Opacity",
+                "contrast": {
+                    "hint": "Contrast ratio is {ratio}, it {level} {context}",
+                    "level": {
+                        "aa": "meets Level AA guideline (minimal)",
+                        "aaa": "meets Level AAA guideline (recommended)",
+                        "bad": "doesn't meet any accessibility guidelines"
+                    },
+                    "context": {
+                        "18pt": "for large (18pt+) text",
+                        "text": "for text"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Common",
+                "main": "Common colors",
+                "foreground_hint": "See \"Advanced\" tab for more detailed control",
+                "rgbo": "Icons, accents, badges"
+            },
+            "advanced_colors": {
+                "_tab_label": "Advanced",
+                "alert": "Alert background",
+                "alert_error": "Error",
+                "alert_warning": "Warning",
+                "alert_neutral": "Neutral",
+                "post": "Posts/User bios",
+                "badge": "Badge background",
+                "popover": "Tooltips, menus, popovers",
+                "badge_notification": "Notification",
+                "panel_header": "Panel header",
+                "top_bar": "Top bar",
+                "borders": "Borders",
+                "buttons": "Buttons",
+                "inputs": "Input fields",
+                "faint_text": "Faded text",
+                "underlay": "Underlay",
+                "poll": "Poll graph",
+                "icons": "Icons",
+                "highlight": "Highlighted elements",
+                "pressed": "Pressed",
+                "selectedPost": "Selected post",
+                "selectedMenu": "Selected menu item",
+                "disabled": "Disabled",
+                "toggled": "Toggled",
+                "tabs": "Tabs"
+            },
+            "radii": {
+                "_tab_label": "Roundness"
+            },
+            "shadows": {
+                "_tab_label": "Shadow and lighting",
+                "component": "Component",
+                "override": "Override",
+                "shadow_id": "Shadow #{value}",
+                "blur": "Blur",
+                "spread": "Spread",
+                "inset": "Inset",
+                "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
+                "filter_hint": {
+                    "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
+                    "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
+                    "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
+                    "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
+                    "inset_classic": "Inset shadows will be using {0}"
+                },
+                "components": {
+                    "panel": "Panel",
+                    "panelHeader": "Panel header",
+                    "topBar": "Top bar",
+                    "avatar": "User avatar (in profile view)",
+                    "avatarStatus": "User avatar (in post display)",
+                    "popup": "Popups and tooltips",
+                    "button": "Button",
+                    "buttonHover": "Button (hover)",
+                    "buttonPressed": "Button (pressed)",
+                    "buttonPressedHover": "Button (pressed+hover)",
+                    "input": "Input field"
+                }
+            },
+            "fonts": {
+                "_tab_label": "Fonts",
+                "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
+                "components": {
+                    "interface": "Interface",
+                    "input": "Input fields",
+                    "post": "Post text",
+                    "postCode": "Monospaced text in a post (rich text)"
+                },
+                "family": "Font name",
+                "size": "Size (in px)",
+                "weight": "Weight (boldness)",
+                "custom": "Custom"
+            },
+            "preview": {
+                "header": "Preview",
+                "content": "Content",
+                "error": "Example error",
+                "button": "Button",
+                "text": "A bunch of more {0} and {1}",
+                "mono": "content",
+                "input": "Just landed in L.A.",
+                "faint_link": "helpful manual",
+                "fine_print": "Read our {0} to learn nothing useful!",
+                "header_faint": "This is fine",
+                "checkbox": "I have skimmed over terms and conditions",
+                "link": "a nice lil' link"
+            }
+        },
+        "version": {
+            "title": "Version",
+            "backend_version": "Backend Version",
+            "frontend_version": "Frontend Version"
+        }
+    },
+    "time": {
+        "day": "{0} day",
+        "days": "{0} days",
+        "day_short": "{0}d",
+        "days_short": "{0}d",
+        "hour": "{0} hour",
+        "hours": "{0} hours",
+        "hour_short": "{0}h",
+        "hours_short": "{0}h",
+        "in_future": "in {0}",
+        "in_past": "{0} ago",
+        "minute": "{0} minute",
+        "minutes": "{0} minutes",
+        "minute_short": "{0}min",
+        "minutes_short": "{0}min",
+        "month": "{0} month",
+        "months": "{0} months",
+        "month_short": "{0}mo",
+        "months_short": "{0}mo",
+        "now": "just now",
+        "now_short": "now",
+        "second": "{0} second",
+        "seconds": "{0} seconds",
+        "second_short": "{0}s",
+        "seconds_short": "{0}s",
+        "week": "{0} week",
+        "weeks": "{0} weeks",
+        "week_short": "{0}w",
+        "weeks_short": "{0}w",
+        "year": "{0} year",
+        "years": "{0} years",
+        "year_short": "{0}y",
+        "years_short": "{0}y"
+    },
+    "timeline": {
+        "collapse": "Collapse",
+        "conversation": "Conversation",
+        "error_fetching": "Error fetching updates",
+        "load_older": "Load older statuses",
+        "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
+        "repeated": "repeated",
+        "show_new": "Show new",
+        "up_to_date": "Up-to-date",
+        "no_more_statuses": "No more statuses",
+        "no_statuses": "No statuses"
+    },
+    "status": {
+        "favorites": "Favorites",
+        "repeats": "Repeats",
+        "delete": "Delete status",
+        "pin": "Pin on profile",
+        "unpin": "Unpin from profile",
+        "pinned": "Pinned",
+        "delete_confirm": "Do you really want to delete this status?",
+        "reply_to": "Reply to",
+        "replies_list": "Replies:",
+        "mute_conversation": "Mute conversation",
+        "unmute_conversation": "Unmute conversation",
+        "status_unavailable": "Status unavailable",
+        "copy_link": "Copy link to status"
+    },
+    "user_card": {
+        "approve": "Approve",
+        "block": "Block",
+        "blocked": "Blocked!",
+        "deny": "Deny",
+        "favorites": "Favorites",
+        "follow": "Follow",
+        "follow_sent": "Request sent!",
+        "follow_progress": "Requesting…",
+        "follow_again": "Send request again?",
+        "follow_unfollow": "Unfollow",
+        "followees": "Following",
+        "followers": "Followers",
+        "following": "Following!",
+        "follows_you": "Follows you!",
+        "hidden": "Hidden",
+        "its_you": "It's you!",
+        "media": "Media",
+        "mention": "Mention",
+        "mute": "Mute",
+        "muted": "Muted",
+        "per_day": "per day",
+        "remote_follow": "Remote follow",
+        "report": "Report",
+        "statuses": "Statuses",
+        "subscribe": "Subscribe",
+        "unsubscribe": "Unsubscribe",
+        "unblock": "Unblock",
+        "unblock_progress": "Unblocking...",
+        "block_progress": "Blocking...",
+        "unmute": "Unmute",
+        "unmute_progress": "Unmuting...",
+        "mute_progress": "Muting...",
+        "hide_repeats": "Hide repeats",
+        "show_repeats": "Show repeats",
+        "admin_menu": {
+            "moderation": "Moderation",
+            "grant_admin": "Grant Admin",
+            "revoke_admin": "Revoke Admin",
+            "grant_moderator": "Grant Moderator",
+            "revoke_moderator": "Revoke Moderator",
+            "activate_account": "Activate account",
+            "deactivate_account": "Deactivate account",
+            "delete_account": "Delete account",
+            "force_nsfw": "Mark all posts as NSFW",
+            "strip_media": "Remove media from posts",
+            "force_unlisted": "Force posts to be unlisted",
+            "sandbox": "Force posts to be followers-only",
+            "disable_remote_subscription": "Disallow following user from remote instances",
+            "disable_any_subscription": "Disallow following user at all",
+            "quarantine": "Disallow user posts from federating",
+            "delete_user": "Delete user",
+            "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+        }
+    },
+    "user_profile": {
+        "timeline_title": "User Timeline",
+        "profile_does_not_exist": "Sorry, this profile does not exist.",
+        "profile_loading_error": "Sorry, there was an error loading this profile."
+    },
+    "user_reporting": {
+        "title": "Reporting {0}",
+        "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+        "additional_comments": "Additional comments",
+        "forward_description": "The account is from another server. Send a copy of the report there as well?",
+        "forward_to": "Forward to {0}",
+        "submit": "Submit",
+        "generic_error": "An error occurred while processing your request."
+    },
+    "who_to_follow": {
+        "more": "More",
+        "who_to_follow": "Who to follow"
+    },
+    "tool_tip": {
+        "media_upload": "Upload Media",
+        "repeat": "Repeat",
+        "reply": "Reply",
+        "favorite": "Favorite",
+        "add_reaction": "Add Reaction",
+        "user_settings": "User Settings",
+        "accept_follow_request": "Accept follow request",
+        "reject_follow_request": "Reject follow request"
+    },
+    "upload": {
+        "error": {
+            "base": "Upload failed.",
+            "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "Try again later"
+        },
+        "file_size_units": {
+            "B": "B",
+            "KiB": "KiB",
+            "MiB": "MiB",
+            "GiB": "GiB",
+            "TiB": "TiB"
+        }
+    },
+    "search": {
+        "people": "People",
+        "hashtags": "Hashtags",
+        "person_talking": "{count} person talking",
+        "people_talking": "{count} people talking",
+        "no_results": "No results"
+    },
+    "password_reset": {
+        "forgot_password": "Forgot password?",
+        "password_reset": "Password reset",
+        "instruction": "Enter your email address or username. We will send you a link to reset your password.",
+        "placeholder": "Your email or username",
+        "check_email": "Check your email for a link to reset your password.",
+        "return_home": "Return to the home page",
+        "not_found": "We couldn't find that email or username.",
+        "too_many_requests": "You have reached the limit of attempts, try again later.",
+        "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
+        "password_reset_required": "You must reset your password to log in.",
+        "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
     }
-  },
-  "search": {
-    "people": "People",
-    "hashtags": "Hashtags",
-    "person_talking": "{count} person talking",
-    "people_talking": "{count} people talking",
-    "no_results": "No results"
-  },
-  "password_reset": {
-    "forgot_password": "Forgot password?",
-    "password_reset": "Password reset",
-    "instruction": "Enter your email address or username. We will send you a link to reset your password.",
-    "placeholder": "Your email or username",
-    "check_email": "Check your email for a link to reset your password.",
-    "return_home": "Return to the home page",
-    "not_found": "We couldn't find that email or username.",
-    "too_many_requests": "You have reached the limit of attempts, try again later.",
-    "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
-    "password_reset_required": "You must reset your password to log in.",
-    "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
-  }
 }

From 4aaa3f87d8ed375d3ec20ad6d9867357f0e6a95c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 20 May 2020 12:16:43 -0500
Subject: [PATCH 056/415] Document the sidebarRight feature

---
 docs/CONFIGURATION.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 39a2840d..14b0428f 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -73,6 +73,9 @@ These two settings should point to where FE should redirect visitor when they lo
 ### `scopeCopy`
 Copy post scope (visibility) when replying to a post. Instance-default.
 
+### `sidebarRight`
+Change alignment of sidebar and panels to the right. Defaults to `false`.
+
 ### `showFeaturesPanel`
 Show panel showcasing instance features/settings to logged-out visitors
 

From 3cd6bc9cfb7ed29c97c3a5cdc4a35e9808a47e2e Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Thu, 14 May 2020 19:38:31 +0000
Subject: [PATCH 057/415] Translated using Weblate (Dutch)

Currently translated at 77.9% (478 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index bac7e62c..9be89109 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -580,7 +580,8 @@
         "unicode": "Unicode emoji",
         "load_all": "Alle {emojiAmount} emoji worden geladen",
         "stickers": "Stickers",
-        "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan prestatie problemen veroorzaken."
+        "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan prestatie problemen veroorzaken.",
+        "custom": "Gepersonaliseerde emoji"
     },
     "interactions": {
         "favs_repeats": "Herhalingen en Favorieten",

From 7f7919bf6ffd58fc0ed312831f25dfc5f39f18ca Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Thu, 14 May 2020 18:17:30 +0000
Subject: [PATCH 058/415] Translated using Weblate (Italian)

Currently translated at 36.2% (222 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 6fc2be74..5554620c 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -180,7 +180,16 @@
         "placeholder": "es. Lupo Lucio",
         "register": "Registrati",
         "username": "Nome utente",
-        "description": "Accedi con OAuth"
+        "description": "Accedi con OAuth",
+        "hint": "Accedi per partecipare alla discussione",
+        "authentication_code": "Codice di autenticazione",
+        "enter_recovery_code": "Inserisci un codice di recupero",
+        "enter_two_factor_code": "Inserisci un codice two-factor",
+        "recovery_code": "Codice di recupero",
+        "heading": {
+            "totp": "Autenticazione two-factor",
+            "recovery": "Recupero two-factor"
+        }
     },
     "post_status": {
         "account_not_locked_warning": "Il tuo profilo non è {0}. Chiunque può seguirti e vedere i tuoi messaggi riservati ai tuoi seguaci.",

From a62d504fabe10b8443203c84a6d7de4909dc101d Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Thu, 14 May 2020 19:51:25 +0000
Subject: [PATCH 059/415] Translated using Weblate (Dutch)

Currently translated at 78.1% (479 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 9be89109..15216244 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -90,20 +90,20 @@
             "text/bbcode": "BBCode"
         },
         "content_warning": "Onderwerp (optioneel)",
-        "default": "Tijd voor een pauze!",
+        "default": "Zojuist geland in L.A.",
         "direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
         "posting": "Plaatsen",
         "scope": {
-            "direct": "Direct - Post enkel naar genoemde gebruikers",
+            "direct": "Direct - Post enkel naar vermelde gebruikers",
             "private": "Enkel volgers - Post enkel naar volgers",
             "public": "Publiek - Post op publieke tijdlijnen",
-            "unlisted": "Unlisted - Toon niet op publieke tijdlijnen"
+            "unlisted": "Niet Vermelden - Niet tonen op publieke tijdlijnen"
         },
         "direct_warning_to_all": "Dit bericht zal zichtbaar zijn voor alle vermelde gebruikers.",
         "direct_warning_to_first_only": "Dit bericht zal alleen zichtbaar zijn voor de vermelde gebruikers aan het begin van het bericht.",
         "scope_notice": {
             "public": "Dit bericht zal voor iedereen zichtbaar zijn",
-            "unlisted": "Dit bericht zal niet zichtbaar zijn in de Publieke Tijdlijn en Het Geheel Gekende Netwerk",
+            "unlisted": "Dit bericht zal niet zichtbaar zijn in de Publieke Tijdlijn en Het Geheel Bekende Netwerk",
             "private": "Dit bericht zal voor alleen je volgers zichtbaar zijn"
         }
     },
@@ -113,7 +113,7 @@
         "fullname": "Weergave naam",
         "password_confirm": "Wachtwoord bevestiging",
         "registration": "Registratie",
-        "token": "Uitnodigingstoken",
+        "token": "Uitnodigings-token",
         "captcha": "CAPTCHA",
         "new_captcha": "Klik op de afbeelding voor een nieuwe captcha",
         "validations": {
@@ -131,37 +131,37 @@
     "settings": {
         "attachmentRadius": "Bijlages",
         "attachments": "Bijlages",
-        "autoload": "Automatisch laden wanneer tot de bodem gescrold inschakelen",
+        "autoload": "Automatisch laden inschakelen wanneer tot de bodem gescrold wordt",
         "avatar": "Avatar",
         "avatarAltRadius": "Avatars (Meldingen)",
         "avatarRadius": "Avatars",
         "background": "Achtergrond",
         "bio": "Bio",
         "btnRadius": "Knoppen",
-        "cBlue": "Blauw (Antwoord, volgen)",
-        "cGreen": "Groen (Herhaal)",
-        "cOrange": "Oranje (Vind ik leuk)",
-        "cRed": "Rood (Annuleer)",
-        "change_password": "Verander Wachtwoord",
-        "change_password_error": "Er was een probleem bij het aanpassen van je wachtwoord.",
-        "changed_password": "Wachtwoord succesvol aangepast!",
-        "collapse_subject": "Klap posts met onderwerp in",
-        "composing": "Samenstellen",
-        "confirm_new_password": "Bevestig nieuw wachtwoord",
+        "cBlue": "Blauw (Beantwoorden, volgen)",
+        "cGreen": "Groen (Herhalen)",
+        "cOrange": "Oranje (Favoriet)",
+        "cRed": "Rood (Annuleren)",
+        "change_password": "Wachtwoord Wijzigen",
+        "change_password_error": "Er is een fout opgetreden bij het wijzigen van je wachtwoord.",
+        "changed_password": "Wachtwoord succesvol gewijzigd!",
+        "collapse_subject": "Klap berichten met een onderwerp in",
+        "composing": "Opstellen",
+        "confirm_new_password": "Nieuw wachtwoord bevestigen",
         "current_avatar": "Je huidige avatar",
         "current_password": "Huidig wachtwoord",
         "current_profile_banner": "Je huidige profiel banner",
         "data_import_export_tab": "Data Import / Export",
-        "default_vis": "Standaard zichtbaarheidsscope",
-        "delete_account": "Verwijder Account",
-        "delete_account_description": "Verwijder je account en berichten permanent.",
-        "delete_account_error": "Er was een probleem bij het verwijderen van je account. Indien dit probleem blijft, gelieve de administratie van deze instantie te verwittigen.",
-        "delete_account_instructions": "Typ je wachtwoord in de input hieronder om het verwijderen van je account te bevestigen.",
-        "export_theme": "Sla preset op",
+        "default_vis": "Standaard zichtbaarheidsbereik",
+        "delete_account": "Account Verwijderen",
+        "delete_account_description": "Permanent je account en al je berichten verwijderen.",
+        "delete_account_error": "Er is een fout opgetreden bij het verwijderen van je account. Indien dit probleem zich voor blijft doen, neem dan contact op met de beheerder van deze instantie.",
+        "delete_account_instructions": "Voer je wachtwoord in het onderstaande invoerveld in om het verwijderen van je account te bevestigen.",
+        "export_theme": "Preset opslaan",
         "filtering": "Filtering",
-        "filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn.",
+        "filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn",
         "follow_export": "Volgers exporteren",
-        "follow_export_button": "Exporteer je volgers naar een csv file",
+        "follow_export_button": "Exporteer je volgers naar een csv bestand",
         "follow_export_processing": "Aan het verwerken, binnen enkele ogenblikken wordt je gevraagd je bestand te downloaden",
         "follow_import": "Volgers importeren",
         "follow_import_error": "Fout bij importeren volgers",
@@ -171,91 +171,91 @@
         "hide_attachments_in_convo": "Verberg bijlages in conversaties",
         "hide_attachments_in_tl": "Verberg bijlages in de tijdlijn",
         "hide_isp": "Verberg instantie-specifiek paneel",
-        "preload_images": "Afbeeldingen voorladen",
-        "hide_post_stats": "Verberg post statistieken (bv. het aantal vind-ik-leuks)",
-        "hide_user_stats": "Verberg post statistieken (bv. het aantal volgers)",
-        "import_followers_from_a_csv_file": "Importeer volgers uit een csv file",
-        "import_theme": "Laad preset",
-        "inputRadius": "Invoer velden",
+        "preload_images": "Afbeeldingen vooraf laden",
+        "hide_post_stats": "Verberg bericht statistieken (bijv. het aantal favorieten)",
+        "hide_user_stats": "Verberg bericht statistieken (bijv. het aantal volgers)",
+        "import_followers_from_a_csv_file": "Importeer volgers uit een csv bestand",
+        "import_theme": "Preset laden",
+        "inputRadius": "Invoervelden",
         "checkboxRadius": "Checkboxen",
         "instance_default": "(standaard: {value})",
         "instance_default_simple": "(standaard)",
         "interface": "Interface",
         "interfaceLanguage": "Interface taal",
-        "invalid_theme_imported": "Het geselecteerde thema is geen door Pleroma ondersteund thema. Er zijn geen aanpassingen gedaan.",
-        "limited_availability": "Onbeschikbaar in je browser",
+        "invalid_theme_imported": "Het geselecteerde bestand is geen door Pleroma ondersteund thema. Er zijn geen aanpassingen gedaan.",
+        "limited_availability": "Niet beschikbaar in je browser",
         "links": "Links",
         "lock_account_description": "Laat volgers enkel toe na expliciete toestemming",
-        "loop_video": "Speel videos af in een lus",
-        "loop_video_silent_only": "Speel enkel videos zonder geluid af in een lus (bv. Mastodon's \"gifs\")",
+        "loop_video": "Herhaal video's",
+        "loop_video_silent_only": "Herhaal enkel video's zonder geluid (bijv. Mastodon's \"gifs\")",
         "name": "Naam",
         "name_bio": "Naam & Bio",
         "new_password": "Nieuw wachtwoord",
         "notification_visibility": "Type meldingen die getoond worden",
-        "notification_visibility_follows": "Volgers",
+        "notification_visibility_follows": "Volgingen",
         "notification_visibility_likes": "Vind-ik-leuks",
         "notification_visibility_mentions": "Vermeldingen",
         "notification_visibility_repeats": "Herhalingen",
-        "no_rich_text_description": "Strip rich text formattering van alle posts",
+        "no_rich_text_description": "Verwijder rich text formattering van alle berichten",
         "hide_network_description": "Toon niet wie mij volgt en wie ik volg.",
-        "nsfw_clickthrough": "Schakel doorklikbaar verbergen van NSFW bijlages in",
+        "nsfw_clickthrough": "Doorklikbaar verbergen van gevoelige bijlages inschakelen",
         "oauth_tokens": "OAuth-tokens",
         "token": "Token",
-        "refresh_token": "Token vernieuwen",
+        "refresh_token": "Token Vernieuwen",
         "valid_until": "Geldig tot",
         "revoke_token": "Intrekken",
         "panelRadius": "Panelen",
-        "pause_on_unfocused": "Pauzeer streamen wanneer de tab niet gefocused is",
+        "pause_on_unfocused": "Streamen pauzeren wanneer de tab niet in focus is",
         "presets": "Presets",
         "profile_background": "Profiel Achtergrond",
         "profile_banner": "Profiel Banner",
         "profile_tab": "Profiel",
         "radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
         "replies_in_timeline": "Antwoorden in tijdlijn",
-        "reply_link_preview": "Schakel antwoordlink preview in bij over zweven met muisaanwijzer",
-        "reply_visibility_all": "Toon alle antwoorden",
-        "reply_visibility_following": "Toon enkel antwoorden naar mij of andere gebruikers gericht",
-        "reply_visibility_self": "Toon enkel antwoorden naar mij gericht",
+        "reply_link_preview": "Antwoord-link weergave inschakelen bij aanwijzen met muisaanwijzer",
+        "reply_visibility_all": "Alle antwoorden tonen",
+        "reply_visibility_following": "Enkel antwoorden tonen die aan mij of gevolgde gebruikers gericht zijn",
+        "reply_visibility_self": "Enkel antwoorden tonen die aan mij gericht zijn",
         "saving_err": "Fout tijdens opslaan van instellingen",
         "saving_ok": "Instellingen opgeslagen",
-        "security_tab": "Veiligheid",
-        "scope_copy": "Neem scope over bij antwoorden (Directe Berichten blijven altijd Direct)",
-        "set_new_avatar": "Zet nieuwe avatar",
-        "set_new_profile_background": "Zet nieuwe profiel achtergrond",
-        "set_new_profile_banner": "Zet nieuwe profiel banner",
+        "security_tab": "Beveiliging",
+        "scope_copy": "Neem bereik over bij beantwoorden (Directe Berichten blijven altijd Direct)",
+        "set_new_avatar": "Nieuwe avatar instellen",
+        "set_new_profile_background": "Nieuwe profiel achtergrond instellen",
+        "set_new_profile_banner": "Nieuwe profiel banner instellen",
         "settings": "Instellingen",
-        "subject_input_always_show": "Maak onderwerpveld altijd zichtbaar",
-        "subject_line_behavior": "Kopieer onderwerp bij antwoorden",
+        "subject_input_always_show": "Altijd onderwerpveld tonen",
+        "subject_line_behavior": "Onderwerp kopiëren bij antwoorden",
         "subject_line_email": "Zoals email: \"re: onderwerp\"",
-        "subject_line_mastodon": "Zoals Mastodon: kopieer zoals het is",
-        "subject_line_noop": "Kopieer niet",
-        "stop_gifs": "Speel GIFs af bij zweven",
-        "streaming": "Schakel automatisch streamen van posts in wanneer tot boven gescrold.",
+        "subject_line_mastodon": "Zoals mastodon: kopieer zoals het is",
+        "subject_line_noop": "Niet kopiëren",
+        "stop_gifs": "GIFs afspelen bij zweven",
+        "streaming": "Automatisch streamen van nieuwe berichten inschakelen wanneer tot boven gescrold is",
         "text": "Tekst",
         "theme": "Thema",
         "theme_help": "Gebruik hex color codes (#rrggbb) om je kleurschema te wijzigen.",
-        "theme_help_v2_1": "Je kan ook de kleur en transparantie van bepaalde componenten overschrijven door de checkbox aan te vinken, gebruik de \"Wis alles\" knop om alle overschrijvingen te annuleren.",
-        "theme_help_v2_2": "Iconen onder sommige items zijn achtergrond/tekst contrast indicators, zweef er over voor gedetailleerde info. Hou er rekening mee dat bij doorzichtigheid de ergst mogelijke situatie wordt weer gegeven.",
-        "tooltipRadius": "Gereedschapstips/alarmen",
-        "user_settings": "Gebruikers Instellingen",
+        "theme_help_v2_1": "Je kan ook de kleur en transparantie van bepaalde componenten overschrijven door de checkbox aan te vinken, gebruik de \"Alles wissen\" knop om alle overschrijvingen te annuleren.",
+        "theme_help_v2_2": "Iconen onder sommige onderdelen zijn achtergrond/tekst contrast indicatoren, zweef er over voor gedetailleerde info. Hou er rekening mee dat bij doorzichtigheid de ergst mogelijke situatie wordt weer gegeven.",
+        "tooltipRadius": "Tooltips/alarmen",
+        "user_settings": "Gebruikersinstellingen",
         "values": {
             "false": "nee",
             "true": "ja"
         },
         "notifications": "Meldingen",
-        "enable_web_push_notifications": "Schakel web push meldingen in",
+        "enable_web_push_notifications": "Web push meldingen inschakelen",
         "style": {
             "switcher": {
-                "keep_color": "Behoud kleuren",
-                "keep_shadows": "Behoud schaduwen",
-                "keep_opacity": "Behoud transparantie",
-                "keep_roundness": "Behoud afrondingen",
-                "keep_fonts": "Behoud lettertypes",
+                "keep_color": "Kleuren behouden",
+                "keep_shadows": "Schaduwen behouden",
+                "keep_opacity": "Transparantie behouden",
+                "keep_roundness": "Rondingen behouden",
+                "keep_fonts": "Lettertypes behouden",
                 "save_load_hint": "\"Behoud\" opties behouden de momenteel ingestelde opties bij het selecteren of laden van thema's, maar slaan ook de genoemde opties op bij het exporteren van een thema. Wanneer alle selectievakjes zijn uitgeschakeld, zal het exporteren van thema's alles opslaan.",
                 "reset": "Reset",
-                "clear_all": "Wis alles",
-                "clear_opacity": "Wis transparantie",
-                "keep_as_is": "Houdt zoals het is",
+                "clear_all": "Alles wissen",
+                "clear_opacity": "Transparantie wissen",
+                "keep_as_is": "Hou zoals het is",
                 "use_snapshot": "Oude versie",
                 "use_source": "Nieuwe versie",
                 "help": {
@@ -367,8 +367,8 @@
         "notification_setting_non_follows": "Gebruikers die je niet volgt",
         "notification_setting_followers": "Gebruikers die je volgen",
         "notification_setting_privacy": "Privacy",
-        "notification_setting_privacy_option": "Verberg de afzender en inhoud van push notificaties",
-        "notification_mutes": "Om niet langer notificaties te ontvangen van een specifieke gebruiker, kun je deze dempen.",
+        "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
+        "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
         "app_name": "App naam",
         "security": "Beveiliging",
         "enter_current_password_to_confirm": "Voer je huidige wachtwoord in om je identiteit te bevestigen",
@@ -393,57 +393,57 @@
             "warning_of_generate_new_codes": "Wanneer je nieuwe herstelcodes genereert, zullen je oude code niet langer werken.",
             "recovery_codes_warning": "Schrijf de codes op of sla ze op een veilige locatie op - anders kun je ze niet meer inzien. Als je toegang tot je 2FA app en herstelcodes verliest, zal je buitengesloten zijn uit je account."
         },
-        "allow_following_move": "Auto-volgen toestaan wanneer een gevolgd account migreert",
-        "block_export": "Geblokkeerde gebruikers exporteren",
-        "block_import": "Geblokkeerde gebruikers importeren",
-        "blocks_imported": "Geblokkeerde gebruikers geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
-        "blocks_tab": "Geblokkeerde gebruikers",
+        "allow_following_move": "Automatisch volgen toestaan wanneer een gevolgd account migreert",
+        "block_export": "Blokkades exporteren",
+        "block_import": "Blokkades importeren",
+        "blocks_imported": "Blokkades geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
+        "blocks_tab": "Blokkades",
         "change_email": "Email wijzigen",
-        "change_email_error": "Er is een probleem opgetreden tijdens het wijzigen van je email.",
+        "change_email_error": "Er is een fout opgetreden tijdens het wijzigen van je email.",
         "changed_email": "Email succesvol gewijzigd!",
         "domain_mutes": "Domeinen",
         "avatar_size_instruction": "De aangeraden minimale afmeting voor avatar afbeeldingen is 150x150 pixels.",
-        "pad_emoji": "Vul emoji op met spaties wanneer deze met de picker ingevoegd worden",
+        "pad_emoji": "Vul emoji aan met spaties wanneer deze met de picker ingevoegd worden",
         "emoji_reactions_on_timeline": "Toon emoji reacties op de tijdlijn",
         "accent": "Accent",
-        "hide_muted_posts": "Verberg berichten van gedempte gebruikers",
+        "hide_muted_posts": "Verberg berichten van genegeerde gebruikers",
         "max_thumbnails": "Maximaal aantal miniaturen per bericht",
         "use_one_click_nsfw": "Open gevoelige bijlagen met slechts één klik",
-        "hide_filtered_statuses": "Verberg gefilterde statussen",
-        "import_blocks_from_a_csv_file": "Importeer geblokkeerde gebruikers van een csv bestand",
-        "mutes_tab": "Gedempte gebruikers",
+        "hide_filtered_statuses": "Gefilterde statussen verbergen",
+        "import_blocks_from_a_csv_file": "Importeer blokkades van een csv bestand",
+        "mutes_tab": "Negeringen",
         "play_videos_in_modal": "Speel video's af in een popup frame",
         "new_email": "Nieuwe Email",
         "notification_visibility_emoji_reactions": "Reacties",
-        "no_blocks": "Geen geblokkeerde gebruikers",
-        "no_mutes": "Geen gedempte gebruikers",
+        "no_blocks": "Geen blokkades",
+        "no_mutes": "Geen negeringen",
         "hide_followers_description": "Niet tonen wie mij volgt",
         "hide_followers_count_description": "Niet mijn volgers aantal tonen",
         "hide_follows_count_description": "Niet mijn gevolgde aantal tonen",
-        "show_admin_badge": "Admin badge tonen in mijn profiel",
+        "show_admin_badge": "Beheerders badge tonen in mijn profiel",
         "autohide_floating_post_button": "Nieuw Bericht knop automatisch verbergen (mobiel)",
         "search_user_to_block": "Zoek wie je wilt blokkeren",
-        "search_user_to_mute": "Zoek wie je wilt dempen",
+        "search_user_to_mute": "Zoek wie je wilt negeren",
         "minimal_scopes_mode": "Bericht bereik-opties minimaliseren",
         "post_status_content_type": "Bericht status content type",
         "user_mutes": "Gebruikers",
-        "useStreamingApi": "Berichten en notificatie in real-time ontvangen",
+        "useStreamingApi": "Berichten en meldingen in real-time ontvangen",
         "useStreamingApiWarning": "(Afgeraden, experimenteel, kan berichten overslaan)",
-        "type_domains_to_mute": "Voer domeinen in om te dempen",
+        "type_domains_to_mute": "Voer domeinen in om te negeren",
         "upload_a_photo": "Upload een foto",
         "fun": "Plezier",
         "greentext": "Meme pijlen",
-        "notification_setting": "Ontvang notificaties van:",
+        "notification_setting": "Ontvang meldingen van:",
         "block_export_button": "Exporteer je geblokkeerde gebruikers naar een csv bestand",
-        "block_import_error": "Fout bij importeren geblokkeerde gebruikers",
+        "block_import_error": "Fout bij importeren blokkades",
         "discoverable": "Sta toe dat dit account ontdekt kan worden in zoekresultaten en andere diensten",
-        "use_contain_fit": "Bijlage in miniaturen niet bijsnijden",
+        "use_contain_fit": "Snij bijlage in miniaturen niet bij",
         "notification_visibility_moves": "Gebruiker Migraties",
         "hide_follows_description": "Niet tonen wie ik volg",
-        "show_moderator_badge": "Moderator badge tonen in mijn profiel",
+        "show_moderator_badge": "Moderators badge tonen in mijn profiel",
         "notification_setting_filters": "Filters",
         "notification_setting_non_followers": "Gebruikers die je niet volgen",
-        "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen notificaties meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven."
+        "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven."
     },
     "timeline": {
         "collapse": "Inklappen",

From 00b4b1f4f62276b94b578db1b0d25bfe23b7f779 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Thu, 14 May 2020 19:53:48 +0000
Subject: [PATCH 060/415] Translated using Weblate (Italian)

Currently translated at 40.6% (249 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 5554620c..d4c4cb74 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -20,7 +20,16 @@
         "timeline": "Sequenza personale",
         "twkn": "Sequenza globale",
         "chat": "Chat della stanza",
-        "friend_requests": "Vogliono seguirti"
+        "friend_requests": "Vogliono seguirti",
+        "about": "Informazioni",
+        "administration": "Amministrazione",
+        "back": "Indietro",
+        "interactions": "Interazioni",
+        "dms": "Messaggi diretti",
+        "user_search": "Ricerca utenti",
+        "search": "Ricerca",
+        "who_to_follow": "Chi seguire",
+        "preferences": "Preferenze"
     },
     "notifications": {
         "followed_you": "ti segue",
@@ -29,7 +38,11 @@
         "broken_favorite": "Stato sconosciuto, lo sto cercando...",
         "favorited_you": "ha gradito il tuo messaggio",
         "load_older": "Carica notifiche precedenti",
-        "repeated_you": "ha condiviso il tuo messaggio"
+        "repeated_you": "ha condiviso il tuo messaggio",
+        "follow_request": "vuole seguirti",
+        "no_more_notifications": "Fine delle notifiche",
+        "migrated_to": "è migrato verso",
+        "reacted_with": "ha reagito con"
     },
     "settings": {
         "attachments": "Allegati",
@@ -274,5 +287,23 @@
         "submit": "Invia",
         "success": "Importato.",
         "error": "L'importazione non è andata a buon fine."
+    },
+    "media_modal": {
+        "previous": "Precedente",
+        "next": "Prossimo"
+    },
+    "polls": {
+        "add_poll": "Sondaggio",
+        "add_option": "Alternativa",
+        "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",
+        "not_enough_options": "Aggiungi altre risposte"
     }
 }

From b994bde3e21e69bf5a32576779496e6f38251252 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:20:46 +0000
Subject: [PATCH 061/415] Translated using Weblate (German)

Currently translated at 68.3% (419 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 4037b4b3..e242f364 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -84,7 +84,10 @@
         "account_not_locked_warning_link": "gesperrt",
         "attachments_sensitive": "Anhänge als heikel markieren",
         "content_type": {
-            "text/plain": "Nur Text"
+            "text/plain": "Nur Text",
+            "text/bbcode": "BBCode",
+            "text/markdown": "Markdown",
+            "text/html": "HTML"
         },
         "content_warning": "Betreff (optional)",
         "default": "Sitze gerade im Hofbräuhaus.",
@@ -95,7 +98,8 @@
             "private": "Nur Follower - Beitrag nur für Follower sichtbar",
             "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
             "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
-        }
+        },
+        "direct_warning_to_all": "Dieser Post wird für alle erwähnten User sichtbar sein."
     },
     "registration": {
         "bio": "Bio",
@@ -511,6 +515,14 @@
         "search_emoji": "Nach einem Emoji suchen",
         "custom": "Benutzerdefinierter Emoji",
         "keep_open": "Auswahlfenster offen halten",
-        "add_emoji": "Emoji einfügen"
+        "add_emoji": "Emoji einfügen",
+        "load_all": "Lade alle {emojiAmount} Emoji",
+        "load_all_hint": "Erfolgreich erste {saneAmount} Emoji geladen, alle Emojis zu laden würde Leistungsprobleme hervorrufen.",
+        "unicode": "Unicode Emoji"
+    },
+    "interactions": {
+        "load_older": "Lade ältere Interaktionen",
+        "follows": "Neue Follows",
+        "favs_repeats": "Wiederholungen und Favoriten"
     }
 }

From 9e306efe2edb104a74a0543feb61697659330266 Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:24:51 +0000
Subject: [PATCH 062/415] Translated using Weblate (German)

Currently translated at 68.3% (419 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index e242f364..6359b608 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -523,6 +523,7 @@
     "interactions": {
         "load_older": "Lade ältere Interaktionen",
         "follows": "Neue Follows",
-        "favs_repeats": "Wiederholungen und Favoriten"
+        "favs_repeats": "Wiederholungen und Favoriten",
+        "moves": "Benutzer migriert zu"
     }
 }

From ab4790034bbd452f3e5408d1e5f2814af30c262b Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:27:02 +0000
Subject: [PATCH 063/415] Translated using Weblate (German)

Currently translated at 68.5% (420 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 6359b608..c68edb43 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -99,7 +99,7 @@
             "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
             "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
         },
-        "direct_warning_to_all": "Dieser Post wird für alle erwähnten User sichtbar sein."
+        "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein."
     },
     "registration": {
         "bio": "Bio",

From 9374002de09fcfb23fb8fb1ba7684d0a1d8f0254 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:27:09 +0000
Subject: [PATCH 064/415] Translated using Weblate (German)

Currently translated at 68.5% (420 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index c68edb43..ea5dfb91 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -99,7 +99,8 @@
             "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
             "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
         },
-        "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein."
+        "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
+        "direct_warning_to_first_only": "Dieser Post wird für alle User, die am Anfang der Nachricht erwähnt wurden, sichtbar sein."
     },
     "registration": {
         "bio": "Bio",

From 14ac5a5fdb706174b9a4611bb1414106af79fc82 Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:27:26 +0000
Subject: [PATCH 065/415] Translated using Weblate (German)

Currently translated at 68.6% (421 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index ea5dfb91..9688695f 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -100,7 +100,7 @@
             "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
         },
         "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
-        "direct_warning_to_first_only": "Dieser Post wird für alle User, die am Anfang der Nachricht erwähnt wurden, sichtbar sein."
+        "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein."
     },
     "registration": {
         "bio": "Bio",

From f22d3c18cfaf587c8014e8718e8bdcbb4d14a7b0 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:27:57 +0000
Subject: [PATCH 066/415] Translated using Weblate (German)

Currently translated at 68.6% (421 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 9688695f..1a60505e 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -100,7 +100,10 @@
             "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
         },
         "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
-        "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein."
+        "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
+        "scope_notice": {
+            "public": "Dieser Post wird für alle sichtbar sein"
+        }
     },
     "registration": {
         "bio": "Bio",

From f91bb4dc7cfa32c06711fc1ca0f38b30712f7fb5 Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:28:07 +0000
Subject: [PATCH 067/415] Translated using Weblate (German)

Currently translated at 68.8% (422 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 1a60505e..1344ed1b 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -102,7 +102,7 @@
         "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
         "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
         "scope_notice": {
-            "public": "Dieser Post wird für alle sichtbar sein"
+            "public": "Dieser Beitrag wird für alle sichtbar sein"
         }
     },
     "registration": {

From 1179a6687a87f57018eebbebda7568efbe9326bd Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:28:12 +0000
Subject: [PATCH 068/415] Translated using Weblate (German)

Currently translated at 68.8% (422 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 1344ed1b..f0f4cbaa 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -102,7 +102,8 @@
         "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
         "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
         "scope_notice": {
-            "public": "Dieser Beitrag wird für alle sichtbar sein"
+            "public": "Dieser Beitrag wird für alle sichtbar sein",
+            "private": "Dieser Post wird nur für deine Follower sichtbar sein"
         }
     },
     "registration": {

From 9e43a83c487d7182da15992142ede01612e9832a Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:28:22 +0000
Subject: [PATCH 069/415] Translated using Weblate (German)

Currently translated at 69.0% (423 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index f0f4cbaa..f0b715aa 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -103,7 +103,7 @@
         "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
         "scope_notice": {
             "public": "Dieser Beitrag wird für alle sichtbar sein",
-            "private": "Dieser Post wird nur für deine Follower sichtbar sein"
+            "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein"
         }
     },
     "registration": {

From e7fd793438b87674d6d27ed5e6446b08d3f2aef8 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:28:34 +0000
Subject: [PATCH 070/415] Translated using Weblate (German)

Currently translated at 69.0% (423 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index f0b715aa..71f4eb49 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -103,7 +103,8 @@
         "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
         "scope_notice": {
             "public": "Dieser Beitrag wird für alle sichtbar sein",
-            "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein"
+            "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein",
+            "unlisted": "Dieser Post wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
         }
     },
     "registration": {

From f141fa2a6609cdea0ea22b0b83fe2563de0d1006 Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:28:45 +0000
Subject: [PATCH 071/415] Translated using Weblate (German)

Currently translated at 70.3% (431 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 71f4eb49..eaf7bef1 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -104,7 +104,7 @@
         "scope_notice": {
             "public": "Dieser Beitrag wird für alle sichtbar sein",
             "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein",
-            "unlisted": "Dieser Post wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
+            "unlisted": "Dieser Beitrag wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
         }
     },
     "registration": {
@@ -531,5 +531,8 @@
         "follows": "Neue Follows",
         "favs_repeats": "Wiederholungen und Favoriten",
         "moves": "Benutzer migriert zu"
+    },
+    "selectable_list": {
+        "select_all": "Alle auswählen"
     }
 }

From 7bd0f1a5f10db69bebb98ea991e051bce62183b6 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:28:54 +0000
Subject: [PATCH 072/415] Translated using Weblate (German)

Currently translated at 70.3% (431 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index eaf7bef1..ee09f1f3 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -123,7 +123,10 @@
             "password_required": "darf nicht leer sein",
             "password_confirmation_required": "darf nicht leer sein",
             "password_confirmation_match": "sollte mit dem Passwort identisch sein."
-        }
+        },
+        "bio_placeholder": "z.B.\nHallo, ich bin Lain.\nIch bin ein Anime Mödchen aus dem vorstädtischen Japan. Du kennst mich vielleicht vom Wired.",
+        "fullname_placeholder": "z.B. Lain Iwakura",
+        "username_placeholder": "z.B. lain"
     },
     "settings": {
         "attachmentRadius": "Anhänge",
@@ -365,7 +368,13 @@
                 "checkbox": "Ich habe die Allgemeinen Geschäftsbedingungen überflogen",
                 "link": "ein netter kleiner Link"
             }
-        }
+        },
+        "app_name": "Anwendungsname",
+        "mfa": {
+            "otp": "OTP"
+        },
+        "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
+        "security": "Sicherheit"
     },
     "timeline": {
         "collapse": "Einklappen",

From c1834b31569aa67f4dfa0a2680b2f8e76c484285 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:31:31 +0000
Subject: [PATCH 073/415] Translated using Weblate (German)

Currently translated at 71.2% (437 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index ee09f1f3..e14492d0 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -371,7 +371,12 @@
         },
         "app_name": "Anwendungsname",
         "mfa": {
-            "otp": "OTP"
+            "otp": "OTP",
+            "recovery_codes_warning": "Schreibe dir die Codes auf oder speichere sie an einem sicheren Ort - ansonsten wirst du sie nicht wieder finden. Wenn du den Zugriff zu deiner 2FA App und die Wiederherstellungs-Codes verlierst, wirst du aus deinem Account ausgeschlossen sein.",
+            "recovery_codes": "Wiederherstellungs-Codes.",
+            "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
+            "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
+            "title": "Zwei-Faktor Authentifizierung"
         },
         "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
         "security": "Sicherheit"

From 495b3d819cae106462e1d7af16efea2758db8f26 Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:33:16 +0000
Subject: [PATCH 074/415] Translated using Weblate (German)

Currently translated at 71.2% (437 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index e14492d0..a34c604b 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -376,7 +376,8 @@
             "recovery_codes": "Wiederherstellungs-Codes.",
             "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
             "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
-            "title": "Zwei-Faktor Authentifizierung"
+            "title": "Zwei-Faktor Authentifizierung",
+            "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes..."
         },
         "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
         "security": "Sicherheit"

From 9202eeef4b10c935b511a53abbd596b89f581f7b Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:34:19 +0000
Subject: [PATCH 075/415] Translated using Weblate (German)

Currently translated at 71.4% (438 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index a34c604b..884e31d1 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -372,7 +372,7 @@
         "app_name": "Anwendungsname",
         "mfa": {
             "otp": "OTP",
-            "recovery_codes_warning": "Schreibe dir die Codes auf oder speichere sie an einem sicheren Ort - ansonsten wirst du sie nicht wieder finden. Wenn du den Zugriff zu deiner 2FA App und die Wiederherstellungs-Codes verlierst, wirst du aus deinem Account ausgeschlossen sein.",
+            "recovery_codes_warning": "Schreibe dir die Codes auf oder speichere sie an einem sicheren Ort - ansonsten wirst du sie nicht wiederfinden. Wenn du den Zugriff zu deiner 2FA App und die Wiederherstellungs-Codes verlierst, wirst du aus deinem Account ausgeschlossen sein.",
             "recovery_codes": "Wiederherstellungs-Codes.",
             "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
             "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",

From c8cf939cddbb173be67544025b53e24b7abd8376 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:34:35 +0000
Subject: [PATCH 076/415] Translated using Weblate (German)

Currently translated at 71.4% (438 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 884e31d1..b50bd72a 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -377,7 +377,8 @@
             "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
             "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
             "title": "Zwei-Faktor Authentifizierung",
-            "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes..."
+            "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes...",
+            "authentication_methods": "Authentifizierungs-Methoden"
         },
         "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
         "security": "Sicherheit"

From 53b2ae0f73a40fb7dbe2522edbd78e6b2d7349e9 Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:34:42 +0000
Subject: [PATCH 077/415] Translated using Weblate (German)

Currently translated at 73.0% (448 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index b50bd72a..979566d6 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -378,10 +378,14 @@
             "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
             "title": "Zwei-Faktor Authentifizierung",
             "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes...",
-            "authentication_methods": "Authentifizierungs-Methoden"
+            "authentication_methods": "Authentifizierungsmethoden",
+            "scan": {
+                "title": "Scan"
+            }
         },
         "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
-        "security": "Sicherheit"
+        "security": "Sicherheit",
+        "allow_following_move": "Erlaube automatisches Folgen, sobald ein gefolgter Nutzer umzieht"
     },
     "timeline": {
         "collapse": "Einklappen",

From 3e260661d0cdbaaaeda8c3fa33756c4e2e9ccc0d Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:37:01 +0000
Subject: [PATCH 078/415] Translated using Weblate (German)

Currently translated at 73.0% (448 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 979566d6..ce7c13c5 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -380,12 +380,22 @@
             "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes...",
             "authentication_methods": "Authentifizierungsmethoden",
             "scan": {
-                "title": "Scan"
+                "title": "Scan",
+                "secret_code": "Schlüssel",
+                "desc": "Wenn du deine 2FA App verwendest, scanne diesen QR Code oder gebe den Schlüssel ein:"
+            },
+            "verify": {
+                "desc": "Um 2FA zu aktivieren, gib den Code von deiner 2FA-App ein:"
             }
         },
         "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
         "security": "Sicherheit",
-        "allow_following_move": "Erlaube automatisches Folgen, sobald ein gefolgter Nutzer umzieht"
+        "allow_following_move": "Erlaube automatisches Folgen, sobald ein gefolgter Nutzer umzieht",
+        "blocks_imported": "Blocks importiert! Die Verarbeitung wird eine kurze Weile brauchen.",
+        "block_import_error": "Fehler beim Importieren der Blocks",
+        "block_import": "Block Import",
+        "block_export_button": "Exportiere deine Blocks in eine csv Datei",
+        "block_export": "Block Export"
     },
     "timeline": {
         "collapse": "Einklappen",

From 9ede7db8dfe773af93dbfcf82a889f6de63b92ae Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:40:50 +0000
Subject: [PATCH 079/415] Translated using Weblate (German)

Currently translated at 74.0% (454 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index ce7c13c5..644682db 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -138,7 +138,7 @@
         "background": "Hintergrund",
         "bio": "Bio",
         "btnRadius": "Buttons",
-        "cBlue": "Blau (Antworten, Folgt dir)",
+        "cBlue": "Blau (Antworten, folgt dir)",
         "cGreen": "Grün (Retweet)",
         "cOrange": "Orange (Favorisieren)",
         "cRed": "Rot (Abbrechen)",
@@ -154,10 +154,10 @@
         "data_import_export_tab": "Datenimport/-export",
         "default_vis": "Standard-Sichtbarkeitsumfang",
         "delete_account": "Account löschen",
-        "delete_account_description": "Lösche deinen Account und alle deine Nachrichten unwiderruflich.",
+        "delete_account_description": "Lösche deine Daten und deaktiviere deinen Account unwiderruflich.",
         "delete_account_error": "Es ist ein Fehler beim Löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.",
         "delete_account_instructions": "Tippe dein Passwort unten in das Feld ein, um die Löschung deines Accounts zu bestätigen.",
-        "discoverable": "Erlaubnis für automatisches Suchen nach diesem Account",
+        "discoverable": "Erlaube, dass dieser Account in Suchergebnissen auftaucht",
         "avatar_size_instruction": "Die empfohlene minimale Größe für Avatare ist 150x150 Pixel.",
         "pad_emoji": "Emojis mit Leerzeichen umrahmen",
         "export_theme": "Farbschema speichern",
@@ -391,7 +391,7 @@
         "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
         "security": "Sicherheit",
         "allow_following_move": "Erlaube automatisches Folgen, sobald ein gefolgter Nutzer umzieht",
-        "blocks_imported": "Blocks importiert! Die Verarbeitung wird eine kurze Weile brauchen.",
+        "blocks_imported": "Blocks importiert! Die Verarbeitung wird einen Moment brauchen.",
         "block_import_error": "Fehler beim Importieren der Blocks",
         "block_import": "Block Import",
         "block_export_button": "Exportiere deine Blocks in eine csv Datei",

From 91da315af9409c45bd6bea069ba9b32f8200decd Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:42:50 +0000
Subject: [PATCH 080/415] Translated using Weblate (German)

Currently translated at 74.0% (454 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 644682db..71e1fd0a 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -395,7 +395,12 @@
         "block_import_error": "Fehler beim Importieren der Blocks",
         "block_import": "Block Import",
         "block_export_button": "Exportiere deine Blocks in eine csv Datei",
-        "block_export": "Block Export"
+        "block_export": "Block Export",
+        "emoji_reactions_on_timeline": "Zeige Emoji Reaktionen auf der Zeitleiste",
+        "domain_mutes": "Domains",
+        "changed_email": "Email Adresse erfolgreich geändert!",
+        "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
+        "change_email": "Ändere Email"
     },
     "timeline": {
         "collapse": "Einklappen",

From 1478ff7fc768d5677ee6f43d6903df818160f0b2 Mon Sep 17 00:00:00 2001
From: Toromino <mail@dennisbuchholz.net>
Date: Fri, 15 May 2020 09:48:15 +0000
Subject: [PATCH 081/415] Translated using Weblate (German)

Currently translated at 75.2% (461 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 71e1fd0a..5490f710 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -122,7 +122,7 @@
             "email_required": "darf nicht leer sein",
             "password_required": "darf nicht leer sein",
             "password_confirmation_required": "darf nicht leer sein",
-            "password_confirmation_match": "sollte mit dem Passwort identisch sein."
+            "password_confirmation_match": "sollte mit dem Passwort identisch sein"
         },
         "bio_placeholder": "z.B.\nHallo, ich bin Lain.\nIch bin ein Anime Mödchen aus dem vorstädtischen Japan. Du kennst mich vielleicht vom Wired.",
         "fullname_placeholder": "z.B. Lain Iwakura",
@@ -162,13 +162,13 @@
         "pad_emoji": "Emojis mit Leerzeichen umrahmen",
         "export_theme": "Farbschema speichern",
         "filtering": "Filtern",
-        "filtering_explanation": "Alle Beiträge die diese Wörter enthalten werden ausgeblendet. Ein Wort pro Zeile.",
+        "filtering_explanation": "Alle Beiträge, welche diese Wörter enthalten, werden ausgeblendet. Ein Wort pro Zeile.",
         "follow_export": "Follower exportieren",
         "follow_export_button": "Exportiere deine Follows in eine csv-Datei",
         "follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.",
-        "follow_import": "Followers importieren",
-        "follow_import_error": "Fehler beim importieren der Follower",
-        "follows_imported": "Followers importiert! Die Bearbeitung kann eine Zeit lang dauern.",
+        "follow_import": "Follower importieren",
+        "follow_import_error": "Fehler beim Importieren der Follower",
+        "follows_imported": "Follower importiert! Die Bearbeitung kann einen Moment dauern.",
         "foreground": "Vordergrund",
         "general": "Allgemein",
         "hide_attachments_in_convo": "Anhänge in Unterhaltungen ausblenden",
@@ -181,7 +181,7 @@
         "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
         "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
         "hide_filtered_statuses": "Gefilterte Beiträge verbergen",
-        "import_followers_from_a_csv_file": "Importiere Follower, denen du folgen möchtest, aus einer CSV-Datei",
+        "import_followers_from_a_csv_file": "Importiere Follower aus einer CSV-Datei",
         "import_theme": "Farbschema laden",
         "inputRadius": "Eingabefelder",
         "checkboxRadius": "Auswahlfelder",
@@ -195,7 +195,7 @@
         "lock_account_description": "Sperre deinen Account, um neue Follower zu genehmigen oder abzulehnen",
         "loop_video": "Videos wiederholen",
         "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
-        "mutes_tab": "Mutes",
+        "mutes_tab": "Stummschaltungen",
         "play_videos_in_modal": "Videos in größerem Medienfenster abspielen",
         "use_contain_fit": "Vorschaubilder nicht zuschneiden",
         "name": "Name",
@@ -396,7 +396,7 @@
         "block_import": "Block Import",
         "block_export_button": "Exportiere deine Blocks in eine csv Datei",
         "block_export": "Block Export",
-        "emoji_reactions_on_timeline": "Zeige Emoji Reaktionen auf der Zeitleiste",
+        "emoji_reactions_on_timeline": "Zeige Emoji-Reaktionen auf der Zeitleiste",
         "domain_mutes": "Domains",
         "changed_email": "Email Adresse erfolgreich geändert!",
         "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
@@ -423,7 +423,7 @@
         "follow_again": "Anfrage erneut senden?",
         "follow_unfollow": "Folgen beenden",
         "followees": "Folgt",
-        "followers": "Followers",
+        "followers": "Folgende",
         "following": "Folgst du!",
         "follows_you": "Folgt dir!",
         "its_you": "Das bist du!",
@@ -431,7 +431,10 @@
         "muted": "Stummgeschaltet",
         "per_day": "pro Tag",
         "remote_follow": "Folgen",
-        "statuses": "Beiträge"
+        "statuses": "Beiträge",
+        "admin_menu": {
+            "sandbox": "Erzwinge Beiträge nur für Follower sichtbar zu sein"
+        }
     },
     "user_profile": {
         "timeline_title": "Beiträge"
@@ -569,5 +572,8 @@
     },
     "selectable_list": {
         "select_all": "Alle auswählen"
+    },
+    "remote_user_resolver": {
+        "searching_for": "Suche nach"
     }
 }

From 7f9eb23759cffc8462c369e4051e3735b617aa8f Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 15 May 2020 09:54:03 +0000
Subject: [PATCH 082/415] Translated using Weblate (German)

Currently translated at 75.2% (461 of 613 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 5490f710..d3eedcb6 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -400,7 +400,11 @@
         "domain_mutes": "Domains",
         "changed_email": "Email Adresse erfolgreich geändert!",
         "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
-        "change_email": "Ändere Email"
+        "change_email": "Ändere Email",
+        "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
+        "notification_setting_followers": "Nutzer, die dir folgen",
+        "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
+        "accent": "Akzent"
     },
     "timeline": {
         "collapse": "Einklappen",
@@ -571,9 +575,10 @@
         "moves": "Benutzer migriert zu"
     },
     "selectable_list": {
-        "select_all": "Alle auswählen"
+        "select_all": "Wähle alle"
     },
     "remote_user_resolver": {
-        "searching_for": "Suche nach"
+        "searching_for": "Suche nach",
+        "error": "Nicht gefunden."
     }
 }

From b4f8d91905c37ee95b09ca81e7dbde1491902def Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Fri, 15 May 2020 08:00:54 +0000
Subject: [PATCH 083/415] Translated using Weblate (Dutch)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 15216244..472d11ec 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -16,7 +16,7 @@
         "find_user": "Gebruiker zoeken"
     },
     "general": {
-        "apply": "toepassen",
+        "apply": "Toepassen",
         "submit": "Verzend",
         "more": "Meer",
         "optional": "optioneel",
@@ -33,10 +33,10 @@
     "login": {
         "login": "Log in",
         "description": "Log in met OAuth",
-        "logout": "Log uit",
+        "logout": "Uitloggen",
         "password": "Wachtwoord",
-        "placeholder": "bv. lain",
-        "register": "Registreer",
+        "placeholder": "bijv. lain",
+        "register": "Registreren",
         "username": "Gebruikersnaam",
         "hint": "Log in om deel te nemen aan de discussie",
         "authentication_code": "Authenticatie code",
@@ -51,14 +51,14 @@
     "nav": {
         "about": "Over",
         "back": "Terug",
-        "chat": "Locale Chat",
-        "friend_requests": "Volgverzoek",
+        "chat": "Lokale Chat",
+        "friend_requests": "Volgverzoeken",
         "mentions": "Vermeldingen",
         "dms": "Directe Berichten",
         "public_tl": "Publieke Tijdlijn",
         "timeline": "Tijdlijn",
-        "twkn": "Het Geheel Gekende Netwerk",
-        "user_search": "Zoek Gebruiker",
+        "twkn": "Het Geheel Bekende Netwerk",
+        "user_search": "Gebruiker Zoeken",
         "who_to_follow": "Wie te volgen",
         "preferences": "Voorkeuren",
         "administration": "Administratie",
@@ -73,18 +73,18 @@
         "notifications": "Meldingen",
         "read": "Gelezen!",
         "repeated_you": "Herhaalde je status",
-        "no_more_notifications": "Geen notificaties meer",
+        "no_more_notifications": "Geen meldingen meer",
         "migrated_to": "is gemigreerd naar",
         "follow_request": "wil je volgen",
         "reacted_with": "reageerde met {0}"
     },
     "post_status": {
-        "new_status": "Post nieuwe status",
-        "account_not_locked_warning": "Je account is niet {0}. Iedereen die je volgt kan enkel-volgers posts lezen.",
+        "new_status": "Nieuwe status plaatsen",
+        "account_not_locked_warning": "Je account is niet {0}. Iedereen kan je volgen om je alleen-volgers berichten te lezen.",
         "account_not_locked_warning_link": "gesloten",
-        "attachments_sensitive": "Markeer bijlage als gevoelig",
+        "attachments_sensitive": "Markeer bijlagen als gevoelig",
         "content_type": {
-            "text/plain": "Gewone tekst",
+            "text/plain": "Platte tekst",
             "text/html": "HTML",
             "text/markdown": "Markdown",
             "text/bbcode": "BBCode"
@@ -154,7 +154,7 @@
         "data_import_export_tab": "Data Import / Export",
         "default_vis": "Standaard zichtbaarheidsbereik",
         "delete_account": "Account Verwijderen",
-        "delete_account_description": "Permanent je account en al je berichten verwijderen.",
+        "delete_account_description": "Permanent je gegevens verwijderen en account deactiveren.",
         "delete_account_error": "Er is een fout opgetreden bij het verwijderen van je account. Indien dit probleem zich voor blijft doen, neem dan contact op met de beheerder van deze instantie.",
         "delete_account_instructions": "Voer je wachtwoord in het onderstaande invoerveld in om het verwijderen van je account te bevestigen.",
         "export_theme": "Preset opslaan",
@@ -262,7 +262,14 @@
                     "future_version_imported": "Het geïmporteerde bestand is gemaakt voor een nieuwere versie van FE.",
                     "older_version_imported": "Het geïmporteerde bestand is gemaakt voor een oudere versie van FE.",
                     "upgraded_from_v2": "PleromaFE is bijgewerkt, het thema kan iets anders uitzien dan dat je gewend bent.",
-                    "v2_imported": "Het geïmporteerde bestand is gemaakt voor een oudere FE. We proberen compatibiliteit te maximaliseren, maar het kan toch voorkomen dat er inconsistenties zijn."
+                    "v2_imported": "Het geïmporteerde bestand is gemaakt voor een oudere FE. We proberen compatibiliteit te maximaliseren, maar het kan toch voorkomen dat er inconsistenties zijn.",
+                    "snapshot_source_mismatch": "Versie conflict: waarschijnlijk was FE terug gerold en opnieuw bijgewerkt, indien je het thema aangepast hebt met de oudere versie van FE wil je waarschijnlijk de oude versie gebruiken, gebruik anders de nieuwe versie.",
+                    "migration_napshot_gone": "Voor een onduidelijke reden mist de momentopname, dus sommige dingen kunnen anders uitzien dan je gewend bent.",
+                    "migration_snapshot_ok": "Voor de zekerheid is een momentopname van het thema geladen. Je kunt proberen om de thema gegevens te laden.",
+                    "fe_downgraded": "PleromaFE's versie is terug gerold.",
+                    "fe_upgraded": "De thema-engine van PleromaFE is bijgewerkt na de versie update.",
+                    "snapshot_missing": "Het bestand bevat geen thema momentopname, dus het thema kan anders uitzien dan je oorspronkelijk bedacht had.",
+                    "snapshot_present": "Thema momentopname is geladen, alle waarden zijn overschreven. Je kunt in plaats daarvan ook de daadwerkelijke data van het thema laden."
                 },
                 "load_theme": "Thema laden"
             },
@@ -270,7 +277,7 @@
                 "color": "Kleur",
                 "opacity": "Transparantie",
                 "contrast": {
-                    "hint": "Contrast ratio is {ratio}, {level} {context}",
+                    "hint": "Contrast verhouding is {ratio}, {level} {context}",
                     "level": {
                         "aa": "voldoet aan de richtlijn van niveau AA (minimum)",
                         "aaa": "voldoet aan de richtlijn van niveau AAA (aangeraden)",
@@ -283,8 +290,8 @@
                 }
             },
             "common_colors": {
-                "_tab_label": "Gemeenschappelijk",
-                "main": "Gemeenschappelijke kleuren",
+                "_tab_label": "Algemeen",
+                "main": "Algemene kleuren",
                 "foreground_hint": "Zie \"Geavanceerd\" tab voor meer gedetailleerde controle",
                 "rgbo": "Iconen, accenten, badges"
             },
@@ -294,58 +301,73 @@
                 "alert_error": "Fout",
                 "badge": "Badge achtergrond",
                 "badge_notification": "Meldingen",
-                "panel_header": "Paneel hoofding",
-                "top_bar": "Top bar",
+                "panel_header": "Paneel koptekst",
+                "top_bar": "Top balk",
                 "borders": "Randen",
                 "buttons": "Knoppen",
                 "inputs": "Invoervelden",
-                "faint_text": "Vervaagde tekst"
+                "faint_text": "Vervaagde tekst",
+                "tabs": "Tabbladen",
+                "toggled": "Geschakeld",
+                "disabled": "Uitgeschakeld",
+                "selectedMenu": "Geselecteerd menu item",
+                "selectedPost": "Geselecteerd bericht",
+                "pressed": "Ingedrukt",
+                "highlight": "Gemarkeerde elementen",
+                "icons": "Iconen",
+                "poll": "Poll grafiek",
+                "underlay": "Onderlaag",
+                "popover": "Tooltips, menu's, popovers",
+                "post": "Berichten / Gebruiker bios",
+                "alert_neutral": "Neutraal",
+                "alert_warning": "Waarschuwing"
             },
             "radii": {
                 "_tab_label": "Rondheid"
             },
             "shadows": {
                 "_tab_label": "Schaduw en belichting",
-                "component": "Component",
+                "component": "Onderdeel",
                 "override": "Overschrijven",
                 "shadow_id": "Schaduw #{value}",
                 "blur": "Vervagen",
-                "spread": "Spreid",
+                "spread": "Spreiding",
                 "inset": "Inzet",
                 "hint": "Voor schaduw kan je ook --variable gebruiken als een kleur waarde om CSS3 variabelen te gebruiken. Houd er rekening mee dat het instellen van opaciteit in dit geval niet werkt.",
                 "filter_hint": {
                     "always_drop_shadow": "Waarschuwing, deze schaduw gebruikt altijd {0} als de browser dit ondersteund.",
                     "drop_shadow_syntax": "{0} ondersteund niet de {1} parameter en {2} sleutelwoord.",
-                    "avatar_inset": "Houd er rekening mee dat het combineren van zowel inzet and niet-inzet schaduwen op transparante avatars onverwachte resultaten kan opleveren.",
+                    "avatar_inset": "Houdt er rekening mee dat het combineren van zowel inzet and niet-inzet schaduwen op transparante avatars onverwachte resultaten kan opleveren.",
                     "spread_zero": "Schaduw met spreiding > 0 worden weergegeven alsof ze op nul staan",
                     "inset_classic": "Inzet schaduw zal {0} gebruiken"
                 },
                 "components": {
                     "panel": "Paneel",
-                    "panelHeader": "Paneel hoofding",
-                    "topBar": "Top bar",
-                    "avatar": "Gebruiker avatar (in profiel weergave)",
-                    "avatarStatus": "Gebruiker avatar  (in post weergave)",
-                    "popup": "Popups en gereedschapstips",
+                    "panelHeader": "Paneel koptekst",
+                    "topBar": "Top balk",
+                    "avatar": "Gebruikers avatar (in profiel weergave)",
+                    "avatarStatus": "Gebruikers avatar (in bericht weergave)",
+                    "popup": "Popups en tooltips",
                     "button": "Knop",
                     "buttonHover": "Knop (zweven)",
                     "buttonPressed": "Knop (ingedrukt)",
                     "buttonPressedHover": "Knop (ingedrukt+zweven)",
                     "input": "Invoerveld"
-                }
+                },
+                "hintV3": "Voor schaduwen kun je ook de {0} notatie gebruiken om de andere kleur invoer te gebruiken."
             },
             "fonts": {
                 "_tab_label": "Lettertypes",
-                "help": "Selecteer het lettertype om te gebruiken voor elementen van de UI.Voor \"aangepast\" moet je de exacte naam van het lettertype invoeren zoals die in het systeem wordt weergegeven.",
+                "help": "Selecteer het lettertype om te gebruiken voor elementen van de UI. Voor \"aangepast\" dien je de exacte naam van het lettertype in te voeren zoals die in het systeem wordt weergegeven.",
                 "components": {
                     "interface": "Interface",
                     "input": "Invoervelden",
-                    "post": "Post tekst",
-                    "postCode": "Monospaced tekst in een post (rich text)"
+                    "post": "Bericht tekst",
+                    "postCode": "Monospaced tekst in een bericht (rich text)"
                 },
-                "family": "Naam lettertype",
+                "family": "Lettertype naam",
                 "size": "Grootte (in px)",
-                "weight": "Gewicht (vetheid)",
+                "weight": "Gewicht (dikgedruktheid)",
                 "custom": "Aangepast"
             },
             "preview": {
@@ -355,12 +377,12 @@
                 "button": "Knop",
                 "text": "Nog een boel andere {0} en {1}",
                 "mono": "inhoud",
-                "input": "Tijd voor een pauze!",
+                "input": "Zojuist geland in L.A.",
                 "faint_link": "handige gebruikershandleiding",
                 "fine_print": "Lees onze {0} om niets nuttig te leren!",
                 "header_faint": "Alles komt goed",
-                "checkbox": "Ik heb de gebruikersvoorwaarden eens van ver bekeken",
-                "link": "een link"
+                "checkbox": "Ik heb de gebruikersvoorwaarden gelezen",
+                "link": "een leuke kleine link"
             }
         },
         "notification_setting_follows": "Gebruikers die je volgt",
@@ -443,24 +465,31 @@
         "show_moderator_badge": "Moderators badge tonen in mijn profiel",
         "notification_setting_filters": "Filters",
         "notification_setting_non_followers": "Gebruikers die je niet volgen",
-        "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven."
+        "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
+        "version": {
+            "frontend_version": "Frontend Versie",
+            "backend_version": "Backend Versie",
+            "title": "Versie"
+        }
     },
     "timeline": {
         "collapse": "Inklappen",
         "conversation": "Conversatie",
         "error_fetching": "Fout bij ophalen van updates",
-        "load_older": "Laad oudere Statussen",
-        "no_retweet_hint": "Post is gemarkeerd als enkel volgers of direct en kan niet worden herhaald",
+        "load_older": "Oudere statussen laden",
+        "no_retweet_hint": "Bericht is gemarkeerd als enkel volgers of direct en kan niet worden herhaald",
         "repeated": "herhaalde",
-        "show_new": "Toon nieuwe",
-        "up_to_date": "Up-to-date"
+        "show_new": "Nieuwe tonen",
+        "up_to_date": "Up-to-date",
+        "no_statuses": "Geen statussen",
+        "no_more_statuses": "Geen statussen meer"
     },
     "user_card": {
         "approve": "Goedkeuren",
         "block": "Blokkeren",
         "blocked": "Geblokkeerd!",
-        "deny": "Ontzeggen",
-        "favorites": "Vind-ik-leuks",
+        "deny": "Weigeren",
+        "favorites": "Favorieten",
         "follow": "Volgen",
         "follow_sent": "Aanvraag verzonden!",
         "follow_progress": "Aanvragen…",
@@ -471,31 +500,69 @@
         "following": "Aan het volgen!",
         "follows_you": "Volgt jou!",
         "its_you": "'t is jij!",
-        "mute": "Dempen",
-        "muted": "Gedempt",
+        "mute": "Negeren",
+        "muted": "Genegeerd",
         "per_day": "per dag",
         "remote_follow": "Volg vanop afstand",
-        "statuses": "Statussen"
+        "statuses": "Statussen",
+        "admin_menu": {
+            "delete_user_confirmation": "Weet je het heel zeker? Deze uitvoering kan niet ongedaan worden gemaakt.",
+            "delete_user": "Gebruiker verwijderen",
+            "quarantine": "Federeren van gebruikers berichten verbieden",
+            "disable_any_subscription": "Volgen van gebruiker in zijn geheel verbieden",
+            "disable_remote_subscription": "Volgen van gebruiker vanaf andere instanties verbieden",
+            "sandbox": "Berichten forceren om alleen voor volgers zichtbaar te zijn",
+            "force_unlisted": "Berichten forceren om niet publiekelijk getoond te worden",
+            "strip_media": "Media van berichten verwijderen",
+            "force_nsfw": "Alle berichten als gevoelig markeren",
+            "delete_account": "Account verwijderen",
+            "deactivate_account": "Account deactiveren",
+            "activate_account": "Account activeren",
+            "revoke_moderator": "Moderatorsrechten intrekken",
+            "grant_moderator": "Moderatorsrechten toekennen",
+            "revoke_admin": "Beheerdersrechten intrekken",
+            "grant_admin": "Beheerdersrechten toekennen",
+            "moderation": "Moderatie"
+        },
+        "show_repeats": "Herhalingen tonen",
+        "hide_repeats": "Herhalingen verbergen",
+        "mute_progress": "Negeren...",
+        "unmute_progress": "Negering opheffen...",
+        "unmute": "Negering opheffen",
+        "block_progress": "Blokkeren...",
+        "unblock_progress": "Blokkade opheffen...",
+        "unblock": "Blokkade opheffen",
+        "unsubscribe": "Abonnement opzeggen",
+        "subscribe": "Abonneren",
+        "report": "Aangeven",
+        "mention": "Vermelding",
+        "media": "Media",
+        "hidden": "Verborgen"
     },
     "user_profile": {
-        "timeline_title": "Gebruikers Tijdlijn"
+        "timeline_title": "Gebruikers Tijdlijn",
+        "profile_loading_error": "Sorry, er is een fout opgetreden bij het laden van dit profiel.",
+        "profile_does_not_exist": "Sorry, dit profiel bestaat niet."
     },
     "who_to_follow": {
         "more": "Meer",
         "who_to_follow": "Wie te volgen"
     },
     "tool_tip": {
-        "media_upload": "Upload Media",
-        "repeat": "Herhaal",
-        "reply": "Antwoord",
-        "favorite": "Vind-ik-leuk",
-        "user_settings": "Gebruikers Instellingen"
+        "media_upload": "Media Uploaden",
+        "repeat": "Herhalen",
+        "reply": "Beantwoorden",
+        "favorite": "Favoriet maken",
+        "user_settings": "Gebruikers Instellingen",
+        "reject_follow_request": "Volg-verzoek afwijzen",
+        "accept_follow_request": "Volg-aanvraag accepteren",
+        "add_reaction": "Reactie toevoegen"
     },
     "upload": {
         "error": {
-            "base": "Upload gefaald.",
+            "base": "Upload mislukt.",
             "file_too_big": "Bestand is te groot [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Probeer later opnieuw"
+            "default": "Probeer het later opnieuw"
         },
         "file_size_units": {
             "B": "B",
@@ -512,7 +579,8 @@
                 "reject": "Afwijzen",
                 "replace": "Vervangen",
                 "is_replaced_by": "→",
-                "keyword_policies": "Zoekwoord Beleid"
+                "keyword_policies": "Zoekwoord Beleid",
+                "ftl_removal": "Verwijdering van \"Het Geheel Bekende Netwerk\" Tijdlijn"
             },
             "mrf_policies_desc": "MRF regels beïnvloeden het federatie gedrag van de instantie. De volgende regels zijn ingeschakeld:",
             "mrf_policies": "Ingeschakelde MRF Regels",
@@ -524,20 +592,21 @@
                 "reject_desc": "Deze instantie zal geen berichten accepteren van de volgende instanties:",
                 "quarantine": "Quarantaine",
                 "quarantine_desc": "Deze instantie zal alleen publieke berichten sturen naar de volgende instanties:",
-                "ftl_removal_desc": "Deze instantie verwijdert de volgende instanties van \"Het Geheel Gekende Netwerk\" tijdlijn:",
+                "ftl_removal_desc": "Deze instantie verwijdert de volgende instanties van \"Het Geheel Bekende Netwerk\" tijdlijn:",
                 "media_removal_desc": "Deze instantie verwijdert media van berichten van de volgende instanties:",
                 "media_nsfw_desc": "Deze instantie stelt media in als gevoelig in berichten van de volgende instanties:",
                 "ftl_removal": "Verwijderen van \"Het Geheel Bekende Netwerk\" Tijdlijn",
-                "media_removal": "Media Verwijdering"
+                "media_removal": "Media Verwijdering",
+                "media_nsfw": "Forceer Media als Gevoelig"
             }
         },
         "staff": "Personeel"
     },
     "domain_mute_card": {
-        "mute": "Dempen",
-        "mute_progress": "Dempen...",
-        "unmute": "Dempen opheffen",
-        "unmute_progress": "Dempen wordt opgeheven..."
+        "mute": "Negeren",
+        "mute_progress": "Negeren...",
+        "unmute": "Negering opheffen",
+        "unmute_progress": "Negering wordt opgeheven..."
     },
     "exporter": {
         "export": "Exporteren",
@@ -564,7 +633,7 @@
         "option": "Optie",
         "votes": "stemmen",
         "vote": "Stem",
-        "single_choice": "Enkelkeuze",
+        "single_choice": "Enkele keuze",
         "multiple_choices": "Meerkeuze",
         "expiry": "Poll leeftijd",
         "expires_in": "Poll eindigt in {0}",
@@ -574,26 +643,105 @@
     },
     "emoji": {
         "emoji": "Emoji",
-        "keep_open": "Houdt picker open",
+        "keep_open": "Picker openhouden",
         "search_emoji": "Zoek voor een emoji",
         "add_emoji": "Emoji invoegen",
         "unicode": "Unicode emoji",
         "load_all": "Alle {emojiAmount} emoji worden geladen",
         "stickers": "Stickers",
-        "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan prestatie problemen veroorzaken.",
+        "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan problemen veroorzaken met prestaties.",
         "custom": "Gepersonaliseerde emoji"
     },
     "interactions": {
         "favs_repeats": "Herhalingen en Favorieten",
-        "follows": "Nieuwe volgers",
+        "follows": "Nieuwe volgingen",
         "moves": "Gebruiker migreert",
         "load_older": "Oudere interacties laden"
     },
     "remote_user_resolver": {
         "searching_for": "Zoeken naar",
-        "error": "Niet gevonden."
+        "error": "Niet gevonden.",
+        "remote_user_resolver": "Externe gebruikers zoeker"
     },
     "selectable_list": {
         "select_all": "Alles selecteren"
+    },
+    "password_reset": {
+        "password_reset_required_but_mailer_is_disabled": "Je dient je wachtwoord opnieuw in te stellen, maar wachtwoord reset is uitgeschakeld. Neem contact op met de beheerder van deze instantie.",
+        "password_reset_required": "Je dient je wachtwoord opnieuw in te stellen om in te kunnen loggen.",
+        "password_reset_disabled": "Wachtwoord reset is uitgeschakeld. Neem contact op met de beheerder van deze instantie.",
+        "too_many_requests": "Je hebt het maximaal aantal pogingen bereikt, probeer het later opnieuw.",
+        "not_found": "We kunnen die email of gebruikersnaam niet vinden.",
+        "return_home": "Terugkeren naar de home pagina",
+        "check_email": "Controleer je email inbox voor een link om je wachtwoord opnieuw in te stellen.",
+        "placeholder": "Je email of gebruikersnaam",
+        "instruction": "Voer je email adres of gebruikersnaam in. We sturen je een link om je wachtwoord opnieuw in te stellen.",
+        "password_reset": "Wachtwoord opnieuw instellen",
+        "forgot_password": "Wachtwoord vergeten?"
+    },
+    "search": {
+        "no_results": "Geen resultaten",
+        "people_talking": "{count} personen aan het praten",
+        "person_talking": "{count} persoon aan het praten",
+        "hashtags": "Hashtags",
+        "people": "Personen"
+    },
+    "user_reporting": {
+        "generic_error": "Er is een fout opgetreden tijdens het verwerken van je verzoek.",
+        "submit": "Verzenden",
+        "forward_to": "Doorsturen naar {0}",
+        "forward_description": "Dit account hoort bij een andere server. Wil je een kopie van het rapport ook daarheen sturen?",
+        "additional_comments": "Aanvullende opmerkingen",
+        "add_comment_description": "Het rapport zal naar de moderators van de instantie worden verstuurd. Je kunt hieronder uitleg bijvoegen waarom je dit account wilt aangeven:",
+        "title": "{0} aangeven"
+    },
+    "status": {
+        "copy_link": "Link naar status kopiëren",
+        "status_unavailable": "Status niet beschikbaar",
+        "unmute_conversation": "Conversatie niet meer negeren",
+        "mute_conversation": "Conversatie negeren",
+        "replies_list": "Antwoorden:",
+        "reply_to": "Antwoorden aan",
+        "delete_confirm": "Wil je echt deze status verwijderen?",
+        "pin": "Aan profiel vastmaken",
+        "pinned": "Vastgezet",
+        "unpin": "Van profiel losmaken",
+        "delete": "Status verwijderen",
+        "repeats": "Herhalingen",
+        "favorites": "Favorieten"
+    },
+    "time": {
+        "years_short": "{0}j",
+        "year_short": "{0}j",
+        "years": "{0} jaren",
+        "year": "{0} jaar",
+        "weeks_short": "{0}w",
+        "week_short": "{0}w",
+        "weeks": "{0} weken",
+        "week": "{0} week",
+        "seconds_short": "{0}s",
+        "second_short": "{0}s",
+        "seconds": "{0} seconden",
+        "second": "{0} seconde",
+        "now_short": "nu",
+        "now": "zojuist",
+        "months_short": "{0}ma",
+        "month_short": "{0}ma",
+        "months": "{0} maanden",
+        "month": "{0} maand",
+        "minutes_short": "{0}min",
+        "minute_short": "{0}min",
+        "minutes": "{0} minuten",
+        "minute": "{0} minuut",
+        "in_past": "{0} geleden",
+        "in_future": "over {0}",
+        "hours_short": "{0}u",
+        "hour_short": "{0}u",
+        "hours": "{0} uren",
+        "hour": "{0} uur",
+        "days_short": "{0}d",
+        "day_short": "{0}d",
+        "days": "{0} dagen",
+        "day": "{0} dag"
     }
 }

From 0a2aeb5d1a7ce0bf13cc09e57a2a5a877216ace2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Tomaszewski?= <jederow@hotmail.com>
Date: Sat, 16 May 2020 13:49:12 +0000
Subject: [PATCH 084/415] Translated using Weblate (Polish)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 89f2fdc2..101e5d39 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -27,7 +27,7 @@
                 "media_nsfw_desc": "Ta instancja wymusza, by multimedia z wymienionych instancji były ustawione jako wrażliwe:"
             }
         },
-        "staff": "Obsługa"
+        "staff": "Administracja"
     },
     "chat": {
         "title": "Czat"
@@ -40,7 +40,7 @@
     },
     "exporter": {
         "export": "Eksportuj",
-        "processing": "Przetwarzam, za chwilę zostaniesz zapytany o ściągnięcie pliku"
+        "processing": "Przetwarzam, za chwilę zostaniesz zapytany(-na) o ściągnięcie pliku"
     },
     "features_panel": {
         "chat": "Czat",
@@ -131,7 +131,7 @@
         "no_more_notifications": "Nie masz więcej powiadomień",
         "migrated_to": "wyemigrował do",
         "reacted_with": "zareagował z {0}",
-        "follow_request": "chce cię obserwować"
+        "follow_request": "chce ciebie obserwować"
     },
     "polls": {
         "add_poll": "Dodaj ankietę",
@@ -143,7 +143,7 @@
         "single_choice": "jednokrotnego wyboru",
         "multiple_choices": "wielokrotnego wyboru",
         "expiry": "Czas trwania ankiety",
-        "expires_in": "Ankieta kończy się za{0}",
+        "expires_in": "Ankieta kończy się za {0}",
         "expired": "Ankieta skończyła się {0} temu",
         "not_enough_options": "Zbyt mało unikalnych opcji w ankiecie"
     },
@@ -232,10 +232,10 @@
             "confirm_and_enable": "Potwierdź i włącz OTP",
             "title": "Weryfikacja dwuetapowa",
             "generate_new_recovery_codes": "Wygeneruj nowe kody zapasowe",
-            "warning_of_generate_new_codes": "Po tym gdy generujesz nowe kody zapasowe, stare przestaną działać.",
+            "warning_of_generate_new_codes": "Po tym gdy wygenerujesz nowe kody zapasowe, stare przestaną działać.",
             "recovery_codes": "Kody zapasowe.",
             "waiting_a_recovery_codes": "Otrzymuję kody zapasowe...",
-            "recovery_codes_warning": "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał dostępu do swojego konta.",
+            "recovery_codes_warning": "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał(-a) dostępu do swojego konta.",
             "authentication_methods": "Metody weryfikacji",
             "scan": {
                 "title": "Skanuj",
@@ -281,7 +281,7 @@
         "data_import_export_tab": "Import/eksport danych",
         "default_vis": "Domyślny zakres widoczności",
         "delete_account": "Usuń konto",
-        "delete_account_description": "Trwale usuń konto i wszystkie posty.",
+        "delete_account_description": "Trwale usuń dane i zdezaktywuj konto.",
         "delete_account_error": "Wystąpił problem z usuwaniem twojego konta. Jeżeli problem powtarza się, poinformuj administratora swojej instancji.",
         "delete_account_instructions": "Wprowadź swoje hasło w poniższe pole aby potwierdzić usunięcie konta.",
         "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługach",
@@ -315,14 +315,14 @@
         "import_theme": "Załaduj motyw",
         "inputRadius": "Pola tekstowe",
         "checkboxRadius": "Pola wyboru",
-        "instance_default": "(domyślny: {value})",
-        "instance_default_simple": "(domyślny)",
+        "instance_default": "(domyślnie: {value})",
+        "instance_default_simple": "(domyślne)",
         "interface": "Interfejs",
         "interfaceLanguage": "Język interfejsu",
         "invalid_theme_imported": "Wybrany plik nie jest obsługiwanym motywem Pleromy. Nie dokonano zmian w twoim motywie.",
         "limited_availability": "Niedostępne w twojej przeglądarce",
         "links": "Łącza",
-        "lock_account_description": "Ogranicz swoje konto dla zatwierdzonych obserwowanych",
+        "lock_account_description": "Spraw, by konto mogli wyświetlać tylko zatwierdzeni obserwujący",
         "loop_video": "Zapętlaj filmy",
         "loop_video_silent_only": "Zapętlaj tylko filmy bez dźwięku (np. mastodonowe „gify”)",
         "mutes_tab": "Wyciszenia",
@@ -420,7 +420,7 @@
                 "keep_opacity": "Zachowaj widoczność",
                 "keep_roundness": "Zachowaj zaokrąglenie",
                 "keep_fonts": "Zachowaj czcionki",
-                "save_load_hint": "Opcje „zachowaj” pozwalają na pozostanie przy obecnych opcjach po wybraniu lub załadowaniu motywu, jak i przechowywanie ich podczas eksportowania motywu. Jeżeli wszystkie są odznaczone, eksportowanie motywu spowoduje zapisanie wszystkiego.",
+                "save_load_hint": "Opcje „zachowaj” pozwalają na pozostanie przy obecnych opcjach po wybraniu lub załadowaniu motywu, jak i przechowywanie ich podczas eksportowania motywu. Jeżeli wszystkie opcje są odznaczone, eksportowanie motywu spowoduje zapisanie wszystkiego.",
                 "reset": "Wyzeruj",
                 "clear_all": "Wyczyść wszystko",
                 "clear_opacity": "Wyczyść widoczność",
@@ -429,17 +429,17 @@
                 "use_snapshot": "Stara wersja",
                 "use_source": "Nowa wersja",
                 "help": {
-                    "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż sobie zapamiętałeś.",
-                    "v2_imported": "Plik który zaimportowałeś został stworzony dla starszego FE. Próbujemy zwiększyć kompatybiliność, lecz wciąż mogą występować rozbieżności.",
-                    "future_version_imported": "Plik który zaimportowałeś został stworzony w nowszej wersji FE.",
-                    "older_version_imported": "Plik który zaimportowałeś został stworzony w starszej wersji FE.",
+                    "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż zapamiętałeś(-aś).",
+                    "v2_imported": "Plik który zaimportowałeś(-aś) został stworzony dla starszego FE. Próbujemy zwiększyć kompatybilność, lecz wciąż mogą występować rozbieżności.",
+                    "future_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w nowszej wersji FE.",
+                    "older_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w starszej wersji FE.",
                     "snapshot_present": "Migawka motywu jest załadowana, więc wszystkie wartości zostały nadpisane. Zamiast tego możesz załadować właściwe dane motywu.",
                     "snapshot_missing": "Nie znaleziono migawki motywu w pliku, więc motyw może wyglądać inaczej niż pierwotnie zaplanowano.",
                     "fe_upgraded": "Silnik motywów PleromaFE został zaaktualizowany.",
                     "fe_downgraded": "Wersja PleromaFE została cofnięta.",
                     "migration_snapshot_ok": "Żeby być bezpiecznym, migawka motywu została załadowana. Możesz spróbować załadować dane motywu.",
-                    "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż sobie zapamiętałeś.",
-                    "snapshot_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaaktualizowane ponownie, jeśli zmieniłeś motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji."
+                    "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż zapamiętałeś(-aś).",
+                    "snapshot_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaktualizowane ponownie, jeśli zmieniłeś(-aś) motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji."
                 }
             },
             "common": {
@@ -506,7 +506,7 @@
                 "filter_hint": {
                     "always_drop_shadow": "Ostrzeżenie, ten cień zawsze używa {0} jeżeli to obsługiwane przez przeglądarkę.",
                     "drop_shadow_syntax": "{0} nie obsługuje parametru {1} i słowa kluczowego {2}.",
-                    "avatar_inset": "Pamiętaj że użycie jednocześnie cieni inset i nie inset na awatarach może daćnieoczekiwane wyniki z przezroczystymi awatarami.",
+                    "avatar_inset": "Pamiętaj że użycie jednocześnie cieni inset i nie inset na awatarach może dać nieoczekiwane wyniki z przezroczystymi awatarami.",
                     "spread_zero": "Cienie o ujemnej szerokości będą widoczne tak, jakby wynosiła ona zero",
                     "inset_classic": "Cienie inset będą używały {0}"
                 },
@@ -549,7 +549,7 @@
                 "faint_link": "pomocny podręcznik",
                 "fine_print": "Przeczytaj nasz {0}, aby nie nauczyć się niczego przydatnego!",
                 "header_faint": "W porządku",
-                "checkbox": "Przeleciałem przez zasady użytkowania",
+                "checkbox": "Przeleciałem(-am) przez zasady użytkowania",
                 "link": "i fajny mały odnośnik"
             }
         },
@@ -565,8 +565,8 @@
     "time": {
         "day": "{0} dzień",
         "days": "{0} dni",
-        "day_short": "{0}d",
-        "days_short": "{0}d",
+        "day_short": "{0} d",
+        "days_short": "{0} d",
         "hour": "{0} godzina",
         "hours": "{0} godzin",
         "hour_short": "{0} godz.",
@@ -575,8 +575,8 @@
         "in_past": "{0} temu",
         "minute": "{0} minuta",
         "minutes": "{0} minut",
-        "minute_short": "{0}min",
-        "minutes_short": "{0}min",
+        "minute_short": "{0} min",
+        "minutes_short": "{0} min",
         "month": "{0} miesiąc",
         "months": "{0} miesięcy",
         "month_short": "{0} mies.",
@@ -585,8 +585,8 @@
         "now_short": "teraz",
         "second": "{0} sekunda",
         "seconds": "{0} sekund",
-        "second_short": "{0}s",
-        "seconds_short": "{0}s",
+        "second_short": "{0} s",
+        "seconds_short": "{0} s",
         "week": "{0} tydzień",
         "weeks": "{0} tygodni",
         "week_short": "{0} tydz.",
@@ -646,7 +646,7 @@
         "muted": "Wyciszony(-a)",
         "per_day": "dziennie",
         "remote_follow": "Zdalna obserwacja",
-        "report": "Raportuj",
+        "report": "Zgłoś",
         "statuses": "Statusy",
         "subscribe": "Subskrybuj",
         "unsubscribe": "Odsubskrybuj",
@@ -675,7 +675,7 @@
             "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika",
             "quarantine": "Zakaż federowania postów od tego użytkownika",
             "delete_user": "Usuń użytkownika",
-            "delete_user_confirmation": "Czy jesteś absolutnie pewny? Ta operacja nie może być cofnięta."
+            "delete_user_confirmation": "Czy jesteś absolutnie pewny(-a)? Ta operacja nie może być cofnięta."
         }
     },
     "user_profile": {
@@ -685,10 +685,10 @@
     },
     "user_reporting": {
         "title": "Raportowanie {0}",
-        "add_comment_description": "Raport zostanie wysłany do moderatorów instancji. Możesz dodać powód dlaczego raportujesz to konto poniżej:",
+        "add_comment_description": "Zgłoszenie zostanie wysłane do moderatorów instancji. Możesz dodać powód dlaczego zgłaszasz owe konto poniżej:",
         "additional_comments": "Dodatkowe komentarze",
-        "forward_description": "To konto jest z innego serwera. Wysłać również tam kopię raportu?",
-        "forward_to": "Przekaż do{0}",
+        "forward_description": "To konto jest z innego serwera. Wysłać również tam kopię zgłoszenia?",
+        "forward_to": "Przekaż do {0}",
         "submit": "Wyślij",
         "generic_error": "Wystąpił błąd podczas przetwarzania twojej prośby."
     },
@@ -728,14 +728,14 @@
         "no_results": "Brak wyników"
     },
     "password_reset": {
-        "forgot_password": "Zapomniałeś hasła?",
+        "forgot_password": "Zapomniałeś(-aś) hasła?",
         "password_reset": "Reset hasła",
         "instruction": "Wprowadź swój adres email lub nazwę użytkownika. Wyślemy ci link z którym możesz zresetować hasło.",
         "placeholder": "Twój email lub nazwa użytkownika",
         "check_email": "Sprawdź pocztę, aby uzyskać link do zresetowania hasła.",
         "return_home": "Wróć do strony głównej",
         "not_found": "Nie mogliśmy znaleźć tego emaila lub nazwy użytkownika.",
-        "too_many_requests": "Przekroczyłeś limit prób, spróbuj ponownie później.",
+        "too_many_requests": "Przekroczyłeś(-aś) limit prób, spróbuj ponownie później.",
         "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
         "password_reset_required": "Musisz zresetować hasło, by się zalogować.",
         "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji."

From 866fe78bbaa4285f2ee96ea500c33a0f5d9ecfdd Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 16 May 2020 11:22:34 +0000
Subject: [PATCH 085/415] Translated using Weblate (Russian)

Currently translated at 61.1% (375 of 613 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 3c52416c..357d97a8 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -16,7 +16,9 @@
         "verify": "Проверить",
         "more": "Больше",
         "generic_error": "Произошла ошибка",
-        "optional": "не обязательно"
+        "optional": "не обязательно",
+        "show_less": "Показать меньше",
+        "show_more": "Показать больше"
     },
     "login": {
         "login": "Войти",

From e300f08e09b2f1cb444d2127fb2d06d904f39d15 Mon Sep 17 00:00:00 2001
From: Master Sparker <starmancer@protonmail.com>
Date: Fri, 15 May 2020 13:46:01 +0000
Subject: [PATCH 086/415] Translated using Weblate (Chinese (Simplified))

Currently translated at 92.0% (564 of 613 strings)

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

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 8d9462ab..095db754 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -1,623 +1,698 @@
 {
-  "chat": {
-    "title": "聊天"
-  },
-  "exporter": {
-    "export": "导出",
-    "processing": "正在处理，稍后会提示您下载文件"
-  },
-  "features_panel": {
-    "chat": "聊天",
-    "gopher": "Gopher",
-    "media_proxy": "媒体代理",
-    "scope_options": "可见范围设置",
-    "text_limit": "文本长度限制",
-    "title": "功能",
-    "who_to_follow": "推荐关注"
-  },
-  "finder": {
-    "error_fetching_user": "获取用户时发生错误",
-    "find_user": "寻找用户"
-  },
-  "general": {
-    "apply": "应用",
-    "submit": "提交",
-    "more": "更多",
-    "generic_error": "发生一个错误",
-    "optional": "可选项",
-    "show_more": "显示更多",
-    "show_less": "显示更少",
-    "cancel": "取消",
-    "disable": "禁用",
-    "enable": "启用",
-    "confirm": "确认",
-    "verify": "验证"
-  },
-  "image_cropper": {
-    "crop_picture": "裁剪图片",
-    "save": "保存",
-    "save_without_cropping": "保存未经裁剪的图片",
-    "cancel": "取消"
-  },
-  "importer": {
-    "submit": "提交",
-    "success": "导入成功。",
-    "error": "导入此文件时出现一个错误。"
-  },
-  "login": {
-    "login": "登录",
-    "description": "用 OAuth 登录",
-    "logout": "登出",
-    "password": "密码",
-    "placeholder": "例如：lain",
-    "register": "注册",
-    "username": "用户名",
-    "hint": "登录后加入讨论",
-    "authentication_code": "验证码",
-    "enter_recovery_code": "输入一个恢复码",
-    "enter_two_factor_code": "输入一个双重因素验证码",
-    "recovery_code": "恢复码",
-    "heading" : {
-      "totp" : "双重因素验证",
-      "recovery" : "双重因素恢复"
-    }
-  },
-  "media_modal": {
-    "previous": "往前",
-    "next": "往后"
-  },
-  "nav": {
-    "about": "关于",
-    "back": "Back",
-    "chat": "本地聊天",
-    "friend_requests": "关注请求",
-    "mentions": "提及",
-    "interactions": "互动",
-    "dms": "私信",
-    "public_tl": "公共时间线",
-    "timeline": "时间线",
-    "twkn": "所有已知网络",
-    "user_search": "用户搜索",
-    "search": "搜索",
-    "who_to_follow": "推荐关注",
-    "preferences": "偏好设置"
-  },
-  "notifications": {
-    "broken_favorite": "未知的状态，正在搜索中...",
-    "favorited_you": "收藏了你的状态",
-    "followed_you": "关注了你",
-    "load_older": "加载更早的通知",
-    "notifications": "通知",
-    "read": "阅读！",
-    "repeated_you": "转发了你的状态",
-    "no_more_notifications": "没有更多的通知"
-  },
-  "polls": {
-    "add_poll": "增加问卷调查",
-    "add_option": "增加选项",
-    "option": "选项",
-    "votes": "投票",
-    "vote": "投票",
-    "type": "问卷类型",
-    "single_choice": "单选项",
-    "multiple_choices": "多选项",
-    "expiry": "问卷的时间",
-    "expires_in": "投票于 {0} 内结束",
-    "expired": "投票 {0} 前已结束",
-    "not_enough_options": "投票的选项太少"
-  },
-  "stickers": {
-    "add_sticker": "添加贴纸"
-  },
-  "interactions": {
-    "favs_repeats": "转发和收藏",
-    "follows": "新的关注者",
-    "load_older": "加载更早的互动"
-  },
-  "post_status": {
-    "new_status": "发布新状态",
-    "account_not_locked_warning": "你的帐号没有 {0}。任何人都可以关注你并浏览你的上锁内容。",
-    "account_not_locked_warning_link": "上锁",
-    "attachments_sensitive": "标记附件为敏感内容",
-    "content_type": {
-      "text/plain": "纯文本",
-      "text/html": "HTML",
-      "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
+    "chat": {
+        "title": "聊天"
     },
-    "content_warning": "主题（可选）",
-    "default": "刚刚抵达上海",
-    "direct_warning_to_all": "本条内容只有被提及的用户能够看到。",
-    "direct_warning_to_first_only": "本条内容只有被在消息开始处提及的用户能够看到。",
-    "posting": "发送",
-    "scope_notice": {
-      "public": "本条内容可以被所有人看到",
-      "private": "关注你的人才能看到本条内容",
-      "unlisted": "本条内容既不在公共时间线，也不会在所有已知网络上可见"
+    "exporter": {
+        "export": "导出",
+        "processing": "正在处理，稍后会提示您下载文件"
     },
-    "scope": {
-      "direct": "私信 - 只发送给被提及的用户",
-      "private": "仅关注者 - 只有关注了你的人能看到",
-      "public": "公共 - 发送到公共时间轴",
-      "unlisted": "不公开 - 不会发送到公共时间轴"
-    }
-  },
-  "registration": {
-    "bio": "简介",
-    "email": "电子邮箱",
-    "fullname": "全名",
-    "password_confirm": "确认密码",
-    "registration": "注册",
-    "token": "邀请码",
-    "captcha": "CAPTCHA",
-    "new_captcha": "点击图片获取新的验证码",
-    "username_placeholder": "例如： lain",
-    "fullname_placeholder": "例如： Lain Iwakura",
-    "bio_placeholder": "例如：\n你好， 我是 Lain.\n我是一个住在上海的宅男。你可能在某处见过我。",
-    "validations": {
-      "username_required": "不能留空",
-      "fullname_required": "不能留空",
-      "email_required": "不能留空",
-      "password_required": "不能留空",
-      "password_confirmation_required": "不能留空",
-      "password_confirmation_match": "密码不一致"
-    }
-  },
-  "selectable_list": {
-    "select_all": "选择全部"
-  },
-  "settings": {
-    "app_name": "App 名称",
-    "security": "安全",
-    "enter_current_password_to_confirm": "输入你当前密码来确认你的身份",
-    "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "设置 OTP",
-      "wait_pre_setup_otp" : "预设 OTP",
-      "confirm_and_enable" : "确认并启用 OTP",
-      "title": "双因素验证",
-      "generate_new_recovery_codes" : "生成新的恢复码",
-      "warning_of_generate_new_codes" : "当你生成新的恢复码时，你的就恢复码就失效了。",
-      "recovery_codes" : "恢复码。",
-      "waiting_a_recovery_codes": "接受备份码。。。",
-      "recovery_codes_warning" : "抄写这些号码，或者保存在安全的地方。这些号码不会再次显示。如果你无法访问你的 2FA app，也丢失了你的恢复码，你的账号就再也无法登录了。",
-      "authentication_methods" : "身份验证方法",
-      "scan": {
-        "title": "扫一下",
-        "desc": "使用你的双因素验证 app，扫描这个二维码，或者输入这些文字密钥：",
-        "secret_code": "密钥"
-      },
-      "verify": {
-        "desc": "要启用双因素验证，请把你的双因素验证 app 里的数字输入："
-      }
+    "features_panel": {
+        "chat": "聊天",
+        "gopher": "Gopher",
+        "media_proxy": "媒体代理",
+        "scope_options": "可见范围设置",
+        "text_limit": "文本长度限制",
+        "title": "功能",
+        "who_to_follow": "推荐关注"
     },
-    "attachmentRadius": "附件",
-    "attachments": "附件",
-    "autoload": "启用滚动到底部时的自动加载",
-    "avatar": "头像",
-    "avatarAltRadius": "头像（通知）",
-    "avatarRadius": "头像",
-    "background": "背景",
-    "bio": "简介",
-    "block_export": "拉黑名单导出",
-    "block_export_button": "导出你的拉黑名单到一个 csv 文件",
-    "block_import": "拉黑名单导入",
-    "block_import_error": "导入拉黑名单出错",
-    "blocks_imported": "拉黑名单导入成功！需要一点时间来处理。",
-    "blocks_tab": "块",
-    "btnRadius": "按钮",
-    "cBlue": "蓝色（回复，关注）",
-    "cGreen": "绿色（转发）",
-    "cOrange": "橙色（收藏）",
-    "cRed": "红色（取消）",
-    "change_password": "修改密码",
-    "change_password_error": "修改密码的时候出了点问题。",
-    "changed_password": "成功修改了密码！",
-    "collapse_subject": "折叠带主题的内容",
-    "composing": "正在书写",
-    "confirm_new_password": "确认新密码",
-    "current_avatar": "当前头像",
-    "current_password": "当前密码",
-    "current_profile_banner": "您当前的横幅图片",
-    "data_import_export_tab": "数据导入/导出",
-    "default_vis": "默认可见范围",
-    "delete_account": "删除账户",
-    "delete_account_description": "永久删除你的帐号和所有消息。",
-    "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。",
-    "delete_account_instructions": "在下面输入你的密码来确认删除账户",
-    "avatar_size_instruction": "推荐的头像图片最小的尺寸是 150x150 像素。",
-    "export_theme": "导出预置主题",
-    "filtering": "过滤器",
-    "filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个",
-    "follow_export": "导出关注",
-    "follow_export_button": "将关注导出成 csv 文件",
-    "follow_import": "导入关注",
-    "follow_import_error": "导入关注时错误",
-    "follows_imported": "关注已导入！尚需要一些时间来处理。",
-    "foreground": "前景",
-    "general": "通用",
-    "hide_attachments_in_convo": "在对话中隐藏附件",
-    "hide_attachments_in_tl": "在时间线上隐藏附件",
-    "hide_muted_posts": "不显示被隐藏的用户的帖子",
-    "max_thumbnails": "最多再每个帖子所能显示的缩略图数量",
-    "hide_isp": "隐藏指定实例的面板H",
-    "preload_images": "预载图片",
-    "use_one_click_nsfw": "点击一次以打开工作场所不适宜的附件",
-    "hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)",
-    "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）",
-    "hide_filtered_statuses": "隐藏过滤的状态",
-    "import_blocks_from_a_csv_file": "从 csv 文件中导入拉黑名单",
-    "import_followers_from_a_csv_file": "从 csv 文件中导入关注",
-    "import_theme": "导入预置主题",
-    "inputRadius": "输入框",
-    "checkboxRadius": "复选框",
-    "instance_default": "(默认：{value})",
-    "instance_default_simple": "(默认)",
-    "interface": "界面",
-    "interfaceLanguage": "界面语言",
-    "invalid_theme_imported": "您所选择的主题文件不被 Pleroma 支持，因此主题未被修改。",
-    "limited_availability": "在您的浏览器中无法使用",
-    "links": "链接",
-    "lock_account_description": "你需要手动审核关注请求",
-    "loop_video": "循环视频",
-    "loop_video_silent_only": "只循环没有声音的视频（例如：Mastodon 里的“GIF”）",
-    "mutes_tab": "隐藏",
-    "play_videos_in_modal": "在弹出框内播放视频",
-    "use_contain_fit": "生成缩略图时不要裁剪附件。",
-    "name": "名字",
-    "name_bio": "名字及简介",
-    "new_password": "新密码",
-    "notification_visibility": "要显示的通知类型",
-    "notification_visibility_follows": "关注",
-    "notification_visibility_likes": "点赞",
-    "notification_visibility_mentions": "提及",
-    "notification_visibility_repeats": "转发",
-    "no_rich_text_description": "不显示富文本格式",
-    "no_blocks": "没有拉黑的",
-    "no_mutes": "没有隐藏",
-    "hide_follows_description": "不要显示我所关注的人",
-    "hide_followers_description": "不要显示关注我的人",
-    "show_admin_badge": "显示管理徽章",
-    "show_moderator_badge": "显示版主徽章",
-    "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
-    "oauth_tokens": "OAuth令牌",
-    "token": "令牌",
-    "refresh_token": "刷新令牌",
-    "valid_until": "有效期至",
-    "revoke_token": "撤消",
-    "panelRadius": "面板",
-    "pause_on_unfocused": "在离开页面时暂停时间线推送",
-    "presets": "预置",
-    "profile_background": "个人资料背景图",
-    "profile_banner": "横幅图片",
-    "profile_tab": "个人资料",
-    "radii_help": "设置界面边缘的圆角 (单位：像素)",
-    "replies_in_timeline": "时间线中的回复",
-    "reply_link_preview": "启用鼠标悬停时预览回复链接",
-    "reply_visibility_all": "显示所有回复",
-    "reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
-    "reply_visibility_self": "只显示发送给我的回复",
-    "autohide_floating_post_button": "自动隐藏新帖子的按钮（移动设备）",
-    "saving_err": "保存设置时发生错误",
-    "saving_ok": "设置已保存",
-    "search_user_to_block": "搜索你想屏蔽的用户",
-    "search_user_to_mute": "搜索你想要隐藏的用户",
-    "security_tab": "安全",
-    "scope_copy": "回复时的复制范围（私信是总是复制的）",
-    "minimal_scopes_mode": "最小发文范围",
-    "set_new_avatar": "设置新头像",
-    "set_new_profile_background": "设置新的个人资料背景",
-    "set_new_profile_banner": "设置新的横幅图片",
-    "settings": "设置",
-    "subject_input_always_show": "总是显示主题框",
-    "subject_line_behavior": "回复时复制主题",
-    "subject_line_email": "比如电邮： \"re: 主题\"",
-    "subject_line_mastodon": "比如 mastodon: copy as is",
-    "subject_line_noop": "不要复制",
-    "post_status_content_type": "发文状态内容类型",
-    "stop_gifs": "鼠标悬停时播放GIF",
-    "streaming": "开启滚动到顶部时的自动推送",
-    "text": "文本",
-    "theme": "主题",
-    "theme_help": "使用十六进制代码（#rrggbb）来设置主题颜色。",
-    "theme_help_v2_1": "你也可以通过切换复选框来覆盖某些组件的颜色和透明。使用“清除所有”来清楚所有覆盖设置。",
-    "theme_help_v2_2": "某些条目下的图标是背景或文本对比指示器，鼠标悬停可以获取详细信息。请记住，使用透明度来显示最差的情况。",
-    "tooltipRadius": "提醒",
-    "upload_a_photo": "上传照片",
-    "user_settings": "用户设置",
-    "values": {
-      "false": "否",
-      "true": "是"
+    "finder": {
+        "error_fetching_user": "获取用户时发生错误",
+        "find_user": "寻找用户"
     },
-    "notifications": "通知",
-    "notification_setting": "通知来源：",
-    "notification_setting_follows": "你所关注的用户",
-    "notification_setting_non_follows": "你没有关注的用户",
-    "notification_setting_followers": "关注你的用户",
-    "notification_setting_non_followers": "没有关注你的用户",
-    "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
-    "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
-    "enable_web_push_notifications": "启用 web 推送通知",
-    "style": {
-      "switcher": {
-        "keep_color": "保留颜色",
-        "keep_shadows": "保留阴影",
-        "keep_opacity": "保留透明度",
-        "keep_roundness": "保留圆角",
-        "keep_fonts": "保留字体",
-        "save_load_hint": "\"保留\" 选项在选择或加载主题时保留当前设置的选项，在导出主题时还会存储上述选项。当所有复选框未设置时，导出主题将保存所有内容。",
-        "reset": "重置",
-        "clear_all": "清除全部",
-        "clear_opacity": "清除透明度"
-      },
-      "common": {
-        "color": "颜色",
-        "opacity": "透明度",
-        "contrast": {
-          "hint": "对比度是 {ratio}， 它 {level} {context}",
-          "level": {
-            "aa": "符合 AA 等级准则（最低）",
-            "aaa": "符合 AAA 等级准则（推荐）",
-            "bad": "不符合任何辅助功能指南"
-          },
-          "context": {
-            "18pt": "大字文本 (18pt+)",
-            "text": "文本"
-          }
+    "general": {
+        "apply": "应用",
+        "submit": "提交",
+        "more": "更多",
+        "generic_error": "发生一个错误",
+        "optional": "可选项",
+        "show_more": "展开",
+        "show_less": "收起",
+        "cancel": "取消",
+        "disable": "禁用",
+        "enable": "启用",
+        "confirm": "确认",
+        "verify": "验证",
+        "dismiss": "忽略"
+    },
+    "image_cropper": {
+        "crop_picture": "裁剪图片",
+        "save": "保存",
+        "save_without_cropping": "保存未经裁剪的图片",
+        "cancel": "取消"
+    },
+    "importer": {
+        "submit": "提交",
+        "success": "导入成功。",
+        "error": "导入此文件时出现一个错误。"
+    },
+    "login": {
+        "login": "登录",
+        "description": "用 OAuth 登录",
+        "logout": "登出",
+        "password": "密码",
+        "placeholder": "例如：lain",
+        "register": "注册",
+        "username": "用户名",
+        "hint": "登录后加入讨论",
+        "authentication_code": "验证码",
+        "enter_recovery_code": "输入一个恢复码",
+        "enter_two_factor_code": "输入一个双重因素验证码",
+        "recovery_code": "恢复码",
+        "heading": {
+            "totp": "双重因素验证",
+            "recovery": "双重因素恢复"
         }
-      },
-      "common_colors": {
-        "_tab_label": "常规",
-        "main": "常用颜色",
-        "foreground_hint": "点击”高级“ 标签进行细致的控制",
-        "rgbo": "图标，口音，徽章"
-      },
-      "advanced_colors": {
-        "_tab_label": "高级",
-        "alert": "提醒或警告背景色",
-        "alert_error": "错误",
-        "badge": "徽章背景",
-        "badge_notification": "通知",
-        "panel_header": "面板标题",
-        "top_bar": "顶栏",
-        "borders": "边框",
-        "buttons": "按钮",
-        "inputs": "输入框",
-        "faint_text": "灰度文字"
-      },
-      "radii": {
-        "_tab_label": "圆角"
-      },
-      "shadows": {
-        "_tab_label": "阴影和照明",
-        "component": "组件",
-        "override": "覆盖",
-        "shadow_id": "阴影 #{value}",
-        "blur": "模糊",
-        "spread": "扩散",
-        "inset": "插入内部",
-        "hint": "对于阴影你还可以使用 --variable 作为颜色值来使用 CSS3 变量。请注意，这种情况下，透明设置将不起作用。",
-        "filter_hint": {
-          "always_drop_shadow": "警告，此阴影设置会总是使用 {0} ，如果浏览器支持的话。",
-          "drop_shadow_syntax": "{0} 不支持参数 {1} 和关键词 {2} 。",
-          "avatar_inset": "请注意组合两个内部和非内部的阴影到头像上，在透明头像上可能会有意料之外的效果。",
-          "spread_zero": "阴影的扩散 > 0 会同设置成零一样",
-          "inset_classic": "插入内部的阴影会使用 {0}"
+    },
+    "media_modal": {
+        "previous": "往前",
+        "next": "往后"
+    },
+    "nav": {
+        "about": "关于",
+        "back": "后退",
+        "chat": "本站聊天",
+        "friend_requests": "关注请求",
+        "mentions": "提及",
+        "interactions": "互动",
+        "dms": "私信",
+        "public_tl": "公共时间线",
+        "timeline": "时间线",
+        "twkn": "所有已知网络",
+        "user_search": "用户搜索",
+        "search": "搜索",
+        "who_to_follow": "推荐关注",
+        "preferences": "偏好设置",
+        "administration": "管理员"
+    },
+    "notifications": {
+        "broken_favorite": "未知的状态，正在搜索中...",
+        "favorited_you": "收藏了你的状态",
+        "followed_you": "关注了你",
+        "load_older": "加载更早的通知",
+        "notifications": "通知",
+        "read": "阅读！",
+        "repeated_you": "转发了你的状态",
+        "no_more_notifications": "没有更多的通知",
+        "reacted_with": "和 {0} 互动过",
+        "migrated_to": "迁移到",
+        "follow_request": "想要关注你"
+    },
+    "polls": {
+        "add_poll": "增加问卷调查",
+        "add_option": "增加选项",
+        "option": "选项",
+        "votes": "投票",
+        "vote": "投票",
+        "type": "问卷类型",
+        "single_choice": "单选项",
+        "multiple_choices": "多选项",
+        "expiry": "问卷的时间",
+        "expires_in": "投票于 {0} 内结束",
+        "expired": "投票 {0} 前已结束",
+        "not_enough_options": "投票的选项太少"
+    },
+    "stickers": {
+        "add_sticker": "添加贴纸"
+    },
+    "interactions": {
+        "favs_repeats": "转发和收藏",
+        "follows": "新的关注者",
+        "load_older": "加载更早的互动",
+        "moves": "用户迁移"
+    },
+    "post_status": {
+        "new_status": "发布新状态",
+        "account_not_locked_warning": "你的帐号没有 {0}。任何人都可以关注你并浏览你的上锁内容。",
+        "account_not_locked_warning_link": "上锁",
+        "attachments_sensitive": "标记附件为敏感内容",
+        "content_type": {
+            "text/plain": "纯文本",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
         },
-        "components": {
-          "panel": "面板",
-          "panelHeader": "面板标题",
-          "topBar": "顶栏",
-          "avatar": "用户头像（在个人资料栏）",
-          "avatarStatus": "用户头像（在帖子显示栏）",
-          "popup": "弹窗和工具提示",
-          "button": "按钮",
-          "buttonHover": "按钮（悬停）",
-          "buttonPressed": "按钮（按下）",
-          "buttonPressedHover": "按钮（按下和悬停）",
-          "input": "输入框"
+        "content_warning": "主题（可选）",
+        "default": "刚刚抵达上海",
+        "direct_warning_to_all": "本条内容只有被提及的用户能够看到。",
+        "direct_warning_to_first_only": "本条内容只有被在消息开始处提及的用户能够看到。",
+        "posting": "发送",
+        "scope_notice": {
+            "public": "本条内容可以被所有人看到",
+            "private": "关注你的人才能看到本条内容",
+            "unlisted": "本条内容既不在公共时间线，也不会在所有已知网络上可见"
+        },
+        "scope": {
+            "direct": "私信 - 只发送给被提及的用户",
+            "private": "仅关注者 - 只有关注了你的人能看到",
+            "public": "公共 - 发送到公共时间轴",
+            "unlisted": "不公开 - 不会发送到公共时间轴"
         }
-      },
-      "fonts": {
-        "_tab_label": "字体",
-        "help": "给用户界面的元素选择字体。选择 “自选”的你必须输入确切的字体名称。",
-        "components": {
-          "interface": "界面",
-          "input": "输入框",
-          "post": "发帖文字",
-          "postCode": "帖子中使用等间距文字（富文本）"
+    },
+    "registration": {
+        "bio": "简介",
+        "email": "电子邮箱",
+        "fullname": "全名",
+        "password_confirm": "确认密码",
+        "registration": "注册",
+        "token": "邀请码",
+        "captcha": "CAPTCHA",
+        "new_captcha": "点击图片获取新的验证码",
+        "username_placeholder": "例如：lain",
+        "fullname_placeholder": "例如：岩仓玲音",
+        "bio_placeholder": "例如：\n你好，我是玲音。\n我是一个住在日本郊区的动画少女。你可能在 Wired 见过我。",
+        "validations": {
+            "username_required": "不能留空",
+            "fullname_required": "不能留空",
+            "email_required": "不能留空",
+            "password_required": "不能留空",
+            "password_confirmation_required": "不能留空",
+            "password_confirmation_match": "密码不一致"
+        }
+    },
+    "selectable_list": {
+        "select_all": "选择全部"
+    },
+    "settings": {
+        "app_name": "App 名称",
+        "security": "安全",
+        "enter_current_password_to_confirm": "输入你当前密码来确认你的身份",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "设置 OTP",
+            "wait_pre_setup_otp": "预设 OTP",
+            "confirm_and_enable": "确认并启用 OTP",
+            "title": "双因素验证",
+            "generate_new_recovery_codes": "生成新的恢复码",
+            "warning_of_generate_new_codes": "当你生成新的恢复码时，你的旧恢复码就失效了。",
+            "recovery_codes": "恢复码。",
+            "waiting_a_recovery_codes": "正在接收备份码……",
+            "recovery_codes_warning": "抄写这些号码，或者保存在安全的地方。这些号码不会再次显示。如果你无法访问你的 2FA app，也丢失了你的恢复码，你的账号就再也无法登录了。",
+            "authentication_methods": "身份验证方法",
+            "scan": {
+                "title": "扫一下",
+                "desc": "使用你的双因素验证 app，扫描这个二维码，或者输入这些文字密钥：",
+                "secret_code": "密钥"
+            },
+            "verify": {
+                "desc": "要启用双因素验证，请把你的双因素验证 app 里的数字输入："
+            }
         },
-        "family": "字体名称",
-        "size": "大小 (in px)",
-        "weight": "字重 （粗体）)",
-        "custom": "自选"
-      },
-      "preview": {
-        "header": "预览",
-        "content": "内容",
-        "error": "例子错误",
-        "button": "按钮",
-        "text": "有堆 {0} 和 {1}",
-        "mono": "内容",
-        "input": "刚刚抵达上海",
-        "faint_link": "帮助菜单",
-        "fine_print": "阅读我们的 {0} 学不到什么东东！",
-        "header_faint": "这很正常",
-        "checkbox": "我已经浏览了 TOC",
-        "link": "一个很棒的摇滚链接"
-      }
+        "attachmentRadius": "附件",
+        "attachments": "附件",
+        "autoload": "启用滚动到底部时的自动加载",
+        "avatar": "头像",
+        "avatarAltRadius": "头像（通知）",
+        "avatarRadius": "头像",
+        "background": "背景",
+        "bio": "简介",
+        "block_export": "拉黑名单导出",
+        "block_export_button": "导出你的拉黑名单到一个 csv 文件",
+        "block_import": "拉黑名单导入",
+        "block_import_error": "导入拉黑名单出错",
+        "blocks_imported": "拉黑名单导入成功！需要一点时间来处理。",
+        "blocks_tab": "块",
+        "btnRadius": "按钮",
+        "cBlue": "蓝色（回复，关注）",
+        "cGreen": "绿色（转发）",
+        "cOrange": "橙色（收藏）",
+        "cRed": "红色（取消）",
+        "change_password": "修改密码",
+        "change_password_error": "修改密码的时候出了点问题。",
+        "changed_password": "成功修改了密码！",
+        "collapse_subject": "折叠带主题的内容",
+        "composing": "正在书写",
+        "confirm_new_password": "确认新密码",
+        "current_avatar": "当前头像",
+        "current_password": "当前密码",
+        "current_profile_banner": "您当前的横幅图片",
+        "data_import_export_tab": "数据导入/导出",
+        "default_vis": "默认可见范围",
+        "delete_account": "删除账户",
+        "delete_account_description": "永久删除你的帐号和所有数据。",
+        "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。",
+        "delete_account_instructions": "在下面输入你的密码来确认删除账户",
+        "avatar_size_instruction": "推荐的头像图片最小的尺寸是 150x150 像素。",
+        "export_theme": "导出预置主题",
+        "filtering": "过滤器",
+        "filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个",
+        "follow_export": "导出关注",
+        "follow_export_button": "将关注导出成 csv 文件",
+        "follow_import": "导入关注",
+        "follow_import_error": "导入关注时错误",
+        "follows_imported": "关注已导入！尚需要一些时间来处理。",
+        "foreground": "前景",
+        "general": "通用",
+        "hide_attachments_in_convo": "在对话中隐藏附件",
+        "hide_attachments_in_tl": "在时间线上隐藏附件",
+        "hide_muted_posts": "不显示被隐藏的用户的帖子",
+        "max_thumbnails": "最多再每个帖子所能显示的缩略图数量",
+        "hide_isp": "隐藏指定实例的面板H",
+        "preload_images": "预载图片",
+        "use_one_click_nsfw": "点击一次以打开工作场所不适宜的附件",
+        "hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)",
+        "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）",
+        "hide_filtered_statuses": "隐藏过滤的状态",
+        "import_blocks_from_a_csv_file": "从 csv 文件中导入拉黑名单",
+        "import_followers_from_a_csv_file": "从 csv 文件中导入关注",
+        "import_theme": "导入预置主题",
+        "inputRadius": "输入框",
+        "checkboxRadius": "复选框",
+        "instance_default": "(默认：{value})",
+        "instance_default_simple": "(默认)",
+        "interface": "界面",
+        "interfaceLanguage": "界面语言",
+        "invalid_theme_imported": "您所选择的主题文件不被 Pleroma 支持，因此主题未被修改。",
+        "limited_availability": "在您的浏览器中无法使用",
+        "links": "链接",
+        "lock_account_description": "你需要手动审核关注请求",
+        "loop_video": "循环视频",
+        "loop_video_silent_only": "只循环没有声音的视频（例如：Mastodon 里的“GIF”）",
+        "mutes_tab": "隐藏",
+        "play_videos_in_modal": "在弹出框内播放视频",
+        "use_contain_fit": "生成缩略图时不要裁剪附件",
+        "name": "名字",
+        "name_bio": "名字及简介",
+        "new_password": "新密码",
+        "notification_visibility": "要显示的通知类型",
+        "notification_visibility_follows": "关注",
+        "notification_visibility_likes": "点赞",
+        "notification_visibility_mentions": "提及",
+        "notification_visibility_repeats": "转发",
+        "no_rich_text_description": "不显示富文本格式",
+        "no_blocks": "没有拉黑的",
+        "no_mutes": "没有隐藏",
+        "hide_follows_description": "不要显示我所关注的人",
+        "hide_followers_description": "不要显示关注我的人",
+        "show_admin_badge": "显示管理徽章",
+        "show_moderator_badge": "显示版主徽章",
+        "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
+        "oauth_tokens": "OAuth令牌",
+        "token": "令牌",
+        "refresh_token": "刷新令牌",
+        "valid_until": "有效期至",
+        "revoke_token": "撤消",
+        "panelRadius": "面板",
+        "pause_on_unfocused": "在离开页面时暂停时间线推送",
+        "presets": "预置",
+        "profile_background": "个人资料背景图",
+        "profile_banner": "横幅图片",
+        "profile_tab": "个人资料",
+        "radii_help": "设置界面边缘的圆角 (单位：像素)",
+        "replies_in_timeline": "时间线中的回复",
+        "reply_link_preview": "启用鼠标悬停时预览回复链接",
+        "reply_visibility_all": "显示所有回复",
+        "reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
+        "reply_visibility_self": "只显示发送给我的回复",
+        "autohide_floating_post_button": "自动隐藏新帖子的按钮（移动设备）",
+        "saving_err": "保存设置时发生错误",
+        "saving_ok": "设置已保存",
+        "search_user_to_block": "搜索你想屏蔽的用户",
+        "search_user_to_mute": "搜索你想要隐藏的用户",
+        "security_tab": "安全",
+        "scope_copy": "回复时的复制范围（私信是总是复制的）",
+        "minimal_scopes_mode": "最小发文范围",
+        "set_new_avatar": "设置新头像",
+        "set_new_profile_background": "设置新的个人资料背景",
+        "set_new_profile_banner": "设置新的横幅图片",
+        "settings": "设置",
+        "subject_input_always_show": "总是显示主题框",
+        "subject_line_behavior": "回复时复制主题",
+        "subject_line_email": "比如电邮： \"re: 主题\"",
+        "subject_line_mastodon": "比如 mastodon: copy as is",
+        "subject_line_noop": "不要复制",
+        "post_status_content_type": "发文状态内容类型",
+        "stop_gifs": "鼠标悬停时播放GIF",
+        "streaming": "开启滚动到顶部时的自动推送",
+        "text": "文本",
+        "theme": "主题",
+        "theme_help": "使用十六进制代码（#rrggbb）来设置主题颜色。",
+        "theme_help_v2_1": "你也可以通过切换复选框来覆盖某些组件的颜色和透明。使用“清除所有”来清楚所有覆盖设置。",
+        "theme_help_v2_2": "某些条目下的图标是背景或文本对比指示器，鼠标悬停可以获取详细信息。请记住，使用透明度来显示最差的情况。",
+        "tooltipRadius": "提醒",
+        "upload_a_photo": "上传照片",
+        "user_settings": "用户设置",
+        "values": {
+            "false": "否",
+            "true": "是"
+        },
+        "notifications": "通知",
+        "notification_setting": "通知来源：",
+        "notification_setting_follows": "你所关注的用户",
+        "notification_setting_non_follows": "你没有关注的用户",
+        "notification_setting_followers": "关注你的用户",
+        "notification_setting_non_followers": "没有关注你的用户",
+        "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
+        "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
+        "enable_web_push_notifications": "启用 web 推送通知",
+        "style": {
+            "switcher": {
+                "keep_color": "保留颜色",
+                "keep_shadows": "保留阴影",
+                "keep_opacity": "保留透明度",
+                "keep_roundness": "保留圆角",
+                "keep_fonts": "保留字体",
+                "save_load_hint": "\"保留\" 选项在选择或加载主题时保留当前设置的选项，在导出主题时还会存储上述选项。当所有复选框未设置时，导出主题将保存所有内容。",
+                "reset": "重置",
+                "clear_all": "清除全部",
+                "clear_opacity": "清除透明度",
+                "load_theme": "加载主题",
+                "help": {
+                    "upgraded_from_v2": "PleromaFE 已升级，主题会和你记忆中的不太一样。"
+                },
+                "use_source": "新版本",
+                "use_snapshot": "老版本",
+                "keep_as_is": "保持原状"
+            },
+            "common": {
+                "color": "颜色",
+                "opacity": "透明度",
+                "contrast": {
+                    "hint": "对比度是 {ratio}， 它 {level} {context}",
+                    "level": {
+                        "aa": "符合 AA 等级准则（最低）",
+                        "aaa": "符合 AAA 等级准则（推荐）",
+                        "bad": "不符合任何辅助功能指南"
+                    },
+                    "context": {
+                        "18pt": "大字文本 (18pt+)",
+                        "text": "文本"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "常规",
+                "main": "常用颜色",
+                "foreground_hint": "点击”高级“ 标签进行细致的控制",
+                "rgbo": "图标，口音，徽章"
+            },
+            "advanced_colors": {
+                "_tab_label": "高级",
+                "alert": "提醒或警告背景色",
+                "alert_error": "错误",
+                "badge": "徽章背景",
+                "badge_notification": "通知",
+                "panel_header": "面板标题",
+                "top_bar": "顶栏",
+                "borders": "边框",
+                "buttons": "按钮",
+                "inputs": "输入框",
+                "faint_text": "灰度文字"
+            },
+            "radii": {
+                "_tab_label": "圆角"
+            },
+            "shadows": {
+                "_tab_label": "阴影和照明",
+                "component": "组件",
+                "override": "覆盖",
+                "shadow_id": "阴影 #{value}",
+                "blur": "模糊",
+                "spread": "扩散",
+                "inset": "插入内部",
+                "hint": "对于阴影你还可以使用 --variable 作为颜色值来使用 CSS3 变量。请注意，这种情况下，透明设置将不起作用。",
+                "filter_hint": {
+                    "always_drop_shadow": "警告，此阴影设置会总是使用 {0} ，如果浏览器支持的话。",
+                    "drop_shadow_syntax": "{0} 不支持参数 {1} 和关键词 {2} 。",
+                    "avatar_inset": "请注意组合两个内部和非内部的阴影到头像上，在透明头像上可能会有意料之外的效果。",
+                    "spread_zero": "阴影的扩散 > 0 会同设置成零一样",
+                    "inset_classic": "插入内部的阴影会使用 {0}"
+                },
+                "components": {
+                    "panel": "面板",
+                    "panelHeader": "面板标题",
+                    "topBar": "顶栏",
+                    "avatar": "用户头像（在个人资料栏）",
+                    "avatarStatus": "用户头像（在帖子显示栏）",
+                    "popup": "弹窗和工具提示",
+                    "button": "按钮",
+                    "buttonHover": "按钮（悬停）",
+                    "buttonPressed": "按钮（按下）",
+                    "buttonPressedHover": "按钮（按下和悬停）",
+                    "input": "输入框"
+                }
+            },
+            "fonts": {
+                "_tab_label": "字体",
+                "help": "给用户界面的元素选择字体。选择 “自选”的你必须输入确切的字体名称。",
+                "components": {
+                    "interface": "界面",
+                    "input": "输入框",
+                    "post": "发帖文字",
+                    "postCode": "帖子中使用等间距文字（富文本）"
+                },
+                "family": "字体名称",
+                "size": "大小 (in px)",
+                "weight": "字重 （粗体）)",
+                "custom": "自选"
+            },
+            "preview": {
+                "header": "预览",
+                "content": "内容",
+                "error": "例子错误",
+                "button": "按钮",
+                "text": "有堆 {0} 和 {1}",
+                "mono": "内容",
+                "input": "刚刚抵达上海",
+                "faint_link": "帮助菜单",
+                "fine_print": "阅读我们的 {0} ，然而什么也学不到！",
+                "header_faint": "这很正常",
+                "checkbox": "我已经浏览了 TOC",
+                "link": "一个很棒的摇滚链接"
+            }
+        },
+        "version": {
+            "title": "版本",
+            "backend_version": "后端版本",
+            "frontend_version": "前端版本"
+        },
+        "notification_setting_filters": "过滤器",
+        "domain_mutes": "域名",
+        "changed_email": "邮箱修改成功！",
+        "change_email_error": "修改你的电子邮箱时发生错误",
+        "change_email": "修改电子邮箱",
+        "allow_following_move": "正在关注的账号迁移时自动重新关注",
+        "notification_setting_privacy_option": "在通知推送中隐藏发送者和内容",
+        "notification_setting_privacy": "隐私",
+        "hide_follows_count_description": "不显示关注数",
+        "notification_visibility_emoji_reactions": "互动",
+        "notification_visibility_moves": "用户迁移",
+        "new_email": "新邮箱",
+        "emoji_reactions_on_timeline": "在时间线上显示表情符号互动"
     },
-    "version": {
-      "title": "版本",
-      "backend_version": "后端版本",
-      "frontend_version": "前端版本"
-    }
-  },
-  "time": {
-    "day": "{0} 天",
-    "days": "{0} 天",
-    "day_short": "{0}d",
-    "days_short": "{0}d",
-    "hour": "{0} 小时",
-    "hours": "{0} 小时",
-    "hour_short": "{0}h",
-    "hours_short": "{0}h",
-    "in_future": "还有 {0}",
-    "in_past": "{0} 之前",
-    "minute": "{0} 分钟",
-    "minutes": "{0} 分钟",
-    "minute_short": "{0}min",
-    "minutes_short": "{0}min",
-    "month": "{0} 月",
-    "months": "{0} 月",
-    "month_short": "{0}mo",
-    "months_short": "{0}mo",
-    "now": "刚刚",
-    "now_short": "刚刚",
-    "second": "{0} 秒",
-    "seconds": "{0} 秒",
-    "second_short": "{0}s",
-    "seconds_short": "{0}s",
-    "week": "{0} 周",
-    "weeks": "{0} 周",
-    "week_short": "{0}w",
-    "weeks_short": "{0}w",
-    "year": "{0} 年",
-    "years": "{0} 年",
-    "year_short": "{0}y",
-    "years_short": "{0}y"
-  },
-  "timeline": {
-    "collapse": "折叠",
-    "conversation": "对话",
-    "error_fetching": "获取更新时发生错误",
-    "load_older": "加载更早的状态",
-    "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发。",
-    "repeated": "已转发",
-    "show_new": "显示新内容",
-    "up_to_date": "已是最新",
-    "no_more_statuses": "没有更多的状态",
-    "no_statuses": "没有状态更新"
-  },
-  "status": {
-    "favorites": "收藏",
-    "repeats": "转发",
-    "delete": "删除状态",
-    "pin": "在个人资料置顶",
-    "unpin": "取消在个人资料置顶",
-    "pinned": "置顶",
-    "delete_confirm": "你真的想要删除这条状态吗？",
-    "reply_to": "回复",
-    "replies_list": "回复：",
-    "mute_conversation": "隐藏对话",
-    "unmute_conversation": "对话取消隐藏"
-  },
-  "user_card": {
-    "approve": "允许",
-    "block": "屏蔽",
-    "blocked": "已屏蔽！",
-    "deny": "拒绝",
-    "favorites": "收藏",
-    "follow": "关注",
-    "follow_sent": "请求已发送！",
-    "follow_progress": "请求中",
-    "follow_again": "再次发送请求？",
-    "follow_unfollow": "取消关注",
-    "followees": "正在关注",
-    "followers": "关注者",
-    "following": "正在关注！",
-    "follows_you": "关注了你！",
-    "its_you": "就是你！!",
-    "media": "媒体",
-    "mute": "隐藏",
-    "muted": "已隐藏",
-    "per_day": "每天",
-    "remote_follow": "跨站关注",
-    "report": "报告", 
-    "statuses": "状态",
-    "subscribe": "订阅",
-    "unsubscribe": "退订",
-    "unblock": "取消拉黑",
-    "unblock_progress": "取消拉黑中...",
-    "block_progress": "拉黑中...",
-    "unmute": "取消隐藏",
-    "unmute_progress": "取消隐藏中...",
-    "mute_progress": "隐藏中...",
-    "admin_menu": {
-      "moderation": "权限",
-      "grant_admin": "赋予管理权限",
-      "revoke_admin": "撤销管理权限",
-      "grant_moderator": "赋予版主权限",
-      "revoke_moderator": "撤销版主权限",
-      "activate_account": "激活账号",
-      "deactivate_account": "关闭账号",
-      "delete_account": "删除账号",
-      "force_nsfw": "标记所有的帖子都是 - 工作场合不适",
-      "strip_media": "从帖子里删除媒体文件",
-      "force_unlisted": "强制帖子为不公开",
-      "sandbox": "强制帖子为只有关注者可看",
-      "disable_remote_subscription": "禁止从远程实例关注用户",
-      "disable_any_subscription": "完全禁止关注用户",
-      "quarantine": "从联合实例中禁止用户帖子",
-      "delete_user": "删除用户",
-      "delete_user_confirmation": "你确认吗？此操作无法撤销。"
-    }
-  },
-  "user_profile": {
-    "timeline_title": "用户时间线",
-    "profile_does_not_exist": "抱歉，此个人资料不存在。",
-    "profile_loading_error": "抱歉，载入个人资料时出错。"
-  },
-  "user_reporting": {
-    "title": "报告 {0}",
-    "add_comment_description": "此报告会发送给你的实例管理员。你可以在下面提供更多详细信息解释报告的缘由：",
-    "additional_comments": "其它信息",
-    "forward_description": "这个账号是从另外一个服务器。同时发送一个副本到那里？",
-    "forward_to": "转发 {0}",
-    "submit": "提交",
-    "generic_error": "当处理你的请求时，发生了一个错误。"
-  },
-  "who_to_follow": {
-    "more": "更多",
-    "who_to_follow": "推荐关注"
-  },
-  "tool_tip": {
-    "media_upload": "上传多媒体",
-    "repeat": "转发",
-    "reply": "回复",
-    "favorite": "收藏",
-    "user_settings": "用户设置"
-  },
-  "upload":{
-    "error": {
-      "base": "上传不成功。",
-      "file_too_big": "文件太大了 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "迟些再试"
+    "time": {
+        "day": "{0} 天",
+        "days": "{0} 天",
+        "day_short": "{0}d",
+        "days_short": "{0}d",
+        "hour": "{0} 小时",
+        "hours": "{0} 小时",
+        "hour_short": "{0}h",
+        "hours_short": "{0}h",
+        "in_future": "还有 {0}",
+        "in_past": "{0} 之前",
+        "minute": "{0} 分钟",
+        "minutes": "{0} 分钟",
+        "minute_short": "{0}min",
+        "minutes_short": "{0}min",
+        "month": "{0} 月",
+        "months": "{0} 月",
+        "month_short": "{0}mo",
+        "months_short": "{0}mo",
+        "now": "刚刚",
+        "now_short": "刚刚",
+        "second": "{0} 秒",
+        "seconds": "{0} 秒",
+        "second_short": "{0}s",
+        "seconds_short": "{0}s",
+        "week": "{0} 周",
+        "weeks": "{0} 周",
+        "week_short": "{0}w",
+        "weeks_short": "{0}w",
+        "year": "{0} 年",
+        "years": "{0} 年",
+        "year_short": "{0}y",
+        "years_short": "{0}y"
     },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
+    "timeline": {
+        "collapse": "折叠",
+        "conversation": "对话",
+        "error_fetching": "获取更新时发生错误",
+        "load_older": "加载更早的状态",
+        "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发。",
+        "repeated": "已转发",
+        "show_new": "显示新内容",
+        "up_to_date": "已是最新",
+        "no_more_statuses": "没有更多的状态",
+        "no_statuses": "没有状态更新"
+    },
+    "status": {
+        "favorites": "收藏",
+        "repeats": "转发",
+        "delete": "删除状态",
+        "pin": "在个人资料置顶",
+        "unpin": "取消在个人资料置顶",
+        "pinned": "置顶",
+        "delete_confirm": "你真的想要删除这条状态吗？",
+        "reply_to": "回复",
+        "replies_list": "回复：",
+        "mute_conversation": "隐藏对话",
+        "unmute_conversation": "对话取消隐藏"
+    },
+    "user_card": {
+        "approve": "允许",
+        "block": "屏蔽",
+        "blocked": "已屏蔽！",
+        "deny": "拒绝",
+        "favorites": "收藏",
+        "follow": "关注",
+        "follow_sent": "请求已发送！",
+        "follow_progress": "请求中",
+        "follow_again": "再次发送请求？",
+        "follow_unfollow": "取消关注",
+        "followees": "正在关注",
+        "followers": "关注者",
+        "following": "正在关注！",
+        "follows_you": "关注了你！",
+        "its_you": "就是你！!",
+        "media": "媒体",
+        "mute": "隐藏",
+        "muted": "已隐藏",
+        "per_day": "每天",
+        "remote_follow": "跨站关注",
+        "report": "报告",
+        "statuses": "状态",
+        "subscribe": "订阅",
+        "unsubscribe": "退订",
+        "unblock": "取消拉黑",
+        "unblock_progress": "取消拉黑中...",
+        "block_progress": "拉黑中...",
+        "unmute": "取消隐藏",
+        "unmute_progress": "取消隐藏中...",
+        "mute_progress": "隐藏中...",
+        "admin_menu": {
+            "moderation": "权限",
+            "grant_admin": "赋予管理权限",
+            "revoke_admin": "撤销管理权限",
+            "grant_moderator": "赋予版主权限",
+            "revoke_moderator": "撤销版主权限",
+            "activate_account": "激活账号",
+            "deactivate_account": "关闭账号",
+            "delete_account": "删除账号",
+            "force_nsfw": "标记所有的帖子都是 - 工作场合不适",
+            "strip_media": "从帖子里删除媒体文件",
+            "force_unlisted": "强制帖子为不公开",
+            "sandbox": "强制帖子为只有关注者可看",
+            "disable_remote_subscription": "禁止从远程实例关注用户",
+            "disable_any_subscription": "完全禁止关注用户",
+            "quarantine": "从联合实例中禁止用户帖子",
+            "delete_user": "删除用户",
+            "delete_user_confirmation": "你确认吗？此操作无法撤销。"
+        },
+        "hidden": "已隐藏",
+        "show_repeats": "显示转发",
+        "hide_repeats": "隐藏转发"
+    },
+    "user_profile": {
+        "timeline_title": "用户时间线",
+        "profile_does_not_exist": "抱歉，此个人资料不存在。",
+        "profile_loading_error": "抱歉，载入个人资料时出错。"
+    },
+    "user_reporting": {
+        "title": "报告 {0}",
+        "add_comment_description": "此报告会发送给你的实例管理员。你可以在下面提供更多详细信息解释报告的缘由：",
+        "additional_comments": "其它信息",
+        "forward_description": "这个账号是从另外一个服务器。同时发送一个副本到那里？",
+        "forward_to": "转发 {0}",
+        "submit": "提交",
+        "generic_error": "当处理你的请求时，发生了一个错误。"
+    },
+    "who_to_follow": {
+        "more": "更多",
+        "who_to_follow": "推荐关注"
+    },
+    "tool_tip": {
+        "media_upload": "上传多媒体",
+        "repeat": "转发",
+        "reply": "回复",
+        "favorite": "收藏",
+        "user_settings": "用户设置",
+        "reject_follow_request": "拒绝关注请求",
+        "add_reaction": "添加互动"
+    },
+    "upload": {
+        "error": {
+            "base": "上传不成功。",
+            "file_too_big": "文件太大了 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "迟些再试"
+        },
+        "file_size_units": {
+            "B": "B",
+            "KiB": "KiB",
+            "MiB": "MiB",
+            "GiB": "GiB",
+            "TiB": "TiB"
+        }
+    },
+    "search": {
+        "people": "人",
+        "hashtags": "Hashtags",
+        "person_talking": "{count} 人正在讨论",
+        "people_talking": "{count} 人正在讨论",
+        "no_results": "没有搜索结果"
+    },
+    "password_reset": {
+        "forgot_password": "忘记密码了？",
+        "password_reset": "重置密码",
+        "instruction": "输入你的电邮地址或者用户名，我们将发送一个链接到你的邮箱，用于重置密码。",
+        "placeholder": "你的电邮地址或者用户名",
+        "check_email": "检查你的邮箱，会有一个链接用于重置密码。",
+        "return_home": "回到首页",
+        "not_found": "我们无法找到匹配的邮箱地址或者用户名。",
+        "too_many_requests": "你触发了尝试的限制，请稍后再试。",
+        "password_reset_disabled": "密码重置已经被禁用。请联系你的实例管理员。"
+    },
+    "remote_user_resolver": {
+        "error": "未找到。",
+        "searching_for": "搜索",
+        "remote_user_resolver": "远程用户解析器"
+    },
+    "emoji": {
+        "keep_open": "选择器保持打开",
+        "stickers": "贴图",
+        "unicode": "Unicode 表情符号",
+        "custom": "自定义表情符号",
+        "add_emoji": "插入表情符号",
+        "search_emoji": "搜索表情符号",
+        "emoji": "表情符号"
+    },
+    "about": {
+        "mrf": {
+            "simple": {
+                "quarantine_desc": "本实例只会把公开状态发送非下列实例：",
+                "quarantine": "隔离",
+                "reject_desc": "本实例不会接收来自下列实例的消息：",
+                "reject": "拒绝",
+                "accept_desc": "本实例只接收来自下列实例的消息：",
+                "simple_policies": "站规",
+                "accept": "接受",
+                "media_removal": "移除媒体"
+            },
+            "mrf_policies_desc": "MRF 策略会影响本实例的互通行为。以下策略已启用：",
+            "mrf_policies": "已启动 MRF 策略",
+            "keyword": {
+                "ftl_removal": "从“全部已知网络”时间线上移除",
+                "keyword_policies": "关键词策略",
+                "is_replaced_by": "→",
+                "replace": "替换",
+                "reject": "拒绝"
+            },
+            "federation": "联邦"
+        }
+    },
+    "domain_mute_card": {
+        "unmute_progress": "正在取消隐藏……",
+        "unmute": "取消隐藏",
+        "mute_progress": "隐藏中……",
+        "mute": "隐藏"
     }
-  },
-  "search": {
-    "people": "人",
-    "hashtags": "Hashtags",
-    "person_talking": "{count} 人谈论",
-    "people_talking": "{count} 人谈论",
-    "no_results": "没有搜索结果"
-  },
-  "password_reset": {
-    "forgot_password": "忘记密码了？",
-    "password_reset": "重置密码",
-    "instruction": "输入你的电邮地址或者用户名，我们将发送一个链接到你的邮箱，用于重置密码。",
-    "placeholder": "你的电邮地址或者用户名",
-    "check_email": "检查你的邮箱，会有一个链接用于重置密码。",
-    "return_home": "回到首页",
-    "not_found": "我们无法找到匹配的邮箱地址或者用户名。",
-    "too_many_requests": "你触发了尝试的限制，请稍后再试。",
-    "password_reset_disabled": "密码重置已经被禁用。请联系你的实例管理员。"
-  }
 }

From 306ed130872a861dc6e7cfe2524f3e50bd262809 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Mon, 18 May 2020 15:42:11 +0000
Subject: [PATCH 087/415] Translated using Weblate (Italian)

Currently translated at 42.2% (259 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index d4c4cb74..e565049d 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -85,7 +85,7 @@
         "data_import_export_tab": "Importa o esporta dati",
         "default_vis": "Visibilità predefinita dei messaggi",
         "delete_account": "Elimina profilo",
-        "delete_account_description": "Elimina definitivamente il tuo profilo e tutti i tuoi messaggi.",
+        "delete_account_description": "Elimina definitivamente i tuoi dati e disattiva il tuo profilo.",
         "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo profilo. Se il problema persiste contatta l'amministratore della tua stanza.",
         "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione del tuo profilo.",
         "export_theme": "Salva impostazioni",
@@ -305,5 +305,19 @@
         "expires_in": "Scade fra {0}",
         "expired": "Scaduto {0} fa",
         "not_enough_options": "Aggiungi altre risposte"
+    },
+    "interactions": {
+        "favs_repeats": "Condivisi e preferiti"
+    },
+    "emoji": {
+        "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",
+        "search_emoji": "Cerca un emoji",
+        "keep_open": "Tieni aperto il menù",
+        "emoji": "Emoji",
+        "stickers": "Adesivi"
     }
 }

From ab74cd497205d5964db38d56f6f70fb727c60d78 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 24 May 2020 02:06:55 +0300
Subject: [PATCH 088/415] Multiple fixes for CSS, added proper auth checking

---
 src/boot/routes.js                            |   4 -
 src/components/modal/modal.vue                |  17 +-
 .../settings_modal/settings_modal.scss        |  26 +-
 .../settings_modal/settings_modal.vue         |  61 +++-
 .../tabs/mutes_and_blocks_tab.vue             | 327 +++++++++---------
 .../tabs/theme_tab/theme_tab.scss             |   1 +
 src/components/tab_switcher/tab_switcher.js   |  12 +-
 src/components/tab_switcher/tab_switcher.scss |   8 +-
 8 files changed, 263 insertions(+), 193 deletions(-)

diff --git a/src/boot/routes.js b/src/boot/routes.js
index 7400a682..d98a3b50 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -7,10 +7,8 @@ import Interactions from 'components/interactions/interactions.vue'
 import DMs from 'components/dm_timeline/dm_timeline.vue'
 import UserProfile from 'components/user_profile/user_profile.vue'
 import Search from 'components/search/search.vue'
-import Settings from 'components/settings/settings.vue'
 import Registration from 'components/registration/registration.vue'
 import PasswordReset from 'components/password_reset/password_reset.vue'
-import UserSettings from 'components/user_settings/user_settings.vue'
 import FollowRequests from 'components/follow_requests/follow_requests.vue'
 import OAuthCallback from 'components/oauth_callback/oauth_callback.vue'
 import Notifications from 'components/notifications/notifications.vue'
@@ -56,12 +54,10 @@ export default (store) => {
     { name: 'external-user-profile', path: '/users/:id', component: UserProfile },
     { name: 'interactions', path: '/users/:username/interactions', component: Interactions, beforeEnter: validateAuthenticatedRoute },
     { name: 'dms', path: '/users/:username/dms', component: DMs, beforeEnter: validateAuthenticatedRoute },
-    { name: 'settings', path: '/settings', component: Settings },
     { name: 'registration', path: '/registration', component: Registration },
     { name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true },
     { name: 'registration-token', path: '/registration/:token', component: Registration },
     { name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute },
-    { name: 'user-settings', path: '/user-settings', component: UserSettings, beforeEnter: validateAuthenticatedRoute },
     { name: 'notifications', path: '/:username/notifications', component: Notifications, beforeEnter: validateAuthenticatedRoute },
     { name: 'login', path: '/login', component: AuthForm },
     { name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index e5ecc0c0..2b58913f 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -1,9 +1,9 @@
 <template>
   <div
     v-show="isOpen"
-    v-body-scroll-lock="isOpen"
+    v-body-scroll-lock="isOpen && !noBackground"
     class="modal-view"
-    :class="{ 'modal-background': !noBackground }"
+    :class="classes"
     @click.self="$emit('backdropClicked')"
   >
     <slot />
@@ -21,6 +21,14 @@ export default {
       type: Boolean,
       default: false
     }
+  },
+  computed: {
+    classes () {
+      return {
+        'modal-background': !this.noBackground,
+        'open': this.isOpen
+      }
+    }
   }
 }
 </script>
@@ -40,6 +48,7 @@ export default {
   pointer-events: none;
   animation-duration: 0.2s;
   animation-name: modal-background-fadein;
+  opacity: 0;
 
   > * {
     pointer-events: initial;
@@ -50,8 +59,8 @@ export default {
     background-color: rgba(0, 0, 0, 0.5);
   }
 
-  body:not(.scroll-locked) & {
-    opacity: 0;
+  &.open {
+    opacity: 1;
   }
 }
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 3efbe205..b82590a7 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -1,12 +1,21 @@
 @import 'src/_variables.scss';
 .settings-modal {
+  overflow: hidden;
 
   .settings_tab-switcher {
     height: 100%;
   }
   &.peek {
     .settings-modal-panel {
-      transform: translateY(calc(100% - 50px));
+      /* Explanation:
+       * Modal is positioned vertically centered.
+       * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
+       * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen
+       * + 100% - we move modal completely off-screen, it's top boundary touches
+       *   bottom of the screen
+       * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible
+       */
+      transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
     }
   }
 
@@ -25,17 +34,22 @@
   .panel-body {
     height: 100%;
     overflow-y: hidden;
-  }
-  .setting-item {
-    border-bottom: 2px solid var(--fg, $fallback--fg);
-    margin: 1em 1em 1.4em;
-    padding-bottom: 1.4em;
 
     .btn {
       min-height: 28px;
       min-width: 10em;
       padding: 0 2em;
     }
+  }
+
+  .full-height {
+    height: 100%;
+  }
+
+  .setting-item {
+    border-bottom: 2px solid var(--fg, $fallback--fg);
+    margin: 1em 1em 1.4em;
+    padding-bottom: 1.4em;
 
     > div {
       margin-bottom: .5em;
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 53481bdd..741c15c4 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -1,6 +1,5 @@
 <template>
 <Modal
-  v-if="isLoggedIn && !resettingForm"
   :is-open="modalActivated"
   class="settings-modal"
   :class="{ peek: modalPeeked }"
@@ -25,15 +24,57 @@
         :scrollableTabs="true"
         ref="tabSwitcher"
         >
-        <div :label="$t('settings.general')"><GeneralTab /></div>
-        <div :label="$t('settings.profile_tab')"><ProfileTab /></div>
-        <div :label="$t('settings.security_tab')"><SecurityTab /></div>
-        <div :label="$t('settings.filtering')"><FilteringTab /></div>
-        <div :label="$t('settings.theme')"><ThemeTab /></div>
-        <div :label="$t('settings.notifications')"><NotificationsTab /></div>
-        <div :label="$t('settings.data_import_export_tab')"><DataImportExportTab /></div>
-        <div :label="$t('settings.mutes_and_blocks')"><MutesAndBlocksTab /></div>
-        <div :label="$t('settings.version.title')"><VersionTab /></div>
+        <div
+          :label="$t('settings.general')"
+          >
+          <GeneralTab />
+        </div>
+        <div v-if="isLoggedIn"
+             :label="$t('settings.profile_tab')"
+             >
+          <ProfileTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.security_tab')"
+          >
+          <SecurityTab />
+        </div>
+        <div
+          :label="$t('settings.filtering')"
+          >
+          <FilteringTab />
+        </div>
+        <div
+          :label="$t('settings.theme')"
+          >
+          <ThemeTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.notifications')"
+          >
+          <NotificationsTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.data_import_export_tab')"
+          >
+          <DataImportExportTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.mutes_and_blocks')"
+          :fullHeight="true"
+          class="full-height"
+          >
+          <MutesAndBlocksTab />
+        </div>
+        <div
+          :label="$t('settings.version.title')"
+          >
+          <VersionTab />
+        </div>
       </tab-switcher>
     </div>
   </div>
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index 7fce7b78..04f9c6dd 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -1,173 +1,176 @@
 <template>
-  <tab-switcher>
-    <div :label="$t('settings.blocks_tab')">
-      <div class="profile-edit-usersearch-wrapper">
-        <Autosuggest
-          :filter="filterUnblockedUsers"
-          :query="queryUserIds"
-          :placeholder="$t('settings.search_user_to_block')"
-          >
-          <BlockCard
-            slot-scope="row"
-            :user-id="row.item"
-            />
-        </Autosuggest>
-      </div>
-      <BlockList
-        :refresh="true"
-        :get-key="i => i"
+<tab-switcher
+  :scrollableTabs="true"
+  class="mutes-and-blocks-tab"
+  >
+  <div :label="$t('settings.blocks_tab')">
+    <div class="usersearch-wrapper">
+      <Autosuggest
+        :filter="filterUnblockedUsers"
+        :query="queryUserIds"
+        :placeholder="$t('settings.search_user_to_block')"
         >
-        <template
-          slot="header"
-          slot-scope="{selected}"
-          >
-          <div class="profile-edit-bulk-actions">
-            <ProgressButton
-              v-if="selected.length > 0"
-              class="btn btn-default"
-              :click="() => blockUsers(selected)"
-              >
-              {{ $t('user_card.block') }}
-              <template slot="progress">
-                {{ $t('user_card.block_progress') }}
-              </template>
-            </ProgressButton>
-            <ProgressButton
-              v-if="selected.length > 0"
-              class="btn btn-default"
-              :click="() => unblockUsers(selected)"
-              >
-              {{ $t('user_card.unblock') }}
-              <template slot="progress">
-                {{ $t('user_card.unblock_progress') }}
-              </template>
-            </ProgressButton>
-          </div>
-        </template>
-        <template
-          slot="item"
-          slot-scope="{item}"
-          >
-          <BlockCard :user-id="item" />
-        </template>
-        <template slot="empty">
-          {{ $t('settings.no_blocks') }}
-        </template>
-      </BlockList>
+        <BlockCard
+          slot-scope="row"
+          :user-id="row.item"
+          />
+      </Autosuggest>
     </div>
-
-    <div :label="$t('settings.mutes_tab')">
-      <tab-switcher>
-        <div label="Users">
-          <div class="profile-edit-usersearch-wrapper">
-            <Autosuggest
-              :filter="filterUnMutedUsers"
-              :query="queryUserIds"
-              :placeholder="$t('settings.search_user_to_mute')"
-              >
-              <MuteCard
-                slot-scope="row"
-                :user-id="row.item"
-                />
-            </Autosuggest>
-          </div>
-          <MuteList
-            :refresh="true"
-            :get-key="i => i"
+    <BlockList
+      :refresh="true"
+      :get-key="i => i"
+      >
+      <template
+        slot="header"
+        slot-scope="{selected}"
+        >
+        <div class="bulk-actions">
+          <ProgressButton
+            v-if="selected.length > 0"
+            class="btn btn-default bulk-action-button"
+            :click="() => blockUsers(selected)"
             >
-            <template
-              slot="header"
-              slot-scope="{selected}"
-              >
-              <div class="profile-edit-bulk-actions">
-                <ProgressButton
-                  v-if="selected.length > 0"
-                  class="btn btn-default"
-                  :click="() => muteUsers(selected)"
-                  >
-                  {{ $t('user_card.mute') }}
-                  <template slot="progress">
-                    {{ $t('user_card.mute_progress') }}
-                  </template>
-                </ProgressButton>
-                <ProgressButton
-                  v-if="selected.length > 0"
-                  class="btn btn-default"
-                  :click="() => unmuteUsers(selected)"
-                  >
-                  {{ $t('user_card.unmute') }}
-                  <template slot="progress">
-                    {{ $t('user_card.unmute_progress') }}
-                  </template>
-                </ProgressButton>
-              </div>
+            {{ $t('user_card.block') }}
+            <template slot="progress">
+              {{ $t('user_card.block_progress') }}
             </template>
-            <template
-              slot="item"
-              slot-scope="{item}"
-              >
-              <MuteCard :user-id="item" />
-            </template>
-            <template slot="empty">
-              {{ $t('settings.no_mutes') }}
-            </template>
-          </MuteList>
-        </div>
-
-        <div :label="$t('settings.domain_mutes')">
-          <div class="profile-edit-domain-mute-form">
-            <input
-              v-model="newDomainToMute"
-              :placeholder="$t('settings.type_domains_to_mute')"
-              type="text"
-              @keyup.enter="muteDomain"
-              >
-            <ProgressButton
-              class="btn btn-default"
-              :click="muteDomain"
-              >
-              {{ $t('domain_mute_card.mute') }}
-              <template slot="progress">
-                {{ $t('domain_mute_card.mute_progress') }}
-              </template>
-            </ProgressButton>
-          </div>
-          <DomainMuteList
-            :refresh="true"
-            :get-key="i => i"
+          </ProgressButton>
+          <ProgressButton
+            v-if="selected.length > 0"
+            class="btn btn-default"
+            :click="() => unblockUsers(selected)"
             >
-            <template
-              slot="header"
-              slot-scope="{selected}"
-              >
-              <div class="profile-edit-bulk-actions">
-                <ProgressButton
-                  v-if="selected.length > 0"
-                  class="btn btn-default"
-                  :click="() => unmuteDomains(selected)"
-                  >
-                  {{ $t('domain_mute_card.unmute') }}
-                  <template slot="progress">
-                    {{ $t('domain_mute_card.unmute_progress') }}
-                  </template>
-                </ProgressButton>
-              </div>
+            {{ $t('user_card.unblock') }}
+            <template slot="progress">
+              {{ $t('user_card.unblock_progress') }}
             </template>
-            <template
-              slot="item"
-              slot-scope="{item}"
-              >
-              <DomainMuteCard :domain="item" />
-            </template>
-            <template slot="empty">
-              {{ $t('settings.no_mutes') }}
-            </template>
-          </DomainMuteList>
+          </ProgressButton>
         </div>
-      </tab-switcher>
-    </div>
-  </tab-switcher>
+      </template>
+      <template
+        slot="item"
+        slot-scope="{item}"
+        >
+        <BlockCard :user-id="item" />
+      </template>
+      <template slot="empty">
+        {{ $t('settings.no_blocks') }}
+      </template>
+    </BlockList>
+  </div>
+
+  <div :label="$t('settings.mutes_tab')">
+    <tab-switcher>
+      <div label="Users">
+        <div class="usersearch-wrapper">
+          <Autosuggest
+            :filter="filterUnMutedUsers"
+            :query="queryUserIds"
+            :placeholder="$t('settings.search_user_to_mute')"
+            >
+            <MuteCard
+              slot-scope="row"
+              :user-id="row.item"
+              />
+          </Autosuggest>
+        </div>
+        <MuteList
+          :refresh="true"
+          :get-key="i => i"
+          >
+          <template
+            slot="header"
+            slot-scope="{selected}"
+            >
+            <div class="bulk-actions">
+              <ProgressButton
+                v-if="selected.length > 0"
+                class="btn btn-default"
+                :click="() => muteUsers(selected)"
+                >
+                {{ $t('user_card.mute') }}
+                <template slot="progress">
+                  {{ $t('user_card.mute_progress') }}
+                </template>
+              </ProgressButton>
+              <ProgressButton
+                v-if="selected.length > 0"
+                class="btn btn-default"
+                :click="() => unmuteUsers(selected)"
+                >
+                {{ $t('user_card.unmute') }}
+                <template slot="progress">
+                  {{ $t('user_card.unmute_progress') }}
+                </template>
+              </ProgressButton>
+            </div>
+          </template>
+          <template
+            slot="item"
+            slot-scope="{item}"
+            >
+            <MuteCard :user-id="item" />
+          </template>
+          <template slot="empty">
+            {{ $t('settings.no_mutes') }}
+          </template>
+        </MuteList>
+      </div>
+
+      <div :label="$t('settings.domain_mutes')">
+        <div class="domain-mute-form">
+          <input
+            v-model="newDomainToMute"
+            :placeholder="$t('settings.type_domains_to_mute')"
+            type="text"
+            @keyup.enter="muteDomain"
+            >
+          <ProgressButton
+            class="btn btn-default domain-mute-button"
+            :click="muteDomain"
+            >
+            {{ $t('domain_mute_card.mute') }}
+            <template slot="progress">
+              {{ $t('domain_mute_card.mute_progress') }}
+            </template>
+          </ProgressButton>
+        </div>
+        <DomainMuteList
+          :refresh="true"
+          :get-key="i => i"
+          >
+          <template
+            slot="header"
+            slot-scope="{selected}"
+            >
+            <div class="bulk-actions">
+              <ProgressButton
+                v-if="selected.length > 0"
+                class="btn btn-default"
+                :click="() => unmuteDomains(selected)"
+                >
+                {{ $t('domain_mute_card.unmute') }}
+                <template slot="progress">
+                  {{ $t('domain_mute_card.unmute_progress') }}
+                </template>
+              </ProgressButton>
+            </div>
+          </template>
+          <template
+            slot="item"
+            slot-scope="{item}"
+            >
+            <DomainMuteCard :domain="item" />
+          </template>
+          <template slot="empty">
+            {{ $t('settings.no_mutes') }}
+          </template>
+        </DomainMuteList>
+      </div>
+    </tab-switcher>
+  </div>
+</tab-switcher>
 </template>
 
 <script src="./mutes_and_blocks_tab.js"></script>
-<!-- <style lang="scss" src="./profile.scss"></style> -->
+<style lang="scss" src="./mutes_and_blocks_tab.scss"></style>
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
index 75b3017d..e0b1a2df 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@@ -1,5 +1,6 @@
 @import 'src/_variables.scss';
 .theme-tab {
+  padding-bottom: 2em;
   .theme-warning {
     display: flex;
     align-items: baseline;
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 97791de3..a54b474f 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -69,7 +69,6 @@ export default Vue.component('tab-switcher', {
         if (!slot.tag) return
         const classesTab = ['tab']
         const classesWrapper = ['tab-wrapper']
-
         if (this.activeIndex === index) {
           classesTab.push('active')
           classesWrapper.push('active')
@@ -101,12 +100,17 @@ export default Vue.component('tab-switcher', {
     const contents = this.$slots.default.map((slot, index) => {
       if (!slot.tag) return
       const active = this.activeIndex === index
+      const classes = [ active ? 'active' : 'hidden' ]
+      if (slot.data.attrs.fullHeight) {
+        classes.push('full-height')
+      }
+
       if (this.renderOnlyFocused) {
         return active
-          ? <div class="active">{slot}</div>
-          : <div class="hidden"></div>
+          ? <div class={classes.join(' ')}>{slot}</div>
+          : <div class={classes.join(' ')}></div>
       }
-      return <div class={active ? 'active' : 'hidden' }>{slot}</div>
+      return <div class={classes.join(' ')}>{slot}</div>
     })
 
     return (
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index a7b790a3..c9050781 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -59,7 +59,6 @@
       flex: 1 0 auto;
       overflow-y: auto;
       overflow-x: hidden;
-      padding-top: 5px;
       flex-direction: column;
       &::after {
         content: '';
@@ -78,6 +77,9 @@
           border-right-color: $fallback--border;
           border-right-color: var(--border, $fallback--border);
         }
+        &:last-child .tab {
+          margin-bottom: 0;
+        }
       }
       .tab {
         box-sizing: content-box;
@@ -87,8 +89,8 @@
         min-width: 1px;
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
-        // padding-right: 200px;
-        // margin-right: 6px - 200px;
+        padding-right: calc(1em + 200px);
+        margin-right: 6px - 200px;
         margin-left: 6px;
       }
 

From a872c53472a46973a18808254f9d812b074bb0ee Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 24 May 2020 02:29:09 +0300
Subject: [PATCH 089/415] misc fixes

---
 .../tabs/mutes_and_blocks_tab.scss            | 29 ++++++++++++++++
 src/components/tab_switcher/tab_switcher.scss | 33 ++++++++++---------
 2 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 src/components/settings_modal/tabs/mutes_and_blocks_tab.scss

diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
new file mode 100644
index 00000000..ceb64efb
--- /dev/null
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
@@ -0,0 +1,29 @@
+.mutes-and-blocks-tab {
+    height: 100%;
+
+    .usersearch-wrapper {
+        padding: 1em;
+    }
+
+    .bulk-actions {
+        text-align: right;
+        padding: 0 1em;
+        min-height: 28px;
+    }
+
+    .bulk-action-button {
+        width: 10em
+    }
+
+    .domain-mute-form {
+        padding: 1em;
+        display: flex;
+        flex-direction: column
+    }
+
+    .domain-mute-button {
+        align-self: flex-end;
+        margin-top: 1em;
+        width: 10em
+    }
+}
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index c9050781..f994380f 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -61,14 +61,22 @@
       overflow-x: hidden;
       flex-direction: column;
       &::after {
-        content: '';
         flex: 1 1 auto;
+      }
+      &::before {
+        flex: 0 0 auto;
+        height: 0.5em;
+      }
+      &::after, &::before {
+        content: '';
         border-right: 1px solid;
         border-right-color: $fallback--border;
         border-right-color: var(--border, $fallback--border);
       }
       .tab-wrapper {
         min-width: 10em;
+        display: flex;
+        flex-direction: column;
         &:not(.active)::after {
           top: 0;
           right: 0;
@@ -77,14 +85,21 @@
           border-right-color: $fallback--border;
           border-right-color: var(--border, $fallback--border);
         }
+        &::before {
+          flex: 0 0 6px;
+          content: '';
+          border-right: 1px solid;
+          border-right-color: $fallback--border;
+          border-right-color: var(--border, $fallback--border);
+        }
         &:last-child .tab {
           margin-bottom: 0;
         }
       }
+
       .tab {
+        flex: 1;
         box-sizing: content-box;
-        width: 100%;
-        margin-bottom: 5px;
         min-width: 10em;
         min-width: 1px;
         border-top-right-radius: 0;
@@ -105,18 +120,6 @@
           border-right-color: var(--border, $fallback--border);
         }
       }
-      .tab {
-        box-sizing: content-box;
-        width: 100%;
-        margin-bottom: 5px;
-        min-width: 10em;
-        min-width: 1px;
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-        // padding-right: 200px;
-        // margin-right: 6px - 200px;
-        margin-left: 6px;
-      }
     }
   }
 

From 1e606d2f268e796a3efd2a995713c70a000daf62 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 03:14:41 +0300
Subject: [PATCH 090/415] split modal's content into another component, add
 lazy loading

---
 .../settings_modal/settings_modal.js          | 33 +-------
 .../settings_modal/settings_modal.scss        | 71 +----------------
 .../settings_modal/settings_modal.vue         | 77 +-----------------
 .../settings_modal/settings_modal_content.js  | 42 ++++++++++
 .../settings_modal_content.scss               | 73 +++++++++++++++++
 .../settings_modal/settings_modal_content.vue | 79 +++++++++++++++++++
 6 files changed, 200 insertions(+), 175 deletions(-)
 create mode 100644 src/components/settings_modal/settings_modal_content.js
 create mode 100644 src/components/settings_modal/settings_modal_content.scss
 create mode 100644 src/components/settings_modal/settings_modal_content.vue

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index d60babf6..8f55af71 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -1,40 +1,11 @@
 import Modal from 'src/components/modal/modal.vue'
-import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
-
-import DataImportExportTab from './tabs/data_import_export_tab.vue'
-import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
-import NotificationsTab from './tabs/notifications_tab.vue'
-import FilteringTab from './tabs/filtering_tab.vue'
-import SecurityTab from './tabs/security_tab/security_tab.vue'
-import ProfileTab from './tabs/profile_tab.vue'
-import GeneralTab from './tabs/general_tab.vue'
-import VersionTab from './tabs/version_tab.vue'
-import ThemeTab from './tabs/theme_tab/theme_tab.vue'
 
 const SettingsModal = {
   components: {
     Modal,
-    TabSwitcher,
-
-    DataImportExportTab,
-    MutesAndBlocksTab,
-    NotificationsTab,
-    FilteringTab,
-    SecurityTab,
-    ProfileTab,
-    GeneralTab,
-    VersionTab,
-    ThemeTab
-  },
-  data () {
-    return {
-      resettingForm: false
-    }
+    SettingsModalContent: () => import('./settings_modal_content.vue')
   },
   computed: {
-    isLoggedIn () {
-      return !!this.$store.state.users.currentUser
-    },
     modalActivated () {
       return this.$store.state.interface.settingsModalState !== 'hidden'
     },
@@ -42,8 +13,6 @@ const SettingsModal = {
       return this.$store.state.interface.settingsModalState === 'minimized'
     }
   },
-  watch: {
-  },
   methods: {
     closeModal () {
       this.$store.dispatch('closeSettingsModal')
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index b82590a7..ece96364 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -2,11 +2,8 @@
 .settings-modal {
   overflow: hidden;
 
-  .settings_tab-switcher {
-    height: 100%;
-  }
   &.peek {
-    .settings-modal-panel {
+    .modal-panel {
       /* Explanation:
        * Modal is positioned vertically centered.
        * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
@@ -18,70 +15,4 @@
       transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
     }
   }
-
-  .settings-modal-panel {
-    transition: transform;
-    transition-timing-function: ease-in-out;
-    transition-duration: 300ms;
-    width: 1000px;
-    max-width: 90vw;
-    height: 90vh;
-    @media all and (max-width: 800px) {
-      max-width: 100vw;
-      height: 100vh;
-    }
-  }
-  .panel-body {
-    height: 100%;
-    overflow-y: hidden;
-
-    .btn {
-      min-height: 28px;
-      min-width: 10em;
-      padding: 0 2em;
-    }
-  }
-
-  .full-height {
-    height: 100%;
-  }
-
-  .setting-item {
-    border-bottom: 2px solid var(--fg, $fallback--fg);
-    margin: 1em 1em 1.4em;
-    padding-bottom: 1.4em;
-
-    > div {
-      margin-bottom: .5em;
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    &:last-child {
-      border-bottom: none;
-      padding-bottom: 0;
-      margin-bottom: 1em;
-    }
-
-    select {
-      min-width: 10em;
-    }
-
-    textarea {
-      width: 100%;
-      max-width: 100%;
-      height: 100px;
-    }
-
-    .unavailable,
-    .unavailable i {
-      color: var(--cRed, $fallback--cRed);
-      color: $fallback--cRed;
-    }
-
-    .number-input {
-      max-width: 6em;
-    }
-  }
 }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 741c15c4..b9c0689e 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -5,79 +5,10 @@
   :class="{ peek: modalPeeked }"
   :no-background="modalPeeked"
   >
-  <div class="settings-modal-panel panel">
-    <div class="panel-heading">
-      <span class="title">
-        {{ $t('settings.settings') }}
-      </span>
-      <button class="btn" @click="peekModal">
-        {{ $t('general.peek') }}
-      </button>
-      <button class="btn" @click="closeModal">
-        {{ $t('general.close') }}
-      </button>
-    </div>
-    <div class="panel-body">
-      <tab-switcher
-        class="settings_tab-switcher"
-        :sideTabBar="true"
-        :scrollableTabs="true"
-        ref="tabSwitcher"
-        >
-        <div
-          :label="$t('settings.general')"
-          >
-          <GeneralTab />
-        </div>
-        <div v-if="isLoggedIn"
-             :label="$t('settings.profile_tab')"
-             >
-          <ProfileTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.security_tab')"
-          >
-          <SecurityTab />
-        </div>
-        <div
-          :label="$t('settings.filtering')"
-          >
-          <FilteringTab />
-        </div>
-        <div
-          :label="$t('settings.theme')"
-          >
-          <ThemeTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.notifications')"
-          >
-          <NotificationsTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.data_import_export_tab')"
-          >
-          <DataImportExportTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.mutes_and_blocks')"
-          :fullHeight="true"
-          class="full-height"
-          >
-          <MutesAndBlocksTab />
-        </div>
-        <div
-          :label="$t('settings.version.title')"
-          >
-          <VersionTab />
-        </div>
-      </tab-switcher>
-    </div>
-  </div>
+  <SettingsModalContent
+    v-if="modalActivated"
+    class="modal-panel"
+    />
 </Modal>
 </template>
 
diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js
new file mode 100644
index 00000000..bd8df672
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_content.js
@@ -0,0 +1,42 @@
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
+
+import DataImportExportTab from './tabs/data_import_export_tab.vue'
+import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
+import NotificationsTab from './tabs/notifications_tab.vue'
+import FilteringTab from './tabs/filtering_tab.vue'
+import SecurityTab from './tabs/security_tab/security_tab.vue'
+import ProfileTab from './tabs/profile_tab.vue'
+import GeneralTab from './tabs/general_tab.vue'
+import VersionTab from './tabs/version_tab.vue'
+import ThemeTab from './tabs/theme_tab/theme_tab.vue'
+
+const SettingsModalContent = {
+  components: {
+    TabSwitcher,
+
+    DataImportExportTab,
+    MutesAndBlocksTab,
+    NotificationsTab,
+    FilteringTab,
+    SecurityTab,
+    ProfileTab,
+    GeneralTab,
+    VersionTab,
+    ThemeTab
+  },
+  computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    }
+  },
+  methods: {
+    closeModal () {
+      this.$store.dispatch('closeSettingsModal')
+    },
+    peekModal () {
+      this.$store.dispatch('togglePeekSettingsModal')
+    }
+  }
+}
+
+export default SettingsModalContent
diff --git a/src/components/settings_modal/settings_modal_content.scss b/src/components/settings_modal/settings_modal_content.scss
new file mode 100644
index 00000000..92e167a2
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_content.scss
@@ -0,0 +1,73 @@
+@import 'src/_variables.scss';
+
+.settings-modal-panel {
+  overflow: hidden;
+  transition: transform;
+  transition-timing-function: ease-in-out;
+  transition-duration: 300ms;
+  width: 1000px;
+  max-width: 90vw;
+  height: 90vh;
+
+  @media all and (max-width: 800px) {
+    max-width: 100vw;
+    height: 100vh;
+  }
+
+  .settings_tab-switcher {
+    height: 100%;
+  }
+  .panel-body {
+    height: 100%;
+    overflow-y: hidden;
+
+    .btn {
+      min-height: 28px;
+      min-width: 10em;
+      padding: 0 2em;
+    }
+  }
+
+  .full-height {
+    height: 100%;
+  }
+
+  .setting-item {
+    border-bottom: 2px solid var(--fg, $fallback--fg);
+    margin: 1em 1em 1.4em;
+    padding-bottom: 1.4em;
+
+    > div {
+      margin-bottom: .5em;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    &:last-child {
+      border-bottom: none;
+      padding-bottom: 0;
+      margin-bottom: 1em;
+    }
+
+    select {
+      min-width: 10em;
+    }
+
+    textarea {
+      width: 100%;
+      max-width: 100%;
+      height: 100px;
+    }
+
+    .unavailable,
+    .unavailable i {
+      color: var(--cRed, $fallback--cRed);
+      color: $fallback--cRed;
+    }
+
+    .number-input {
+      max-width: 6em;
+    }
+  }
+}
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
new file mode 100644
index 00000000..1778c23b
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="settings-modal-panel panel">
+    <div class="panel-heading">
+      <span class="title">
+        {{ $t('settings.settings') }}
+      </span>
+      <button class="btn" @click="peekModal">
+        {{ $t('general.peek') }}
+      </button>
+      <button class="btn" @click="closeModal">
+        {{ $t('general.close') }}
+      </button>
+    </div>
+    <div class="panel-body">
+      <tab-switcher
+        class="settings_tab-switcher"
+        :sideTabBar="true"
+        :scrollableTabs="true"
+        ref="tabSwitcher"
+        >
+        <div
+          :label="$t('settings.general')"
+          >
+          <GeneralTab />
+        </div>
+        <div v-if="isLoggedIn"
+             :label="$t('settings.profile_tab')"
+             >
+          <ProfileTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.security_tab')"
+          >
+          <SecurityTab />
+        </div>
+        <div
+          :label="$t('settings.filtering')"
+          >
+          <FilteringTab />
+        </div>
+        <div
+          :label="$t('settings.theme')"
+          >
+          <ThemeTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.notifications')"
+          >
+          <NotificationsTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.data_import_export_tab')"
+          >
+          <DataImportExportTab />
+        </div>
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.mutes_and_blocks')"
+          :fullHeight="true"
+          class="full-height"
+          >
+          <MutesAndBlocksTab />
+        </div>
+        <div
+          :label="$t('settings.version.title')"
+          >
+          <VersionTab />
+        </div>
+      </tab-switcher>
+    </div>
+  </div>
+</template>
+
+<script src="./settings_modal_content.js"></script>
+
+<style src="./settings_modal_content.scss" lang="scss"></style>

From bcea2e4d12a2f8a460def340debdff3d0dec7770 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 03:30:14 +0300
Subject: [PATCH 091/415] cleanup

---
 src/components/settings_modal/settings_modal.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 8f55af71..192ba5d3 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -13,14 +13,6 @@ const SettingsModal = {
       return this.$store.state.interface.settingsModalState === 'minimized'
     }
   },
-  methods: {
-    closeModal () {
-      this.$store.dispatch('closeSettingsModal')
-    },
-    peekModal () {
-      this.$store.dispatch('togglePeekSettingsModal')
-    }
-  }
 }
 
 export default SettingsModal

From e7ba4255bbfdc199c513e83007fc6956166b6dc0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 03:43:55 +0300
Subject: [PATCH 092/415] eslint --fix + small fix

---
 .../settings_modal/settings_modal.js          |   2 +-
 .../settings_modal/settings_modal.vue         |  18 +-
 .../settings_modal/settings_modal_content.vue |  41 +-
 .../tabs/data_import_export_tab.vue           |  64 +--
 .../settings_modal/tabs/filtering_tab.vue     | 152 +++----
 .../settings_modal/tabs/general_tab.js        |   3 +-
 .../settings_modal/tabs/general_tab.vue       | 306 +++++++-------
 .../tabs/mutes_and_blocks_tab.vue             | 300 +++++++-------
 .../settings_modal/tabs/notifications_tab.vue |  94 ++---
 .../settings_modal/tabs/profile_tab.js        |   2 +-
 .../settings_modal/tabs/profile_tab.vue       | 388 +++++++++---------
 .../tabs/security_tab/security_tab.vue        | 260 ++++++------
 .../tabs/theme_tab/theme_tab.vue              | 168 ++++----
 .../settings_modal/tabs/version_tab.vue       |  50 +--
 14 files changed, 927 insertions(+), 921 deletions(-)

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 192ba5d3..d38c5751 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -12,7 +12,7 @@ const SettingsModal = {
     modalPeeked () {
       return this.$store.state.interface.settingsModalState === 'minimized'
     }
-  },
+  }
 }
 
 export default SettingsModal
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index b9c0689e..b6ca5c6b 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -1,15 +1,15 @@
 <template>
-<Modal
-  :is-open="modalActivated"
-  class="settings-modal"
-  :class="{ peek: modalPeeked }"
-  :no-background="modalPeeked"
+  <Modal
+    :is-open="modalActivated"
+    class="settings-modal"
+    :class="{ peek: modalPeeked }"
+    :no-background="modalPeeked"
   >
-  <SettingsModalContent
-    v-if="modalActivated"
-    class="modal-panel"
+    <SettingsModalContent
+      v-if="modalActivated"
+      class="modal-panel"
     />
-</Modal>
+  </Modal>
 </template>
 
 <script src="./settings_modal.js"></script>
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 1778c23b..013bf34f 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -4,56 +4,63 @@
       <span class="title">
         {{ $t('settings.settings') }}
       </span>
-      <button class="btn" @click="peekModal">
+      <button
+        class="btn"
+        @click="peekModal"
+      >
         {{ $t('general.peek') }}
       </button>
-      <button class="btn" @click="closeModal">
+      <button
+        class="btn"
+        @click="closeModal"
+      >
         {{ $t('general.close') }}
       </button>
     </div>
     <div class="panel-body">
       <tab-switcher
-        class="settings_tab-switcher"
-        :sideTabBar="true"
-        :scrollableTabs="true"
         ref="tabSwitcher"
-        >
+        class="settings_tab-switcher"
+        :side-tab-bar="true"
+        :scrollable-tabs="true"
+      >
         <div
           :label="$t('settings.general')"
-          >
+        >
           <GeneralTab />
         </div>
-        <div v-if="isLoggedIn"
-             :label="$t('settings.profile_tab')"
-             >
+        <div
+          v-if="isLoggedIn"
+          :label="$t('settings.profile_tab')"
+        >
           <ProfileTab />
         </div>
         <div
           v-if="isLoggedIn"
           :label="$t('settings.security_tab')"
-          >
+        >
           <SecurityTab />
         </div>
         <div
           :label="$t('settings.filtering')"
-          >
+        >
           <FilteringTab />
         </div>
         <div
           :label="$t('settings.theme')"
-          >
+        >
           <ThemeTab />
         </div>
         <div
           v-if="isLoggedIn"
           :label="$t('settings.notifications')"
-          >
+        >
           <NotificationsTab />
         </div>
         <div
           v-if="isLoggedIn"
           :label="$t('settings.data_import_export_tab')"
-          >
+        >
           <DataImportExportTab />
         </div>
         <div
@@ -61,12 +68,12 @@
           :label="$t('settings.mutes_and_blocks')"
           :fullHeight="true"
           class="full-height"
-          >
+        >
           <MutesAndBlocksTab />
         </div>
         <div
           :label="$t('settings.version.title')"
-          >
+        >
           <VersionTab />
         </div>
       </tab-switcher>
diff --git a/src/components/settings_modal/tabs/data_import_export_tab.vue b/src/components/settings_modal/tabs/data_import_export_tab.vue
index 3ddc8b03..b5d0f5ed 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.vue
+++ b/src/components/settings_modal/tabs/data_import_export_tab.vue
@@ -1,42 +1,42 @@
 <template>
-<div
-  :label="$t('settings.data_import_export_tab')"
+  <div
+    :label="$t('settings.data_import_export_tab')"
   >
-  <div class="setting-item">
-    <h2>{{ $t('settings.follow_import') }}</h2>
-    <p>{{ $t('settings.import_followers_from_a_csv_file') }}</p>
-    <Importer
-      :submit-handler="importFollows"
-      :success-message="$t('settings.follows_imported')"
-      :error-message="$t('settings.follow_import_error')"
+    <div class="setting-item">
+      <h2>{{ $t('settings.follow_import') }}</h2>
+      <p>{{ $t('settings.import_followers_from_a_csv_file') }}</p>
+      <Importer
+        :submit-handler="importFollows"
+        :success-message="$t('settings.follows_imported')"
+        :error-message="$t('settings.follow_import_error')"
       />
-  </div>
-  <div class="setting-item">
-    <h2>{{ $t('settings.follow_export') }}</h2>
-    <Exporter
-      :get-content="getFollowsContent"
-      filename="friends.csv"
-      :export-button-label="$t('settings.follow_export_button')"
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('settings.follow_export') }}</h2>
+      <Exporter
+        :get-content="getFollowsContent"
+        filename="friends.csv"
+        :export-button-label="$t('settings.follow_export_button')"
       />
-  </div>
-  <div class="setting-item">
-    <h2>{{ $t('settings.block_import') }}</h2>
-    <p>{{ $t('settings.import_blocks_from_a_csv_file') }}</p>
-    <Importer
-      :submit-handler="importBlocks"
-      :success-message="$t('settings.blocks_imported')"
-      :error-message="$t('settings.block_import_error')"
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('settings.block_import') }}</h2>
+      <p>{{ $t('settings.import_blocks_from_a_csv_file') }}</p>
+      <Importer
+        :submit-handler="importBlocks"
+        :success-message="$t('settings.blocks_imported')"
+        :error-message="$t('settings.block_import_error')"
       />
-  </div>
-  <div class="setting-item">
-    <h2>{{ $t('settings.block_export') }}</h2>
-    <Exporter
-      :get-content="getBlocksContent"
-      filename="blocks.csv"
-      :export-button-label="$t('settings.block_export_button')"
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('settings.block_export') }}</h2>
+      <Exporter
+        :get-content="getBlocksContent"
+        filename="blocks.csv"
+        :export-button-label="$t('settings.block_export_button')"
       />
+    </div>
   </div>
-</div>
 </template>
 
 <script src="./data_import_export_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 647ec7b4..eea41514 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -1,86 +1,86 @@
 <template>
-<div :label="$t('settings.filtering')">
-  <div class="setting-item">
-    <div class="select-multiple">
-      <span class="label">{{ $t('settings.notification_visibility') }}</span>
-      <ul class="option-list">
-        <li>
-          <Checkbox v-model="notificationVisibility.likes">
-            {{ $t('settings.notification_visibility_likes') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationVisibility.repeats">
-            {{ $t('settings.notification_visibility_repeats') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationVisibility.follows">
-            {{ $t('settings.notification_visibility_follows') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationVisibility.mentions">
-            {{ $t('settings.notification_visibility_mentions') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationVisibility.moves">
-            {{ $t('settings.notification_visibility_moves') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationVisibility.emojiReactions">
-            {{ $t('settings.notification_visibility_emoji_reactions') }}
-          </Checkbox>
-        </li>
-      </ul>
-    </div>
-    <div>
-      {{ $t('settings.replies_in_timeline') }}
-      <label
-        for="replyVisibility"
-        class="select"
+  <div :label="$t('settings.filtering')">
+    <div class="setting-item">
+      <div class="select-multiple">
+        <span class="label">{{ $t('settings.notification_visibility') }}</span>
+        <ul class="option-list">
+          <li>
+            <Checkbox v-model="notificationVisibility.likes">
+              {{ $t('settings.notification_visibility_likes') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationVisibility.repeats">
+              {{ $t('settings.notification_visibility_repeats') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationVisibility.follows">
+              {{ $t('settings.notification_visibility_follows') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationVisibility.mentions">
+              {{ $t('settings.notification_visibility_mentions') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationVisibility.moves">
+              {{ $t('settings.notification_visibility_moves') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationVisibility.emojiReactions">
+              {{ $t('settings.notification_visibility_emoji_reactions') }}
+            </Checkbox>
+          </li>
+        </ul>
+      </div>
+      <div>
+        {{ $t('settings.replies_in_timeline') }}
+        <label
+          for="replyVisibility"
+          class="select"
         >
-        <select
-          id="replyVisibility"
-          v-model="replyVisibility"
+          <select
+            id="replyVisibility"
+            v-model="replyVisibility"
           >
-          <option
-            value="all"
-            selected
+            <option
+              value="all"
+              selected
             >{{ $t('settings.reply_visibility_all') }}</option>
-          <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
-          <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
-        </select>
-        <i class="icon-down-open" />
-      </label>
+            <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
+            <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
+          </select>
+          <i class="icon-down-open" />
+        </label>
+      </div>
+      <div>
+        <Checkbox v-model="hidePostStats">
+          {{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
+        </Checkbox>
+      </div>
+      <div>
+        <Checkbox v-model="hideUserStats">
+          {{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
+        </Checkbox>
+      </div>
     </div>
-    <div>
-      <Checkbox v-model="hidePostStats">
-        {{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
-      </Checkbox>
-    </div>
-    <div>
-      <Checkbox v-model="hideUserStats">
-        {{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
-      </Checkbox>
-    </div>
-  </div>
-  <div class="setting-item">
-    <div>
-      <p>{{ $t('settings.filtering_explanation') }}</p>
-      <textarea
-        id="muteWords"
-        v-model="muteWordsString"
+    <div class="setting-item">
+      <div>
+        <p>{{ $t('settings.filtering_explanation') }}</p>
+        <textarea
+          id="muteWords"
+          v-model="muteWordsString"
         />
-    </div>
-    <div>
-      <Checkbox v-model="hideFilteredStatuses">
-        {{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
-      </Checkbox>
+      </div>
+      <div>
+        <Checkbox v-model="hideFilteredStatuses">
+          {{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
+        </Checkbox>
+      </div>
     </div>
   </div>
-</div>
 </template>
 <script src="./filtering_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 82bf6862..9df1da79 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -5,7 +5,6 @@ import SharedComputedObject from './helpers/shared_computed_object.js'
 
 const GeneralTab = {
   data () {
-    const instance = this.$store.state.instance
     return {
       loopSilentAvailable:
       // Firefox
@@ -13,7 +12,7 @@ const GeneralTab = {
       // Chrome-likes
       Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') ||
       // Future spec, still not supported in Nightly 63 as of 08/2018
-      Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
+      Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks')
     }
   },
   components: {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 0d2da07a..f89c0480 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -1,160 +1,160 @@
 <template>
-<div :label="$t('settings.general')">
-  <div class="setting-item">
-    <h2>{{ $t('settings.interface') }}</h2>
-    <ul class="setting-list">
-      <li>
-        <interface-language-switcher />
-      </li>
-      <li v-if="instanceSpecificPanelPresent">
-        <Checkbox v-model="hideISP">
-          {{ $t('settings.hide_isp') }}
-        </Checkbox>
-      </li>
-    </ul>
-  </div>
-  <div class="setting-item">
-    <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>
-      </li>
-      <li>
-        <Checkbox v-model="collapseMessageWithSubject">
-          {{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
-        </Checkbox>
-      </li>
-      <li>
-        <Checkbox v-model="streaming">
-          {{ $t('settings.streaming') }}
-        </Checkbox>
-        <ul
-          class="setting-list suboptions"
-          :class="[{disabled: !streaming}]"
+  <div :label="$t('settings.general')">
+    <div class="setting-item">
+      <h2>{{ $t('settings.interface') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <interface-language-switcher />
+        </li>
+        <li v-if="instanceSpecificPanelPresent">
+          <Checkbox v-model="hideISP">
+            {{ $t('settings.hide_isp') }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
+    <div class="setting-item">
+      <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>
+        </li>
+        <li>
+          <Checkbox v-model="collapseMessageWithSubject">
+            {{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="streaming">
+            {{ $t('settings.streaming') }}
+          </Checkbox>
+          <ul
+            class="setting-list suboptions"
+            :class="[{disabled: !streaming}]"
           >
-          <li>
-            <Checkbox
-              v-model="pauseOnUnfocused"
-              :disabled="!streaming"
+            <li>
+              <Checkbox
+                v-model="pauseOnUnfocused"
+                :disabled="!streaming"
               >
-              {{ $t('settings.pause_on_unfocused') }}
-            </Checkbox>
-          </li>
-        </ul>
-      </li>
-      <li>
-        <Checkbox v-model="useStreamingApi">
-          {{ $t('settings.useStreamingApi') }}
-          <br>
-          <small>
-            {{ $t('settings.useStreamingApiWarning') }}
-          </small>
-        </Checkbox>
-      </li>
-      <li>
-        <Checkbox v-model="autoLoad">
-          {{ $t('settings.autoload') }}
-        </Checkbox>
-      </li>
-      <li>
-        <Checkbox v-model="hoverPreview">
-          {{ $t('settings.reply_link_preview') }}
-        </Checkbox>
-      </li>
-      <li>
-        <Checkbox v-model="emojiReactionsOnTimeline">
-          {{ $t('settings.emoji_reactions_on_timeline') }}
-        </Checkbox>
-      </li>
-    </ul>
-  </div>
+                {{ $t('settings.pause_on_unfocused') }}
+              </Checkbox>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <Checkbox v-model="useStreamingApi">
+            {{ $t('settings.useStreamingApi') }}
+            <br>
+            <small>
+              {{ $t('settings.useStreamingApiWarning') }}
+            </small>
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="autoLoad">
+            {{ $t('settings.autoload') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="hoverPreview">
+            {{ $t('settings.reply_link_preview') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="emojiReactionsOnTimeline">
+            {{ $t('settings.emoji_reactions_on_timeline') }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
 
-  <div class="setting-item">
-    <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>
-      </li>
-      <li>
-        <Checkbox v-model="alwaysShowSubjectInput">
-          {{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
-        </Checkbox>
-      </li>
-      <li>
-        <div>
-          {{ $t('settings.subject_line_behavior') }}
-          <label
-            for="subjectLineBehavior"
-            class="select"
+    <div class="setting-item">
+      <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>
+        </li>
+        <li>
+          <Checkbox v-model="alwaysShowSubjectInput">
+            {{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
+          </Checkbox>
+        </li>
+        <li>
+          <div>
+            {{ $t('settings.subject_line_behavior') }}
+            <label
+              for="subjectLineBehavior"
+              class="select"
             >
-            <select
-              id="subjectLineBehavior"
-              v-model="subjectLineBehavior"
+              <select
+                id="subjectLineBehavior"
+                v-model="subjectLineBehavior"
               >
-              <option value="email">
-                {{ $t('settings.subject_line_email') }}
-                {{ subjectLineBehaviorDefaultValue == 'email' ? $t('settings.instance_default_simple') : '' }}
-              </option>
-              <option value="masto">
-                {{ $t('settings.subject_line_mastodon') }}
-                {{ subjectLineBehaviorDefaultValue == 'mastodon' ? $t('settings.instance_default_simple') : '' }}
-              </option>
-              <option value="noop">
-                {{ $t('settings.subject_line_noop') }}
-                {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
-              </option>
-            </select>
-            <i class="icon-down-open" />
-          </label>
-        </div>
-      </li>
-      <li v-if="postFormats.length > 0">
-        <div>
-          {{ $t('settings.post_status_content_type') }}
-          <label
-            for="postContentType"
-            class="select"
+                <option value="email">
+                  {{ $t('settings.subject_line_email') }}
+                  {{ subjectLineBehaviorDefaultValue == 'email' ? $t('settings.instance_default_simple') : '' }}
+                </option>
+                <option value="masto">
+                  {{ $t('settings.subject_line_mastodon') }}
+                  {{ subjectLineBehaviorDefaultValue == 'mastodon' ? $t('settings.instance_default_simple') : '' }}
+                </option>
+                <option value="noop">
+                  {{ $t('settings.subject_line_noop') }}
+                  {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
+                </option>
+              </select>
+              <i class="icon-down-open" />
+            </label>
+          </div>
+        </li>
+        <li v-if="postFormats.length > 0">
+          <div>
+            {{ $t('settings.post_status_content_type') }}
+            <label
+              for="postContentType"
+              class="select"
             >
-            <select
-              id="postContentType"
-              v-model="postContentType"
+              <select
+                id="postContentType"
+                v-model="postContentType"
               >
-              <option
-                v-for="postFormat in postFormats"
-                :key="postFormat"
-                :value="postFormat"
+                <option
+                  v-for="postFormat in postFormats"
+                  :key="postFormat"
+                  :value="postFormat"
                 >
-                {{ $t(`post_status.content_type["${postFormat}"]`) }}
-                {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
-              </option>
-            </select>
-            <i class="icon-down-open" />
-          </label>
-        </div>
-      </li>
-      <li>
-        <Checkbox v-model="minimalScopesMode">
-          {{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
-        </Checkbox>
-      </li>
-      <li>
-        <Checkbox v-model="autohideFloatingPostButton">
-          {{ $t('settings.autohide_floating_post_button') }}
-        </Checkbox>
-      </li>
-      <li>
-        <Checkbox v-model="padEmoji">
-          {{ $t('settings.pad_emoji') }}
-        </Checkbox>
-      </li>
-    </ul>
-  </div>
+                  {{ $t(`post_status.content_type["${postFormat}"]`) }}
+                  {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
+                </option>
+              </select>
+              <i class="icon-down-open" />
+            </label>
+          </div>
+        </li>
+        <li>
+          <Checkbox v-model="minimalScopesMode">
+            {{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="autohideFloatingPostButton">
+            {{ $t('settings.autohide_floating_post_button') }}
+          </Checkbox>
+        </li>
+        <li>
+          <Checkbox v-model="padEmoji">
+            {{ $t('settings.pad_emoji') }}
+          </Checkbox>
+        </li>
+      </ul>
+    </div>
 
-  <div class="setting-item">
+    <div class="setting-item">
       <h2>{{ $t('settings.attachments') }}</h2>
       <ul class="setting-list">
         <li>
@@ -178,7 +178,7 @@
             type="number"
             min="0"
             step="1"
-            >
+          >
         </li>
         <li>
           <Checkbox v-model="hideNsfw">
@@ -190,7 +190,7 @@
             <Checkbox
               v-model="preloadImage"
               :disabled="!hideNsfw"
-              >
+            >
               {{ $t('settings.preload_images') }}
             </Checkbox>
           </li>
@@ -198,7 +198,7 @@
             <Checkbox
               v-model="useOneClickNsfw"
               :disabled="!hideNsfw"
-              >
+            >
               {{ $t('settings.use_one_click_nsfw') }}
             </Checkbox>
           </li>
@@ -215,18 +215,18 @@
           <ul
             class="setting-list suboptions"
             :class="[{disabled: !streaming}]"
-            >
+          >
             <li>
               <Checkbox
                 v-model="loopVideoSilentOnly"
                 :disabled="!loopVideo || !loopSilentAvailable"
-                >
+              >
                 {{ $t('settings.loop_video_silent_only') }}
               </Checkbox>
               <div
                 v-if="!loopSilentAvailable"
                 class="unavailable"
-                >
+              >
                 <i class="icon-globe" />! {{ $t('settings.limited_availability') }}
               </div>
             </li>
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index 04f9c6dd..6884b7be 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -1,175 +1,175 @@
 <template>
-<tab-switcher
-  :scrollableTabs="true"
-  class="mutes-and-blocks-tab"
+  <tab-switcher
+    :scrollable-tabs="true"
+    class="mutes-and-blocks-tab"
   >
-  <div :label="$t('settings.blocks_tab')">
-    <div class="usersearch-wrapper">
-      <Autosuggest
-        :filter="filterUnblockedUsers"
-        :query="queryUserIds"
-        :placeholder="$t('settings.search_user_to_block')"
+    <div :label="$t('settings.blocks_tab')">
+      <div class="usersearch-wrapper">
+        <Autosuggest
+          :filter="filterUnblockedUsers"
+          :query="queryUserIds"
+          :placeholder="$t('settings.search_user_to_block')"
         >
-        <BlockCard
-          slot-scope="row"
-          :user-id="row.item"
+          <BlockCard
+            slot-scope="row"
+            :user-id="row.item"
           />
-      </Autosuggest>
-    </div>
-    <BlockList
-      :refresh="true"
-      :get-key="i => i"
+        </Autosuggest>
+      </div>
+      <BlockList
+        :refresh="true"
+        :get-key="i => i"
       >
-      <template
-        slot="header"
-        slot-scope="{selected}"
+        <template
+          slot="header"
+          slot-scope="{selected}"
         >
-        <div class="bulk-actions">
-          <ProgressButton
-            v-if="selected.length > 0"
-            class="btn btn-default bulk-action-button"
-            :click="() => blockUsers(selected)"
+          <div class="bulk-actions">
+            <ProgressButton
+              v-if="selected.length > 0"
+              class="btn btn-default bulk-action-button"
+              :click="() => blockUsers(selected)"
             >
-            {{ $t('user_card.block') }}
-            <template slot="progress">
-              {{ $t('user_card.block_progress') }}
-            </template>
-          </ProgressButton>
-          <ProgressButton
-            v-if="selected.length > 0"
-            class="btn btn-default"
-            :click="() => unblockUsers(selected)"
+              {{ $t('user_card.block') }}
+              <template slot="progress">
+                {{ $t('user_card.block_progress') }}
+              </template>
+            </ProgressButton>
+            <ProgressButton
+              v-if="selected.length > 0"
+              class="btn btn-default"
+              :click="() => unblockUsers(selected)"
             >
-            {{ $t('user_card.unblock') }}
-            <template slot="progress">
-              {{ $t('user_card.unblock_progress') }}
-            </template>
-          </ProgressButton>
-        </div>
-      </template>
-      <template
-        slot="item"
-        slot-scope="{item}"
+              {{ $t('user_card.unblock') }}
+              <template slot="progress">
+                {{ $t('user_card.unblock_progress') }}
+              </template>
+            </ProgressButton>
+          </div>
+        </template>
+        <template
+          slot="item"
+          slot-scope="{item}"
         >
-        <BlockCard :user-id="item" />
-      </template>
-      <template slot="empty">
-        {{ $t('settings.no_blocks') }}
-      </template>
-    </BlockList>
-  </div>
+          <BlockCard :user-id="item" />
+        </template>
+        <template slot="empty">
+          {{ $t('settings.no_blocks') }}
+        </template>
+      </BlockList>
+    </div>
 
-  <div :label="$t('settings.mutes_tab')">
-    <tab-switcher>
-      <div label="Users">
-        <div class="usersearch-wrapper">
-          <Autosuggest
-            :filter="filterUnMutedUsers"
-            :query="queryUserIds"
-            :placeholder="$t('settings.search_user_to_mute')"
+    <div :label="$t('settings.mutes_tab')">
+      <tab-switcher>
+        <div label="Users">
+          <div class="usersearch-wrapper">
+            <Autosuggest
+              :filter="filterUnMutedUsers"
+              :query="queryUserIds"
+              :placeholder="$t('settings.search_user_to_mute')"
             >
-            <MuteCard
-              slot-scope="row"
-              :user-id="row.item"
+              <MuteCard
+                slot-scope="row"
+                :user-id="row.item"
               />
-          </Autosuggest>
-        </div>
-        <MuteList
-          :refresh="true"
-          :get-key="i => i"
+            </Autosuggest>
+          </div>
+          <MuteList
+            :refresh="true"
+            :get-key="i => i"
           >
-          <template
-            slot="header"
-            slot-scope="{selected}"
+            <template
+              slot="header"
+              slot-scope="{selected}"
             >
-            <div class="bulk-actions">
-              <ProgressButton
-                v-if="selected.length > 0"
-                class="btn btn-default"
-                :click="() => muteUsers(selected)"
+              <div class="bulk-actions">
+                <ProgressButton
+                  v-if="selected.length > 0"
+                  class="btn btn-default"
+                  :click="() => muteUsers(selected)"
                 >
-                {{ $t('user_card.mute') }}
-                <template slot="progress">
-                  {{ $t('user_card.mute_progress') }}
-                </template>
-              </ProgressButton>
-              <ProgressButton
-                v-if="selected.length > 0"
-                class="btn btn-default"
-                :click="() => unmuteUsers(selected)"
+                  {{ $t('user_card.mute') }}
+                  <template slot="progress">
+                    {{ $t('user_card.mute_progress') }}
+                  </template>
+                </ProgressButton>
+                <ProgressButton
+                  v-if="selected.length > 0"
+                  class="btn btn-default"
+                  :click="() => unmuteUsers(selected)"
                 >
-                {{ $t('user_card.unmute') }}
-                <template slot="progress">
-                  {{ $t('user_card.unmute_progress') }}
-                </template>
-              </ProgressButton>
-            </div>
-          </template>
-          <template
-            slot="item"
-            slot-scope="{item}"
-            >
-            <MuteCard :user-id="item" />
-          </template>
-          <template slot="empty">
-            {{ $t('settings.no_mutes') }}
-          </template>
-        </MuteList>
-      </div>
-
-      <div :label="$t('settings.domain_mutes')">
-        <div class="domain-mute-form">
-          <input
-            v-model="newDomainToMute"
-            :placeholder="$t('settings.type_domains_to_mute')"
-            type="text"
-            @keyup.enter="muteDomain"
-            >
-          <ProgressButton
-            class="btn btn-default domain-mute-button"
-            :click="muteDomain"
-            >
-            {{ $t('domain_mute_card.mute') }}
-            <template slot="progress">
-              {{ $t('domain_mute_card.mute_progress') }}
+                  {{ $t('user_card.unmute') }}
+                  <template slot="progress">
+                    {{ $t('user_card.unmute_progress') }}
+                  </template>
+                </ProgressButton>
+              </div>
             </template>
-          </ProgressButton>
+            <template
+              slot="item"
+              slot-scope="{item}"
+            >
+              <MuteCard :user-id="item" />
+            </template>
+            <template slot="empty">
+              {{ $t('settings.no_mutes') }}
+            </template>
+          </MuteList>
         </div>
-        <DomainMuteList
-          :refresh="true"
-          :get-key="i => i"
+
+        <div :label="$t('settings.domain_mutes')">
+          <div class="domain-mute-form">
+            <input
+              v-model="newDomainToMute"
+              :placeholder="$t('settings.type_domains_to_mute')"
+              type="text"
+              @keyup.enter="muteDomain"
+            >
+            <ProgressButton
+              class="btn btn-default domain-mute-button"
+              :click="muteDomain"
+            >
+              {{ $t('domain_mute_card.mute') }}
+              <template slot="progress">
+                {{ $t('domain_mute_card.mute_progress') }}
+              </template>
+            </ProgressButton>
+          </div>
+          <DomainMuteList
+            :refresh="true"
+            :get-key="i => i"
           >
-          <template
-            slot="header"
-            slot-scope="{selected}"
+            <template
+              slot="header"
+              slot-scope="{selected}"
             >
-            <div class="bulk-actions">
-              <ProgressButton
-                v-if="selected.length > 0"
-                class="btn btn-default"
-                :click="() => unmuteDomains(selected)"
+              <div class="bulk-actions">
+                <ProgressButton
+                  v-if="selected.length > 0"
+                  class="btn btn-default"
+                  :click="() => unmuteDomains(selected)"
                 >
-                {{ $t('domain_mute_card.unmute') }}
-                <template slot="progress">
-                  {{ $t('domain_mute_card.unmute_progress') }}
-                </template>
-              </ProgressButton>
-            </div>
-          </template>
-          <template
-            slot="item"
-            slot-scope="{item}"
+                  {{ $t('domain_mute_card.unmute') }}
+                  <template slot="progress">
+                    {{ $t('domain_mute_card.unmute_progress') }}
+                  </template>
+                </ProgressButton>
+              </div>
+            </template>
+            <template
+              slot="item"
+              slot-scope="{item}"
             >
-            <DomainMuteCard :domain="item" />
-          </template>
-          <template slot="empty">
-            {{ $t('settings.no_mutes') }}
-          </template>
-        </DomainMuteList>
-      </div>
-    </tab-switcher>
-  </div>
-</tab-switcher>
+              <DomainMuteCard :domain="item" />
+            </template>
+            <template slot="empty">
+              {{ $t('settings.no_mutes') }}
+            </template>
+          </DomainMuteList>
+        </div>
+      </tab-switcher>
+    </div>
+  </tab-switcher>
 </template>
 
 <script src="./mutes_and_blocks_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index 19181e24..b7a3cb37 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -1,53 +1,53 @@
 <template>
-<div :label="$t('settings.notifications')">
-  <div class="setting-item">
-    <h2>{{ $t('settings.notification_setting_filters') }}</h2>
-    <div class="select-multiple">
-      <span class="label">{{ $t('settings.notification_setting') }}</span>
-      <ul class="option-list">
-        <li>
-          <Checkbox v-model="notificationSettings.follows">
-            {{ $t('settings.notification_setting_follows') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationSettings.followers">
-            {{ $t('settings.notification_setting_followers') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationSettings.non_follows">
-            {{ $t('settings.notification_setting_non_follows') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="notificationSettings.non_followers">
-            {{ $t('settings.notification_setting_non_followers') }}
-          </Checkbox>
-        </li>
-      </ul>
+  <div :label="$t('settings.notifications')">
+    <div class="setting-item">
+      <h2>{{ $t('settings.notification_setting_filters') }}</h2>
+      <div class="select-multiple">
+        <span class="label">{{ $t('settings.notification_setting') }}</span>
+        <ul class="option-list">
+          <li>
+            <Checkbox v-model="notificationSettings.follows">
+              {{ $t('settings.notification_setting_follows') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationSettings.followers">
+              {{ $t('settings.notification_setting_followers') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationSettings.non_follows">
+              {{ $t('settings.notification_setting_non_follows') }}
+            </Checkbox>
+          </li>
+          <li>
+            <Checkbox v-model="notificationSettings.non_followers">
+              {{ $t('settings.notification_setting_non_followers') }}
+            </Checkbox>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="setting-item">
+      <h2>{{ $t('settings.notification_setting_privacy') }}</h2>
+      <p>
+        <Checkbox v-model="notificationSettings.privacy_option">
+          {{ $t('settings.notification_setting_privacy_option') }}
+        </Checkbox>
+      </p>
+    </div>
+    <div class="setting-item">
+      <p>{{ $t('settings.notification_mutes') }}</p>
+      <p>{{ $t('settings.notification_blocks') }}</p>
+      <button
+        class="btn btn-default"
+        @click="updateNotificationSettings"
+      >
+        {{ $t('general.submit') }}
+      </button>
     </div>
   </div>
-
-  <div class="setting-item">
-    <h2>{{ $t('settings.notification_setting_privacy') }}</h2>
-    <p>
-      <Checkbox v-model="notificationSettings.privacy_option">
-        {{ $t('settings.notification_setting_privacy_option') }}
-      </Checkbox>
-    </p>
-  </div>
-  <div class="setting-item">
-    <p>{{ $t('settings.notification_mutes') }}</p>
-    <p>{{ $t('settings.notification_blocks') }}</p>
-    <button
-      class="btn btn-default"
-      @click="updateNotificationSettings"
-      >
-      {{ $t('general.submit') }}
-    </button>
-  </div>
-</div>
 </template>
 
 <script src="./notifications_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 0b4951d3..8658b097 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -32,7 +32,7 @@ const ProfileTab = {
       background: null,
       backgroundPreview: null,
       bannerUploadError: null,
-      backgroundUploadError: null,
+      backgroundUploadError: null
     }
   },
   components: {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 9dd89b99..fff4f970 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -1,212 +1,212 @@
 <template>
-<div class="profile-tab">
-  <div class="setting-item">
-    <h2>{{ $t('settings.name_bio') }}</h2>
-    <p>{{ $t('settings.name') }}</p>
-    <EmojiInput
-      v-model="newName"
-      enable-emoji-picker
-      :suggest="emojiSuggestor"
-      >
-      <input
-        id="username"
+  <div class="profile-tab">
+    <div class="setting-item">
+      <h2>{{ $t('settings.name_bio') }}</h2>
+      <p>{{ $t('settings.name') }}</p>
+      <EmojiInput
         v-model="newName"
-        classname="name-changer"
-        >
-    </EmojiInput>
-    <p>{{ $t('settings.bio') }}</p>
-    <EmojiInput
-      v-model="newBio"
-      enable-emoji-picker
-      :suggest="emojiUserSuggestor"
+        enable-emoji-picker
+        :suggest="emojiSuggestor"
       >
-      <textarea
-        v-model="newBio"
-        classname="bio"
-        />
-    </EmojiInput>
-    <p>
-      <Checkbox v-model="newLocked">
-        {{ $t('settings.lock_account_description') }}
-      </Checkbox>
-    </p>
-    <div>
-      <label for="default-vis">{{ $t('settings.default_vis') }}</label>
-      <div
-        id="default-vis"
-        class="visibility-tray"
+        <input
+          id="username"
+          v-model="newName"
+          classname="name-changer"
         >
-        <scope-selector
-          :show-all="true"
-          :user-default="newDefaultScope"
-          :initial-scope="newDefaultScope"
-          :on-scope-change="changeVis"
+      </EmojiInput>
+      <p>{{ $t('settings.bio') }}</p>
+      <EmojiInput
+        v-model="newBio"
+        enable-emoji-picker
+        :suggest="emojiUserSuggestor"
+      >
+        <textarea
+          v-model="newBio"
+          classname="bio"
+        />
+      </EmojiInput>
+      <p>
+        <Checkbox v-model="newLocked">
+          {{ $t('settings.lock_account_description') }}
+        </Checkbox>
+      </p>
+      <div>
+        <label for="default-vis">{{ $t('settings.default_vis') }}</label>
+        <div
+          id="default-vis"
+          class="visibility-tray"
+        >
+          <scope-selector
+            :show-all="true"
+            :user-default="newDefaultScope"
+            :initial-scope="newDefaultScope"
+            :on-scope-change="changeVis"
           />
+        </div>
+      </div>
+      <p>
+        <Checkbox v-model="newNoRichText">
+          {{ $t('settings.no_rich_text_description') }}
+        </Checkbox>
+      </p>
+      <p>
+        <Checkbox v-model="hideFollows">
+          {{ $t('settings.hide_follows_description') }}
+        </Checkbox>
+      </p>
+      <p class="setting-subitem">
+        <Checkbox
+          v-model="hideFollowsCount"
+          :disabled="!hideFollows"
+        >
+          {{ $t('settings.hide_follows_count_description') }}
+        </Checkbox>
+      </p>
+      <p>
+        <Checkbox v-model="hideFollowers">
+          {{ $t('settings.hide_followers_description') }}
+        </Checkbox>
+      </p>
+      <p class="setting-subitem">
+        <Checkbox
+          v-model="hideFollowersCount"
+          :disabled="!hideFollowers"
+        >
+          {{ $t('settings.hide_followers_count_description') }}
+        </Checkbox>
+      </p>
+      <p>
+        <Checkbox v-model="allowFollowingMove">
+          {{ $t('settings.allow_following_move') }}
+        </Checkbox>
+      </p>
+      <p v-if="role === 'admin' || role === 'moderator'">
+        <Checkbox v-model="showRole">
+          <template v-if="role === 'admin'">
+            {{ $t('settings.show_admin_badge') }}
+          </template>
+          <template v-if="role === 'moderator'">
+            {{ $t('settings.show_moderator_badge') }}
+          </template>
+        </Checkbox>
+      </p>
+      <p>
+        <Checkbox v-model="discoverable">
+          {{ $t('settings.discoverable') }}
+        </Checkbox>
+      </p>
+      <button
+        :disabled="newName && newName.length === 0"
+        class="btn btn-default"
+        @click="updateProfile"
+      >
+        {{ $t('general.submit') }}
+      </button>
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('settings.avatar') }}</h2>
+      <p class="visibility-notice">
+        {{ $t('settings.avatar_size_instruction') }}
+      </p>
+      <p>{{ $t('settings.current_avatar') }}</p>
+      <img
+        :src="user.profile_image_url_original"
+        class="current-avatar"
+      >
+      <p>{{ $t('settings.set_new_avatar') }}</p>
+      <button
+        v-show="pickAvatarBtnVisible"
+        id="pick-avatar"
+        class="btn"
+        type="button"
+      >
+        {{ $t('settings.upload_a_photo') }}
+      </button>
+      <image-cropper
+        trigger="#pick-avatar"
+        :submit-handler="submitAvatar"
+        @open="pickAvatarBtnVisible=false"
+        @close="pickAvatarBtnVisible=true"
+      />
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('settings.profile_banner') }}</h2>
+      <p>{{ $t('settings.current_profile_banner') }}</p>
+      <img
+        :src="user.cover_photo"
+        class="banner"
+      >
+      <p>{{ $t('settings.set_new_profile_banner') }}</p>
+      <img
+        v-if="bannerPreview"
+        class="banner"
+        :src="bannerPreview"
+      >
+      <div>
+        <input
+          type="file"
+          @change="uploadFile('banner', $event)"
+        >
+      </div>
+      <i
+        v-if="bannerUploading"
+        class=" icon-spin4 animate-spin uploading"
+      />
+      <button
+        v-else-if="bannerPreview"
+        class="btn btn-default"
+        @click="submitBanner"
+      >
+        {{ $t('general.submit') }}
+      </button>
+      <div
+        v-if="bannerUploadError"
+        class="alert error"
+      >
+        Error: {{ bannerUploadError }}
+        <i
+          class="button-icon icon-cancel"
+          @click="clearUploadError('banner')"
+        />
       </div>
     </div>
-    <p>
-      <Checkbox v-model="newNoRichText">
-        {{ $t('settings.no_rich_text_description') }}
-      </Checkbox>
-    </p>
-    <p>
-      <Checkbox v-model="hideFollows">
-        {{ $t('settings.hide_follows_description') }}
-      </Checkbox>
-    </p>
-    <p class="setting-subitem">
-      <Checkbox
-        v-model="hideFollowsCount"
-        :disabled="!hideFollows"
+    <div class="setting-item">
+      <h2>{{ $t('settings.profile_background') }}</h2>
+      <p>{{ $t('settings.set_new_profile_background') }}</p>
+      <img
+        v-if="backgroundPreview"
+        class="bg"
+        :src="backgroundPreview"
+      >
+      <div>
+        <input
+          type="file"
+          @change="uploadFile('background', $event)"
         >
-        {{ $t('settings.hide_follows_count_description') }}
-      </Checkbox>
-    </p>
-    <p>
-      <Checkbox v-model="hideFollowers">
-        {{ $t('settings.hide_followers_description') }}
-      </Checkbox>
-    </p>
-    <p class="setting-subitem">
-      <Checkbox
-        v-model="hideFollowersCount"
-        :disabled="!hideFollowers"
-        >
-        {{ $t('settings.hide_followers_count_description') }}
-      </Checkbox>
-    </p>
-    <p>
-      <Checkbox v-model="allowFollowingMove">
-        {{ $t('settings.allow_following_move') }}
-      </Checkbox>
-    </p>
-    <p v-if="role === 'admin' || role === 'moderator'">
-      <Checkbox v-model="showRole">
-        <template v-if="role === 'admin'">
-          {{ $t('settings.show_admin_badge') }}
-        </template>
-        <template v-if="role === 'moderator'">
-          {{ $t('settings.show_moderator_badge') }}
-        </template>
-      </Checkbox>
-    </p>
-    <p>
-      <Checkbox v-model="discoverable">
-        {{ $t('settings.discoverable') }}
-      </Checkbox>
-    </p>
-    <button
-      :disabled="newName && newName.length === 0"
-      class="btn btn-default"
-      @click="updateProfile"
-      >
-      {{ $t('general.submit') }}
-    </button>
-  </div>
-  <div class="setting-item">
-    <h2>{{ $t('settings.avatar') }}</h2>
-    <p class="visibility-notice">
-      {{ $t('settings.avatar_size_instruction') }}
-    </p>
-    <p>{{ $t('settings.current_avatar') }}</p>
-    <img
-      :src="user.profile_image_url_original"
-      class="current-avatar"
-      >
-    <p>{{ $t('settings.set_new_avatar') }}</p>
-    <button
-      v-show="pickAvatarBtnVisible"
-      id="pick-avatar"
-      class="btn"
-      type="button"
-      >
-      {{ $t('settings.upload_a_photo') }}
-    </button>
-    <image-cropper
-      trigger="#pick-avatar"
-      :submit-handler="submitAvatar"
-      @open="pickAvatarBtnVisible=false"
-      @close="pickAvatarBtnVisible=true"
-      />
-  </div>
-  <div class="setting-item">
-    <h2>{{ $t('settings.profile_banner') }}</h2>
-    <p>{{ $t('settings.current_profile_banner') }}</p>
-    <img
-      :src="user.cover_photo"
-      class="banner"
-      >
-    <p>{{ $t('settings.set_new_profile_banner') }}</p>
-    <img
-      v-if="bannerPreview"
-      class="banner"
-      :src="bannerPreview"
-      >
-    <div>
-      <input
-        type="file"
-        @change="uploadFile('banner', $event)"
-        >
-    </div>
-    <i
-      v-if="bannerUploading"
-      class=" icon-spin4 animate-spin uploading"
-      />
-    <button
-      v-else-if="bannerPreview"
-      class="btn btn-default"
-      @click="submitBanner"
-      >
-      {{ $t('general.submit') }}
-    </button>
-    <div
-      v-if="bannerUploadError"
-      class="alert error"
-      >
-      Error: {{ bannerUploadError }}
+      </div>
       <i
-        class="button-icon icon-cancel"
-        @click="clearUploadError('banner')"
-        />
-    </div>
-  </div>
-  <div class="setting-item">
-    <h2>{{ $t('settings.profile_background') }}</h2>
-    <p>{{ $t('settings.set_new_profile_background') }}</p>
-    <img
-      v-if="backgroundPreview"
-      class="bg"
-      :src="backgroundPreview"
-      >
-    <div>
-      <input
-        type="file"
-        @change="uploadFile('background', $event)"
-        >
-    </div>
-    <i
-      v-if="backgroundUploading"
-      class=" icon-spin4 animate-spin uploading"
+        v-if="backgroundUploading"
+        class=" icon-spin4 animate-spin uploading"
       />
-    <button
-      v-else-if="backgroundPreview"
-      class="btn btn-default"
-      @click="submitBg"
+      <button
+        v-else-if="backgroundPreview"
+        class="btn btn-default"
+        @click="submitBg"
       >
-      {{ $t('general.submit') }}
-    </button>
-    <div
-      v-if="backgroundUploadError"
-      class="alert error"
+        {{ $t('general.submit') }}
+      </button>
+      <div
+        v-if="backgroundUploadError"
+        class="alert error"
       >
-      Error: {{ backgroundUploadError }}
-      <i
-        class="button-icon icon-cancel"
-        @click="clearUploadError('background')"
+        Error: {{ backgroundUploadError }}
+        <i
+          class="button-icon icon-cancel"
+          @click="clearUploadError('background')"
         />
+      </div>
     </div>
   </div>
-</div>
 </template>
 
 <script src="./profile_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.vue b/src/components/settings_modal/tabs/security_tab/security_tab.vue
index 45bacec1..3d32d73d 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.vue
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.vue
@@ -1,142 +1,142 @@
 <template>
-<div :label="$t('settings.security_tab')">
-  <div class="setting-item">
-    <h2>{{ $t('settings.change_email') }}</h2>
-    <div>
-      <p>{{ $t('settings.new_email') }}</p>
-      <input
-        v-model="newEmail"
-        type="email"
-        autocomplete="email"
+  <div :label="$t('settings.security_tab')">
+    <div class="setting-item">
+      <h2>{{ $t('settings.change_email') }}</h2>
+      <div>
+        <p>{{ $t('settings.new_email') }}</p>
+        <input
+          v-model="newEmail"
+          type="email"
+          autocomplete="email"
         >
-    </div>
-    <div>
-      <p>{{ $t('settings.current_password') }}</p>
-      <input
-        v-model="changeEmailPassword"
-        type="password"
-        autocomplete="current-password"
-        >
-    </div>
-    <button
-      class="btn btn-default"
-      @click="changeEmail"
-      >
-      {{ $t('general.submit') }}
-    </button>
-    <p v-if="changedEmail">
-      {{ $t('settings.changed_email') }}
-    </p>
-    <template v-if="changeEmailError !== false">
-      <p>{{ $t('settings.change_email_error') }}</p>
-      <p>{{ changeEmailError }}</p>
-    </template>
-  </div>
-
-  <div class="setting-item">
-    <h2>{{ $t('settings.change_password') }}</h2>
-    <div>
-      <p>{{ $t('settings.current_password') }}</p>
-      <input
-        v-model="changePasswordInputs[0]"
-        type="password"
-        >
-    </div>
-    <div>
-      <p>{{ $t('settings.new_password') }}</p>
-      <input
-        v-model="changePasswordInputs[1]"
-        type="password"
-        >
-    </div>
-    <div>
-      <p>{{ $t('settings.confirm_new_password') }}</p>
-      <input
-        v-model="changePasswordInputs[2]"
-        type="password"
-        >
-    </div>
-    <button
-      class="btn btn-default"
-      @click="changePassword"
-      >
-      {{ $t('general.submit') }}
-    </button>
-    <p v-if="changedPassword">
-      {{ $t('settings.changed_password') }}
-    </p>
-    <p v-else-if="changePasswordError !== false">
-      {{ $t('settings.change_password_error') }}
-    </p>
-    <p v-if="changePasswordError">
-      {{ changePasswordError }}
-    </p>
-  </div>
-
-  <div class="setting-item">
-    <h2>{{ $t('settings.oauth_tokens') }}</h2>
-    <table class="oauth-tokens">
-      <thead>
-        <tr>
-          <th>{{ $t('settings.app_name') }}</th>
-          <th>{{ $t('settings.valid_until') }}</th>
-          <th />
-        </tr>
-      </thead>
-      <tbody>
-        <tr
-          v-for="oauthToken in oauthTokens"
-          :key="oauthToken.id"
-          >
-          <td>{{ oauthToken.appName }}</td>
-          <td>{{ oauthToken.validUntil }}</td>
-          <td class="actions">
-            <button
-              class="btn btn-default"
-              @click="revokeToken(oauthToken.id)"
-              >
-              {{ $t('settings.revoke_token') }}
-            </button>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-  <mfa />
-  <div class="setting-item">
-    <h2>{{ $t('settings.delete_account') }}</h2>
-    <p v-if="!deletingAccount">
-      {{ $t('settings.delete_account_description') }}
-    </p>
-    <div v-if="deletingAccount">
-      <p>{{ $t('settings.delete_account_instructions') }}</p>
-      <p>{{ $t('login.password') }}</p>
-      <input
-        v-model="deleteAccountConfirmPasswordInput"
-        type="password"
+      </div>
+      <div>
+        <p>{{ $t('settings.current_password') }}</p>
+        <input
+          v-model="changeEmailPassword"
+          type="password"
+          autocomplete="current-password"
         >
+      </div>
       <button
         class="btn btn-default"
-        @click="deleteAccount"
+        @click="changeEmail"
+      >
+        {{ $t('general.submit') }}
+      </button>
+      <p v-if="changedEmail">
+        {{ $t('settings.changed_email') }}
+      </p>
+      <template v-if="changeEmailError !== false">
+        <p>{{ $t('settings.change_email_error') }}</p>
+        <p>{{ changeEmailError }}</p>
+      </template>
+    </div>
+
+    <div class="setting-item">
+      <h2>{{ $t('settings.change_password') }}</h2>
+      <div>
+        <p>{{ $t('settings.current_password') }}</p>
+        <input
+          v-model="changePasswordInputs[0]"
+          type="password"
         >
-        {{ $t('settings.delete_account') }}
+      </div>
+      <div>
+        <p>{{ $t('settings.new_password') }}</p>
+        <input
+          v-model="changePasswordInputs[1]"
+          type="password"
+        >
+      </div>
+      <div>
+        <p>{{ $t('settings.confirm_new_password') }}</p>
+        <input
+          v-model="changePasswordInputs[2]"
+          type="password"
+        >
+      </div>
+      <button
+        class="btn btn-default"
+        @click="changePassword"
+      >
+        {{ $t('general.submit') }}
+      </button>
+      <p v-if="changedPassword">
+        {{ $t('settings.changed_password') }}
+      </p>
+      <p v-else-if="changePasswordError !== false">
+        {{ $t('settings.change_password_error') }}
+      </p>
+      <p v-if="changePasswordError">
+        {{ changePasswordError }}
+      </p>
+    </div>
+
+    <div class="setting-item">
+      <h2>{{ $t('settings.oauth_tokens') }}</h2>
+      <table class="oauth-tokens">
+        <thead>
+          <tr>
+            <th>{{ $t('settings.app_name') }}</th>
+            <th>{{ $t('settings.valid_until') }}</th>
+            <th />
+          </tr>
+        </thead>
+        <tbody>
+          <tr
+            v-for="oauthToken in oauthTokens"
+            :key="oauthToken.id"
+          >
+            <td>{{ oauthToken.appName }}</td>
+            <td>{{ oauthToken.validUntil }}</td>
+            <td class="actions">
+              <button
+                class="btn btn-default"
+                @click="revokeToken(oauthToken.id)"
+              >
+                {{ $t('settings.revoke_token') }}
+              </button>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <mfa />
+    <div class="setting-item">
+      <h2>{{ $t('settings.delete_account') }}</h2>
+      <p v-if="!deletingAccount">
+        {{ $t('settings.delete_account_description') }}
+      </p>
+      <div v-if="deletingAccount">
+        <p>{{ $t('settings.delete_account_instructions') }}</p>
+        <p>{{ $t('login.password') }}</p>
+        <input
+          v-model="deleteAccountConfirmPasswordInput"
+          type="password"
+        >
+        <button
+          class="btn btn-default"
+          @click="deleteAccount"
+        >
+          {{ $t('settings.delete_account') }}
+        </button>
+      </div>
+      <p v-if="deleteAccountError !== false">
+        {{ $t('settings.delete_account_error') }}
+      </p>
+      <p v-if="deleteAccountError">
+        {{ deleteAccountError }}
+      </p>
+      <button
+        v-if="!deletingAccount"
+        class="btn btn-default"
+        @click="confirmDelete"
+      >
+        {{ $t('general.submit') }}
       </button>
     </div>
-    <p v-if="deleteAccountError !== false">
-      {{ $t('settings.delete_account_error') }}
-    </p>
-    <p v-if="deleteAccountError">
-      {{ deleteAccountError }}
-    </p>
-    <button
-      v-if="!deletingAccount"
-      class="btn btn-default"
-      @click="confirmDelete"
-      >
-      {{ $t('general.submit') }}
-    </button>
   </div>
-</div>
 </template>
 
 <script src="./security_tab.js"></script>
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 6f6cf1d6..33098498 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -1,90 +1,90 @@
 <template>
-<div class="theme-tab">
-  <div class="presets-container">
-    <div class="save-load">
-      <div
-        v-if="themeWarning"
-        class="theme-warning"
+  <div class="theme-tab">
+    <div class="presets-container">
+      <div class="save-load">
+        <div
+          v-if="themeWarning"
+          class="theme-warning"
         >
-        <div class="alert warning">
-          {{ themeWarningHelp }}
-        </div>
-        <div class="buttons">
-          <template v-if="themeWarning.type === 'snapshot_source_mismatch'">
-            <button
-              class="btn"
-              @click="forceLoad"
-              >
-              {{ $t('settings.style.switcher.use_source') }}
-            </button>
-            <button
-              class="btn"
-              @click="forceSnapshot"
-              >
-              {{ $t('settings.style.switcher.use_snapshot') }}
-            </button>
-          </template>
-          <template v-else-if="themeWarning.noActionsPossible">
-            <button
-              class="btn"
-              @click="dismissWarning"
-              >
-              {{ $t('general.dismiss') }}
-            </button>
-          </template>
-          <template v-else>
-            <button
-              class="btn"
-              @click="forceLoad"
-              >
-              {{ $t('settings.style.switcher.load_theme') }}
-            </button>
-            <button
-              class="btn"
-              @click="dismissWarning"
-              >
-              {{ $t('settings.style.switcher.keep_as_is') }}
-            </button>
-          </template>
-        </div>
-      </div>
-      <ExportImport
-        :export-object="exportedTheme"
-        :export-label="$t(&quot;settings.export_theme&quot;)"
-        :import-label="$t(&quot;settings.import_theme&quot;)"
-        :import-failed-text="$t(&quot;settings.invalid_theme_imported&quot;)"
-        :on-import="onImport"
-        :validator="importValidator"
-        >
-        <template slot="before">
-          <div class="presets">
-            {{ $t('settings.presets') }}
-            <label
-              for="preset-switcher"
-              class="select"
-              >
-              <select
-                id="preset-switcher"
-                v-model="selected"
-                class="preset-switcher"
-                >
-                <option
-                  v-for="style in availableStyles"
-                  :key="style.name"
-                  :value="style"
-                  :style="{
-                          backgroundColor: style[1] || (style.theme || style.source).colors.bg,
-                          color: style[3] || (style.theme || style.source).colors.text
-                          }"
-                  >
-                  {{ style[0] || style.name }}
-                </option>
-              </select>
-              <i class="icon-down-open" />
-            </label>
+          <div class="alert warning">
+            {{ themeWarningHelp }}
           </div>
-        </template>
-      </ExportImport>
+          <div class="buttons">
+            <template v-if="themeWarning.type === 'snapshot_source_mismatch'">
+              <button
+                class="btn"
+                @click="forceLoad"
+              >
+                {{ $t('settings.style.switcher.use_source') }}
+              </button>
+              <button
+                class="btn"
+                @click="forceSnapshot"
+              >
+                {{ $t('settings.style.switcher.use_snapshot') }}
+              </button>
+            </template>
+            <template v-else-if="themeWarning.noActionsPossible">
+              <button
+                class="btn"
+                @click="dismissWarning"
+              >
+                {{ $t('general.dismiss') }}
+              </button>
+            </template>
+            <template v-else>
+              <button
+                class="btn"
+                @click="forceLoad"
+              >
+                {{ $t('settings.style.switcher.load_theme') }}
+              </button>
+              <button
+                class="btn"
+                @click="dismissWarning"
+              >
+                {{ $t('settings.style.switcher.keep_as_is') }}
+              </button>
+            </template>
+          </div>
+        </div>
+        <ExportImport
+          :export-object="exportedTheme"
+          :export-label="$t(&quot;settings.export_theme&quot;)"
+          :import-label="$t(&quot;settings.import_theme&quot;)"
+          :import-failed-text="$t(&quot;settings.invalid_theme_imported&quot;)"
+          :on-import="onImport"
+          :validator="importValidator"
+        >
+          <template slot="before">
+            <div class="presets">
+              {{ $t('settings.presets') }}
+              <label
+                for="preset-switcher"
+                class="select"
+              >
+                <select
+                  id="preset-switcher"
+                  v-model="selected"
+                  class="preset-switcher"
+                >
+                  <option
+                    v-for="style in availableStyles"
+                    :key="style.name"
+                    :value="style"
+                    :style="{
+                      backgroundColor: style[1] || (style.theme || style.source).colors.bg,
+                      color: style[3] || (style.theme || style.source).colors.text
+                    }"
+                  >
+                    {{ style[0] || style.name }}
+                  </option>
+                </select>
+                <i class="icon-down-open" />
+              </label>
+            </div>
+          </template>
+        </ExportImport>
       </div>
       <div class="save-load-options">
         <span class="keep-option">
diff --git a/src/components/settings_modal/tabs/version_tab.vue b/src/components/settings_modal/tabs/version_tab.vue
index acc43569..d35ff25e 100644
--- a/src/components/settings_modal/tabs/version_tab.vue
+++ b/src/components/settings_modal/tabs/version_tab.vue
@@ -1,31 +1,31 @@
 <template>
-<div :label="$t('settings.version.title')">
-  <div class="setting-item">
-    <ul class="setting-list">
-      <li>
-        <p>{{ $t('settings.version.backend_version') }}</p>
-        <ul class="option-list">
-          <li>
-            <a
-              :href="backendVersionLink"
-              target="_blank"
+  <div :label="$t('settings.version.title')">
+    <div class="setting-item">
+      <ul class="setting-list">
+        <li>
+          <p>{{ $t('settings.version.backend_version') }}</p>
+          <ul class="option-list">
+            <li>
+              <a
+                :href="backendVersionLink"
+                target="_blank"
               >{{ backendVersion }}</a>
-          </li>
-        </ul>
-      </li>
-      <li>
-        <p>{{ $t('settings.version.frontend_version') }}</p>
-        <ul class="option-list">
-          <li>
-            <a
-              :href="frontendVersionLink"
-              target="_blank"
+            </li>
+          </ul>
+        </li>
+        <li>
+          <p>{{ $t('settings.version.frontend_version') }}</p>
+          <ul class="option-list">
+            <li>
+              <a
+                :href="frontendVersionLink"
+                target="_blank"
               >{{ frontendVersion }}</a>
-          </li>
-        </ul>
-      </li>
-    </ul>
+            </li>
+          </ul>
+        </li>
+      </ul>
+    </div>
   </div>
-</div>
 </template>
 <script src="./version_tab.js">

From 5235e7ea1e133d699f7e3dc39473d44e789f15c9 Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Mon, 25 May 2020 08:48:44 +0300
Subject: [PATCH 093/415] Removed `with_muted` param usage for user favorites
 timeline endpoint (it only supports pagination params).

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

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 7f82d2fa..9c7530a2 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -538,9 +538,11 @@ const fetchTimeline = ({
   if (timeline === 'public' || timeline === 'publicAndExternal') {
     params.push(['only_media', false])
   }
+  if (timeline !== 'favorites') {
+    params.push(['with_muted', withMuted])
+  }
 
   params.push(['limit', 20])
-  params.push(['with_muted', withMuted])
 
   const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
   url += `?${queryString}`

From 6a4ad1fe624b2e2da68707ffffcc6a4cbe7e5e03 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 14:04:36 +0300
Subject: [PATCH 094/415] added "settings saved" notice back

---
 .../settings_modal/settings_modal_content.js  |  3 +++
 .../settings_modal/settings_modal_content.vue | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js
index bd8df672..b842ec7d 100644
--- a/src/components/settings_modal/settings_modal_content.js
+++ b/src/components/settings_modal/settings_modal_content.js
@@ -25,6 +25,9 @@ const SettingsModalContent = {
     ThemeTab
   },
   computed: {
+    currentSaveStateNotice () {
+      return this.$store.state.interface.settings.currentSaveStateNotice
+    },
     isLoggedIn () {
       return !!this.$store.state.users.currentUser
     }
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 013bf34f..737c3637 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -4,6 +4,25 @@
       <span class="title">
         {{ $t('settings.settings') }}
       </span>
+      <transition name="fade">
+        <template v-if="currentSaveStateNotice">
+          <div
+            v-if="currentSaveStateNotice.error"
+            class="alert error"
+            @click.prevent
+            >
+            {{ $t('settings.saving_err') }}
+          </div>
+
+          <div
+            v-if="!currentSaveStateNotice.error"
+            class="alert transparent"
+            @click.prevent
+            >
+            {{ $t('settings.saving_ok') }}
+          </div>
+        </template>
+      </transition>
       <button
         class="btn"
         @click="peekModal"

From 79c03984bcf63387863f6979849c39ff5f404186 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 14:16:03 +0300
Subject: [PATCH 095/415] scroll to top when switching tabs

---
 src/components/tab_switcher/tab_switcher.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index a54b474f..bd1f51cb 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -60,6 +60,9 @@ export default Vue.component('tab-switcher', {
           this.onSwitch.call(null, this.$slots.default[index].key)
         }
         this.active = index
+        if (this.scrollableTabs) {
+          this.$refs.contents.scrollTop = 0
+        }
       }
     }
   },
@@ -118,7 +121,7 @@ export default Vue.component('tab-switcher', {
         <div class="tabs">
           {tabs}
         </div>
-        <div class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')}>
+        <div ref="contents" class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')}>
           {contents}
         </div>
       </div>

From a6ca923a7695477f57367bf3dd95bdf41a4b64a4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 16:10:14 +0300
Subject: [PATCH 096/415] icons update

---
 .../settings_modal/settings_modal_content.vue        |  9 +++++++++
 src/components/tab_switcher/tab_switcher.js          |  7 +++++--
 src/components/tab_switcher/tab_switcher.scss        |  5 +++++
 static/fontello.json                                 | 12 ++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 737c3637..847de1da 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -45,40 +45,47 @@
       >
         <div
           :label="$t('settings.general')"
+          icon="wrench"
         >
           <GeneralTab />
         </div>
         <div
           v-if="isLoggedIn"
           :label="$t('settings.profile_tab')"
+          icon="user"
         >
           <ProfileTab />
         </div>
         <div
           v-if="isLoggedIn"
           :label="$t('settings.security_tab')"
+          icon="lock"
         >
           <SecurityTab />
         </div>
         <div
           :label="$t('settings.filtering')"
+          icon="filter"
         >
           <FilteringTab />
         </div>
         <div
           :label="$t('settings.theme')"
+          icon="brush"
         >
           <ThemeTab />
         </div>
         <div
           v-if="isLoggedIn"
           :label="$t('settings.notifications')"
+          icon="chat"
         >
           <NotificationsTab />
         </div>
         <div
           v-if="isLoggedIn"
           :label="$t('settings.data_import_export_tab')"
+          icon="download"
         >
           <DataImportExportTab />
         </div>
@@ -87,11 +94,13 @@
           :label="$t('settings.mutes_and_blocks')"
           :fullHeight="true"
           class="full-height"
+          icon="eye-off"
         >
           <MutesAndBlocksTab />
         </div>
         <div
           :label="$t('settings.version.title')"
+          icon="info-circled"
         >
           <VersionTab />
         </div>
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index bd1f51cb..2d04e15d 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -94,8 +94,11 @@ export default Vue.component('tab-switcher', {
             <button
               disabled={slot.data.attrs.disabled}
               onClick={this.activateTab(index)}
-              class={classesTab.join(' ')}>
-              {slot.data.attrs.label}</button>
+              class={classesTab.join(' ')}
+            >
+              {!slot.data.attrs.icon ? '' : (<i class={'tab-icon icon-' + slot.data.attrs.icon}/>)}
+              {slot.data.attrs.label}
+            </button>
           </div>
         )
       })
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index f994380f..129a68b7 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -3,6 +3,11 @@
 .tab-switcher {
   display: flex;
 
+  .tab-icon {
+    font-size: 2em;
+    display: block;
+  }
+
   &.top-tabs {
     flex-direction: column;
     > .tabs {
diff --git a/static/fontello.json b/static/fontello.json
index 7f0e7cdd..ac3f0a18 100755
--- a/static/fontello.json
+++ b/static/fontello.json
@@ -363,6 +363,18 @@
       "css": "ok",
       "code": 59431,
       "src": "fontawesome"
+    },
+    {
+      "uid": "4109c474ff99cad28fd5a2c38af2ec6f",
+      "css": "filter",
+      "code": 61616,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "9a76bc135eac17d2c8b8ad4a5774fc87",
+      "css": "download",
+      "code": 59429,
+      "src": "fontawesome"
     }
   ]
 }
\ No newline at end of file

From 7951192cd98263a2e5c9e1010f1299c651f82cef Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 16:11:05 +0300
Subject: [PATCH 097/415] Improve settings-modal async loading, update vue to
 2.6.11 to be able to use Vue.observable, to implmement resettable async
 component

---
 package.json                                  |  4 +-
 src/components/big_spinner/big_spinner.vue    | 13 ++++++
 src/components/error_window/error_window.vue  | 41 +++++++++++++++++++
 .../settings_modal/settings_modal.js          | 13 +++++-
 src/i18n/en.json                              |  1 +
 src/services/resettable_async_component.js    | 32 +++++++++++++++
 yarn.lock                                     | 15 ++++---
 7 files changed, 110 insertions(+), 9 deletions(-)
 create mode 100644 src/components/big_spinner/big_spinner.vue
 create mode 100644 src/components/error_window/error_window.vue
 create mode 100644 src/services/resettable_async_component.js

diff --git a/package.json b/package.json
index 542086b4..4d68cc6e 100644
--- a/package.json
+++ b/package.json
@@ -29,11 +29,11 @@
     "portal-vue": "^2.1.4",
     "sanitize-html": "^1.13.0",
     "v-click-outside": "^2.1.1",
-    "vue": "^2.5.13",
+    "vue": "^2.6.11",
     "vue-chat-scroll": "^1.2.1",
     "vue-i18n": "^7.3.2",
     "vue-router": "^3.0.1",
-    "vue-template-compiler": "^2.3.4",
+    "vue-template-compiler": "^2.6.11",
     "vuelidate": "^0.7.4",
     "vuex": "^3.0.1",
     "whatwg-fetch": "^2.0.3"
diff --git a/src/components/big_spinner/big_spinner.vue b/src/components/big_spinner/big_spinner.vue
new file mode 100644
index 00000000..cda28de5
--- /dev/null
+++ b/src/components/big_spinner/big_spinner.vue
@@ -0,0 +1,13 @@
+<template>
+  <div class="big-spinner">
+    <i class="icon-spin4 animate-spin" />
+  </div>
+</template>
+
+<style lang="scss">
+.big-spinner {
+  font-size: 15em;
+  line-height: 0;
+  opacity: .6;
+}
+</style>
diff --git a/src/components/error_window/error_window.vue b/src/components/error_window/error_window.vue
new file mode 100644
index 00000000..ddb4ba00
--- /dev/null
+++ b/src/components/error_window/error_window.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="error-window panel">
+    <div class="panel-heading">
+      <span class="title">
+        {{ $t('general.generic_error') }}
+      </span>
+    </div>
+    <div class="panel-body">
+      <p>
+        {{ $t('general.error_retry') }}
+      </p>
+      <button
+        class="btn"
+        @click="closeAllModals"
+      >
+        {{ $t('general.close') }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    closeAllModals () {
+      // TODO make a global hook to close all modals?
+      this.$store.dispatch('closeSettingsModal')
+      this.$emit('resetAsyncComponent')
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.error-window {
+  .btn {
+    margin: .5em;
+    padding: .5em 2em;
+  }
+}
+</style>
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index d38c5751..60d14649 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -1,9 +1,20 @@
 import Modal from 'src/components/modal/modal.vue'
+import BigSpinner from 'src/components/big_spinner/big_spinner.vue'
+import ErrorWindow from 'src/components/error_window/error_window.vue'
+import getResettableAsyncComponent from 'src/services/resettable_async_component.js'
 
 const SettingsModal = {
   components: {
     Modal,
-    SettingsModalContent: () => import('./settings_modal_content.vue')
+    SettingsModalContent: getResettableAsyncComponent(
+      () => import('./settings_modal_content.vue'),
+      {
+        loading: BigSpinner,
+        error: ErrorWindow,
+        delay: 0,
+        timeout: 3000
+      }
+    )
   },
   computed: {
     modalActivated () {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ad9c22bd..e3dc75d7 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -60,6 +60,7 @@
     "submit": "Submit",
     "more": "More",
     "generic_error": "An error occured",
+    "error_retry": "Please try again",
     "optional": "optional",
     "show_more": "Show more",
     "show_less": "Show less",
diff --git a/src/services/resettable_async_component.js b/src/services/resettable_async_component.js
new file mode 100644
index 00000000..517bbd88
--- /dev/null
+++ b/src/services/resettable_async_component.js
@@ -0,0 +1,32 @@
+import Vue from 'vue'
+
+/* By default async components don't have any way to recover, if component is
+ * failed, it is failed forever. This helper tries to remedy that by recreating
+ * async component when retry is requested (by user). You need to emit the
+ * `resetAsyncComponent` event from child to reset the component. Generally,
+ * this should be done from error component but could be done from loading or
+ * actual target component itself if needs to be.
+ */
+function getResettableAsyncComponent (asyncComponent, options) {
+  const asyncComponentFactory = () => () => ({
+    component: asyncComponent(),
+    ...options
+  })
+
+  const observe = Vue.observable({ c: asyncComponentFactory() })
+
+  return {
+    functional: true,
+    render (createElement, { data, children }) {
+      //  emit event resetAsyncComponent to reloading
+      data.on = {}
+      data.on.resetAsyncComponent = () => {
+        observe.c = asyncComponentFactory()
+        // parent.$forceUpdate()
+      }
+      return createElement(observe.c, data, children)
+    }
+  }
+}
+
+export default getResettableAsyncComponent
diff --git a/yarn.lock b/yarn.lock
index 0defefcb..61afa7ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2327,6 +2327,7 @@ dateformat@^1.0.6:
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+  integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
 
 debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
@@ -7903,9 +7904,10 @@ vue-style-loader@^4.0.0, vue-style-loader@^4.0.1:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.3.4:
-  version "2.5.21"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz#a57ceb903177e8f643560a8d639a0f8db647054a"
+vue-template-compiler@^2.6.11:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080"
+  integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -7914,9 +7916,10 @@ vue-template-es2015-compiler@^1.6.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
 
-vue@^2.5.13:
-  version "2.5.21"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85"
+vue@^2.6.11:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
+  integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
 
 vuelidate@^0.7.4:
   version "0.7.4"

From 0286e1024c9e9f9f1794a870bd7a0680aa29cee2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 16:16:30 +0300
Subject: [PATCH 098/415] fix cursor on desktop, add modal link on mobile

---
 src/App.vue                                | 1 +
 src/components/side_drawer/side_drawer.js  | 5 ++++-
 src/components/side_drawer/side_drawer.vue | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 40278cb4..7b9ad3dc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -47,6 +47,7 @@
             @click.stop.native
           />
           <a
+            href="#"
             class="mobile-hidden"
             @click.stop="openSettingsModal"
           >
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 2181ecc7..e0d118a1 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -62,7 +62,10 @@ const SideDrawer = {
     },
     touchMove (e) {
       GestureService.updateSwipe(e, this.closeGesture)
-    }
+    },
+    openSettingsModal () {
+      this.$store.dispatch('openSettingsModal')
+    },
   }
 }
 
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 2958a386..aa39bc6f 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -122,9 +122,12 @@
           </router-link>
         </li>
         <li @click="toggleDrawer">
-          <router-link :to="{ name: 'settings' }">
+          <a
+            href="#"
+            @click.stop="openSettingsModal"
+          >
             <i class="button-icon icon-cog" /> {{ $t("settings.settings") }}
-          </router-link>
+          </a>
         </li>
         <li @click="toggleDrawer">
           <router-link :to="{ name: 'about'}">

From bb418bf155dad1c6dc39e88bf4d20f0644d1236d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 16:23:14 +0300
Subject: [PATCH 099/415] fix tests. user-profile didn't have tab-switcher
 compnent imported!!

---
 src/components/user_profile/user_profile.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 9558a0bd..95760bf8 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -3,6 +3,7 @@ import UserCard from '../user_card/user_card.vue'
 import FollowCard from '../follow_card/follow_card.vue'
 import Timeline from '../timeline/timeline.vue'
 import Conversation from '../conversation/conversation.vue'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
 import List from '../list/list.vue'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
 
@@ -146,6 +147,7 @@ const UserProfile = {
     FollowerList,
     FriendList,
     FollowCard,
+    TabSwitcher,
     Conversation
   }
 }

From 097216c49eaabf02b7a64308bf2c41bcf58b4c53 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 16:32:32 +0300
Subject: [PATCH 100/415] remove timeout, was meant for testing

---
 src/components/settings_modal/settings_modal.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 60d14649..84d673a8 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -11,8 +11,7 @@ const SettingsModal = {
       {
         loading: BigSpinner,
         error: ErrorWindow,
-        delay: 0,
-        timeout: 3000
+        delay: 0
       }
     )
   },

From 5d1b539da20950f05bf062df1a0904437c204e97 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 16:48:23 +0300
Subject: [PATCH 101/415] lint

---
 src/components/settings_modal/settings_modal_content.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 847de1da..865a2adf 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -10,7 +10,7 @@
             v-if="currentSaveStateNotice.error"
             class="alert error"
             @click.prevent
-            >
+          >
             {{ $t('settings.saving_err') }}
           </div>
 
@@ -18,7 +18,7 @@
             v-if="!currentSaveStateNotice.error"
             class="alert transparent"
             @click.prevent
-            >
+          >
             {{ $t('settings.saving_ok') }}
           </div>
         </template>

From 534e1fef88862023cd85e29b265319da300b7995 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 16:56:32 +0300
Subject: [PATCH 102/415] lint

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

diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index e0d118a1..d1f044f6 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -65,7 +65,7 @@ const SideDrawer = {
     },
     openSettingsModal () {
       this.$store.dispatch('openSettingsModal')
-    },
+    }
   }
 }
 

From 500511b41534e051803db8731a6e6315447d5854 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 17:05:30 +0300
Subject: [PATCH 103/415] fix sidebar not closing in mobile

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

diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index aa39bc6f..f253742d 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -124,7 +124,7 @@
         <li @click="toggleDrawer">
           <a
             href="#"
-            @click.stop="openSettingsModal"
+            @click="openSettingsModal"
           >
             <i class="button-icon icon-cog" /> {{ $t("settings.settings") }}
           </a>

From 0eea5c6b80c1fcd9f99636599e484bac8845e075 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 17:11:30 +0300
Subject: [PATCH 104/415] fix icon changing color

---
 src/components/tab_switcher/tab_switcher.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index 129a68b7..479fb686 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -147,8 +147,10 @@
     white-space: nowrap;
 
     padding: 6px 1em;
-    color: $fallback--text;
-    color: var(--tabText, $fallback--text);
+    &, &:active .tab-icon {
+      color: $fallback--text;
+      color: var(--tabText, $fallback--text);
+    }
     background-color: $fallback--fg;
     background-color: var(--tab, $fallback--fg);
 

From c0fe39af7a817be47f3a80019127ddb74876222e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 17:15:02 +0300
Subject: [PATCH 105/415] increase gap between buttons in titlebars

---
 src/App.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.scss b/src/App.scss
index 120eea53..f2972eda 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -566,7 +566,7 @@ main-router {
     min-height: 0;
     box-sizing: border-box;
     margin: 0;
-    margin-left: .25em;
+    margin-left: .5em;
     min-width: 1px;
     align-self: stretch;
   }

From ccdbba23485d90d437b0a3a19594faa25ef8833a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 17:18:57 +0300
Subject: [PATCH 106/415] Change flex for tab switcher lines to always have
 some small space reserved

---
 src/components/tab_switcher/tab_switcher.scss | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index 479fb686..fff6cc21 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -65,14 +65,8 @@
       overflow-y: auto;
       overflow-x: hidden;
       flex-direction: column;
-      &::after {
-        flex: 1 1 auto;
-      }
-      &::before {
-        flex: 0 0 auto;
-        height: 0.5em;
-      }
       &::after, &::before {
+        flex: 1 0 .5em;
         content: '';
         border-right: 1px solid;
         border-right-color: $fallback--border;

From 101f657d36275cf575ccbc45b556eb628bc8ad43 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 17:21:05 +0300
Subject: [PATCH 107/415] improve big spinner visibility

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

diff --git a/src/components/big_spinner/big_spinner.vue b/src/components/big_spinner/big_spinner.vue
index cda28de5..64f16e4d 100644
--- a/src/components/big_spinner/big_spinner.vue
+++ b/src/components/big_spinner/big_spinner.vue
@@ -9,5 +9,8 @@
   font-size: 15em;
   line-height: 0;
   opacity: .6;
+  > i {
+    color: white;
+  }
 }
 </style>

From dc8f78e84dc2f125407cecd66cfaa814e131713a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 17:22:57 +0300
Subject: [PATCH 108/415] fix for a previous fix

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

diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index fff6cc21..d60e065b 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -72,6 +72,9 @@
         border-right-color: $fallback--border;
         border-right-color: var(--border, $fallback--border);
       }
+      &::before {
+        flex-grow: 0;
+      }
       .tab-wrapper {
         min-width: 10em;
         display: flex;

From a14635f4f2338301d707b6acc0d11a4f9de20068 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 19:57:32 +0300
Subject: [PATCH 109/415] oops

---
 .../mobile_post_status_button/mobile_post_status_button.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index ff2d4eaa..0ad12bb1 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -52,7 +52,7 @@ const MobilePostStatusButton = {
       window.removeEventListener('scroll', this.handleScrollEnd)
     },
     openPostForm () {
-      this.$store.dispatch('openSettingsModal')
+      this.$store.dispatch('openPostStatusModal')
     },
     handleOSK () {
       // This is a big hack: we're guessing from changed window sizes if the

From b5c1d074f83d08473a19a3885f6ff5eeb95274e5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 25 May 2020 23:38:31 +0300
Subject: [PATCH 110/415] =?UTF-8?q?fix=20repr=C3=B6=C3=B6ted=20posts=20not?=
 =?UTF-8?q?=20being=20muted=20properly.=20fix=20muted=20posts=20making=20d?=
 =?UTF-8?q?esktop=20notifications?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/status/status.js             | 57 ++++++++++++++++-----
 src/components/status/status.vue            | 18 ++++++-
 src/i18n/en.json                            |  4 +-
 src/modules/statuses.js                     | 10 +++-
 src/services/status_parser/status_parser.js | 11 ++++
 5 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 9cd9d61c..95278968 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -12,7 +12,8 @@ import StatusPopover from '../status_popover/status_popover.vue'
 import EmojiReactions from '../emoji_reactions/emoji_reactions.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
-import { filter, unescape, uniqBy } from 'lodash'
+import { muteWordHits } from '../../services/status_parser/status_parser.js'
+import { unescape, uniqBy } from 'lodash'
 import { mapGetters, mapState } from 'vuex'
 
 const Status = {
@@ -44,6 +45,12 @@ const Status = {
     muteWords () {
       return this.mergedConfig.muteWords
     },
+    showReasonMutedThread () {
+      return (
+        this.status.thread_muted ||
+          (this.status.reblog && this.status.reblog.thread_muted)
+      ) && !this.inConversation
+    },
     repeaterClass () {
       const user = this.statusoid.user
       return highlightClass(user)
@@ -93,20 +100,44 @@ const Status = {
       return !!this.currentUser
     },
     muteWordHits () {
-      const statusText = this.status.text.toLowerCase()
-      const statusSummary = this.status.summary.toLowerCase()
-      const hits = filter(this.muteWords, (muteWord) => {
-        return statusText.includes(muteWord.toLowerCase()) || statusSummary.includes(muteWord.toLowerCase())
-      })
-
-      return hits
+      return muteWordHits(this.status, this.muteWords)
     },
     muted () {
-      const relationship = this.$store.getters.relationship(this.status.user.id)
-      return !this.unmuted && (
-        (!(this.inProfile && this.status.user.id === this.profileUserId) && relationship.muting) ||
-        (!this.inConversation && this.status.thread_muted) ||
-        this.muteWordHits.length > 0)
+      const { status } = this
+      const { reblog } = status
+      const relationship = this.$store.getters.relationship(status.user.id)
+      const relationshipReblog = reblog && this.$store.getters.relationship(reblog.user.id)
+      const reasonsToMute = (
+        // Post is muted according to BE
+        status.muted ||
+        // Reprööt of a muted post according to BE
+        (reblog && reblog.muted) ||
+        // Muted user
+        relationship.muting ||
+        // Muted user of a reprööt
+        (relationshipReblog && relationshipReblog.muting) ||
+        // Thread is muted
+        status.thread_muted ||
+        // Wordfiltered
+        this.muteWordHits.length > 0
+      )
+      const excusesNotToMute = (
+        // Currently showing status
+        this.unmuted ||
+        (
+          this.inProfile && (
+            // Don't mute user's posts on user timeline (except reblogs)
+            (!reblog && status.user.id === this.profileUserId) ||
+            // Same as above but also allow self-reblogs
+            (reblog && reblog.user.id === this.profileUserId)
+          )
+        ) ||
+        // Don't mute statuses in muted conversation when said conversation is opened
+        (this.inConversation && status.thread_muted)
+        // No excuses if post has muted words
+      ) && !this.muteWordHits.length > 0
+
+      return !excusesNotToMute && reasonsToMute
     },
     hideFilteredStatuses () {
       return this.mergedConfig.hideFilteredStatuses
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index e4c7545b..1c287aa7 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -18,10 +18,26 @@
     <template v-if="muted && !isPreview">
       <div class="media status container muted">
         <small>
+          <i
+            v-if="muted && retweet"
+            class="button-icon icon-retweet"
+          />
           <router-link :to="userProfileLink">
             {{ status.user.screen_name }}
           </router-link>
         </small>
+        <small
+          v-if="showReasonMutedThread && muteWordHits.length === 0"
+          class="mutedThread"
+        >
+          {{ $t('status.thread_muted') }}
+        </small>
+        <small
+          v-if="showReasonMutedThread && muteWordHits.length > 0"
+          class="mutedThread"
+        >
+          {{ $t('status.thread_muted_and_words') }}
+        </small>
         <small class="muteWords">{{ muteWordHits.join(', ') }}</small>
         <a
           href="#"
@@ -642,7 +658,7 @@ $status-margin: 0.75em;
     margin-left: auto;
   }
 
-  .muteWords {
+  .mutedThread, .muteWords {
     margin-left: 10px;
   }
 }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f5d1ce7c..61b818a6 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -621,7 +621,9 @@
     "mute_conversation": "Mute conversation",
     "unmute_conversation": "Unmute conversation",
     "status_unavailable": "Status unavailable",
-    "copy_link": "Copy link to status"
+    "copy_link": "Copy link to status",
+    "thread_muted": "Conversation muted",
+    "thread_muted_and_words": "Conversation muted, contains filtered words:"
   },
   "user_card": {
     "approve": "Approve",
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index cd8c1dba..f73fde25 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -15,7 +15,7 @@ import {
 import { set } from 'vue'
 import { isStatusNotification } from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
-// import parse from '../services/status_parser/status_parser.js'
+import { muteWordHits } from '../services/status_parser/status_parser.js'
 
 const emptyTl = (userId = 0) => ({
   statuses: [],
@@ -381,7 +381,13 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
           notifObj.image = status.attachments[0].url
         }
 
-        if (!notification.seen && !state.notifications.desktopNotificationSilence && visibleNotificationTypes.includes(notification.type)) {
+        if (
+          !notification.seen &&
+            !state.notifications.desktopNotificationSilence &&
+            visibleNotificationTypes.includes(notification.type) &&
+            !status.muted &&
+            muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
+        ) {
           let desktopNotification = new window.Notification(title, notifObj)
           // Chrome is known for not closing notifications automatically
           // according to MDN, anyway.
diff --git a/src/services/status_parser/status_parser.js b/src/services/status_parser/status_parser.js
index 900cd56e..3d517e3c 100644
--- a/src/services/status_parser/status_parser.js
+++ b/src/services/status_parser/status_parser.js
@@ -1,3 +1,4 @@
+import { filter } from 'lodash'
 import sanitize from 'sanitize-html'
 
 export const removeAttachmentLinks = (html) => {
@@ -12,4 +13,14 @@ export const parse = (html) => {
   return removeAttachmentLinks(html)
 }
 
+export const muteWordHits = (status, muteWords) => {
+  const statusText = status.text.toLowerCase()
+  const statusSummary = status.summary.toLowerCase()
+  const hits = filter(muteWords, (muteWord) => {
+    return statusText.includes(muteWord.toLowerCase()) || statusSummary.includes(muteWord.toLowerCase())
+  })
+
+  return hits
+}
+
 export default parse

From 83e5ee549472591b782c36d2321aceec0547cf18 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 26 May 2020 00:22:15 +0300
Subject: [PATCH 111/415] fix non-mention notifs

---
 src/modules/statuses.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index f73fde25..c809cf1c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -381,13 +381,18 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
           notifObj.image = status.attachments[0].url
         }
 
-        if (
-          !notification.seen &&
-            !state.notifications.desktopNotificationSilence &&
-            visibleNotificationTypes.includes(notification.type) &&
-            !status.muted &&
-            muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
-        ) {
+        const reasonsToMuteNotif = (
+          notification.seen ||
+            state.notifications.desktopNotificationSilence ||
+            !visibleNotificationTypes.includes(notification.type) ||
+            (
+              status && (
+                status.muted ||
+                  muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
+              )
+            )
+        )
+        if (!reasonsToMuteNotif) {
           let desktopNotification = new window.Notification(title, notifObj)
           // Chrome is known for not closing notifications automatically
           // according to MDN, anyway.

From 9d09e4090fe37b5cbc775e4e9ae8097610ffd952 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 26 May 2020 01:01:25 +0300
Subject: [PATCH 112/415] multiple fixes

---
 src/components/notification/notification.js  | 6 ++++--
 src/components/notification/notification.vue | 6 ++----
 src/components/status/status.js              | 4 +---
 src/modules/statuses.js                      | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 1cf4c9bc..cacdce87 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,3 +1,4 @@
+import StatusContent from '../status_content/status_content.vue'
 import Status from '../status/status.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
@@ -16,10 +17,11 @@ const Notification = {
   },
   props: [ 'notification' ],
   components: {
-    Status,
+    StatusContent,
     UserAvatar,
     UserCard,
-    Timeago
+    Timeago,
+    Status,
   },
   methods: {
     toggleUserExpanded () {
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 0e46a2a7..044ac871 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -157,11 +157,9 @@
           </router-link>
         </div>
         <template v-else>
-          <status
+          <status-content
             class="faint"
-            :compact="true"
-            :statusoid="notification.action"
-            :no-heading="true"
+            :status="notification.action"
           />
         </template>
       </div>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 95278968..73382521 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -122,8 +122,6 @@ const Status = {
         this.muteWordHits.length > 0
       )
       const excusesNotToMute = (
-        // Currently showing status
-        this.unmuted ||
         (
           this.inProfile && (
             // Don't mute user's posts on user timeline (except reblogs)
@@ -137,7 +135,7 @@ const Status = {
         // No excuses if post has muted words
       ) && !this.muteWordHits.length > 0
 
-      return !excusesNotToMute && reasonsToMute
+      return !this.unmuted && !excusesNotToMute && reasonsToMute
     },
     hideFilteredStatuses () {
       return this.mergedConfig.hideFilteredStatuses
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index c809cf1c..9a2e0df1 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -386,7 +386,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
             state.notifications.desktopNotificationSilence ||
             !visibleNotificationTypes.includes(notification.type) ||
             (
-              status && (
+              notification.type === 'mention' && status && (
                 status.muted ||
                   muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
               )

From 1f205b87ac906f67fa8e72530d18977bca085296 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 26 May 2020 01:06:34 +0300
Subject: [PATCH 113/415] lint

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

diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index cacdce87..5aa40e98 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -21,7 +21,7 @@ const Notification = {
     UserAvatar,
     UserCard,
     Timeago,
-    Status,
+    Status
   },
   methods: {
     toggleUserExpanded () {

From 5187b37aca4d6ca177c254f999e6acb637db5532 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 26 May 2020 22:50:37 +0300
Subject: [PATCH 114/415] moved multiChoiceProperties where it fits better

---
 .../tabs/helpers/shared_computed_object.js            | 11 +++++------
 src/modules/config.js                                 | 10 ++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/settings_modal/tabs/helpers/shared_computed_object.js b/src/components/settings_modal/tabs/helpers/shared_computed_object.js
index 61643e3b..b6a18e9c 100644
--- a/src/components/settings_modal/tabs/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/tabs/helpers/shared_computed_object.js
@@ -1,10 +1,9 @@
 import { filter, trim } from 'lodash'
-import { instanceDefaultProperties, defaultState as configDefaultState } from 'src/modules/config.js'
-
-const multiChoiceProperties = [
-  'postContentType',
-  'subjectLineBehavior'
-]
+import {
+  instanceDefaultProperties,
+  multiChoiceProperties,
+  defaultState as configDefaultState
+} from 'src/modules/config.js'
 
 const SharedComputedObject = () => ({
   user () {
diff --git a/src/modules/config.js b/src/modules/config.js
index 8f4638f5..b6b1b241 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -3,6 +3,16 @@ import { setPreset, applyTheme } from '../services/style_setter/style_setter.js'
 
 const browserLocale = (window.navigator.language || 'en').split('-')[0]
 
+/* TODO this is a bit messy.
+ * We need to declare settings with their types and also deal with
+ * instance-default settings in some way, hopefully try to avoid copy-pasta
+ * in general.
+ */
+export const multiChoiceProperties = [
+  'postContentType',
+  'subjectLineBehavior'
+]
+
 export const defaultState = {
   colors: {},
   theme: undefined,

From a8e013bd6517edb3a81eb5001e6ab948cb87bedb Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 26 May 2020 23:58:55 +0300
Subject: [PATCH 115/415] Move modal frame parts away from modal-content into
 modal, improve error handling

---
 .../async_component_error.vue}                |  26 +--
 src/components/big_spinner/big_spinner.vue    |  16 --
 .../panel_loading/panel_loading.vue           |  29 +++
 .../settings_modal/settings_modal.js          |  16 +-
 .../settings_modal/settings_modal.scss        |  28 ++-
 .../settings_modal/settings_modal.vue         |  45 ++++-
 .../settings_modal/settings_modal_content.js  |   8 -
 .../settings_modal_content.scss               |  30 +---
 .../settings_modal/settings_modal_content.vue | 168 +++++++-----------
 src/i18n/en.json                              |   2 +
 10 files changed, 190 insertions(+), 178 deletions(-)
 rename src/components/{error_window/error_window.vue => async_component_error/async_component_error.vue} (51%)
 delete mode 100644 src/components/big_spinner/big_spinner.vue
 create mode 100644 src/components/panel_loading/panel_loading.vue

diff --git a/src/components/error_window/error_window.vue b/src/components/async_component_error/async_component_error.vue
similarity index 51%
rename from src/components/error_window/error_window.vue
rename to src/components/async_component_error/async_component_error.vue
index ddb4ba00..66b3fb53 100644
--- a/src/components/error_window/error_window.vue
+++ b/src/components/async_component_error/async_component_error.vue
@@ -1,19 +1,17 @@
 <template>
-  <div class="error-window panel">
-    <div class="panel-heading">
-      <span class="title">
+  <div class="async-component-error">
+    <div>
+      <h4>
         {{ $t('general.generic_error') }}
-      </span>
-    </div>
-    <div class="panel-body">
+      </h4>
       <p>
         {{ $t('general.error_retry') }}
       </p>
       <button
         class="btn"
-        @click="closeAllModals"
-      >
-        {{ $t('general.close') }}
+        @click="retry"
+        >
+        {{ $t('general.retry') }}
       </button>
     </div>
   </div>
@@ -22,9 +20,7 @@
 <script>
 export default {
   methods: {
-    closeAllModals () {
-      // TODO make a global hook to close all modals?
-      this.$store.dispatch('closeSettingsModal')
+    retry () {
       this.$emit('resetAsyncComponent')
     }
   }
@@ -32,7 +28,11 @@ export default {
 </script>
 
 <style lang="scss">
-.error-window {
+.async-component-error {
+  display: flex;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
   .btn {
     margin: .5em;
     padding: .5em 2em;
diff --git a/src/components/big_spinner/big_spinner.vue b/src/components/big_spinner/big_spinner.vue
deleted file mode 100644
index 64f16e4d..00000000
--- a/src/components/big_spinner/big_spinner.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <div class="big-spinner">
-    <i class="icon-spin4 animate-spin" />
-  </div>
-</template>
-
-<style lang="scss">
-.big-spinner {
-  font-size: 15em;
-  line-height: 0;
-  opacity: .6;
-  > i {
-    color: white;
-  }
-}
-</style>
diff --git a/src/components/panel_loading/panel_loading.vue b/src/components/panel_loading/panel_loading.vue
new file mode 100644
index 00000000..4efebb3c
--- /dev/null
+++ b/src/components/panel_loading/panel_loading.vue
@@ -0,0 +1,29 @@
+<template>
+  <div class="panel-loading">
+    <span class="loading-text">
+      <i class="icon-spin4 animate-spin" />
+      {{ $t('general.loading') }}
+    </span>
+  </div>
+</template>
+
+<style lang="scss">
+@import 'src/_variables.scss';
+
+.panel-loading {
+  display: flex;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+  font-size: 2em;
+  color: $fallback--text;
+  color: var(--text, $fallback--text);
+  .loading-text i {
+    font-size: 3em;
+    line-height: 0;
+    vertical-align: middle;
+    color: $fallback--text;
+    color: var(--text, $fallback--text);
+  }
+}
+</style>
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 84d673a8..32ef38d6 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -1,6 +1,6 @@
 import Modal from 'src/components/modal/modal.vue'
-import BigSpinner from 'src/components/big_spinner/big_spinner.vue'
-import ErrorWindow from 'src/components/error_window/error_window.vue'
+import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
+import AsyncComponentError from 'src/components/async_component_error/async_component_error.vue'
 import getResettableAsyncComponent from 'src/services/resettable_async_component.js'
 
 const SettingsModal = {
@@ -9,12 +9,20 @@ const SettingsModal = {
     SettingsModalContent: getResettableAsyncComponent(
       () => import('./settings_modal_content.vue'),
       {
-        loading: BigSpinner,
-        error: ErrorWindow,
+        loading: PanelLoading,
+        error: AsyncComponentError,
         delay: 0
       }
     )
   },
+  methods: {
+    closeModal () {
+      this.$store.dispatch('closeSettingsModal')
+    },
+    peekModal () {
+      this.$store.dispatch('togglePeekSettingsModal')
+    }
+  },
   computed: {
     modalActivated () {
       return this.$store.state.interface.settingsModalState !== 'hidden'
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index ece96364..833ff89a 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -3,7 +3,7 @@
   overflow: hidden;
 
   &.peek {
-    .modal-panel {
+    .settings-modal-panel {
       /* Explanation:
        * Modal is positioned vertically centered.
        * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
@@ -15,4 +15,30 @@
       transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
     }
   }
+
+  .settings-modal-panel {
+    overflow: hidden;
+    transition: transform;
+    transition-timing-function: ease-in-out;
+    transition-duration: 300ms;
+    width: 1000px;
+    max-width: 90vw;
+    height: 90vh;
+
+    @media all and (max-width: 800px) {
+      max-width: 100vw;
+      height: 100vh;
+    }
+
+    .panel-body {
+      height: 100%;
+      overflow-y: hidden;
+
+      .btn {
+        min-height: 28px;
+        min-width: 10em;
+        padding: 0 2em;
+      }
+    }
+  }
 }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index b6ca5c6b..ded02f4a 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -5,10 +5,47 @@
     :class="{ peek: modalPeeked }"
     :no-background="modalPeeked"
   >
-    <SettingsModalContent
-      v-if="modalActivated"
-      class="modal-panel"
-    />
+    <div class="settings-modal-panel panel">
+      <div class="panel-heading">
+        <span class="title">
+          {{ $t('settings.settings') }}
+        </span>
+        <transition name="fade">
+          <template v-if="currentSaveStateNotice">
+            <div
+              v-if="currentSaveStateNotice.error"
+              class="alert error"
+              @click.prevent
+            >
+              {{ $t('settings.saving_err') }}
+            </div>
+
+            <div
+              v-if="!currentSaveStateNotice.error"
+              class="alert transparent"
+              @click.prevent
+            >
+              {{ $t('settings.saving_ok') }}
+            </div>
+          </template>
+        </transition>
+        <button
+          class="btn"
+          @click="peekModal"
+        >
+          {{ $t('general.peek') }}
+        </button>
+        <button
+          class="btn"
+          @click="closeModal"
+        >
+          {{ $t('general.close') }}
+        </button>
+      </div>
+      <div class="panel-body">
+        <SettingsModalContent v-if="modalActivated" />
+      </div>
+    </div>
   </Modal>
 </template>
 
diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js
index b842ec7d..b27fbd28 100644
--- a/src/components/settings_modal/settings_modal_content.js
+++ b/src/components/settings_modal/settings_modal_content.js
@@ -31,14 +31,6 @@ const SettingsModalContent = {
     isLoggedIn () {
       return !!this.$store.state.users.currentUser
     }
-  },
-  methods: {
-    closeModal () {
-      this.$store.dispatch('closeSettingsModal')
-    },
-    peekModal () {
-      this.$store.dispatch('togglePeekSettingsModal')
-    }
   }
 }
 
diff --git a/src/components/settings_modal/settings_modal_content.scss b/src/components/settings_modal/settings_modal_content.scss
index 92e167a2..f80306c6 100644
--- a/src/components/settings_modal/settings_modal_content.scss
+++ b/src/components/settings_modal/settings_modal_content.scss
@@ -1,32 +1,6 @@
 @import 'src/_variables.scss';
-
-.settings-modal-panel {
-  overflow: hidden;
-  transition: transform;
-  transition-timing-function: ease-in-out;
-  transition-duration: 300ms;
-  width: 1000px;
-  max-width: 90vw;
-  height: 90vh;
-
-  @media all and (max-width: 800px) {
-    max-width: 100vw;
-    height: 100vh;
-  }
-
-  .settings_tab-switcher {
-    height: 100%;
-  }
-  .panel-body {
-    height: 100%;
-    overflow-y: hidden;
-
-    .btn {
-      min-height: 28px;
-      min-width: 10em;
-      padding: 0 2em;
-    }
-  }
+.settings_tab-switcher {
+  height: 100%;
 
   .full-height {
     height: 100%;
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 865a2adf..3e06148f 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -1,112 +1,72 @@
 <template>
-  <div class="settings-modal-panel panel">
-    <div class="panel-heading">
-      <span class="title">
-        {{ $t('settings.settings') }}
-      </span>
-      <transition name="fade">
-        <template v-if="currentSaveStateNotice">
-          <div
-            v-if="currentSaveStateNotice.error"
-            class="alert error"
-            @click.prevent
-          >
-            {{ $t('settings.saving_err') }}
-          </div>
-
-          <div
-            v-if="!currentSaveStateNotice.error"
-            class="alert transparent"
-            @click.prevent
-          >
-            {{ $t('settings.saving_ok') }}
-          </div>
-        </template>
-      </transition>
-      <button
-        class="btn"
-        @click="peekModal"
+  <tab-switcher
+    ref="tabSwitcher"
+    class="settings_tab-switcher"
+    :side-tab-bar="true"
+    :scrollable-tabs="true"
+    >
+    <div
+      :label="$t('settings.general')"
+      icon="wrench"
       >
-        {{ $t('general.peek') }}
-      </button>
-      <button
-        class="btn"
-        @click="closeModal"
-      >
-        {{ $t('general.close') }}
-      </button>
+      <GeneralTab />
     </div>
-    <div class="panel-body">
-      <tab-switcher
-        ref="tabSwitcher"
-        class="settings_tab-switcher"
-        :side-tab-bar="true"
-        :scrollable-tabs="true"
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.profile_tab')"
+      icon="user"
       >
-        <div
-          :label="$t('settings.general')"
-          icon="wrench"
-        >
-          <GeneralTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.profile_tab')"
-          icon="user"
-        >
-          <ProfileTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.security_tab')"
-          icon="lock"
-        >
-          <SecurityTab />
-        </div>
-        <div
-          :label="$t('settings.filtering')"
-          icon="filter"
-        >
-          <FilteringTab />
-        </div>
-        <div
-          :label="$t('settings.theme')"
-          icon="brush"
-        >
-          <ThemeTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.notifications')"
-          icon="chat"
-        >
-          <NotificationsTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.data_import_export_tab')"
-          icon="download"
-        >
-          <DataImportExportTab />
-        </div>
-        <div
-          v-if="isLoggedIn"
-          :label="$t('settings.mutes_and_blocks')"
-          :fullHeight="true"
-          class="full-height"
-          icon="eye-off"
-        >
-          <MutesAndBlocksTab />
-        </div>
-        <div
-          :label="$t('settings.version.title')"
-          icon="info-circled"
-        >
-          <VersionTab />
-        </div>
-      </tab-switcher>
+      <ProfileTab />
     </div>
-  </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.security_tab')"
+      icon="lock"
+      >
+      <SecurityTab />
+    </div>
+    <div
+      :label="$t('settings.filtering')"
+      icon="filter"
+      >
+      <FilteringTab />
+    </div>
+    <div
+      :label="$t('settings.theme')"
+      icon="brush"
+      >
+      <ThemeTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.notifications')"
+      icon="chat"
+      >
+      <NotificationsTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.data_import_export_tab')"
+      icon="download"
+      >
+      <DataImportExportTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.mutes_and_blocks')"
+      :fullHeight="true"
+      class="full-height"
+      icon="eye-off"
+      >
+      <MutesAndBlocksTab />
+    </div>
+    <div
+      :label="$t('settings.version.title')"
+      icon="info-circled"
+      >
+      <VersionTab />
+    </div>
+  </tab-switcher>
 </template>
 
 <script src="./settings_modal_content.js"></script>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e3dc75d7..062af2c7 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -59,8 +59,10 @@
     "apply": "Apply",
     "submit": "Submit",
     "more": "More",
+    "loading": "Loading…",
     "generic_error": "An error occured",
     "error_retry": "Please try again",
+    "retry": "Try again",
     "optional": "optional",
     "show_more": "Show more",
     "show_less": "Show less",

From 3938ccb8e77afa33ebae2a00b74145399322a060 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 27 May 2020 00:02:36 +0300
Subject: [PATCH 116/415] lint

---
 .../async_component_error.vue                 |  2 +-
 .../settings_modal/settings_modal_content.vue | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/async_component_error/async_component_error.vue b/src/components/async_component_error/async_component_error.vue
index 66b3fb53..b68b98f9 100644
--- a/src/components/async_component_error/async_component_error.vue
+++ b/src/components/async_component_error/async_component_error.vue
@@ -10,7 +10,7 @@
       <button
         class="btn"
         @click="retry"
-        >
+      >
         {{ $t('general.retry') }}
       </button>
     </div>
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 3e06148f..8b83e48c 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -4,51 +4,51 @@
     class="settings_tab-switcher"
     :side-tab-bar="true"
     :scrollable-tabs="true"
-    >
+  >
     <div
       :label="$t('settings.general')"
       icon="wrench"
-      >
+    >
       <GeneralTab />
     </div>
     <div
       v-if="isLoggedIn"
       :label="$t('settings.profile_tab')"
       icon="user"
-      >
+    >
       <ProfileTab />
     </div>
     <div
       v-if="isLoggedIn"
       :label="$t('settings.security_tab')"
       icon="lock"
-      >
+    >
       <SecurityTab />
     </div>
     <div
       :label="$t('settings.filtering')"
       icon="filter"
-      >
+    >
       <FilteringTab />
     </div>
     <div
       :label="$t('settings.theme')"
       icon="brush"
-      >
+    >
       <ThemeTab />
     </div>
     <div
       v-if="isLoggedIn"
       :label="$t('settings.notifications')"
       icon="chat"
-      >
+    >
       <NotificationsTab />
     </div>
     <div
       v-if="isLoggedIn"
       :label="$t('settings.data_import_export_tab')"
       icon="download"
-      >
+    >
       <DataImportExportTab />
     </div>
     <div
@@ -57,13 +57,13 @@
       :fullHeight="true"
       class="full-height"
       icon="eye-off"
-      >
+    >
       <MutesAndBlocksTab />
     </div>
     <div
       :label="$t('settings.version.title')"
       icon="info-circled"
-      >
+    >
       <VersionTab />
     </div>
   </tab-switcher>

From 5ffcddd3b9b4b6600e4e51066b9410d7e852df11 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 27 May 2020 03:32:57 +0300
Subject: [PATCH 117/415] fixes. sorry for bad commit message i'm tired

---
 .../settings_modal/settings_modal.js          |  3 +
 .../settings_modal/settings_modal_content.js  |  3 -
 .../settings_modal/settings_modal_content.vue |  2 +-
 .../tabs/theme_tab/theme_tab.scss             | 19 +++--
 .../tabs/theme_tab/theme_tab.vue              | 26 ++++---
 src/components/tab_switcher/tab_switcher.js   | 19 ++++-
 src/components/tab_switcher/tab_switcher.scss | 74 +++++++++++++------
 7 files changed, 96 insertions(+), 50 deletions(-)

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 32ef38d6..caa7c48c 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -24,6 +24,9 @@ const SettingsModal = {
     }
   },
   computed: {
+    currentSaveStateNotice () {
+      return this.$store.state.interface.settings.currentSaveStateNotice
+    },
     modalActivated () {
       return this.$store.state.interface.settingsModalState !== 'hidden'
     },
diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js
index b27fbd28..48101a90 100644
--- a/src/components/settings_modal/settings_modal_content.js
+++ b/src/components/settings_modal/settings_modal_content.js
@@ -25,9 +25,6 @@ const SettingsModalContent = {
     ThemeTab
   },
   computed: {
-    currentSaveStateNotice () {
-      return this.$store.state.interface.settings.currentSaveStateNotice
-    },
     isLoggedIn () {
       return !!this.$store.state.users.currentUser
     }
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 8b83e48c..283b4ef8 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -40,7 +40,7 @@
     <div
       v-if="isLoggedIn"
       :label="$t('settings.notifications')"
-      icon="chat"
+      icon="bell-ringing-o"
     >
       <NotificationsTab />
     </div>
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
index e0b1a2df..926eceff 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@@ -95,20 +95,25 @@
     align-items: baseline;
     width: 100%;
     min-height: 30px;
-
-    .btn {
-      min-width: 1px;
-      flex: 0 auto;
-      padding: 0 1em;
-    }
+    margin-bottom: 1em;
 
     p {
       flex: 1;
       margin: 0;
       margin-right: .5em;
     }
+  }
 
-    margin-bottom: 1em;
+  .tab-header-buttons {
+    display: flex;
+    flex-direction: column;
+
+    .btn {
+      min-width: 1px;
+      flex: 0 auto;
+      padding: 0 1em;
+      margin-bottom: .5em;
+    }
   }
 
   .shadow-selector {
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 33098498..fcfad23b 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -126,18 +126,20 @@
         >
           <div class="tab-header">
             <p>{{ $t('settings.theme_help') }}</p>
-            <button
-              class="btn"
-              @click="clearOpacity"
-            >
-              {{ $t('settings.style.switcher.clear_opacity') }}
-            </button>
-            <button
-              class="btn"
-              @click="clearV1"
-            >
-              {{ $t('settings.style.switcher.clear_all') }}
-            </button>
+            <div class="tab-header-buttons">
+              <button
+                class="btn"
+                @click="clearOpacity"
+              >
+                {{ $t('settings.style.switcher.clear_opacity') }}
+              </button>
+              <button
+                class="btn"
+                @click="clearV1"
+              >
+                {{ $t('settings.style.switcher.clear_all') }}
+              </button>
+            </div>
           </div>
           <p>{{ $t('settings.theme_help_v2_1') }}</p>
           <h4>{{ $t('settings.style.common_colors.main') }}</h4>
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 2d04e15d..616f1a19 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -95,9 +95,12 @@ export default Vue.component('tab-switcher', {
               disabled={slot.data.attrs.disabled}
               onClick={this.activateTab(index)}
               class={classesTab.join(' ')}
+              type="button"
             >
               {!slot.data.attrs.icon ? '' : (<i class={'tab-icon icon-' + slot.data.attrs.icon}/>)}
-              {slot.data.attrs.label}
+              <span class="text">
+                {slot.data.attrs.label}
+              </span>
             </button>
           </div>
         )
@@ -110,13 +113,23 @@ export default Vue.component('tab-switcher', {
       if (slot.data.attrs.fullHeight) {
         classes.push('full-height')
       }
+      const newSlot = (
+        <div class={classes}>
+          {
+            this.sideTabBar
+              ? <h1 class="mobile-label">{slot.data.attrs.label}</h1>
+              : ''
+          }
+          {slot}
+        </div>
+      )
 
       if (this.renderOnlyFocused) {
         return active
-          ? <div class={classes.join(' ')}>{slot}</div>
+          ? <div class={classes.join(' ')}>{newSlot}</div>
           : <div class={classes.join(' ')}></div>
       }
-      return <div class={classes.join(' ')}>{slot}</div>
+      return <div class={classes.join(' ')}>{newSlot}</div>
     })
 
     return (
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index d60e065b..db58f4cd 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -10,12 +10,14 @@
 
   &.top-tabs {
     flex-direction: column;
+
     > .tabs {
       width: 100%;
       overflow-y: hidden;
       overflow-x: auto;
       padding-top: 5px;
       flex-direction: row;
+
       &::after, &::before {
         content: '';
         flex: 1 1 auto;
@@ -51,34 +53,47 @@
 
   &.side-tabs {
     flex-direction: row;
+
     @media all and (max-width: 800px) {
       overflow-x: auto;
     }
+
     > .contents {
-      flex: 0 1 80%;
-      @media all and (max-width: 800px) {
-        min-width: 96vw;
-      }
+      flex: 1 1 auto;
     }
+
     > .tabs {
-      flex: 1 0 auto;
+      flex: 0 0 auto;
       overflow-y: auto;
       overflow-x: hidden;
       flex-direction: column;
+
       &::after, &::before {
-        flex: 1 0 .5em;
+        flex-shrink: 0;
+        flex-basis: .5em;
         content: '';
         border-right: 1px solid;
         border-right-color: $fallback--border;
         border-right-color: var(--border, $fallback--border);
       }
+
+      &::after {
+        flex-grow: 1;
+      }
+
       &::before {
         flex-grow: 0;
       }
+
       .tab-wrapper {
         min-width: 10em;
         display: flex;
         flex-direction: column;
+
+        @media all and (max-width: 800px) {
+          min-width: 1em;
+        }
+
         &:not(.active)::after {
           top: 0;
           right: 0;
@@ -87,6 +102,7 @@
           border-right-color: $fallback--border;
           border-right-color: var(--border, $fallback--border);
         }
+
         &::before {
           flex: 0 0 6px;
           content: '';
@@ -94,6 +110,7 @@
           border-right-color: $fallback--border;
           border-right-color: var(--border, $fallback--border);
         }
+
         &:last-child .tab {
           margin-bottom: 0;
         }
@@ -106,26 +123,23 @@
         min-width: 1px;
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
+        padding-left: 1em;
         padding-right: calc(1em + 200px);
-        margin-right: 6px - 200px;
-        margin-left: 6px;
-      }
-
-      .tab-wrapper {
-        min-width: 10em;
-        &:not(.active)::after {
-          top: 0;
-          right: 0;
-          bottom: 0;
-          border-right: 1px solid;
-          border-right-color: $fallback--border;
-          border-right-color: var(--border, $fallback--border);
+        margin-right: calc(1em - 200px);
+        margin-left: 1em;
+        @media all and (max-width: 800px) {
+          padding-left: .25em;
+          padding-right: calc(.25em + 200px);
+          margin-right: calc(.25em - 200px);
+          margin-left: .25em;
+          .text {
+            display: none
+          }
         }
       }
     }
   }
 
-
   .contents {
     flex: 1 0 auto;
     min-height: 0px;
@@ -142,14 +156,14 @@
   .tab {
     position: relative;
     white-space: nowrap;
-
     padding: 6px 1em;
+    background-color: $fallback--fg;
+    background-color: var(--tab, $fallback--fg);
+
     &, &:active .tab-icon {
       color: $fallback--text;
       color: var(--tabText, $fallback--text);
     }
-    background-color: $fallback--fg;
-    background-color: var(--tab, $fallback--fg);
 
     &:not(.active) {
       z-index: 4;
@@ -173,7 +187,6 @@
     }
   }
 
-
   .tabs {
     display: flex;
     position: relative;
@@ -198,4 +211,17 @@
       }
     }
   }
+
+  .mobile-label {
+    padding-left: .3em;
+    padding-bottom: .25em;
+    margin-top: .5em;
+    margin-left: .2em;
+    margin-bottom: .25em;
+    border-bottom: 1px solid var(--border, $fallback--border);
+
+    @media all and (min-width: 800px) {
+      display: none;
+    }
+  }
 }

From 6ecd1dd15bc07b7eff86b47ebecd8012eae00e7a Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@firemail.cc>
Date: Thu, 28 May 2020 05:05:27 -0400
Subject: [PATCH 118/415] Remove mention of GNU Social

Pleroma-FE has not supported GNU Social for a while now. Plus the
wiki page for setting it up has been deleted.
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 889f0837..da54eb8f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # pleroma_fe
 
-> A single column frontend for both Pleroma and GS servers.
+> A single column frontend designed for Pleroma.
 
 ![screenshot](https://i.imgur.com/DJVqSJ0.png)
 
@@ -11,7 +11,6 @@ To translate Pleroma-FE, add your language to [src/i18n/messages.js](https://git
 # FOR ADMINS
 
 You don't need to build Pleroma-FE yourself. Those using the Pleroma backend will be able to use it out of the box.
-For the GNU social backend, check out https://git.pleroma.social/pleroma/pleroma-fe/wikis/dual-boot-with-qvitter to see how to run Pleroma-FE and Qvitter at the same time.
 
 ## Build Setup
 

From 3111fc5dbc566181fe80b8807e809cf5942a09bd Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@firemail.cc>
Date: Thu, 28 May 2020 05:08:17 -0400
Subject: [PATCH 119/415] Use consistent naming for Pleroma-FE in README

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

diff --git a/README.md b/README.md
index da54eb8f..b66383ad 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# pleroma_fe
+# Pleroma-FE 
 
 > A single column frontend designed for Pleroma.
 

From b8350423d97cf81708795ec6383803413e7bff98 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 28 May 2020 10:57:02 -0500
Subject: [PATCH 120/415] Updated Notification Settings API use

---
 CHANGELOG.md                                   |  1 +
 src/components/user_settings/user_settings.vue | 17 ++++++-----------
 src/i18n/ar.json                               |  2 +-
 src/i18n/de.json                               |  4 ++--
 src/i18n/en.json                               |  7 +++----
 src/i18n/es.json                               |  9 ++++-----
 src/i18n/eu.json                               |  9 ++++-----
 src/i18n/fi.json                               |  7 +++----
 src/i18n/fr.json                               |  7 +++----
 src/i18n/ja_easy.json                          |  7 +++----
 src/i18n/ja_pedantic.json                      |  7 +++----
 src/i18n/nb.json                               |  7 +++----
 src/i18n/nl.json                               |  7 +++----
 src/i18n/oc.json                               |  9 ++++-----
 src/i18n/pl.json                               |  7 +++----
 src/i18n/ru.json                               |  7 +++----
 src/i18n/zh.json                               |  7 +++----
 17 files changed, 52 insertions(+), 69 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a44fb163..f2de5424 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Changed
 - Removed the use of with_move parameters when fetching notifications
+- Updated Notification Settings to match new BE API
 
 ## [Unreleased patch]
 ### Add
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index ad184520..253607f9 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -384,23 +384,18 @@
               <span class="label">{{ $t('settings.notification_setting') }}</span>
               <ul class="option-list">
                 <li>
-                  <Checkbox v-model="notificationSettings.follows">
-                    {{ $t('settings.notification_setting_follows') }}
+                  <Checkbox v-model="notificationSettings.from_following">
+                    {{ $t('settings.notification_setting_from_following') }}
                   </Checkbox>
                 </li>
                 <li>
-                  <Checkbox v-model="notificationSettings.followers">
-                    {{ $t('settings.notification_setting_followers') }}
+                  <Checkbox v-model="notificationSettings.from_followers">
+                    {{ $t('settings.notification_setting_from_followers') }}
                   </Checkbox>
                 </li>
                 <li>
-                  <Checkbox v-model="notificationSettings.non_follows">
-                    {{ $t('settings.notification_setting_non_follows') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="notificationSettings.non_followers">
-                    {{ $t('settings.notification_setting_non_followers') }}
+                  <Checkbox v-model="notificationSettings.from_strangers">
+                    {{ $t('settings.notification_setting_from_strangers') }}
                   </Checkbox>
                 </li>
               </ul>
diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 72e3010f..5eb6c7fb 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -203,4 +203,4 @@
         "more": "المزيد",
         "who_to_follow": "للمتابعة"
     }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/de.json b/src/i18n/de.json
index d3eedcb6..e0cf80a4 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -401,8 +401,8 @@
         "changed_email": "Email Adresse erfolgreich geändert!",
         "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
         "change_email": "Ändere Email",
-        "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
-        "notification_setting_followers": "Nutzer, die dir folgen",
+        "notification_setting_from_strangers": "Nutzer, die dir nicht folgen",
+        "notification_setting_from_followers": "Nutzer, die dir folgen",
         "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
         "accent": "Akzent"
     },
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f5d1ce7c..c89b7200 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -407,10 +407,9 @@
     "notifications": "Notifications",
     "notification_setting_filters": "Filters",
     "notification_setting": "Receive notifications from:",
-    "notification_setting_follows": "Users you follow",
-    "notification_setting_non_follows": "Users you do not follow",
-    "notification_setting_followers": "Users who follow you",
-    "notification_setting_non_followers": "Users who do not follow you",
+    "notification_setting_from_following": "Users you follow",
+    "notification_setting_from_followers": "Users who follow you",
+    "notification_setting_from_strangers": "Users who do not follow you",
     "notification_setting_privacy": "Privacy",
     "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
     "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 163eb707..2a6998fd 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -345,10 +345,9 @@
     },
     "notifications": "Notificaciones",
     "notification_setting": "Recibir notificaciones de:",
-    "notification_setting_follows": "Usuarios que sigues",
-    "notification_setting_non_follows": "Usuarios que no sigues",
-    "notification_setting_followers": "Usuarios que te siguen",
-    "notification_setting_non_followers": "Usuarios que no te siguen",
+    "notification_setting_from_following": "Usuarios que sigues",
+    "notification_setting_from_followers": "Usuarios que te siguen",
+    "notification_setting_from_strangers": "Usuarios que no te siguen",
     "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
     "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.",
     "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
@@ -635,4 +634,4 @@
     "too_many_requests": "Has alcanzado el límite de intentos, vuelve a intentarlo más tarde.",
     "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia."
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 1c75bf75..8484805f 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -345,10 +345,9 @@
     },
     "notifications": "Jakinarazpenak",
     "notification_setting": "Jaso pertsona honen jakinarazpenak:",
-    "notification_setting_follows": "Jarraitutako erabiltzaileak",
-    "notification_setting_non_follows": "Jarraitzen ez dituzun erabiltzaileak",
-    "notification_setting_followers": "Zu jarraitzen zaituzten erabiltzaileak",
-    "notification_setting_non_followers": "Zu jarraitzen ez zaituzten erabiltzaileak",
+    "notification_setting_from_following": "Jarraitutako erabiltzaileak",
+    "notification_setting_from_followers": "Zu jarraitzen zaituzten erabiltzaileak",
+    "notification_setting_from_strangers": "Zu jarraitzen ez zaituzten erabiltzaileak",
     "notification_mutes": "Erabiltzaile jakin baten jakinarazpenak jasotzeari uzteko, isilarazi ezazu.",
     "notification_blocks": "Erabiltzaile bat blokeatzeak jakinarazpen guztiak gelditzen ditu eta harpidetza ezeztatu.",
     "enable_web_push_notifications": "Gaitu web jakinarazpenak",
@@ -639,4 +638,4 @@
     "password_reset_required": "Pasahitza berrezarri behar duzu saioa hasteko.",
     "password_reset_required_but_mailer_is_disabled": "Pasahitza berrezarri behar duzu, baina pasahitza berrezartzeko aukera desgaituta dago. Mesedez, jarri harremanetan instantziaren administratzailearekin."
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 7248c049..23b83212 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -479,10 +479,9 @@
         "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
         "mutes_tab": "Mykistykset",
         "new_email": "Uusi sähköpostiosoite",
-        "notification_setting_follows": "Käyttäjät joita seuraat",
-        "notification_setting_non_follows": "Käyttäjät joita et seuraa",
-        "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
-        "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
+        "notification_setting_from_following": "Käyttäjät joita seuraat",
+        "notification_setting_from_followers": "Käyttäjät jotka seuraavat sinua",
+        "notification_setting_from_strangers": "Käyttäjät jotka eivät seuraa sinua",
         "notification_setting_privacy": "Yksityisyys",
         "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
         "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 61877a3a..ab6c8259 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -319,10 +319,9 @@
         },
         "notifications": "Notifications",
         "notification_setting": "Reçevoir les notifications de :",
-        "notification_setting_follows": "Utilisateurs que vous suivez",
-        "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
-        "notification_setting_followers": "Utilisateurs qui vous suivent",
-        "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas",
+        "notification_setting_from_following": "Utilisateurs que vous suivez",
+        "notification_setting_from_followers": "Utilisateurs qui vous suivent",
+        "notification_setting_from_strangers": "Utilisateurs qui ne vous suivent pas",
         "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.",
         "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.",
         "enable_web_push_notifications": "Activer les notifications de push web",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 978e43b3..b547ce6a 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -383,10 +383,9 @@
     "greentext": "ミームやじるし",
     "notifications": "つうち",
     "notification_setting": "つうちをうけとる:",
-    "notification_setting_follows": "あなたがフォローしているひとから",
-    "notification_setting_non_follows": "あなたがフォローしていないひとから",
-    "notification_setting_followers": "あなたをフォローしているひとから",
-    "notification_setting_non_followers": "あなたをフォローしていないひとから",
+    "notification_setting_from_following": "あなたがフォローしているひとから",
+    "notification_setting_from_followers": "あなたをフォローしているひとから",
+    "notification_setting_from_strangers": "あなたをフォローしていないひとから",
     "notification_mutes": "あるユーザーからのつうちをとめるには、ミュートしてください。",
     "notification_blocks": "ブロックしているユーザーからのつうちは、すべてとまります。",
     "enable_web_push_notifications": "ウェブプッシュつうちをゆるす",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 2ca7dca8..186e3f64 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -346,10 +346,9 @@
     },
     "notifications": "通知",
     "notification_setting": "通知を受け取る:",
-    "notification_setting_follows": "あなたがフォローしているユーザーから",
-    "notification_setting_non_follows": "あなたがフォローしていないユーザーから",
-    "notification_setting_followers": "あなたをフォローしているユーザーから",
-    "notification_setting_non_followers": "あなたをフォローしていないユーザーから",
+    "notification_setting_from_following": "あなたがフォローしているユーザーから",
+    "notification_setting_from_followers": "あなたをフォローしているユーザーから",
+    "notification_setting_from_strangers": "あなたをフォローしていないユーザーから",
     "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートしてください。",
     "notification_blocks": "ブロックしているユーザーからの通知は、すべて止まります。",
     "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index 248b05bc..0df14f97 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -331,10 +331,9 @@
     },
     "notifications": "Varsler",
     "notification_setting": "Motta varsler i fra:",
-    "notification_setting_follows": "Brukere du følger",
-    "notification_setting_non_follows": "Brukere du ikke følger",
-    "notification_setting_followers": "Brukere som følger deg",
-    "notification_setting_non_followers": "Brukere som ikke følger deg",
+    "notification_setting_from_following": "Brukere du følger",
+    "notification_setting_from_followers": "Brukere som følger deg",
+    "notification_setting_from_strangers": "Brukere som ikke følger deg",
     "notification_mutes": "For å stoppe å motta varsler i fra en spesifikk bruker, kan du dempe dem.",
     "notification_blocks": "Hvis du blokkerer en bruker vil det stoppe alle varsler og i tilleg få dem til å slutte å følge deg",
     "enable_web_push_notifications": "Skru på pushnotifikasjoner i nettlesere",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 472d11ec..e284fbcb 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -385,9 +385,8 @@
                 "link": "een leuke kleine link"
             }
         },
-        "notification_setting_follows": "Gebruikers die je volgt",
-        "notification_setting_non_follows": "Gebruikers die je niet volgt",
-        "notification_setting_followers": "Gebruikers die je volgen",
+        "notification_setting_from_following": "Gebruikers die je volgt",
+        "notification_setting_from_followers": "Gebruikers die je volgen",
         "notification_setting_privacy": "Privacy",
         "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
         "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
@@ -464,7 +463,7 @@
         "hide_follows_description": "Niet tonen wie ik volg",
         "show_moderator_badge": "Moderators badge tonen in mijn profiel",
         "notification_setting_filters": "Filters",
-        "notification_setting_non_followers": "Gebruikers die je niet volgen",
+        "notification_setting_from_strangers": "Gebruikers die je niet volgen",
         "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
         "version": {
             "frontend_version": "Frontend Versie",
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index 680ad6dd..09f64500 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -289,10 +289,9 @@
     },
     "notifications": "Notificacions",
     "notification_setting": "Recebre las notificacions de :",
-    "notification_setting_follows": "Utilizaires que seguissètz",
-    "notification_setting_non_follows": "Utilizaires que seguissètz pas",
-    "notification_setting_followers": "Utilizaires que vos seguisson",
-    "notification_setting_non_followers": "Utilizaires que vos seguisson pas",
+    "notification_setting_from_following": "Utilizaires que seguissètz",
+    "notification_setting_from_followers": "Utilizaires que vos seguisson",
+    "notification_setting_from_strangers": "Utilizaires que vos seguisson pas",
     "notification_mutes": "Per recebre pas mai d’un utilizaire en particular, botatz-lo en silenci.",
     "notification_blocks": "Blocar un utilizaire arrèsta totas las notificacions tan coma quitar de los seguir.",
     "enable_web_push_notifications": "Activar las notificacions web push",
@@ -550,4 +549,4 @@
     "people_talking": "{count} personas ne parlan",
     "no_results": "Cap de resultats"
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 101e5d39..b887ac06 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -406,10 +406,9 @@
         "greentext": "Memiczne strzałki",
         "notifications": "Powiadomienia",
         "notification_setting": "Otrzymuj powiadomienia od:",
-        "notification_setting_follows": "Ludzi których obserwujesz",
-        "notification_setting_non_follows": "Ludzi których nie obserwujesz",
-        "notification_setting_followers": "Ludzi którzy obserwują ciebie",
-        "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
+        "notification_setting_from_following": "Ludzi których obserwujesz",
+        "notification_setting_from_followers": "Ludzi którzy obserwują ciebie",
+        "notification_setting_from_strangers": "Ludzi którzy nie obserwują ciebie",
         "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
         "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
         "enable_web_push_notifications": "Włącz powiadomienia push",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 357d97a8..602301f7 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -348,12 +348,11 @@
                 "link": "ссылка"
             }
         },
-        "notification_setting_non_followers": "Не читающие вас",
+        "notification_setting_from_strangers": "Не читающие вас",
         "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
         "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
-        "notification_setting_followers": "Читающие вас",
-        "notification_setting_follows": "Читаемые вами",
-        "notification_setting_non_follows": "Не читаемые вами"
+        "notification_setting_from_followers": "Читающие вас",
+        "notification_setting_from_following": "Читаемые вами"
     },
     "timeline": {
         "collapse": "Свернуть",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 095db754..ed9b870a 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -337,10 +337,9 @@
         },
         "notifications": "通知",
         "notification_setting": "通知来源：",
-        "notification_setting_follows": "你所关注的用户",
-        "notification_setting_non_follows": "你没有关注的用户",
-        "notification_setting_followers": "关注你的用户",
-        "notification_setting_non_followers": "没有关注你的用户",
+        "notification_setting_from_following": "你所关注的用户",
+        "notification_setting_from_followers": "关注你的用户",
+        "notification_setting_from_strangers": "没有关注你的用户",
         "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
         "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
         "enable_web_push_notifications": "启用 web 推送通知",

From 5f41ee88649ea8cf452680c8081f7d7417a522d3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 28 May 2020 12:28:32 -0500
Subject: [PATCH 121/415] The sidebarRight option wasn't being read

---
 src/boot/after_store.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index abdba305..0db03547 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -110,6 +110,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('alwaysShowSubjectInput')
   copyInstanceOption('showFeaturesPanel')
   copyInstanceOption('hideSitename')
+  copyInstanceOption('sidebarRight')
 
   return store.dispatch('setTheme', config['theme'])
 }

From 9a20a9093287b1835d635398ea900e5dc2ca3484 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 28 May 2020 21:26:33 +0300
Subject: [PATCH 122/415] fixed the remaining issues

---
 .../settings_modal/settings_modal_content.scss    |  4 ----
 .../settings_modal/settings_modal_content.vue     |  1 -
 src/components/tab_switcher/tab_switcher.js       | 15 ++++++---------
 src/components/tab_switcher/tab_switcher.scss     | 11 ++++++++++-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/settings_modal/settings_modal_content.scss b/src/components/settings_modal/settings_modal_content.scss
index f80306c6..a3fef1cf 100644
--- a/src/components/settings_modal/settings_modal_content.scss
+++ b/src/components/settings_modal/settings_modal_content.scss
@@ -2,10 +2,6 @@
 .settings_tab-switcher {
   height: 100%;
 
-  .full-height {
-    height: 100%;
-  }
-
   .setting-item {
     border-bottom: 2px solid var(--fg, $fallback--fg);
     margin: 1em 1em 1.4em;
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index 283b4ef8..2156844f 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -55,7 +55,6 @@
       v-if="isLoggedIn"
       :label="$t('settings.mutes_and_blocks')"
       :fullHeight="true"
-      class="full-height"
       icon="eye-off"
     >
       <MutesAndBlocksTab />
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 616f1a19..7891cb78 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -113,23 +113,20 @@ export default Vue.component('tab-switcher', {
       if (slot.data.attrs.fullHeight) {
         classes.push('full-height')
       }
-      const newSlot = (
+      const renderSlot = (!this.renderOnlyFocused || active)
+        ? slot
+        : ''
+
+      return (
         <div class={classes}>
           {
             this.sideTabBar
               ? <h1 class="mobile-label">{slot.data.attrs.label}</h1>
               : ''
           }
-          {slot}
+          {renderSlot}
         </div>
       )
-
-      if (this.renderOnlyFocused) {
-        return active
-          ? <div class={classes.join(' ')}>{newSlot}</div>
-          : <div class={classes.join(' ')}></div>
-      }
-      return <div class={classes.join(' ')}>{newSlot}</div>
     })
 
     return (
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index db58f4cd..2a364731 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -125,8 +125,9 @@
         border-bottom-right-radius: 0;
         padding-left: 1em;
         padding-right: calc(1em + 200px);
-        margin-right: calc(1em - 200px);
+        margin-right: -200px;
         margin-left: 1em;
+
         @media all and (max-width: 800px) {
           padding-left: .25em;
           padding-right: calc(.25em + 200px);
@@ -147,6 +148,14 @@
     .hidden {
       display: none;
     }
+    .full-height {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      > *:not(.mobile-label) {
+        flex: 1;
+      }
+    }
 
     &.scrollable-tabs {
       overflow-y: auto;

From 94436c1f858dc0fcd8a876df202241fb96f029cc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 29 May 2020 13:39:30 +0300
Subject: [PATCH 123/415] fixed tab not hiding

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

diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index 2a364731..d2ef4857 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -148,7 +148,7 @@
     .hidden {
       display: none;
     }
-    .full-height {
+    .full-height:not(.hidden) {
       height: 100%;
       display: flex;
       flex-direction: column;

From 4fae2f8ea878bedfce89402f19adffaedec65baf Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 2 Jun 2020 01:10:52 +0300
Subject: [PATCH 124/415] track if settings modal has been opened once

---
 src/components/settings_modal/settings_modal.js  | 3 +++
 src/components/settings_modal/settings_modal.vue | 2 +-
 src/modules/interface.js                         | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index caa7c48c..f0d49c91 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -30,6 +30,9 @@ const SettingsModal = {
     modalActivated () {
       return this.$store.state.interface.settingsModalState !== 'hidden'
     },
+    modalOpenedOnce () {
+      return this.$store.state.interface.settingsModalLoaded
+    },
     modalPeeked () {
       return this.$store.state.interface.settingsModalState === 'minimized'
     }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index ded02f4a..6bc64ed0 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -43,7 +43,7 @@
         </button>
       </div>
       <div class="panel-body">
-        <SettingsModalContent v-if="modalActivated" />
+        <SettingsModalContent v-if="modalOpenedOnce" />
       </div>
     </div>
   </Modal>
diff --git a/src/modules/interface.js b/src/modules/interface.js
index e55b7290..eeebd65e 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -2,6 +2,7 @@ import { set, delete as del } from 'vue'
 
 const defaultState = {
   settingsModalState: 'hidden',
+  settingsModalLoaded: false,
   settings: {
     currentSaveStateNotice: null,
     noticeClearTimeout: null,
@@ -54,6 +55,9 @@ const interfaceMod = {
     },
     openSettingsModal (state) {
       state.settingsModalState = 'visible'
+      if (!state.settingsModalLoaded) {
+        state.settingsModalLoaded = true
+      }
     }
   },
   actions: {

From de3a376bebb25fefb1fe513c3491ee6c4e48af0f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 2 Jun 2020 01:16:10 +0300
Subject: [PATCH 125/415] fixed case in class name

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

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 1c287aa7..3137cb9d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -28,17 +28,17 @@
         </small>
         <small
           v-if="showReasonMutedThread && muteWordHits.length === 0"
-          class="mutedThread"
+          class="muted-thread"
         >
           {{ $t('status.thread_muted') }}
         </small>
         <small
           v-if="showReasonMutedThread && muteWordHits.length > 0"
-          class="mutedThread"
+          class="muted-Thread"
         >
           {{ $t('status.thread_muted_and_words') }}
         </small>
-        <small class="muteWords">{{ muteWordHits.join(', ') }}</small>
+        <small class="mute-words">{{ muteWordHits.join(', ') }}</small>
         <a
           href="#"
           class="unmute"
@@ -658,7 +658,7 @@ $status-margin: 0.75em;
     margin-left: auto;
   }
 
-  .mutedThread, .muteWords {
+  .muted-thread, .mute-words {
     margin-left: 10px;
   }
 }

From f197a2aa39eb5cb77887b64b182be78a3eaefdd1 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 4 Jun 2020 15:12:03 +0200
Subject: [PATCH 126/415] EntityNormalizer: Add colons to emoji alt text.

This makes it possible to copy them and still have them work.
---
 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 6dac7c15..c7ed65a4 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -210,7 +210,7 @@ export const addEmojis = (string, emojis) => {
     const regexSafeShortCode = emoji.shortcode.replace(matchOperatorsRegex, '\\$&')
     return acc.replace(
       new RegExp(`:${regexSafeShortCode}:`, 'g'),
-      `<img src='${emoji.url}' alt='${emoji.shortcode}' title='${emoji.shortcode}' class='emoji' />`
+      `<img src='${emoji.url}' alt=':${emoji.shortcode}:' title=':${emoji.shortcode}:' class='emoji' />`
     )
   }, string)
 }

From c2dfe1f6cc364175d5aa17d587f82bdb6b8b189c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 4 Jun 2020 15:25:00 +0200
Subject: [PATCH 127/415] EntityNormalizerSpec: Test new behavior.

---
 .../services/entity_normalizer/entity_normalizer.spec.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 cfb380ba..178e75c6 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -338,9 +338,9 @@ describe('API Entities normalizer', () => {
 
   describe('MastoAPI emoji adder', () => {
     const emojis = makeMockEmojiMasto()
-    const imageHtml = '<img src="https://example.com/image.png" alt="image" title="image" class="emoji" />'
+    const imageHtml = '<img src="https://example.com/image.png" alt=":image:" title=":image:" class="emoji" />'
       .replace(/"/g, '\'')
-    const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" title="thinking" class="emoji" />'
+    const thinkHtml = '<img src="https://example.com/think.png" alt=":thinking:" title=":thinking:" class="emoji" />'
       .replace(/"/g, '\'')
 
     it('correctly replaces shortcodes in supplied string', () => {

From 05167f202fbb55d1cee1a1c36b630c18ab297419 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 4 Jun 2020 15:31:52 +0200
Subject: [PATCH 128/415] EntityNormalizerSpec: More fixes.

---
 .../services/entity_normalizer/entity_normalizer.spec.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 178e75c6..166fce2b 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -366,8 +366,8 @@ describe('API Entities normalizer', () => {
         shortcode: '[a-z] {|}*'
       }])
       const result = addEmojis('This post has :c++: emoji and :[a-z] {|}*: emoji', emojis)
-      expect(result).to.include('title=\'c++\'')
-      expect(result).to.include('title=\'[a-z] {|}*\'')
+      expect(result).to.include('title=\':c++:\'')
+      expect(result).to.include('title=\':[a-z] {|}*:\'')
     })
   })
 })

From c0497b6f1fae9e61156d9bd4fa111f7bd1b56e24 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 4 Jun 2020 15:34:29 +0200
Subject: [PATCH 129/415] Docs: Change wrong documentation.

---
 docs/USER_GUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
index 076bfb1c..f417f33d 100644
--- a/docs/USER_GUIDE.md
+++ b/docs/USER_GUIDE.md
@@ -33,7 +33,7 @@ will become
 Note that you can only use emoji defined on your instance, you cannot "copy" someone else's emoji, and will have to ask your administrator to copy emoji from other instance to yours.  
 Lastly, there's two convenience options for emoji: an emoji picker (smiley face to the right of "submit" button) and autocomplete suggestions - when you start typing :shortcode: it will automatically try to suggest you emoj and complete the shortcode for you if you select one. **Note** that if emoji doesn't show up in suggestions nor in emoji picker it means there's no such emoji on your instance, if shortcode doesn't match any defined emoji it will appear as text.
 * **Attachments** are fairly simple - you can attach any file to a post as long as the file is within maximum size limits. If you're uploading explicit material you can mark all of your attachments as sensitive (or add `#nsfw` tag) - it will hide the images and videos behind a warning so that it won't be displayed instantly.
-* **Subject line** also known as **CW** (Content Warning) could be used as a header to the post and/or to warn others about contents of the post having something that might upset somebody or something among those lines. Several applications allow to hide post content leaving only subject line visible. As a side-effect using subject line will also mark your images as sensitive (see above).
+* **Subject line** also known as **CW** (Content Warning) could be used as a header to the post and/or to warn others about contents of the post having something that might upset somebody or something among those lines. Several applications allow to hide post content leaving only subject line visible. Using a subject line will not mark your images as sensitive, you will have to do that explicitly (see above).
 * **Visiblity scope** controls who will be able to see your posts. There are four scopes available:
 
 1. `Public`: This is the default, and some fediverse software like GNU Social only supports this. This means that your post is accessible by anyone and will be shown in the public timelines.

From d872d55832cf3af43f698edd28b99f0c3c515f5c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 4 Jun 2020 15:50:44 +0200
Subject: [PATCH 130/415] StatusContent: Try to get hashtag from dataset first.

---
 src/components/status_content/status_content.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index ccc01b6f..c0a71e8f 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -176,8 +176,8 @@ const StatusContent = {
           }
         }
         if (target.rel.match(/(?:^|\s)tag(?:$|\s)/) || target.className.match(/hashtag/)) {
-          // Extract tag name from link url
-          const tag = extractTagFromUrl(target.href)
+          // Extract tag name from dataset or link url
+          const tag = target.dataset.tag || extractTagFromUrl(target.href)
           if (tag) {
             const link = this.generateTagLink(tag)
             this.$router.push(link)

From cb99dc2b270d2554f7e2fc85707786a74563e0ca Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 4 Jun 2020 16:30:28 +0200
Subject: [PATCH 131/415] MediaModal: Close on browser navigation events.

---
 src/components/media_modal/media_modal.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/media_modal/media_modal.js b/src/components/media_modal/media_modal.js
index abb18c7d..24764e80 100644
--- a/src/components/media_modal/media_modal.js
+++ b/src/components/media_modal/media_modal.js
@@ -84,10 +84,12 @@ const MediaModal = {
     }
   },
   mounted () {
+    window.addEventListener('popstate', this.hide)
     document.addEventListener('keyup', this.handleKeyupEvent)
     document.addEventListener('keydown', this.handleKeydownEvent)
   },
   destroyed () {
+    window.removeEventListener('popstate', this.hide)
     document.removeEventListener('keyup', this.handleKeyupEvent)
     document.removeEventListener('keydown', this.handleKeydownEvent)
   }

From 282e10e3bec1a76da2d4c2a89152b441a2273fb7 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 5 Jun 2020 13:42:39 +0200
Subject: [PATCH 132/415] Settings: Keep a local version of the
 mutedWordsString

Without this it was impossible to use newlines
---
 src/components/settings/settings.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 31a9e9be..5d01a05f 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -30,7 +30,8 @@ const settings = {
         Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
 
       backendVersion: instance.backendVersion,
-      frontendVersion: instance.frontendVersion
+      frontendVersion: instance.frontendVersion,
+      muteWordsStringLocal: this.$store.getters.mergedConfig.muteWords.join('\n') 
     }
   },
   components: {
@@ -86,8 +87,11 @@ const settings = {
       .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
     // Special cases (need to transform values or perform actions first)
     muteWordsString: {
-      get () { return this.$store.getters.mergedConfig.muteWords.join('\n') },
+      get () { 
+        return this.muteWordsStringLocal
+      },
       set (value) {
+        this.muteWordsStringLocal = value
         this.$store.dispatch('setOption', {
           name: 'muteWords',
           value: filter(value.split('\n'), (word) => trim(word).length > 0)

From c4c5568b98802d05b303a38be61e68386e3f7cd0 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 5 Jun 2020 13:51:47 +0200
Subject: [PATCH 133/415] Linting fixes.

---
 src/components/settings/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 5d01a05f..527b9a8d 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -31,7 +31,7 @@ const settings = {
 
       backendVersion: instance.backendVersion,
       frontendVersion: instance.frontendVersion,
-      muteWordsStringLocal: this.$store.getters.mergedConfig.muteWords.join('\n') 
+      muteWordsStringLocal: this.$store.getters.mergedConfig.muteWords.join('\n')
     }
   },
   components: {
@@ -87,7 +87,7 @@ const settings = {
       .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
     // Special cases (need to transform values or perform actions first)
     muteWordsString: {
-      get () { 
+      get () {
         return this.muteWordsStringLocal
       },
       set (value) {

From ba4c189c53fd6450de7247e55203f18ae65c48e8 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 5 Jun 2020 17:26:13 +0200
Subject: [PATCH 134/415] ReactButton: Change the combined emoji (heart) to a
 simple one.

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

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index abc3bf07..f0931446 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -24,7 +24,7 @@ const ReactButton = {
   },
   computed: {
     commonEmojis () {
-      return ['❤️', '😠', '👀', '😂', '🔥']
+      return ['👍', '😠', '👀', '😂', '🔥']
     },
     emojis () {
       if (this.filterWord !== '') {

From 2aabd8ed1a75be0d4079d23d0bf6702883ff4959 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 5 Jun 2020 17:55:19 +0200
Subject: [PATCH 135/415] StillImage: Make it work properly in both firefox and
 chrome.

---
 src/components/still-image/still-image.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 4137bd59..08af26f6 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -23,12 +23,21 @@
 
 <style lang="scss">
 @import '../../_variables.scss';
+.contain-fit {
+  .still-image {
+    img {
+      height: 100%;
+    }
+  }
+}
+
 .still-image {
   position: relative;
   line-height: 0;
   overflow: hidden;
   width: 100%;
   height: 100%;
+  display: flex;
 
   &:hover canvas {
     display: none;
@@ -36,8 +45,8 @@
 
   img {
     width: 100%;
-    height: 100%;
     object-fit: contain;
+    align-self: center;
   }
 
   &.animated {

From 0a3069aec0c6b664381d202bca5a8460a1d6d9fc Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 5 Jun 2020 16:13:41 +0000
Subject: [PATCH 136/415] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a44fb163..9501f981 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,9 +13,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it
+- Change heart to thumbs up in reaction picker
+- Close the media modal on navigation events
+- Add colons to the emoji alt text, to make them copyable
 
 ### Fixed
 - Status ellipsis menu closes properly when selecting certain options
+- Cropped images look correct in Chrome
+- Newlines in the muted words settings work again
+- Clicking on non-latin hashtags won't open a new window
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From e0e1fe5e20aaf63937674f51db23ef1e89885770 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sun, 24 May 2020 19:36:21 +0000
Subject: [PATCH 137/415] Translated using Weblate (Italian)

Currently translated at 51.8% (318 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index e565049d..82c8e7c8 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -142,7 +142,45 @@
         "values": {
             "false": "no",
             "true": "sì"
-        }
+        },
+        "avatar_size_instruction": "La taglia minima per l'icona personale è 150x150 pixel.",
+        "domain_mutes": "Domini",
+        "discoverable": "Permetti la scoperta di questo profilo da servizi di ricerca ed altro",
+        "composing": "Composizione",
+        "changed_email": "Email cambiata con successo!",
+        "change_email_error": "C'è stato un problema nel cambiare la tua email.",
+        "change_email": "Cambia email",
+        "blocks_tab": "Bloccati",
+        "blocks_imported": "Blocchi importati! Saranno elaborati a breve.",
+        "block_import_error": "Errore nell'importazione",
+        "block_import": "Importa blocchi",
+        "block_export_button": "Esporta i tuoi blocchi in un file CSV",
+        "block_export": "Esporta blocchi",
+        "allow_following_move": "Consenti",
+        "mfa": {
+            "verify": {
+                "desc": "Per abilitare l'autenticazione bifattoriale, inserisci il codice fornito dalla tua applicazione:"
+            },
+            "scan": {
+                "secret_code": "Codice",
+                "desc": "Con la tua applicazione bifattoriale, acquisisci questo QR o inserisci il codice manualmente:",
+                "title": "Acquisisci"
+            },
+            "authentication_methods": "Metodi di accesso",
+            "recovery_codes_warning": "Appuntati i codici o salvali in un posto sicuro, altrimenti rischi di non rivederli mai più. Se perderai l'accesso sia alla tua applicazione bifattoriale che ai codici di recupero non potrai più accedere al tuo profilo.",
+            "waiting_a_recovery_codes": "Ricevo codici di recupero...",
+            "recovery_codes": "Codici di recupero.",
+            "warning_of_generate_new_codes": "Alla generazione di nuovi codici di recupero, quelli vecchi saranno disattivati.",
+            "generate_new_recovery_codes": "Genera nuovi codici di recupero",
+            "title": "Accesso bifattoriale",
+            "confirm_and_enable": "Conferma ed abilita OTP",
+            "wait_pre_setup_otp": "preimposto OTP",
+            "setup_otp": "Imposta OTP",
+            "otp": "OTP"
+        },
+        "enter_current_password_to_confirm": "Inserisci la tua password per identificarti",
+        "security": "Sicurezza",
+        "app_name": "Nome applicazione"
     },
     "timeline": {
         "error_fetching": "Errore nell'aggiornamento",
@@ -209,7 +247,10 @@
         "account_not_locked_warning_link": "protetto",
         "attachments_sensitive": "Nascondi gli allegati",
         "content_type": {
-            "text/plain": "Testo normale"
+            "text/plain": "Testo normale",
+            "text/bbcode": "BBCode",
+            "text/markdown": "Markdown",
+            "text/html": "HTML"
         },
         "content_warning": "Oggetto (facoltativo)",
         "default": "Sono appena atterrato a Fiumicino.",
@@ -220,7 +261,15 @@
             "private": "Solo per seguaci - Visibile solo dai tuoi seguaci",
             "public": "Pubblico - Visibile sulla sequenza pubblica",
             "unlisted": "Non elencato - Non visibile sulla sequenza pubblica"
-        }
+        },
+        "scope_notice": {
+            "unlisted": "Questo messaggio non sarà visibile sulla sequenza locale né su quella pubblica",
+            "private": "Questo messaggio sarà visibile solo ai tuoi seguaci",
+            "public": "Questo messaggio sarà visibile a tutti"
+        },
+        "direct_warning_to_first_only": "Questo messaggio sarà visibile solo agli utenti menzionati all'inizio.",
+        "direct_warning_to_all": "Questo messaggio sarà visibile a tutti i menzionati.",
+        "new_status": "Nuovo messaggio"
     },
     "registration": {
         "bio": "Introduzione",
@@ -228,7 +277,20 @@
         "fullname": "Nome visualizzato",
         "password_confirm": "Conferma password",
         "registration": "Registrazione",
-        "token": "Codice d'invito"
+        "token": "Codice d'invito",
+        "validations": {
+            "password_confirmation_match": "dovrebbe essere uguale alla password",
+            "password_confirmation_required": "non può essere vuoto",
+            "password_required": "non può essere vuoto",
+            "email_required": "non può essere vuoto",
+            "fullname_required": "non può essere vuoto",
+            "username_required": "non può essere vuoto"
+        },
+        "bio_placeholder": "es.\nCiao, sono Lupo Lucio.\nSono un lupo fantastico che vive nel Fantabosco. Forse mi hai visto alla Melevisione.",
+        "fullname_placeholder": "es. Lupo Lucio",
+        "username_placeholder": "es. mister_wolf",
+        "new_captcha": "Clicca l'immagine per avere un altro captcha",
+        "captcha": "CAPTCHA"
     },
     "user_profile": {
         "timeline_title": "Sequenza dell'Utente"
@@ -307,7 +369,10 @@
         "not_enough_options": "Aggiungi altre risposte"
     },
     "interactions": {
-        "favs_repeats": "Condivisi e preferiti"
+        "favs_repeats": "Condivisi e preferiti",
+        "load_older": "Carica vecchie interazioni",
+        "moves": "Utenti migrati",
+        "follows": "Nuovi seguìti"
     },
     "emoji": {
         "load_all": "Carico tutti i {emojiAmount} emoji",
@@ -319,5 +384,13 @@
         "keep_open": "Tieni aperto il menù",
         "emoji": "Emoji",
         "stickers": "Adesivi"
+    },
+    "selectable_list": {
+        "select_all": "Seleziona tutto"
+    },
+    "remote_user_resolver": {
+        "error": "Non trovato.",
+        "searching_for": "Cerco",
+        "remote_user_resolver": "Cerca utenti remoti"
     }
 }

From 18997c2d078ebb7991f247bf87208fca80f8d739 Mon Sep 17 00:00:00 2001
From: Chuculate <l6d5up+9u2qx1kec2m64@sharklasers.com>
Date: Tue, 26 May 2020 15:32:22 +0000
Subject: [PATCH 138/415] Translated using Weblate (Spanish)

Currently translated at 84.3% (517 of 613 strings)

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

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 163eb707..08de345c 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -1,638 +1,638 @@
 {
-  "chat": {
-    "title": "Chat"
-  },
-  "exporter": {
-    "export": "Exportar",
-    "processing": "Procesando. Pronto se te pedirá que descargues tu archivo"
-  },
-  "features_panel": {
-    "chat": "Chat",
-    "gopher": "Gopher",
-    "media_proxy": "Proxy de medios",
-    "scope_options": "Opciones del alcance de la visibilidad",
-    "text_limit": "Límite de caracteres",
-    "title": "Características",
-    "who_to_follow": "A quién seguir"
-  },
-  "finder": {
-    "error_fetching_user": "Error al buscar usuario",
-    "find_user": "Encontrar usuario"
-  },
-  "general": {
-    "apply": "Aplicar",
-    "submit": "Enviar",
-    "more": "Más",
-    "generic_error": "Ha ocurrido un error",
-    "optional": "opcional",
-    "show_more": "Mostrar más",
-    "show_less": "Mostrar menos",
-    "cancel": "Cancelar",
-    "disable": "Inhabilitar",
-    "enable": "Habilitar",
-    "confirm": "Confirmar",
-    "verify": "Verificar"
-  },
-  "image_cropper": {
-    "crop_picture": "Recortar la foto",
-    "save": "Guardar",
-    "save_without_cropping": "Guardar sin recortar",
-    "cancel": "Cancelar"
-  },
-  "importer": {
-    "submit": "Enviar",
-    "success": "Importado con éxito",
-    "error": "Se ha producido un error al importar el archivo."
-  },
-  "login": {
-    "login": "Identificarse",
-    "description": "Identificarse con OAuth",
-    "logout": "Cerrar sesión",
-    "password": "Contraseña",
-    "placeholder": "p.ej. lain",
-    "register": "Registrarse",
-    "username": "Usuario",
-    "hint": "Inicia sesión para unirte a la discusión",
-    "authentication_code": "Código de autenticación",
-    "enter_recovery_code": "Inserta el código de recuperación",
-    "enter_two_factor_code": "Inserta el código de dos factores",
-    "recovery_code": "Código de recuperación",
-    "heading" : {
-      "totp" : "Autenticación de dos factores",
-      "recovery" : "Recuperación de dos factores"
-    }
-  },
-   "media_modal": {
-    "previous": "Anterior",
-    "next": "Siguiente"
-  },
-  "nav": {
-    "about": "Acerca de",
-    "administration": "Administración",
-    "back": "Volver",
-    "chat": "Chat Local",
-    "friend_requests": "Solicitudes de seguimiento",
-    "mentions": "Menciones",
-    "interactions": "Interacciones",
-    "dms": "Mensajes Directos",
-    "public_tl": "Línea Temporal Pública",
-    "timeline": "Línea Temporal",
-    "twkn": "Toda La Red Conocida",
-    "user_search": "Búsqueda de Usuarios",
-    "search": "Buscar",
-    "who_to_follow": "A quién seguir",
-    "preferences": "Preferencias"
-  },
-  "notifications": {
-    "broken_favorite": "Estado desconocido, buscándolo...",
-    "favorited_you": "le gusta tu estado",
-    "followed_you": "empezó a seguirte",
-    "load_older": "Cargar notificaciones antiguas",
-    "notifications": "Notificaciones",
-    "read": "¡Leído!",
-    "repeated_you": "repitió tu estado",
-    "no_more_notifications": "No hay más notificaciones"
-  },
-  "polls": {
-    "add_poll": "Añadir encuesta",
-    "add_option": "Añadir opción",
-    "option": "Opción",
-    "votes": "votos",
-    "vote": "Votar",
-    "type": "Tipo de encuesta",
-    "single_choice": "Elección única",
-    "multiple_choices": "Elección múltiple",
-    "expiry": "Tiempo de vida de la encuesta",
-    "expires_in": "La encuensta termina en {0}",
-    "expired": "La encuesta terminó hace {0}",
-    "not_enough_options": "Muy pocas opciones únicas en la encuesta"
-  },
-  "emoji": {
-    "stickers": "Pegatinas",
-    "emoji": "Emoji",
-    "keep_open": "Mantener el selector abierto",
-    "search_emoji": "Buscar un emoji",
-    "add_emoji": "Insertar un emoji",
-    "custom": "Emojis personalizados",
-    "unicode": "Emojis unicode"
-  },
-  "stickers": {
-    "add_sticker": "Añadir Pegatina"
-  },
-  "interactions": {
-    "favs_repeats": "Favoritos y Repetidos",
-    "follows": "Nuevos seguidores",
-    "load_older": "Cargar interacciones más antiguas"
-  },
-  "post_status": {
-    "new_status": "Publicar un nuevo estado",
-    "account_not_locked_warning": "Tu cuenta no está {0}. Cualquiera puede seguirte y leer las entradas para Solo-Seguidores.",
-    "account_not_locked_warning_link": "bloqueada",
-    "attachments_sensitive": "Contenido sensible",
-    "content_type": {
-      "text/plain": "Texto Plano",
-      "text/html": "HTML",
-      "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
+    "chat": {
+        "title": "Chat"
     },
-    "content_warning": "Tema (opcional)",
-    "default": "Acabo de aterrizar en L.A.",
-    "direct_warning_to_all": "Esta publicación será visible para todos los usarios mencionados.",
-    "direct_warning_to_first_only": "Esta publicación solo será visible para los usuarios mencionados al comienzo del mensaje.",
-    "posting": "Publicando",
-    "scope_notice": {
-      "public": "Esta publicación será visible para todo el mundo",
-      "private": "Esta publicación solo será visible para tus seguidores.",
-      "unlisted": "Esta publicación no será visible en la Línea Temporal Pública ni en Toda La Red Conocida"
+    "exporter": {
+        "export": "Exportar",
+        "processing": "Procesando. Pronto se te pedirá que descargues tu archivo"
     },
-    "scope": {
-      "direct": "Directo - Solo para los usuarios mencionados.",
-      "private": "Solo-seguidores - Solo tus seguidores leerán la publicación",
-      "public": "Público - Entradas visibles en las Líneas Temporales Públicas",
-      "unlisted": "Sin listar - Entradas no visibles en las Líneas Temporales Públicas"
-    }
-  },
-  "registration": {
-    "bio": "Biografía",
-    "email": "Correo electrónico",
-    "fullname": "Nombre a mostrar",
-    "password_confirm": "Confirmar contraseña",
-    "registration": "Registro",
-    "token": "Token de invitación",
-    "captcha": "CAPTCHA",
-    "new_captcha": "Haz click en la imagen para obtener un nuevo captcha",
-    "username_placeholder": "p.ej. lain",
-    "fullname_placeholder": "p.ej. Lain Iwakura",
-    "bio_placeholder": "e.g.\nHola, soy un ejemplo.\nAquí puedes poner algo representativo tuyo... o no.",
-    "validations": {
-      "username_required": "no puede estar vacío",
-      "fullname_required": "no puede estar vacío",
-      "email_required": "no puede estar vacío",
-      "password_required": "no puede estar vacío",
-      "password_confirmation_required": "no puede estar vacío",
-      "password_confirmation_match": "la contraseña no coincide"
-    }
-  },
-   "selectable_list": {
-    "select_all": "Seleccionar todo"
-  },
-  "settings": {
-    "app_name": "Nombre de la aplicación",
-    "security": "Seguridad",
-    "enter_current_password_to_confirm": "Introduce la contraseña actual para confirmar tu identidad",
-    "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "Configurar OTP",
-      "wait_pre_setup_otp" : "preconfiguración OTP",
-      "confirm_and_enable" : "Confirmar y habilitar OTP",
-      "title": "Autentificación de dos factores",
-      "generate_new_recovery_codes" : "Generar códigos de recuperación nuevos",
-      "warning_of_generate_new_codes" : "Cuando generas nuevos códigos de recuperación, los antiguos dejarán de funcionar.",
-      "recovery_codes" : "Códigos de recuperación.",
-      "waiting_a_recovery_codes": "Recibiendo códigos de respaldo",
-      "recovery_codes_warning" : "Anote los códigos o guárdelos en un lugar seguro, de lo contrario no los volverá a ver. Si pierde el acceso a su aplicación 2FA y los códigos de recuperación, su cuenta quedará bloqueada.",
-      "authentication_methods" : "Métodos de autentificación",
-      "scan": {
-        "title": "Escanear",
-        "desc": "Usando su aplicación de dos factores, escanee este código QR o ingrese la clave de texto:",
-        "secret_code": "Clave"
-      },
-      "verify": {
-        "desc": "Para habilitar la autenticación de dos factores, ingrese el código de su aplicación 2FA:"
-      }
+    "features_panel": {
+        "chat": "Chat",
+        "gopher": "Gopher",
+        "media_proxy": "Proxy de medios",
+        "scope_options": "Opciones del alcance de la visibilidad",
+        "text_limit": "Límite de caracteres",
+        "title": "Características",
+        "who_to_follow": "A quién seguir"
     },
-    "attachmentRadius": "Adjuntos",
-    "attachments": "Adjuntos",
-    "autoload": "Habilitar carga automática al llegar al final de la página",
-    "avatar": "Avatar",
-    "avatarAltRadius": "Avatares (Notificaciones)",
-    "avatarRadius": "Avatares",
-    "background": "Fondo",
-    "bio": "Biografía",
-    "block_export": "Exportar usuarios bloqueados",
-    "block_export_button": "Exporta la lista de tus usarios bloqueados a un archivo csv",
-    "block_import": "Importar usuarios bloqueados",
-    "block_import_error": "Error importando la lista de usuarios bloqueados",
-    "blocks_imported": "¡Lista de usuarios bloqueados importada! El procesado puede tardar un poco.",
-    "blocks_tab": "Bloqueados",
-    "btnRadius": "Botones",
-    "cBlue": "Azul (Responder, seguir)",
-    "cGreen": "Verde (Retweet)",
-    "cOrange": "Naranja (Favorito)",
-    "cRed": "Rojo (Cancelar)",
-    "change_password": "Cambiar contraseña",
-    "change_password_error": "Hubo un problema cambiando la contraseña.",
-    "changed_password": "Contraseña cambiada correctamente!",
-    "collapse_subject": "Colapsar entradas con tema",
-    "composing": "Redactando",
-    "confirm_new_password": "Confirmar la nueva contraseña",
-    "current_avatar": "Tu avatar actual",
-    "current_password": "Contraseña actual",
-    "current_profile_banner": "Tu cabecera actual",
-    "data_import_export_tab": "Importar / Exportar Datos",
-    "default_vis": "Alcance de visibilidad por defecto",
-    "delete_account": "Eliminar la cuenta",
-    "discoverable": "Permitir la aparición de esta cuenta en los resultados de búsqueda y otros servicios",
-    "delete_account_description": "Eliminar para siempre la cuenta y todos los mensajes.",
-    "pad_emoji": "Rellenar con espacios al agregar emojis desde el selector",
-    "delete_account_error": "Hubo un error al eliminar tu cuenta. Si el fallo persiste, ponte en contacto con el administrador de tu instancia.",
-    "delete_account_instructions": "Escribe tu contraseña para confirmar la eliminación de tu cuenta.",
-    "avatar_size_instruction": "El tamaño mínimo recomendado para el avatar es de 150X150 píxeles.",
-    "export_theme": "Exportar tema",
-    "filtering": "Filtrado",
-    "filtering_explanation": "Todos los estados que contengan estas palabras serán silenciados, una por línea",
-    "follow_export": "Exportar personas que tú sigues",
-    "follow_export_button": "Exporta tus seguidores a un fichero csv",
-    "follow_import": "Importar personas que tú sigues",
-    "follow_import_error": "Error al importar el fichero",
-    "follows_imported": "¡Importado! Procesarlos llevará tiempo.",
-    "foreground": "Primer plano",
-    "general": "General",
-    "hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
-    "hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
-    "hide_muted_posts": "Ocultar las publicaciones de los usuarios silenciados",
-    "max_thumbnails": "Cantidad máxima de miniaturas por publicación",
-    "hide_isp": "Ocultar el panel específico de la instancia",
-    "preload_images": "Precargar las imágenes",
-    "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
-    "hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
-    "hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
-    "hide_filtered_statuses": "Ocultar estados filtrados",
-    "import_blocks_from_a_csv_file": "Importar lista de usuarios bloqueados dese un archivo csv",
-    "import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
-    "import_theme": "Importar tema",
-    "inputRadius": "Campos de entrada",
-    "checkboxRadius": "Casillas de verificación",
-    "instance_default": "(por defecto: {value})",
-    "instance_default_simple": "(por defecto)",
-    "interface": "Interfaz",
-    "interfaceLanguage": "Idioma",
-    "invalid_theme_imported": "El archivo importado no es un tema válido de Pleroma. No se han realizado cambios.",
-    "limited_availability": "No disponible en tu navegador",
-    "links": "Enlaces",
-    "lock_account_description": "Restringir el acceso a tu cuenta solo a seguidores admitidos",
-    "loop_video": "Vídeos en bucle",
-    "loop_video_silent_only": "Bucle solo en vídeos sin sonido (p.ej. \"gifs\" de Mastodon)",
-    "mutes_tab": "Silenciados",
-    "play_videos_in_modal": "Reproducir los vídeos en un marco emergente",
-    "use_contain_fit": "No recortar los adjuntos en miniaturas",
-    "name": "Nombre",
-    "name_bio": "Nombre y Biografía",
-    "new_password": "Nueva contraseña",
-    "notification_visibility": "Tipos de notificaciones a mostrar",
-    "notification_visibility_follows": "Nuevos seguidores",
-    "notification_visibility_likes": "Me gustan (Likes)",
-    "notification_visibility_mentions": "Menciones",
-    "notification_visibility_repeats": "Repeticiones (Repeats)",
-    "no_rich_text_description": "Eliminar el formato de texto enriquecido de todas las entradas",
-    "no_blocks": "No hay usuarios bloqueados",
-    "no_mutes": "No hay usuarios sinlenciados",
-    "hide_follows_description": "No mostrar a quién sigo",
-    "hide_followers_description": "No mostrar quién me sigue",
-    "hide_follows_count_description": "No mostrar el número de cuentas que sigo",
-    "hide_followers_count_description": "No mostrar el número de cuentas que me siguen",
-    "show_admin_badge": "Mostrar la insignia de Administrador en mi perfil",
-    "show_moderator_badge": "Mostrar la insignia de Moderador en mi perfil",
-    "nsfw_clickthrough": "Activar el clic para ocultar los adjuntos NSFW",
-    "oauth_tokens": "Tokens de OAuth",
-    "token": "Token",
-    "refresh_token": "Actualizar el token",
-    "valid_until": "Válido hasta",
-    "revoke_token": "Revocar",
-    "panelRadius": "Paneles",
-    "pause_on_unfocused": "Parar la transmisión cuando no estés en foco.",
-    "presets": "Por defecto",
-    "profile_background": "Fondo del Perfil",
-    "profile_banner": "Cabecera del Perfil",
-    "profile_tab": "Perfil",
-    "radii_help": "Estable el redondeo de las esquinas de la interfaz (en píxeles)",
-    "replies_in_timeline": "Réplicas en la línea temporal",
-    "reply_link_preview": "Activar la previsualización del enlace de responder al pasar el ratón por encima",
-    "reply_visibility_all": "Mostrar todas las réplicas",
-    "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
-    "reply_visibility_self": "Solo mostrar réplicas para mí",
-    "autohide_floating_post_button": "Ocultar automáticamente el botón 'Nueva Publicación' (para móviles)",
-    "saving_err": "Error al guardar los ajustes",
-    "saving_ok": "Ajustes guardados",
-    "search_user_to_block": "Buscar usuarios a bloquear",
-    "search_user_to_mute": "Buscar usuarios a silenciar",
-    "security_tab": "Seguridad",
-    "scope_copy": "Copiar la visibilidad de la publicación cuando contestamos (En los mensajes directos (MDs) siempre se copia)",
-    "minimal_scopes_mode": "Minimizar las opciones de publicación",
-    "set_new_avatar": "Cambiar avatar",
-    "set_new_profile_background": "Cambiar el fondo del perfil",
-    "set_new_profile_banner": "Cambiar la cabecera del perfil",
-    "settings": "Ajustes",
-    "subject_input_always_show": "Mostrar siempre el campo del tema",
-    "subject_line_behavior": "Copiar el tema en las respuestas",
-    "subject_line_email": "Como email: \"re: tema\"",
-    "subject_line_mastodon": "Como mastodon: copiar como es",
-    "subject_line_noop": "No copiar",
-    "post_status_content_type": "Formato de publicación",
-    "stop_gifs": "Iniciar GIFs al pasar el ratón",
-    "streaming": "Habilitar la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
-    "text": "Texto",
-    "theme": "Tema",
-    "theme_help": "Use códigos de color hexadecimales (#rrggbb) para personalizar su tema de colores.",
-    "theme_help_v2_1": "También puede invalidar los colores y la opacidad de ciertos componentes si activa la casilla de verificación. Use el botón \"Borrar todo\" para deshacer los cambios.",
-    "theme_help_v2_2": "Los iconos debajo de algunas entradas son indicadores de contraste de fondo/texto, desplace el ratón por encima para obtener información más detallada. Tenga en cuenta que cuando se utilizan indicadores de contraste de transparencia se muestra el peor caso posible.",
-    "tooltipRadius": "Información/alertas",
-     "upload_a_photo": "Subir una foto",
-    "user_settings": "Ajustes del Usuario",
-    "values": {
-      "false": "no",
-      "true": "sí"
+    "finder": {
+        "error_fetching_user": "Error al buscar usuario",
+        "find_user": "Encontrar usuario"
     },
-    "notifications": "Notificaciones",
-    "notification_setting": "Recibir notificaciones de:",
-    "notification_setting_follows": "Usuarios que sigues",
-    "notification_setting_non_follows": "Usuarios que no sigues",
-    "notification_setting_followers": "Usuarios que te siguen",
-    "notification_setting_non_followers": "Usuarios que no te siguen",
-    "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
-    "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.",
-    "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
-    "style": {
-      "switcher": {
-        "keep_color": "Mantener colores",
-        "keep_shadows": "Mantener sombras",
-        "keep_opacity": "Mantener opacidad",
-        "keep_roundness": "Mantener redondeces",
-        "keep_fonts": "Mantener fuentes",
-        "save_load_hint": "Las opciones \"Mantener\" conservan las opciones configuradas actualmente al seleccionar o cargar temas, también almacena dichas opciones al exportar un tema. Cuando se desactiven todas las casillas de verificación, el tema de exportación lo guardará todo.",
-        "reset": "Reiniciar",
-        "clear_all": "Limpiar todo",
-        "clear_opacity": "Limpiar opacidad"
-      },
-      "common": {
-        "color": "Color",
-        "opacity": "Opacidad",
-        "contrast": {
-          "hint": "El ratio de contraste es {ratio}. {level} {context}",
-          "level": {
-            "aa": "Cumple con la pauta de nivel AA (mínimo)",
-            "aaa": "Cumple con la pauta de nivel AAA (recomendado)",
-            "bad": "No cumple con las pautas de accesibilidad"
-          },
-          "context": {
-            "18pt": "para textos grandes (+18pt)",
-            "text": "para textos"
-          }
+    "general": {
+        "apply": "Aplicar",
+        "submit": "Enviar",
+        "more": "Más",
+        "generic_error": "Ha ocurrido un error",
+        "optional": "opcional",
+        "show_more": "Mostrar más",
+        "show_less": "Mostrar menos",
+        "cancel": "Cancelar",
+        "disable": "Inhabilitar",
+        "enable": "Habilitar",
+        "confirm": "Confirmar",
+        "verify": "Verificar"
+    },
+    "image_cropper": {
+        "crop_picture": "Recortar la foto",
+        "save": "Guardar",
+        "save_without_cropping": "Guardar sin recortar",
+        "cancel": "Cancelar"
+    },
+    "importer": {
+        "submit": "Enviar",
+        "success": "Importado con éxito",
+        "error": "Se ha producido un error al importar el archivo."
+    },
+    "login": {
+        "login": "Identificarse",
+        "description": "Identificarse con OAuth",
+        "logout": "Cerrar sesión",
+        "password": "Contraseña",
+        "placeholder": "p.ej. lain",
+        "register": "Registrarse",
+        "username": "Usuario",
+        "hint": "Inicia sesión para unirte a la discusión",
+        "authentication_code": "Código de autenticación",
+        "enter_recovery_code": "Inserta el código de recuperación",
+        "enter_two_factor_code": "Inserta el código de dos factores",
+        "recovery_code": "Código de recuperación",
+        "heading": {
+            "totp": "Autenticación de dos factores",
+            "recovery": "Recuperación de dos factores"
         }
-      },
-      "common_colors": {
-        "_tab_label": "Común",
-        "main": "Colores comunes",
-        "foreground_hint": "Vea la pestaña \"Avanzado\" para un control más detallado",
-        "rgbo": "Iconos, acentos, insignias"
-      },
-      "advanced_colors": {
-        "_tab_label": "Avanzado",
-        "alert": "Fondo de Alertas",
-        "alert_error": "Error",
-        "badge": "Fondo de Insignias",
-        "badge_notification": "Notificaciones",
-        "panel_header": "Cabecera del panel",
-        "top_bar": "Barra superior",
-        "borders": "Bordes",
-        "buttons": "Botones",
-        "inputs": "Campos de entrada",
-        "faint_text": "Texto desvanecido"
-      },
-      "radii": {
-        "_tab_label": "Redondez"
-      },
-      "shadows": {
-        "_tab_label": "Sombra e iluminación",
-        "component": "Componente",
-        "override": "Sobreescribir",
-        "shadow_id": "Sombra #{value}",
-        "blur": "Difuminar",
-        "spread": "Cantidad",
-        "inset": "Sombra interior",
-        "hint": "Para las sombras, también puede usar --variable como un valor de color para usar las variables CSS3. Tenga en cuenta que establecer la opacidad no funcionará en este caso.",
-        "filter_hint": {
-          "always_drop_shadow": "Advertencia, esta sombra siempre usa {0} cuando el navegador lo soporta.",
-          "drop_shadow_syntax": "{0} no soporta el parámetro {1} y la palabra clave {2}.",
-          "avatar_inset": "Tenga en cuenta que la combinación de sombras interiores como no-interiores en los avatares, puede dar resultados inesperados con los avatares transparentes.",
-          "spread_zero": "Sombras con una cantidad > 0 aparecerá como si estuviera puesto a cero",
-          "inset_classic": "Las sombras interiores estarán usando {0}"
+    },
+    "media_modal": {
+        "previous": "Anterior",
+        "next": "Siguiente"
+    },
+    "nav": {
+        "about": "Acerca de",
+        "administration": "Administración",
+        "back": "Volver",
+        "chat": "Chat Local",
+        "friend_requests": "Solicitudes de seguimiento",
+        "mentions": "Menciones",
+        "interactions": "Interacciones",
+        "dms": "Mensajes Directos",
+        "public_tl": "Línea Temporal Pública",
+        "timeline": "Línea Temporal",
+        "twkn": "Toda La Red Conocida",
+        "user_search": "Búsqueda de Usuarios",
+        "search": "Buscar",
+        "who_to_follow": "A quién seguir",
+        "preferences": "Preferencias"
+    },
+    "notifications": {
+        "broken_favorite": "Estado desconocido, buscándolo...",
+        "favorited_you": "le gusta tu estado",
+        "followed_you": "empezó a seguirte",
+        "load_older": "Cargar notificaciones antiguas",
+        "notifications": "Notificaciones",
+        "read": "¡Leído!",
+        "repeated_you": "repitió tu estado",
+        "no_more_notifications": "No hay más notificaciones"
+    },
+    "polls": {
+        "add_poll": "Añadir encuesta",
+        "add_option": "Añadir opción",
+        "option": "Opción",
+        "votes": "votos",
+        "vote": "Votar",
+        "type": "Tipo de encuesta",
+        "single_choice": "Elección única",
+        "multiple_choices": "Elección múltiple",
+        "expiry": "Tiempo de vida de la encuesta",
+        "expires_in": "La encuesta termina en {0}",
+        "expired": "La encuesta terminó hace {0}",
+        "not_enough_options": "Muy pocas opciones únicas en la encuesta"
+    },
+    "emoji": {
+        "stickers": "Pegatinas",
+        "emoji": "Emoji",
+        "keep_open": "Mantener el selector abierto",
+        "search_emoji": "Buscar un emoji",
+        "add_emoji": "Insertar un emoji",
+        "custom": "Emojis personalizados",
+        "unicode": "Emojis unicode"
+    },
+    "stickers": {
+        "add_sticker": "Añadir Pegatina"
+    },
+    "interactions": {
+        "favs_repeats": "Favoritos y Repetidos",
+        "follows": "Nuevos seguidores",
+        "load_older": "Cargar interacciones más antiguas"
+    },
+    "post_status": {
+        "new_status": "Publicar un nuevo estado",
+        "account_not_locked_warning": "Tu cuenta no está {0}. Cualquiera puede seguirte y leer las entradas para Solo-Seguidores.",
+        "account_not_locked_warning_link": "bloqueada",
+        "attachments_sensitive": "Contenido sensible",
+        "content_type": {
+            "text/plain": "Texto Plano",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
         },
-        "components": {
-          "panel": "Panel",
-          "panelHeader": "Cabecera del panel",
-          "topBar": "Barra superior",
-          "avatar": "Avatar del usuario (en la vista del perfil)",
-          "avatarStatus": "Avatar del usuario (en la vista de la entrada)",
-          "popup": "Ventanas y textos emergentes (popups & tooltips)",
-          "button": "Botones",
-          "buttonHover": "Botón (encima)",
-          "buttonPressed": "Botón (presionado)",
-          "buttonPressedHover": "Botón (presionado+encima)",
-          "input": "Campo de entrada"
+        "content_warning": "Tema (opcional)",
+        "default": "Acabo de aterrizar en L.A.",
+        "direct_warning_to_all": "Esta publicación será visible para todos los usuarios mencionados.",
+        "direct_warning_to_first_only": "Esta publicación solo será visible para los usuarios mencionados al comienzo del mensaje.",
+        "posting": "Publicando",
+        "scope_notice": {
+            "public": "Esta publicación será visible para todo el mundo",
+            "private": "Esta publicación solo será visible para tus seguidores.",
+            "unlisted": "Esta publicación no será visible en la Línea Temporal Pública ni en Toda La Red Conocida"
+        },
+        "scope": {
+            "direct": "Directo - Solo para los usuarios mencionados",
+            "private": "Solo-seguidores - Solo tus seguidores leerán la publicación",
+            "public": "Público - Entradas visibles en las Líneas Temporales Públicas",
+            "unlisted": "Sin listar - Entradas no visibles en las Líneas Temporales Públicas"
         }
-      },
-      "fonts": {
-        "_tab_label": "Fuentes",
-        "help": "Seleccione la fuente a utilizar para los elementos de la interfaz de usuario. Para \"personalizar\", debe ingresar el nombre exacto de la fuente tal como aparece en el sistema.",
-        "components": {
-          "interface": "Interfaz",
-          "input": "Campos de entrada",
-          "post": "Texto de publicaciones",
-          "postCode": "Texto monoespaciado en publicación (texto enriquecido)"
+    },
+    "registration": {
+        "bio": "Biografía",
+        "email": "Correo electrónico",
+        "fullname": "Nombre a mostrar",
+        "password_confirm": "Confirmar contraseña",
+        "registration": "Registro",
+        "token": "Token de invitación",
+        "captcha": "CAPTCHA",
+        "new_captcha": "Haz click en la imagen para obtener un nuevo captcha",
+        "username_placeholder": "p.ej. lain",
+        "fullname_placeholder": "p.ej. Lain Iwakura",
+        "bio_placeholder": "e.g.\nHola, soy un ejemplo.\nAquí puedes poner algo representativo tuyo... o no.",
+        "validations": {
+            "username_required": "no puede estar vacío",
+            "fullname_required": "no puede estar vacío",
+            "email_required": "no puede estar vacío",
+            "password_required": "no puede estar vacío",
+            "password_confirmation_required": "no puede estar vacío",
+            "password_confirmation_match": "la contraseña no coincide"
+        }
+    },
+    "selectable_list": {
+        "select_all": "Seleccionar todo"
+    },
+    "settings": {
+        "app_name": "Nombre de la aplicación",
+        "security": "Seguridad",
+        "enter_current_password_to_confirm": "Introduce la contraseña actual para confirmar tu identidad",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "Configurar OTP",
+            "wait_pre_setup_otp": "preconfiguración OTP",
+            "confirm_and_enable": "Confirmar y habilitar OTP",
+            "title": "Autentificación de dos factores",
+            "generate_new_recovery_codes": "Generar códigos de recuperación nuevos",
+            "warning_of_generate_new_codes": "Cuando generas nuevos códigos de recuperación, los antiguos dejarán de funcionar.",
+            "recovery_codes": "Códigos de recuperación.",
+            "waiting_a_recovery_codes": "Recibiendo códigos de respaldo",
+            "recovery_codes_warning": "Anote los códigos o guárdelos en un lugar seguro, de lo contrario no los volverá a ver. Si pierde el acceso a su aplicación 2FA y los códigos de recuperación, su cuenta quedará bloqueada.",
+            "authentication_methods": "Métodos de autentificación",
+            "scan": {
+                "title": "Escanear",
+                "desc": "Usando su aplicación de dos factores, escanee este código QR o ingrese la clave de texto:",
+                "secret_code": "Clave"
+            },
+            "verify": {
+                "desc": "Para habilitar la autenticación de dos factores, ingrese el código de su aplicación 2FA:"
+            }
         },
-        "family": "Nombre de la fuente",
-        "size": "Tamaño (en px)",
-        "weight": "Peso (negrita)",
-        "custom": "Personalizado"
-      },
-      "preview": {
-        "header": "Vista previa",
-        "content": "Contenido",
-        "error": "Ejemplo de error",
-        "button": "Botón",
-        "text": "Un montón de {0} y {1}",
-        "mono": "contenido",
-        "input": "Acaba de aterrizar en L.A.",
-        "faint_link": "manual útil",
-        "fine_print": "¡Lea nuestro {0} para aprender nada útil!",
-        "header_faint": "Esto está bien",
-        "checkbox": "He revisado los términos y condiciones",
-        "link": "un bonito enlace"
-      }
+        "attachmentRadius": "Adjuntos",
+        "attachments": "Adjuntos",
+        "autoload": "Habilitar carga automática al llegar al final de la página",
+        "avatar": "Avatar",
+        "avatarAltRadius": "Avatares (Notificaciones)",
+        "avatarRadius": "Avatares",
+        "background": "Fondo",
+        "bio": "Biografía",
+        "block_export": "Exportar usuarios bloqueados",
+        "block_export_button": "Exporta la lista de tus usuarios bloqueados a un archivo csv",
+        "block_import": "Importar usuarios bloqueados",
+        "block_import_error": "Error importando la lista de usuarios bloqueados",
+        "blocks_imported": "¡Lista de usuarios bloqueados importada! El procesado puede tardar un poco.",
+        "blocks_tab": "Bloqueados",
+        "btnRadius": "Botones",
+        "cBlue": "Azul (Responder, seguir)",
+        "cGreen": "Verde (Retweet)",
+        "cOrange": "Naranja (Favorito)",
+        "cRed": "Rojo (Cancelar)",
+        "change_password": "Cambiar contraseña",
+        "change_password_error": "Hubo un problema cambiando la contraseña.",
+        "changed_password": "¡Contraseña cambiada correctamente!",
+        "collapse_subject": "Colapsar entradas con tema",
+        "composing": "Redactando",
+        "confirm_new_password": "Confirmar la nueva contraseña",
+        "current_avatar": "Tu avatar actual",
+        "current_password": "Contraseña actual",
+        "current_profile_banner": "Tu cabecera actual",
+        "data_import_export_tab": "Importar / Exportar Datos",
+        "default_vis": "Alcance de visibilidad por defecto",
+        "delete_account": "Eliminar la cuenta",
+        "discoverable": "Permitir la aparición de esta cuenta en los resultados de búsqueda y otros servicios",
+        "delete_account_description": "Eliminar para siempre la cuenta y todos los mensajes.",
+        "pad_emoji": "Rellenar con espacios al agregar emojis desde el selector",
+        "delete_account_error": "Hubo un error al eliminar tu cuenta. Si el fallo persiste, ponte en contacto con el administrador de tu instancia.",
+        "delete_account_instructions": "Escribe tu contraseña para confirmar la eliminación de tu cuenta.",
+        "avatar_size_instruction": "El tamaño mínimo recomendado para el avatar es de 150X150 píxeles.",
+        "export_theme": "Exportar tema",
+        "filtering": "Filtrado",
+        "filtering_explanation": "Todos los estados que contengan estas palabras serán silenciados, una por línea",
+        "follow_export": "Exportar personas que tú sigues",
+        "follow_export_button": "Exporta tus seguidores a un fichero csv",
+        "follow_import": "Importar personas que tú sigues",
+        "follow_import_error": "Error al importar el fichero",
+        "follows_imported": "¡Importado! Procesarlos llevará tiempo.",
+        "foreground": "Primer plano",
+        "general": "General",
+        "hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
+        "hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
+        "hide_muted_posts": "Ocultar las publicaciones de los usuarios silenciados",
+        "max_thumbnails": "Cantidad máxima de miniaturas por publicación",
+        "hide_isp": "Ocultar el panel específico de la instancia",
+        "preload_images": "Precargar las imágenes",
+        "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
+        "hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
+        "hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
+        "hide_filtered_statuses": "Ocultar estados filtrados",
+        "import_blocks_from_a_csv_file": "Importar lista de usuarios bloqueados dese un archivo csv",
+        "import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
+        "import_theme": "Importar tema",
+        "inputRadius": "Campos de entrada",
+        "checkboxRadius": "Casillas de verificación",
+        "instance_default": "(por defecto: {value})",
+        "instance_default_simple": "(por defecto)",
+        "interface": "Interfaz",
+        "interfaceLanguage": "Idioma",
+        "invalid_theme_imported": "El archivo importado no es un tema válido de Pleroma. No se han realizado cambios.",
+        "limited_availability": "No disponible en tu navegador",
+        "links": "Enlaces",
+        "lock_account_description": "Restringir el acceso a tu cuenta solo a seguidores admitidos",
+        "loop_video": "Vídeos en bucle",
+        "loop_video_silent_only": "Bucle solo en vídeos sin sonido (p.ej. \"gifs\" de Mastodon)",
+        "mutes_tab": "Silenciados",
+        "play_videos_in_modal": "Reproducir los vídeos en un marco emergente",
+        "use_contain_fit": "No recortar los adjuntos en miniaturas",
+        "name": "Nombre",
+        "name_bio": "Nombre y Biografía",
+        "new_password": "Nueva contraseña",
+        "notification_visibility": "Tipos de notificaciones a mostrar",
+        "notification_visibility_follows": "Nuevos seguidores",
+        "notification_visibility_likes": "Me gustan (Likes)",
+        "notification_visibility_mentions": "Menciones",
+        "notification_visibility_repeats": "Repeticiones (Repeats)",
+        "no_rich_text_description": "Eliminar el formato de texto enriquecido de todas las entradas",
+        "no_blocks": "No hay usuarios bloqueados",
+        "no_mutes": "No hay usuarios silenciados",
+        "hide_follows_description": "No mostrar a quién sigo",
+        "hide_followers_description": "No mostrar quién me sigue",
+        "hide_follows_count_description": "No mostrar el número de cuentas que sigo",
+        "hide_followers_count_description": "No mostrar el número de cuentas que me siguen",
+        "show_admin_badge": "Mostrar la insignia de Administrador en mi perfil",
+        "show_moderator_badge": "Mostrar la insignia de Moderador en mi perfil",
+        "nsfw_clickthrough": "Activar el clic para ocultar los adjuntos NSFW",
+        "oauth_tokens": "Tokens de OAuth",
+        "token": "Token",
+        "refresh_token": "Actualizar el token",
+        "valid_until": "Válido hasta",
+        "revoke_token": "Revocar",
+        "panelRadius": "Paneles",
+        "pause_on_unfocused": "Parar la transmisión cuando no estés en foco.",
+        "presets": "Por defecto",
+        "profile_background": "Fondo del Perfil",
+        "profile_banner": "Cabecera del Perfil",
+        "profile_tab": "Perfil",
+        "radii_help": "Establezca el redondeo de las esquinas de la interfaz (en píxeles)",
+        "replies_in_timeline": "Réplicas en la línea temporal",
+        "reply_link_preview": "Activar la previsualización del enlace de responder al pasar el ratón por encima",
+        "reply_visibility_all": "Mostrar todas las réplicas",
+        "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
+        "reply_visibility_self": "Solo mostrar réplicas para mí",
+        "autohide_floating_post_button": "Ocultar automáticamente el botón 'Nueva Publicación' (para móviles)",
+        "saving_err": "Error al guardar los ajustes",
+        "saving_ok": "Ajustes guardados",
+        "search_user_to_block": "Buscar usuarios a bloquear",
+        "search_user_to_mute": "Buscar usuarios a silenciar",
+        "security_tab": "Seguridad",
+        "scope_copy": "Copiar la visibilidad de la publicación cuando contestamos (En los mensajes directos (MDs) siempre se copia)",
+        "minimal_scopes_mode": "Minimizar las opciones de publicación",
+        "set_new_avatar": "Cambiar avatar",
+        "set_new_profile_background": "Cambiar el fondo del perfil",
+        "set_new_profile_banner": "Cambiar la cabecera del perfil",
+        "settings": "Ajustes",
+        "subject_input_always_show": "Mostrar siempre el campo del tema",
+        "subject_line_behavior": "Copiar el tema en las respuestas",
+        "subject_line_email": "Como email: \"re: tema\"",
+        "subject_line_mastodon": "Como mastodon: copiar como es",
+        "subject_line_noop": "No copiar",
+        "post_status_content_type": "Formato de publicación",
+        "stop_gifs": "Iniciar GIFs al pasar el ratón",
+        "streaming": "Habilitar la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
+        "text": "Texto",
+        "theme": "Tema",
+        "theme_help": "Use códigos de color hexadecimales (#rrggbb) para personalizar su tema de colores.",
+        "theme_help_v2_1": "También puede invalidar los colores y la opacidad de ciertos componentes si activa la casilla de verificación. Use el botón \"Borrar todo\" para deshacer los cambios.",
+        "theme_help_v2_2": "Los iconos debajo de algunas entradas son indicadores de contraste de fondo/texto, desplace el ratón por encima para obtener información más detallada. Tenga en cuenta que cuando se utilizan indicadores de contraste de transparencia se muestra el peor caso posible.",
+        "tooltipRadius": "Información/alertas",
+        "upload_a_photo": "Subir una foto",
+        "user_settings": "Ajustes del Usuario",
+        "values": {
+            "false": "no",
+            "true": "sí"
+        },
+        "notifications": "Notificaciones",
+        "notification_setting": "Recibir notificaciones de:",
+        "notification_setting_follows": "Usuarios que sigues",
+        "notification_setting_non_follows": "Usuarios que no sigues",
+        "notification_setting_followers": "Usuarios que te siguen",
+        "notification_setting_non_followers": "Usuarios que no te siguen",
+        "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
+        "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.",
+        "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
+        "style": {
+            "switcher": {
+                "keep_color": "Mantener colores",
+                "keep_shadows": "Mantener sombras",
+                "keep_opacity": "Mantener opacidad",
+                "keep_roundness": "Mantener redondeces",
+                "keep_fonts": "Mantener fuentes",
+                "save_load_hint": "Las opciones \"Mantener\" conservan las opciones configuradas actualmente al seleccionar o cargar temas, también almacena dichas opciones al exportar un tema. Cuando se desactiven todas las casillas de verificación, el tema de exportación lo guardará todo.",
+                "reset": "Reiniciar",
+                "clear_all": "Limpiar todo",
+                "clear_opacity": "Limpiar opacidad"
+            },
+            "common": {
+                "color": "Color",
+                "opacity": "Opacidad",
+                "contrast": {
+                    "hint": "El ratio de contraste es {ratio}. {level} {context}",
+                    "level": {
+                        "aa": "Cumple con la pauta de nivel AA (mínimo)",
+                        "aaa": "Cumple con la pauta de nivel AAA (recomendado)",
+                        "bad": "No cumple con las pautas de accesibilidad"
+                    },
+                    "context": {
+                        "18pt": "para textos grandes (+18pt)",
+                        "text": "para textos"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Común",
+                "main": "Colores comunes",
+                "foreground_hint": "Vea la pestaña \"Avanzado\" para un control más detallado",
+                "rgbo": "Iconos, acentos, insignias"
+            },
+            "advanced_colors": {
+                "_tab_label": "Avanzado",
+                "alert": "Fondo de Alertas",
+                "alert_error": "Error",
+                "badge": "Fondo de Insignias",
+                "badge_notification": "Notificaciones",
+                "panel_header": "Cabecera del panel",
+                "top_bar": "Barra superior",
+                "borders": "Bordes",
+                "buttons": "Botones",
+                "inputs": "Campos de entrada",
+                "faint_text": "Texto desvanecido"
+            },
+            "radii": {
+                "_tab_label": "Redondez"
+            },
+            "shadows": {
+                "_tab_label": "Sombra e iluminación",
+                "component": "Componente",
+                "override": "Sobreescribir",
+                "shadow_id": "Sombra #{value}",
+                "blur": "Difuminar",
+                "spread": "Cantidad",
+                "inset": "Sombra interior",
+                "hint": "Para las sombras, también puede usar --variable como un valor de color para usar las variables CSS3. Tenga en cuenta que establecer la opacidad no funcionará en este caso.",
+                "filter_hint": {
+                    "always_drop_shadow": "Advertencia, esta sombra siempre usa {0} cuando el navegador lo soporta.",
+                    "drop_shadow_syntax": "{0} no soporta el parámetro {1} y la palabra clave {2}.",
+                    "avatar_inset": "Tenga en cuenta que la combinación de sombras interiores como no-interiores en los avatares, puede dar resultados inesperados con los avatares transparentes.",
+                    "spread_zero": "Sombras con una cantidad > 0 aparecerá como si estuviera puesto a cero",
+                    "inset_classic": "Las sombras interiores estarán usando {0}"
+                },
+                "components": {
+                    "panel": "Panel",
+                    "panelHeader": "Cabecera del panel",
+                    "topBar": "Barra superior",
+                    "avatar": "Avatar del usuario (en la vista del perfil)",
+                    "avatarStatus": "Avatar del usuario (en la vista de la entrada)",
+                    "popup": "Ventanas y textos emergentes (popups & tooltips)",
+                    "button": "Botones",
+                    "buttonHover": "Botón (encima)",
+                    "buttonPressed": "Botón (presionado)",
+                    "buttonPressedHover": "Botón (presionado+encima)",
+                    "input": "Campo de entrada"
+                }
+            },
+            "fonts": {
+                "_tab_label": "Fuentes",
+                "help": "Seleccione la fuente a utilizar para los elementos de la interfaz de usuario. Para \"personalizar\", debe ingresar el nombre exacto de la fuente tal como aparece en el sistema.",
+                "components": {
+                    "interface": "Interfaz",
+                    "input": "Campos de entrada",
+                    "post": "Texto de publicaciones",
+                    "postCode": "Texto monoespaciado en publicación (texto enriquecido)"
+                },
+                "family": "Nombre de la fuente",
+                "size": "Tamaño (en px)",
+                "weight": "Peso (negrita)",
+                "custom": "Personalizado"
+            },
+            "preview": {
+                "header": "Vista previa",
+                "content": "Contenido",
+                "error": "Ejemplo de error",
+                "button": "Botón",
+                "text": "Un montón de {0} y {1}",
+                "mono": "contenido",
+                "input": "Acaba de aterrizar en L.A.",
+                "faint_link": "manual útil",
+                "fine_print": "¡Lea nuestro {0} para aprender nada útil!",
+                "header_faint": "Esto está bien",
+                "checkbox": "He revisado los términos y condiciones",
+                "link": "un bonito enlace"
+            }
+        },
+        "version": {
+            "title": "Versión",
+            "backend_version": "Versión del Backend",
+            "frontend_version": "Versión del Frontend"
+        }
     },
-    "version": {
-      "title": "Versión",
-      "backend_version": "Versión del Backend",
-      "frontend_version": "Versión del Frontend"
-    }
-  },
-  "time": {
-    "day": "{0} día",
-    "days": "{0} días",
-    "day_short": "{0}d",
-    "days_short": "{0}d",
-    "hour": "{0} hora",
-    "hours": "{0} horas",
-    "hour_short": "{0}h",
-    "hours_short": "{0}h",
-    "in_future": "en {0}",
-    "in_past": "hace {0}",
-    "minute": "{0} minuto",
-    "minutes": "{0} minutos",
-    "minute_short": "{0}min",
-    "minutes_short": "{0}min",
-    "month": "{0} mes",
-    "months": "{0} meses",
-    "month_short": "{0}m",
-    "months_short": "{0}m",
-    "now": "justo ahora",
-    "now_short": "ahora",
-    "second": "{0} segundo",
-    "seconds": "{0} segundos",
-    "second_short": "{0}s",
-    "seconds_short": "{0}s",
-    "week": "{0} semana",
-    "weeks": "{0} semanas",
-    "week_short": "{0}sem",
-    "weeks_short": "{0}sem",
-    "year": "{0} año",
-    "years": "{0} años",
-    "year_short": "{0}a",
-    "years_short": "{0}a"
-  },
-  "timeline": {
-    "collapse": "Colapsar",
-    "conversation": "Conversación",
-    "error_fetching": "Error al cargar las actualizaciones",
-    "load_older": "Cargar actualizaciones anteriores",
-    "no_retweet_hint": "La publicación está marcada como solo para seguidores o directa y no se puede repetir",
-    "repeated": "repetida",
-    "show_new": "Mostrar lo nuevo",
-    "up_to_date": "Actualizado",
-    "no_more_statuses": "No hay más estados",
-    "no_statuses": "Sin estados"
-  },
-  "status": {
-    "favorites": "Favoritos",
-    "repeats": "Repetidos",
-    "delete": "Eliminar publicación",
-    "pin": "Fijar en tu perfil",
-    "unpin": "Desclavar de tu perfil",
-    "pinned": "Fijado",
-    "delete_confirm": "¿Realmente quieres borrar la publicación?",
-    "reply_to": "Respondiendo a",
-    "replies_list": "Respuestas:",
-    "mute_conversation": "Silenciar la conversación",
-    "unmute_conversation": "Mostrar la conversación"
-  },
-  "user_card": {
-    "approve": "Aprobar",
-    "block": "Bloquear",
-    "blocked": "¡Bloqueado!",
-    "deny": "Denegar",
-    "favorites": "Favoritos",
-    "follow": "Seguir",
-    "follow_sent": "¡Solicitud enviada!",
-    "follow_progress": "Solicitando…",
-    "follow_again": "¿Enviar solicitud de nuevo?",
-    "follow_unfollow": "Dejar de seguir",
-    "followees": "Siguiendo",
-    "followers": "Seguidores",
-    "following": "¡Siguiendo!",
-    "follows_you": "¡Te sigue!",
-    "its_you": "¡Eres tú!",
-    "media": "Media",
-    "mention": "Mencionar",
-    "mute": "Silenciar",
-    "muted": "Silenciado",
-    "per_day": "por día",
-    "remote_follow": "Seguir",
-    "report": "Reportar",
-    "statuses": "Estados",
-    "subscribe": "Suscribirse",
-    "unsubscribe": "Desuscribirse",
-    "unblock": "Desbloquear",
-    "unblock_progress": "Desbloqueando...",
-    "block_progress": "Bloqueando...",
-    "unmute": "Quitar silencio",
-    "unmute_progress": "Quitando silencio...",
-    "mute_progress": "Silenciando...",
-    "admin_menu": {
-      "moderation": "Moderación",
-      "grant_admin": "Conceder permisos de Administrador",
-      "revoke_admin": "Revocar permisos de Administrador",
-      "grant_moderator": "Conceder permisos de Moderador",
-      "revoke_moderator": "Revocar permisos de Moderador",
-      "activate_account": "Activar cuenta",
-      "deactivate_account": "Desactivar cuenta",
-      "delete_account": "Eliminar cuenta",
-      "force_nsfw": "Marcar todas las publicaciones como NSFW (no es seguro/apropiado para el trabajo)",
-      "strip_media": "Eliminar archivos multimedia de las publicaciones",
-      "force_unlisted": "Forzar que se publique en el modo -Sin Listar-",
-      "sandbox": "Forzar que se publique solo para tus seguidores",
-      "disable_remote_subscription": "No permitir que usuarios de instancias remotas te siga.",
-      "disable_any_subscription": "No permitir que ningún usuario te siga",
-      "quarantine": "No permitir publicaciones de usuarios de instancias remotas",
-      "delete_user": "Eliminar usuario",
-      "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer."
-    }
-  },
-  "user_profile": {
-    "timeline_title": "Linea Temporal del Usuario",
-    "profile_does_not_exist": "Lo sentimos, este perfil no existe.",
-    "profile_loading_error": "Lo sentimos, hubo un error al cargar este perfil."
-  },
-   "user_reporting": {
-    "title": "Reportando a {0}",
-    "add_comment_description": "El informe será enviado a los moderadores de su instancia. Puedes proporcionar una explicación de por qué estás reportando esta cuenta a continuación:",
-    "additional_comments": "Comentarios adicionales",
-    "forward_description": "La cuenta es de otro servidor. ¿Enviar una copia del informe allí también?",
-    "forward_to": "Reenviar a {0}",
-    "submit": "Enviar",
-    "generic_error": "Se produjo un error al procesar la solicitud."
-  },
-  "who_to_follow": {
-    "more": "Más",
-    "who_to_follow": "A quién seguir"
-  },
-  "tool_tip": {
-    "media_upload": "Subir Medios",
-    "repeat": "Repetir",
-    "reply": "Contestar",
-    "favorite": "Favorito",
-    "user_settings": "Ajustes de usuario"
-  },
-  "upload":{
-    "error": {
-      "base": "Subida fallida.",
-      "file_too_big": "Archivo demasiado grande [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Inténtalo más tarde"
+    "time": {
+        "day": "{0} día",
+        "days": "{0} días",
+        "day_short": "{0}d",
+        "days_short": "{0}d",
+        "hour": "{0} hora",
+        "hours": "{0} horas",
+        "hour_short": "{0}h",
+        "hours_short": "{0}h",
+        "in_future": "en {0}",
+        "in_past": "hace {0}",
+        "minute": "{0} minuto",
+        "minutes": "{0} minutos",
+        "minute_short": "{0}min",
+        "minutes_short": "{0}min",
+        "month": "{0} mes",
+        "months": "{0} meses",
+        "month_short": "{0}m",
+        "months_short": "{0}m",
+        "now": "justo ahora",
+        "now_short": "ahora",
+        "second": "{0} segundo",
+        "seconds": "{0} segundos",
+        "second_short": "{0}s",
+        "seconds_short": "{0}s",
+        "week": "{0} semana",
+        "weeks": "{0} semanas",
+        "week_short": "{0}sem",
+        "weeks_short": "{0}sem",
+        "year": "{0} año",
+        "years": "{0} años",
+        "year_short": "{0}a",
+        "years_short": "{0}a"
     },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
+    "timeline": {
+        "collapse": "Colapsar",
+        "conversation": "Conversación",
+        "error_fetching": "Error al cargar las actualizaciones",
+        "load_older": "Cargar actualizaciones anteriores",
+        "no_retweet_hint": "La publicación está marcada como solo para seguidores o directa y no se puede repetir",
+        "repeated": "repetida",
+        "show_new": "Mostrar lo nuevo",
+        "up_to_date": "Actualizado",
+        "no_more_statuses": "No hay más estados",
+        "no_statuses": "Sin estados"
+    },
+    "status": {
+        "favorites": "Favoritos",
+        "repeats": "Repetidos",
+        "delete": "Eliminar publicación",
+        "pin": "Fijar en tu perfil",
+        "unpin": "Desclavar de tu perfil",
+        "pinned": "Fijado",
+        "delete_confirm": "¿Realmente quieres borrar la publicación?",
+        "reply_to": "Respondiendo a",
+        "replies_list": "Respuestas:",
+        "mute_conversation": "Silenciar la conversación",
+        "unmute_conversation": "Mostrar la conversación"
+    },
+    "user_card": {
+        "approve": "Aprobar",
+        "block": "Bloquear",
+        "blocked": "¡Bloqueado!",
+        "deny": "Denegar",
+        "favorites": "Favoritos",
+        "follow": "Seguir",
+        "follow_sent": "¡Solicitud enviada!",
+        "follow_progress": "Solicitando…",
+        "follow_again": "¿Enviar solicitud de nuevo?",
+        "follow_unfollow": "Dejar de seguir",
+        "followees": "Siguiendo",
+        "followers": "Seguidores",
+        "following": "¡Siguiendo!",
+        "follows_you": "¡Te sigue!",
+        "its_you": "¡Eres tú!",
+        "media": "Media",
+        "mention": "Mencionar",
+        "mute": "Silenciar",
+        "muted": "Silenciado",
+        "per_day": "por día",
+        "remote_follow": "Seguir",
+        "report": "Reportar",
+        "statuses": "Estados",
+        "subscribe": "Suscribirse",
+        "unsubscribe": "Desuscribirse",
+        "unblock": "Desbloquear",
+        "unblock_progress": "Desbloqueando...",
+        "block_progress": "Bloqueando...",
+        "unmute": "Quitar silencio",
+        "unmute_progress": "Quitando silencio...",
+        "mute_progress": "Silenciando...",
+        "admin_menu": {
+            "moderation": "Moderación",
+            "grant_admin": "Conceder permisos de Administrador",
+            "revoke_admin": "Revocar permisos de Administrador",
+            "grant_moderator": "Conceder permisos de Moderador",
+            "revoke_moderator": "Revocar permisos de Moderador",
+            "activate_account": "Activar cuenta",
+            "deactivate_account": "Desactivar cuenta",
+            "delete_account": "Eliminar cuenta",
+            "force_nsfw": "Marcar todas las publicaciones como NSFW (no es seguro/apropiado para el trabajo)",
+            "strip_media": "Eliminar archivos multimedia de las publicaciones",
+            "force_unlisted": "Forzar que se publique en el modo -Sin Listar-",
+            "sandbox": "Forzar que se publique solo para tus seguidores",
+            "disable_remote_subscription": "No permitir que usuarios de instancias remotas te siga.",
+            "disable_any_subscription": "No permitir que ningún usuario te siga",
+            "quarantine": "No permitir publicaciones de usuarios de instancias remotas",
+            "delete_user": "Eliminar usuario",
+            "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer."
+        }
+    },
+    "user_profile": {
+        "timeline_title": "Linea Temporal del Usuario",
+        "profile_does_not_exist": "Lo sentimos, este perfil no existe.",
+        "profile_loading_error": "Lo sentimos, hubo un error al cargar este perfil."
+    },
+    "user_reporting": {
+        "title": "Reportando a {0}",
+        "add_comment_description": "El informe será enviado a los moderadores de su instancia. Puedes proporcionar una explicación de por qué estás reportando esta cuenta a continuación:",
+        "additional_comments": "Comentarios adicionales",
+        "forward_description": "La cuenta es de otro servidor. ¿Enviar una copia del informe allí también?",
+        "forward_to": "Reenviar a {0}",
+        "submit": "Enviar",
+        "generic_error": "Se produjo un error al procesar la solicitud."
+    },
+    "who_to_follow": {
+        "more": "Más",
+        "who_to_follow": "A quién seguir"
+    },
+    "tool_tip": {
+        "media_upload": "Subir Medios",
+        "repeat": "Repetir",
+        "reply": "Contestar",
+        "favorite": "Favorito",
+        "user_settings": "Ajustes de usuario"
+    },
+    "upload": {
+        "error": {
+            "base": "Subida fallida.",
+            "file_too_big": "Archivo demasiado grande [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "Inténtalo más tarde"
+        },
+        "file_size_units": {
+            "B": "B",
+            "KiB": "KiB",
+            "MiB": "MiB",
+            "GiB": "GiB",
+            "TiB": "TiB"
+        }
+    },
+    "search": {
+        "people": "Personas",
+        "hashtags": "Etiquetas",
+        "person_talking": "{count} personas hablando",
+        "people_talking": "{count} gente hablando",
+        "no_results": "Sin resultados"
+    },
+    "password_reset": {
+        "forgot_password": "¿Contraseña olvidada?",
+        "password_reset": "Restablecer la contraseña",
+        "instruction": "Ingrese su dirección de correo electrónico o nombre de usuario. Le enviaremos un enlace para restablecer su contraseña.",
+        "placeholder": "Su correo electrónico o nombre de usuario",
+        "check_email": "Revise su correo electrónico para obtener un enlace para restablecer su contraseña.",
+        "return_home": "Volver a la página de inicio",
+        "not_found": "No pudimos encontrar ese correo electrónico o nombre de usuario.",
+        "too_many_requests": "Has alcanzado el límite de intentos, vuelve a intentarlo más tarde.",
+        "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia."
     }
-  },
-  "search": {
-    "people": "Personas",
-    "hashtags": "Etiquetas",
-    "person_talking": "{count} personas hablando",
-    "people_talking": "{count} gente hablando",
-    "no_results": "Sin resultados"
-  },
-  "password_reset": {
-    "forgot_password": "¿Contraseña olvidada?",
-    "password_reset": "Restablecer la contraseña",
-    "instruction": "Ingrese su dirección de correo electrónico o nombre de usuario. Le enviaremos un enlace para restablecer su contraseña.",
-    "placeholder": "Su correo electrónico o nombre de usuario",
-    "check_email": "Revise su correo electrónico para obtener un enlace para restablecer su contraseña.",
-    "return_home": "Volver a la página de inicio",
-    "not_found": "No pudimos encontrar ese correo electrónico o nombre de usuario.",
-    "too_many_requests": "Has alcanzado el límite de intentos, vuelve a intentarlo más tarde.",
-    "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia."
-  }
-}
\ No newline at end of file
+}

From 5048f203a38984e7ff358bdf649302b954a1c842 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Tue, 26 May 2020 15:53:28 +0000
Subject: [PATCH 139/415] Translated using Weblate (Italian)

Currently translated at 64.1% (393 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 82c8e7c8..e1b8022c 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -42,7 +42,7 @@
         "follow_request": "vuole seguirti",
         "no_more_notifications": "Fine delle notifiche",
         "migrated_to": "è migrato verso",
-        "reacted_with": "ha reagito con"
+        "reacted_with": "ha reagito con {0}"
     },
     "settings": {
         "attachments": "Allegati",
@@ -57,7 +57,7 @@
         "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
         "name": "Nome",
         "name_bio": "Nome ed introduzione",
-        "nsfw_clickthrough": "Fai click per visualizzare gli allegati nascosti",
+        "nsfw_clickthrough": "Fai click per visualizzare gli allegati offuscati",
         "profile_background": "Sfondo della tua pagina",
         "profile_banner": "Stendardo del tuo profilo",
         "reply_link_preview": "Visualizza le risposte al passaggio del cursore",
@@ -138,7 +138,7 @@
         "streaming": "Mostra automaticamente i nuovi messaggi quando sei in cima alla pagina",
         "text": "Testo",
         "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
-        "tooltipRadius": "Descrizioni/avvisi",
+        "tooltipRadius": "Suggerimenti/avvisi",
         "values": {
             "false": "no",
             "true": "sì"
@@ -180,7 +180,88 @@
         },
         "enter_current_password_to_confirm": "Inserisci la tua password per identificarti",
         "security": "Sicurezza",
-        "app_name": "Nome applicazione"
+        "app_name": "Nome applicazione",
+        "style": {
+            "switcher": {
+                "help": {
+                    "older_version_imported": "Il tema importato è stato creato per una versione precedente dell'interfaccia.",
+                    "future_version_imported": "Il tema importato è stato creato per una versione più recente dell'interfaccia.",
+                    "v2_imported": "Il tema importato è stato creato per una vecchia interfaccia. Non tutto potrebbe essere come prima.",
+                    "upgraded_from_v2": "L'interfaccia è stata aggiornata, il tema potrebbe essere diverso da come lo intendevi."
+                },
+                "use_source": "Nuova versione",
+                "use_snapshot": "Versione precedente",
+                "keep_as_is": "Mantieni tal quale",
+                "load_theme": "Carica tema",
+                "clear_opacity": "Rimuovi opacità",
+                "clear_all": "Azzera tutto",
+                "reset": "Reimposta",
+                "save_load_hint": "Le opzioni \"mantieni\" conservano le impostazioni correnti quando selezioni o carichi un tema, e le salvano quando ne esporti uno. Quando nessuna casella è selezionata, tutte le impostazioni correnti saranno salvate nel tema.",
+                "keep_fonts": "Mantieni font",
+                "keep_roundness": "Mantieni vertici",
+                "keep_opacity": "Mantieni opacità",
+                "keep_shadows": "Mantieni ombre",
+                "keep_color": "Mantieni colori"
+            }
+        },
+        "enable_web_push_notifications": "Abilita notifiche web push",
+        "fun": "Divertimento",
+        "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.",
+        "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push",
+        "notification_setting_privacy": "Privacy",
+        "notification_setting_followers": "Utenti che ti seguono",
+        "notification_setting_non_followers": "Utenti che non ti seguono",
+        "notification_setting_non_follows": "Utenti che non segui",
+        "notification_setting_follows": "Utenti che segui",
+        "notification_setting": "Ricevi notifiche da:",
+        "notification_setting_filters": "Filtri",
+        "notifications": "Notifiche",
+        "greentext": "Frecce da meme",
+        "upload_a_photo": "Carica un'immagine",
+        "type_domains_to_mute": "Inserisci domini da zittire",
+        "theme_help_v2_2": "Le icone dietro alcuni elementi sono indicatori del contrasto fra testo e sfondo, passaci sopra col puntatore per ulteriori informazioni. Se si usano delle trasparenze, questi indicatori mostrano il peggior caso possibile.",
+        "theme_help_v2_1": "Puoi anche forzare colore ed opacità di alcuni elementi selezionando la casella. Usa il pulsante \"Azzera\" per azzerare tutte le forzature.",
+        "useStreamingApiWarning": "(Sconsigliato, sperimentale, può saltare messaggi)",
+        "useStreamingApi": "Ricevi messaggi e notifiche in tempo reale",
+        "user_mutes": "Utenti",
+        "post_status_content_type": "Tipo di contenuto dei messaggi",
+        "subject_line_noop": "Non copiare",
+        "subject_line_mastodon": "Come in Mastodon: copia tal quale",
+        "subject_line_email": "Come nelle email: \"re: oggetto\"",
+        "subject_line_behavior": "Copia oggetto quando rispondi",
+        "subject_input_always_show": "Mostra sempre il campo Oggetto",
+        "minimal_scopes_mode": "Riduci opzioni di visibilità",
+        "scope_copy": "Risposte ereditano la visibilità (messaggi privati lo fanno sempre)",
+        "search_user_to_mute": "Cerca utente da zittire",
+        "search_user_to_block": "Cerca utente da bloccare",
+        "autohide_floating_post_button": "Nascondi automaticamente il pulsante di composizione (mobile)",
+        "show_moderator_badge": "Mostra l'insegna di moderatore sulla mia pagina",
+        "show_admin_badge": "Mostra l'insegna di amministratore sulla mia pagina",
+        "hide_followers_count_description": "Non mostrare quanti seguaci ho",
+        "hide_follows_count_description": "Non mostrare quanti utenti seguo",
+        "hide_followers_description": "Non mostrare i miei seguaci",
+        "hide_follows_description": "Non mostrare chi seguo",
+        "no_mutes": "Nessun utente zittito",
+        "no_blocks": "Nessun utente bloccato",
+        "notification_visibility_emoji_reactions": "Reazioni",
+        "notification_visibility_moves": "Migrazioni utenti",
+        "new_email": "Nuova email",
+        "use_contain_fit": "Non ritagliare le anteprime degli allegati",
+        "play_videos_in_modal": "Riproduci video in un riquadro a sbalzo",
+        "mutes_tab": "Zittiti",
+        "interface": "Interfaccia",
+        "instance_default_simple": "(predefinito)",
+        "checkboxRadius": "Caselle di selezione",
+        "import_blocks_from_a_csv_file": "Importa blocchi da un file CSV",
+        "hide_filtered_statuses": "Nascondi messaggi filtrati",
+        "use_one_click_nsfw": "Apri media offuscati con un solo click",
+        "preload_images": "Precarica immagini",
+        "hide_isp": "Nascondi pannello della stanza",
+        "max_thumbnails": "Numero massimo di anteprime per messaggio",
+        "hide_muted_posts": "Nascondi messaggi degli utenti zittiti",
+        "accent": "Accento",
+        "emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
+        "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore"
     },
     "timeline": {
         "error_fetching": "Errore nell'aggiornamento",

From e1475d7f5729d906444ff0432a1f177f5a4cc5f4 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Thu, 28 May 2020 21:21:34 +0000
Subject: [PATCH 140/415] Translated using Weblate (English)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/en.json b/src/i18n/en.json
index f5d1ce7c..9a4bd154 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1,743 +1,743 @@
 {
-  "about": {
-    "mrf": {
-      "federation": "Federation",
-      "keyword": {
-        "keyword_policies": "Keyword Policies",
-        "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
-        "reject": "Reject",
-        "replace": "Replace",
-        "is_replaced_by": "→"
-      },
-      "mrf_policies": "Enabled MRF Policies",
-      "mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance.  The following policies are enabled:",
-      "simple": {
-        "simple_policies": "Instance-specific Policies",
-        "accept": "Accept",
-        "accept_desc": "This instance only accepts messages from the following instances:",
-        "reject": "Reject",
-        "reject_desc": "This instance will not accept messages from the following instances:",
-        "quarantine": "Quarantine",
-        "quarantine_desc": "This instance will send only public posts to the following instances:",
-        "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
-        "ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
-        "media_removal": "Media Removal",
-        "media_removal_desc": "This instance removes media from posts on the following instances:",
-        "media_nsfw": "Media Force-set As Sensitive",
-        "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
-      }
-    },
-    "staff": "Staff"
-  },
-  "chat": {
-    "title": "Chat"
-  },
-  "domain_mute_card": {
-    "mute": "Mute",
-    "mute_progress": "Muting...",
-    "unmute": "Unmute",
-    "unmute_progress": "Unmuting..."
-  },
-  "exporter": {
-    "export": "Export",
-    "processing": "Processing, you'll soon be asked to download your file"
-  },
-  "features_panel": {
-    "chat": "Chat",
-    "gopher": "Gopher",
-    "media_proxy": "Media proxy",
-    "scope_options": "Scope options",
-    "text_limit": "Text limit",
-    "title": "Features",
-    "who_to_follow": "Who to follow"
-  },
-  "finder": {
-    "error_fetching_user": "Error fetching user",
-    "find_user": "Find user"
-  },
-  "general": {
-    "apply": "Apply",
-    "submit": "Submit",
-    "more": "More",
-    "generic_error": "An error occured",
-    "optional": "optional",
-    "show_more": "Show more",
-    "show_less": "Show less",
-    "dismiss": "Dismiss",
-    "cancel": "Cancel",
-    "disable": "Disable",
-    "enable": "Enable",
-    "confirm": "Confirm",
-    "verify": "Verify"
-  },
-  "image_cropper": {
-    "crop_picture": "Crop picture",
-    "save": "Save",
-    "save_without_cropping": "Save without cropping",
-    "cancel": "Cancel"
-  },
-  "importer": {
-    "submit": "Submit",
-    "success": "Imported successfully.",
-    "error": "An error occured while importing this file."
-  },
-  "login": {
-    "login": "Log in",
-    "description": "Log in with OAuth",
-    "logout": "Log out",
-    "password": "Password",
-    "placeholder": "e.g. lain",
-    "register": "Register",
-    "username": "Username",
-    "hint": "Log in to join the discussion",
-    "authentication_code": "Authentication code",
-    "enter_recovery_code": "Enter a recovery code",
-    "enter_two_factor_code": "Enter a two-factor code",
-    "recovery_code": "Recovery code",
-    "heading" : {
-      "totp" : "Two-factor authentication",
-      "recovery" : "Two-factor recovery"
-    }
-  },
-  "media_modal": {
-    "previous": "Previous",
-    "next": "Next"
-  },
-  "nav": {
-    "about": "About",
-    "administration": "Administration",
-    "back": "Back",
-    "chat": "Local Chat",
-    "friend_requests": "Follow Requests",
-    "mentions": "Mentions",
-    "interactions": "Interactions",
-    "dms": "Direct Messages",
-    "public_tl": "Public Timeline",
-    "timeline": "Timeline",
-    "twkn": "The Whole Known Network",
-    "user_search": "User Search",
-    "search": "Search",
-    "who_to_follow": "Who to follow",
-    "preferences": "Preferences"
-  },
-  "notifications": {
-    "broken_favorite": "Unknown status, searching for it...",
-    "favorited_you": "favorited your status",
-    "followed_you": "followed you",
-    "follow_request": "wants to follow you",
-    "load_older": "Load older notifications",
-    "notifications": "Notifications",
-    "read": "Read!",
-    "repeated_you": "repeated your status",
-    "no_more_notifications": "No more notifications",
-    "migrated_to": "migrated to",
-    "reacted_with": "reacted with {0}"
-  },
-  "polls": {
-    "add_poll": "Add Poll",
-    "add_option": "Add Option",
-    "option": "Option",
-    "votes": "votes",
-    "vote": "Vote",
-    "type": "Poll type",
-    "single_choice": "Single choice",
-    "multiple_choices": "Multiple choices",
-    "expiry": "Poll age",
-    "expires_in": "Poll ends in {0}",
-    "expired": "Poll ended {0} ago",
-    "not_enough_options": "Too few unique options in poll"
-  },
-  "emoji": {
-    "stickers": "Stickers",
-    "emoji": "Emoji",
-    "keep_open": "Keep picker open",
-    "search_emoji": "Search for an emoji",
-    "add_emoji": "Insert emoji",
-    "custom": "Custom emoji",
-    "unicode": "Unicode emoji",
-    "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
-    "load_all": "Loading all {emojiAmount} emoji"
-  },
-  "interactions": {
-    "favs_repeats": "Repeats and Favorites",
-    "follows": "New follows",
-    "moves": "User migrates",
-    "load_older": "Load older interactions"
-  },
-  "post_status": {
-    "new_status": "Post new status",
-    "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
-    "account_not_locked_warning_link": "locked",
-    "attachments_sensitive": "Mark attachments as sensitive",
-    "content_type": {
-      "text/plain": "Plain text",
-      "text/html": "HTML",
-      "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
-    },
-    "content_warning": "Subject (optional)",
-    "default": "Just landed in L.A.",
-    "direct_warning_to_all": "This post will be visible to all the mentioned users.",
-    "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
-    "posting": "Posting",
-    "scope_notice": {
-      "public": "This post will be visible to everyone",
-      "private": "This post will be visible to your followers only",
-      "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
-    },
-    "scope": {
-      "direct": "Direct - Post to mentioned users only",
-      "private": "Followers-only - Post to followers only",
-      "public": "Public - Post to public timelines",
-      "unlisted": "Unlisted - Do not post to public timelines"
-    }
-  },
-  "registration": {
-    "bio": "Bio",
-    "email": "Email",
-    "fullname": "Display name",
-    "password_confirm": "Password confirmation",
-    "registration": "Registration",
-    "token": "Invite token",
-    "captcha": "CAPTCHA",
-    "new_captcha": "Click the image to get a new captcha",
-    "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.",
-    "validations": {
-      "username_required": "cannot be left blank",
-      "fullname_required": "cannot be left blank",
-      "email_required": "cannot be left blank",
-      "password_required": "cannot be left blank",
-      "password_confirmation_required": "cannot be left blank",
-      "password_confirmation_match": "should be the same as password"
-    }
-  },
-  "remote_user_resolver": {
-    "remote_user_resolver": "Remote user resolver",
-    "searching_for": "Searching for",
-    "error": "Not found."
-  },
-  "selectable_list": {
-    "select_all": "Select all"
-  },
-  "settings": {
-    "app_name": "App name",
-    "security": "Security",
-    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
-    "mfa": {
-      "otp" : "OTP",
-      "setup_otp" : "Setup OTP",
-      "wait_pre_setup_otp" : "presetting OTP",
-      "confirm_and_enable" : "Confirm & enable OTP",
-      "title": "Two-factor Authentication",
-      "generate_new_recovery_codes" : "Generate new recovery codes",
-      "warning_of_generate_new_codes" : "When you generate new recovery codes, your old codes won’t work anymore.",
-      "recovery_codes" : "Recovery codes.",
-      "waiting_a_recovery_codes": "Receiving backup codes...",
-      "recovery_codes_warning" : "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
-      "authentication_methods" : "Authentication methods",
-      "scan": {
-        "title": "Scan",
-        "desc": "Using your two-factor app, scan this QR code or enter text key:",
-        "secret_code": "Key"
-      },
-      "verify": {
-        "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
-      }
-    },
-    "allow_following_move": "Allow auto-follow when following account moves",
-    "attachmentRadius": "Attachments",
-    "attachments": "Attachments",
-    "autoload": "Enable automatic loading when scrolled to the bottom",
-    "avatar": "Avatar",
-    "avatarAltRadius": "Avatars (Notifications)",
-    "avatarRadius": "Avatars",
-    "background": "Background",
-    "bio": "Bio",
-    "block_export": "Block export",
-    "block_export_button": "Export your blocks to a csv file",
-    "block_import": "Block import",
-    "block_import_error": "Error importing blocks",
-    "blocks_imported": "Blocks imported! Processing them will take a while.",
-    "blocks_tab": "Blocks",
-    "btnRadius": "Buttons",
-    "cBlue": "Blue (Reply, follow)",
-    "cGreen": "Green (Retweet)",
-    "cOrange": "Orange (Favorite)",
-    "cRed": "Red (Cancel)",
-    "change_email": "Change Email",
-    "change_email_error": "There was an issue changing your email.",
-    "changed_email": "Email changed successfully!",
-    "change_password": "Change Password",
-    "change_password_error": "There was an issue changing your password.",
-    "changed_password": "Password changed successfully!",
-    "collapse_subject": "Collapse posts with subjects",
-    "composing": "Composing",
-    "confirm_new_password": "Confirm new password",
-    "current_avatar": "Your current avatar",
-    "current_password": "Current password",
-    "current_profile_banner": "Your current profile banner",
-    "data_import_export_tab": "Data Import / Export",
-    "default_vis": "Default visibility scope",
-    "delete_account": "Delete Account",
-    "delete_account_description": "Permanently delete your data and deactivate your account.",
-    "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
-    "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
-    "discoverable": "Allow discovery of this account in search results and other services",
-    "domain_mutes": "Domains",
-    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
-    "pad_emoji": "Pad emoji with spaces when adding from picker",
-    "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
-    "export_theme": "Save preset",
-    "filtering": "Filtering",
-    "filtering_explanation": "All statuses containing these words will be muted, one per line",
-    "follow_export": "Follow export",
-    "follow_export_button": "Export your follows to a csv file",
-    "follow_import": "Follow import",
-    "follow_import_error": "Error importing followers",
-    "follows_imported": "Follows imported! Processing them will take a while.",
-    "accent": "Accent",
-    "foreground": "Foreground",
-    "general": "General",
-    "hide_attachments_in_convo": "Hide attachments in conversations",
-    "hide_attachments_in_tl": "Hide attachments in timeline",
-    "hide_muted_posts": "Hide posts of muted users",
-    "max_thumbnails": "Maximum amount of thumbnails per post",
-    "hide_isp": "Hide instance-specific panel",
-    "preload_images": "Preload images",
-    "use_one_click_nsfw": "Open NSFW attachments with just one click",
-    "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
-    "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
-    "hide_filtered_statuses": "Hide filtered statuses",
-    "import_blocks_from_a_csv_file": "Import blocks from a csv file",
-    "import_followers_from_a_csv_file": "Import follows from a csv file",
-    "import_theme": "Load preset",
-    "inputRadius": "Input fields",
-    "checkboxRadius": "Checkboxes",
-    "instance_default": "(default: {value})",
-    "instance_default_simple": "(default)",
-    "interface": "Interface",
-    "interfaceLanguage": "Interface language",
-    "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
-    "limited_availability": "Unavailable in your browser",
-    "links": "Links",
-    "lock_account_description": "Restrict your account to approved followers only",
-    "loop_video": "Loop videos",
-    "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
-    "mutes_tab": "Mutes",
-    "play_videos_in_modal": "Play videos in a popup frame",
-    "use_contain_fit": "Don't crop the attachment in thumbnails",
-    "name": "Name",
-    "name_bio": "Name & Bio",
-    "new_email": "New Email",
-    "new_password": "New password",
-    "notification_visibility": "Types of notifications to show",
-    "notification_visibility_follows": "Follows",
-    "notification_visibility_likes": "Likes",
-    "notification_visibility_mentions": "Mentions",
-    "notification_visibility_repeats": "Repeats",
-    "notification_visibility_moves": "User Migrates",
-    "notification_visibility_emoji_reactions": "Reactions",
-    "no_rich_text_description": "Strip rich text formatting from all posts",
-    "no_blocks": "No blocks",
-    "no_mutes": "No mutes",
-    "hide_follows_description": "Don't show who I'm following",
-    "hide_followers_description": "Don't show who's following me",
-    "hide_follows_count_description": "Don't show follow count",
-    "hide_followers_count_description": "Don't show follower count",
-    "show_admin_badge": "Show Admin badge in my profile",
-    "show_moderator_badge": "Show Moderator badge in my profile",
-    "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
-    "oauth_tokens": "OAuth tokens",
-    "token": "Token",
-    "refresh_token": "Refresh Token",
-    "valid_until": "Valid Until",
-    "revoke_token": "Revoke",
-    "panelRadius": "Panels",
-    "pause_on_unfocused": "Pause streaming when tab is not focused",
-    "presets": "Presets",
-    "profile_background": "Profile Background",
-    "profile_banner": "Profile Banner",
-    "profile_tab": "Profile",
-    "radii_help": "Set up interface edge rounding (in pixels)",
-    "replies_in_timeline": "Replies in timeline",
-    "reply_link_preview": "Enable reply-link preview on mouse hover",
-    "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",
-    "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
-    "saving_err": "Error saving settings",
-    "saving_ok": "Settings saved",
-    "search_user_to_block": "Search whom you want to block",
-    "search_user_to_mute": "Search whom you want to mute",
-    "security_tab": "Security",
-    "scope_copy": "Copy scope when replying (DMs are always copied)",
-    "minimal_scopes_mode": "Minimize post scope selection options",
-    "set_new_avatar": "Set new avatar",
-    "set_new_profile_background": "Set new profile background",
-    "set_new_profile_banner": "Set new profile banner",
-    "settings": "Settings",
-    "subject_input_always_show": "Always show subject field",
-    "subject_line_behavior": "Copy subject when replying",
-    "subject_line_email": "Like email: \"re: subject\"",
-    "subject_line_mastodon": "Like mastodon: copy as is",
-    "subject_line_noop": "Do not copy",
-    "post_status_content_type": "Post status content type",
-    "stop_gifs": "Play-on-hover GIFs",
-    "streaming": "Enable automatic streaming of new posts when scrolled to the top",
-    "user_mutes": "Users",
-    "useStreamingApi": "Receive posts and notifications real-time",
-    "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)",
-    "text": "Text",
-    "theme": "Theme",
-    "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
-    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
-    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
-    "tooltipRadius": "Tooltips/alerts",
-    "type_domains_to_mute": "Type in domains to mute",
-    "upload_a_photo": "Upload a photo",
-    "user_settings": "User Settings",
-    "values": {
-      "false": "no",
-      "true": "yes"
-    },
-    "fun": "Fun",
-    "greentext": "Meme arrows",
-    "notifications": "Notifications",
-    "notification_setting_filters": "Filters",
-    "notification_setting": "Receive notifications from:",
-    "notification_setting_follows": "Users you follow",
-    "notification_setting_non_follows": "Users you do not follow",
-    "notification_setting_followers": "Users who follow you",
-    "notification_setting_non_followers": "Users who do not follow you",
-    "notification_setting_privacy": "Privacy",
-    "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
-    "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",
-    "style": {
-      "switcher": {
-        "keep_color": "Keep colors",
-        "keep_shadows": "Keep shadows",
-        "keep_opacity": "Keep opacity",
-        "keep_roundness": "Keep roundness",
-        "keep_fonts": "Keep fonts",
-        "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
-        "reset": "Reset",
-        "clear_all": "Clear all",
-        "clear_opacity": "Clear opacity",
-        "load_theme": "Load theme",
-        "keep_as_is": "Keep as is",
-        "use_snapshot": "Old version",
-        "use_source": "New version",
-        "help": {
-          "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
-          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
-          "future_version_imported": "File you imported was made in newer version of FE.",
-          "older_version_imported": "File you imported was made in older version of FE.",
-          "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
-          "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
-          "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
-          "fe_downgraded": "PleromaFE's version rolled back.",
-          "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
-          "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
-          "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
-        }
-      },
-      "common": {
-        "color": "Color",
-        "opacity": "Opacity",
-        "contrast": {
-          "hint": "Contrast ratio is {ratio}, it {level} {context}",
-          "level": {
-            "aa": "meets Level AA guideline (minimal)",
-            "aaa": "meets Level AAA guideline (recommended)",
-            "bad": "doesn't meet any accessibility guidelines"
-          },
-          "context": {
-            "18pt": "for large (18pt+) text",
-            "text": "for text"
-          }
-        }
-      },
-      "common_colors": {
-        "_tab_label": "Common",
-        "main": "Common colors",
-        "foreground_hint": "See \"Advanced\" tab for more detailed control",
-        "rgbo": "Icons, accents, badges"
-      },
-      "advanced_colors": {
-        "_tab_label": "Advanced",
-        "alert": "Alert background",
-        "alert_error": "Error",
-        "alert_warning": "Warning",
-        "alert_neutral": "Neutral",
-        "post": "Posts/User bios",
-        "badge": "Badge background",
-        "popover": "Tooltips, menus, popovers",
-        "badge_notification": "Notification",
-        "panel_header": "Panel header",
-        "top_bar": "Top bar",
-        "borders": "Borders",
-        "buttons": "Buttons",
-        "inputs": "Input fields",
-        "faint_text": "Faded text",
-        "underlay": "Underlay",
-        "poll": "Poll graph",
-        "icons": "Icons",
-        "highlight": "Highlighted elements",
-        "pressed": "Pressed",
-        "selectedPost": "Selected post",
-        "selectedMenu": "Selected menu item",
-        "disabled": "Disabled",
-        "toggled": "Toggled",
-        "tabs": "Tabs"
-      },
-      "radii": {
-        "_tab_label": "Roundness"
-      },
-      "shadows": {
-        "_tab_label": "Shadow and lighting",
-        "component": "Component",
-        "override": "Override",
-        "shadow_id": "Shadow #{value}",
-        "blur": "Blur",
-        "spread": "Spread",
-        "inset": "Inset",
-        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
-        "filter_hint": {
-          "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
-          "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
-          "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
-          "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
-          "inset_classic": "Inset shadows will be using {0}"
+    "about": {
+        "mrf": {
+            "federation": "Federation",
+            "keyword": {
+                "keyword_policies": "Keyword Policies",
+                "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
+                "reject": "Reject",
+                "replace": "Replace",
+                "is_replaced_by": "→"
+            },
+            "mrf_policies": "Enabled MRF Policies",
+            "mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance.  The following policies are enabled:",
+            "simple": {
+                "simple_policies": "Instance-specific Policies",
+                "accept": "Accept",
+                "accept_desc": "This instance only accepts messages from the following instances:",
+                "reject": "Reject",
+                "reject_desc": "This instance will not accept messages from the following instances:",
+                "quarantine": "Quarantine",
+                "quarantine_desc": "This instance will send only public posts to the following instances:",
+                "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
+                "ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
+                "media_removal": "Media Removal",
+                "media_removal_desc": "This instance removes media from posts on the following instances:",
+                "media_nsfw": "Media Force-set As Sensitive",
+                "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
+            }
         },
-        "components": {
-          "panel": "Panel",
-          "panelHeader": "Panel header",
-          "topBar": "Top bar",
-          "avatar": "User avatar (in profile view)",
-          "avatarStatus": "User avatar (in post display)",
-          "popup": "Popups and tooltips",
-          "button": "Button",
-          "buttonHover": "Button (hover)",
-          "buttonPressed": "Button (pressed)",
-          "buttonPressedHover": "Button (pressed+hover)",
-          "input": "Input field"
+        "staff": "Staff"
+    },
+    "chat": {
+        "title": "Chat"
+    },
+    "domain_mute_card": {
+        "mute": "Mute",
+        "mute_progress": "Muting…",
+        "unmute": "Unmute",
+        "unmute_progress": "Unmuting…"
+    },
+    "exporter": {
+        "export": "Export",
+        "processing": "Processing, you'll soon be asked to download your file"
+    },
+    "features_panel": {
+        "chat": "Chat",
+        "gopher": "Gopher",
+        "media_proxy": "Media proxy",
+        "scope_options": "Scope options",
+        "text_limit": "Text limit",
+        "title": "Features",
+        "who_to_follow": "Who to follow"
+    },
+    "finder": {
+        "error_fetching_user": "Error fetching user",
+        "find_user": "Find user"
+    },
+    "general": {
+        "apply": "Apply",
+        "submit": "Submit",
+        "more": "More",
+        "generic_error": "An error occured",
+        "optional": "optional",
+        "show_more": "Show more",
+        "show_less": "Show less",
+        "dismiss": "Dismiss",
+        "cancel": "Cancel",
+        "disable": "Disable",
+        "enable": "Enable",
+        "confirm": "Confirm",
+        "verify": "Verify"
+    },
+    "image_cropper": {
+        "crop_picture": "Crop picture",
+        "save": "Save",
+        "save_without_cropping": "Save without cropping",
+        "cancel": "Cancel"
+    },
+    "importer": {
+        "submit": "Submit",
+        "success": "Imported successfully.",
+        "error": "An error occured while importing this file."
+    },
+    "login": {
+        "login": "Log in",
+        "description": "Log in with OAuth",
+        "logout": "Log out",
+        "password": "Password",
+        "placeholder": "e.g. lain",
+        "register": "Register",
+        "username": "Username",
+        "hint": "Log in to join the discussion",
+        "authentication_code": "Authentication code",
+        "enter_recovery_code": "Enter a recovery code",
+        "enter_two_factor_code": "Enter a two-factor code",
+        "recovery_code": "Recovery code",
+        "heading": {
+            "totp": "Two-factor authentication",
+            "recovery": "Two-factor recovery"
         }
-      },
-      "fonts": {
-        "_tab_label": "Fonts",
-        "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
-        "components": {
-          "interface": "Interface",
-          "input": "Input fields",
-          "post": "Post text",
-          "postCode": "Monospaced text in a post (rich text)"
+    },
+    "media_modal": {
+        "previous": "Previous",
+        "next": "Next"
+    },
+    "nav": {
+        "about": "About",
+        "administration": "Administration",
+        "back": "Back",
+        "chat": "Local Chat",
+        "friend_requests": "Follow Requests",
+        "mentions": "Mentions",
+        "interactions": "Interactions",
+        "dms": "Direct Messages",
+        "public_tl": "Public Timeline",
+        "timeline": "Timeline",
+        "twkn": "The Whole Known Network",
+        "user_search": "User Search",
+        "search": "Search",
+        "who_to_follow": "Who to follow",
+        "preferences": "Preferences"
+    },
+    "notifications": {
+        "broken_favorite": "Unknown status, searching for it…",
+        "favorited_you": "favorited your status",
+        "followed_you": "followed you",
+        "follow_request": "wants to follow you",
+        "load_older": "Load older notifications",
+        "notifications": "Notifications",
+        "read": "Read!",
+        "repeated_you": "repeated your status",
+        "no_more_notifications": "No more notifications",
+        "migrated_to": "migrated to",
+        "reacted_with": "reacted with {0}"
+    },
+    "polls": {
+        "add_poll": "Add Poll",
+        "add_option": "Add Option",
+        "option": "Option",
+        "votes": "votes",
+        "vote": "Vote",
+        "type": "Poll type",
+        "single_choice": "Single choice",
+        "multiple_choices": "Multiple choices",
+        "expiry": "Poll age",
+        "expires_in": "Poll ends in {0}",
+        "expired": "Poll ended {0} ago",
+        "not_enough_options": "Too few unique options in poll"
+    },
+    "emoji": {
+        "stickers": "Stickers",
+        "emoji": "Emoji",
+        "keep_open": "Keep picker open",
+        "search_emoji": "Search for an emoji",
+        "add_emoji": "Insert emoji",
+        "custom": "Custom emoji",
+        "unicode": "Unicode emoji",
+        "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
+        "load_all": "Loading all {emojiAmount} emoji"
+    },
+    "interactions": {
+        "favs_repeats": "Repeats and Favorites",
+        "follows": "New follows",
+        "moves": "User migrates",
+        "load_older": "Load older interactions"
+    },
+    "post_status": {
+        "new_status": "Post new status",
+        "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
+        "account_not_locked_warning_link": "locked",
+        "attachments_sensitive": "Mark attachments as sensitive",
+        "content_type": {
+            "text/plain": "Plain text",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
         },
-        "family": "Font name",
-        "size": "Size (in px)",
-        "weight": "Weight (boldness)",
-        "custom": "Custom"
-      },
-      "preview": {
-        "header": "Preview",
-        "content": "Content",
-        "error": "Example error",
-        "button": "Button",
-        "text": "A bunch of more {0} and {1}",
-        "mono": "content",
-        "input": "Just landed in L.A.",
-        "faint_link": "helpful manual",
-        "fine_print": "Read our {0} to learn nothing useful!",
-        "header_faint": "This is fine",
-        "checkbox": "I have skimmed over terms and conditions",
-        "link": "a nice lil' link"
-      }
+        "content_warning": "Subject (optional)",
+        "default": "Just landed in L.A.",
+        "direct_warning_to_all": "This post will be visible to all the mentioned users.",
+        "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
+        "posting": "Posting",
+        "scope_notice": {
+            "public": "This post will be visible to everyone",
+            "private": "This post will be visible to your followers only",
+            "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
+        },
+        "scope": {
+            "direct": "Direct - Post to mentioned users only",
+            "private": "Followers-only - Post to followers only",
+            "public": "Public - Post to public timelines",
+            "unlisted": "Unlisted - Do not post to public timelines"
+        }
     },
-    "version": {
-      "title": "Version",
-      "backend_version": "Backend Version",
-      "frontend_version": "Frontend Version"
-    }
-  },
-  "time": {
-    "day": "{0} day",
-    "days": "{0} days",
-    "day_short": "{0}d",
-    "days_short": "{0}d",
-    "hour": "{0} hour",
-    "hours": "{0} hours",
-    "hour_short": "{0}h",
-    "hours_short": "{0}h",
-    "in_future": "in {0}",
-    "in_past": "{0} ago",
-    "minute": "{0} minute",
-    "minutes": "{0} minutes",
-    "minute_short": "{0}min",
-    "minutes_short": "{0}min",
-    "month": "{0} month",
-    "months": "{0} months",
-    "month_short": "{0}mo",
-    "months_short": "{0}mo",
-    "now": "just now",
-    "now_short": "now",
-    "second": "{0} second",
-    "seconds": "{0} seconds",
-    "second_short": "{0}s",
-    "seconds_short": "{0}s",
-    "week": "{0} week",
-    "weeks": "{0} weeks",
-    "week_short": "{0}w",
-    "weeks_short": "{0}w",
-    "year": "{0} year",
-    "years": "{0} years",
-    "year_short": "{0}y",
-    "years_short": "{0}y"
-  },
-  "timeline": {
-    "collapse": "Collapse",
-    "conversation": "Conversation",
-    "error_fetching": "Error fetching updates",
-    "load_older": "Load older statuses",
-    "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
-    "repeated": "repeated",
-    "show_new": "Show new",
-    "up_to_date": "Up-to-date",
-    "no_more_statuses": "No more statuses",
-    "no_statuses": "No statuses"
-  },
-  "status": {
-    "favorites": "Favorites",
-    "repeats": "Repeats",
-    "delete": "Delete status",
-    "pin": "Pin on profile",
-    "unpin": "Unpin from profile",
-    "pinned": "Pinned",
-    "delete_confirm": "Do you really want to delete this status?",
-    "reply_to": "Reply to",
-    "replies_list": "Replies:",
-    "mute_conversation": "Mute conversation",
-    "unmute_conversation": "Unmute conversation",
-    "status_unavailable": "Status unavailable",
-    "copy_link": "Copy link to status"
-  },
-  "user_card": {
-    "approve": "Approve",
-    "block": "Block",
-    "blocked": "Blocked!",
-    "deny": "Deny",
-    "favorites": "Favorites",
-    "follow": "Follow",
-    "follow_sent": "Request sent!",
-    "follow_progress": "Requesting…",
-    "follow_again": "Send request again?",
-    "follow_unfollow": "Unfollow",
-    "followees": "Following",
-    "followers": "Followers",
-    "following": "Following!",
-    "follows_you": "Follows you!",
-    "hidden": "Hidden",
-    "its_you": "It's you!",
-    "media": "Media",
-    "mention": "Mention",
-    "mute": "Mute",
-    "muted": "Muted",
-    "per_day": "per day",
-    "remote_follow": "Remote follow",
-    "report": "Report",
-    "statuses": "Statuses",
-    "subscribe": "Subscribe",
-    "unsubscribe": "Unsubscribe",
-    "unblock": "Unblock",
-    "unblock_progress": "Unblocking...",
-    "block_progress": "Blocking...",
-    "unmute": "Unmute",
-    "unmute_progress": "Unmuting...",
-    "mute_progress": "Muting...",
-    "hide_repeats": "Hide repeats",
-    "show_repeats": "Show repeats",
-    "admin_menu": {
-      "moderation": "Moderation",
-      "grant_admin": "Grant Admin",
-      "revoke_admin": "Revoke Admin",
-      "grant_moderator": "Grant Moderator",
-      "revoke_moderator": "Revoke Moderator",
-      "activate_account": "Activate account",
-      "deactivate_account": "Deactivate account",
-      "delete_account": "Delete account",
-      "force_nsfw": "Mark all posts as NSFW",
-      "strip_media": "Remove media from posts",
-      "force_unlisted": "Force posts to be unlisted",
-      "sandbox": "Force posts to be followers-only",
-      "disable_remote_subscription": "Disallow following user from remote instances",
-      "disable_any_subscription": "Disallow following user at all",
-      "quarantine": "Disallow user posts from federating",
-      "delete_user": "Delete user",
-      "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
-    }
-  },
-  "user_profile": {
-    "timeline_title": "User Timeline",
-    "profile_does_not_exist": "Sorry, this profile does not exist.",
-    "profile_loading_error": "Sorry, there was an error loading this profile."
-  },
-  "user_reporting": {
-    "title": "Reporting {0}",
-    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
-    "additional_comments": "Additional comments",
-    "forward_description": "The account is from another server. Send a copy of the report there as well?",
-    "forward_to": "Forward to {0}",
-    "submit": "Submit",
-    "generic_error": "An error occurred while processing your request."
-  },
-  "who_to_follow": {
-    "more": "More",
-    "who_to_follow": "Who to follow"
-  },
-  "tool_tip": {
-    "media_upload": "Upload Media",
-    "repeat": "Repeat",
-    "reply": "Reply",
-    "favorite": "Favorite",
-    "add_reaction": "Add Reaction",
-    "user_settings": "User Settings",
-    "accept_follow_request": "Accept follow request",
-    "reject_follow_request": "Reject follow request"
-  },
-  "upload":{
-    "error": {
-      "base": "Upload failed.",
-      "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Try again later"
+    "registration": {
+        "bio": "Bio",
+        "email": "Email",
+        "fullname": "Display name",
+        "password_confirm": "Password confirmation",
+        "registration": "Registration",
+        "token": "Invite token",
+        "captcha": "CAPTCHA",
+        "new_captcha": "Click the image to get a new captcha",
+        "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.",
+        "validations": {
+            "username_required": "cannot be left blank",
+            "fullname_required": "cannot be left blank",
+            "email_required": "cannot be left blank",
+            "password_required": "cannot be left blank",
+            "password_confirmation_required": "cannot be left blank",
+            "password_confirmation_match": "should be the same as password"
+        }
     },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
+    "remote_user_resolver": {
+        "remote_user_resolver": "Remote user resolver",
+        "searching_for": "Searching for",
+        "error": "Not found."
+    },
+    "selectable_list": {
+        "select_all": "Select all"
+    },
+    "settings": {
+        "app_name": "App name",
+        "security": "Security",
+        "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "Setup OTP",
+            "wait_pre_setup_otp": "presetting OTP",
+            "confirm_and_enable": "Confirm & enable OTP",
+            "title": "Two-factor Authentication",
+            "generate_new_recovery_codes": "Generate new recovery codes",
+            "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
+            "recovery_codes": "Recovery codes.",
+            "waiting_a_recovery_codes": "Receiving backup codes…",
+            "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
+            "authentication_methods": "Authentication methods",
+            "scan": {
+                "title": "Scan",
+                "desc": "Using your two-factor app, scan this QR code or enter text key:",
+                "secret_code": "Key"
+            },
+            "verify": {
+                "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
+            }
+        },
+        "allow_following_move": "Allow auto-follow when following account moves",
+        "attachmentRadius": "Attachments",
+        "attachments": "Attachments",
+        "autoload": "Enable automatic loading when scrolled to the bottom",
+        "avatar": "Avatar",
+        "avatarAltRadius": "Avatars (Notifications)",
+        "avatarRadius": "Avatars",
+        "background": "Background",
+        "bio": "Bio",
+        "block_export": "Block export",
+        "block_export_button": "Export your blocks to a csv file",
+        "block_import": "Block import",
+        "block_import_error": "Error importing blocks",
+        "blocks_imported": "Blocks imported! Processing them will take a while.",
+        "blocks_tab": "Blocks",
+        "btnRadius": "Buttons",
+        "cBlue": "Blue (Reply, follow)",
+        "cGreen": "Green (Retweet)",
+        "cOrange": "Orange (Favorite)",
+        "cRed": "Red (Cancel)",
+        "change_email": "Change Email",
+        "change_email_error": "There was an issue changing your email.",
+        "changed_email": "Email changed successfully!",
+        "change_password": "Change Password",
+        "change_password_error": "There was an issue changing your password.",
+        "changed_password": "Password changed successfully!",
+        "collapse_subject": "Collapse posts with subjects",
+        "composing": "Composing",
+        "confirm_new_password": "Confirm new password",
+        "current_avatar": "Your current avatar",
+        "current_password": "Current password",
+        "current_profile_banner": "Your current profile banner",
+        "data_import_export_tab": "Data Import / Export",
+        "default_vis": "Default visibility scope",
+        "delete_account": "Delete Account",
+        "delete_account_description": "Permanently delete your data and deactivate your account.",
+        "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
+        "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
+        "discoverable": "Allow discovery of this account in search results and other services",
+        "domain_mutes": "Domains",
+        "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
+        "pad_emoji": "Pad emoji with spaces when adding from picker",
+        "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
+        "export_theme": "Save preset",
+        "filtering": "Filtering",
+        "filtering_explanation": "All statuses containing these words will be muted, one per line",
+        "follow_export": "Follow export",
+        "follow_export_button": "Export your follows to a csv file",
+        "follow_import": "Follow import",
+        "follow_import_error": "Error importing followers",
+        "follows_imported": "Follows imported! Processing them will take a while.",
+        "accent": "Accent",
+        "foreground": "Foreground",
+        "general": "General",
+        "hide_attachments_in_convo": "Hide attachments in conversations",
+        "hide_attachments_in_tl": "Hide attachments in timeline",
+        "hide_muted_posts": "Hide posts of muted users",
+        "max_thumbnails": "Maximum amount of thumbnails per post",
+        "hide_isp": "Hide instance-specific panel",
+        "preload_images": "Preload images",
+        "use_one_click_nsfw": "Open NSFW attachments with just one click",
+        "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
+        "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+        "hide_filtered_statuses": "Hide filtered statuses",
+        "import_blocks_from_a_csv_file": "Import blocks from a csv file",
+        "import_followers_from_a_csv_file": "Import follows from a csv file",
+        "import_theme": "Load preset",
+        "inputRadius": "Input fields",
+        "checkboxRadius": "Checkboxes",
+        "instance_default": "(default: {value})",
+        "instance_default_simple": "(default)",
+        "interface": "Interface",
+        "interfaceLanguage": "Interface language",
+        "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
+        "limited_availability": "Unavailable in your browser",
+        "links": "Links",
+        "lock_account_description": "Restrict your account to approved followers only",
+        "loop_video": "Loop videos",
+        "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
+        "mutes_tab": "Mutes",
+        "play_videos_in_modal": "Play videos in a popup frame",
+        "use_contain_fit": "Don't crop the attachment in thumbnails",
+        "name": "Name",
+        "name_bio": "Name & Bio",
+        "new_email": "New Email",
+        "new_password": "New password",
+        "notification_visibility": "Types of notifications to show",
+        "notification_visibility_follows": "Follows",
+        "notification_visibility_likes": "Likes",
+        "notification_visibility_mentions": "Mentions",
+        "notification_visibility_repeats": "Repeats",
+        "notification_visibility_moves": "User Migrates",
+        "notification_visibility_emoji_reactions": "Reactions",
+        "no_rich_text_description": "Strip rich text formatting from all posts",
+        "no_blocks": "No blocks",
+        "no_mutes": "No mutes",
+        "hide_follows_description": "Don't show who I'm following",
+        "hide_followers_description": "Don't show who's following me",
+        "hide_follows_count_description": "Don't show follow count",
+        "hide_followers_count_description": "Don't show follower count",
+        "show_admin_badge": "Show Admin badge in my profile",
+        "show_moderator_badge": "Show Moderator badge in my profile",
+        "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
+        "oauth_tokens": "OAuth tokens",
+        "token": "Token",
+        "refresh_token": "Refresh Token",
+        "valid_until": "Valid Until",
+        "revoke_token": "Revoke",
+        "panelRadius": "Panels",
+        "pause_on_unfocused": "Pause streaming when tab is not focused",
+        "presets": "Presets",
+        "profile_background": "Profile Background",
+        "profile_banner": "Profile Banner",
+        "profile_tab": "Profile",
+        "radii_help": "Set up interface edge rounding (in pixels)",
+        "replies_in_timeline": "Replies in timeline",
+        "reply_link_preview": "Enable reply-link preview on mouse hover",
+        "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",
+        "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
+        "saving_err": "Error saving settings",
+        "saving_ok": "Settings saved",
+        "search_user_to_block": "Search whom you want to block",
+        "search_user_to_mute": "Search whom you want to mute",
+        "security_tab": "Security",
+        "scope_copy": "Copy scope when replying (DMs are always copied)",
+        "minimal_scopes_mode": "Minimize post scope selection options",
+        "set_new_avatar": "Set new avatar",
+        "set_new_profile_background": "Set new profile background",
+        "set_new_profile_banner": "Set new profile banner",
+        "settings": "Settings",
+        "subject_input_always_show": "Always show subject field",
+        "subject_line_behavior": "Copy subject when replying",
+        "subject_line_email": "Like email: \"re: subject\"",
+        "subject_line_mastodon": "Like mastodon: copy as is",
+        "subject_line_noop": "Do not copy",
+        "post_status_content_type": "Post status content type",
+        "stop_gifs": "Play-on-hover GIFs",
+        "streaming": "Enable automatic streaming of new posts when scrolled to the top",
+        "user_mutes": "Users",
+        "useStreamingApi": "Receive posts and notifications real-time",
+        "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)",
+        "text": "Text",
+        "theme": "Theme",
+        "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
+        "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
+        "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
+        "tooltipRadius": "Tooltips/alerts",
+        "type_domains_to_mute": "Type in domains to mute",
+        "upload_a_photo": "Upload a photo",
+        "user_settings": "User Settings",
+        "values": {
+            "false": "no",
+            "true": "yes"
+        },
+        "fun": "Fun",
+        "greentext": "Meme arrows",
+        "notifications": "Notifications",
+        "notification_setting_filters": "Filters",
+        "notification_setting": "Receive notifications from:",
+        "notification_setting_follows": "Users you follow",
+        "notification_setting_non_follows": "Users you do not follow",
+        "notification_setting_followers": "Users who follow you",
+        "notification_setting_non_followers": "Users who do not follow you",
+        "notification_setting_privacy": "Privacy",
+        "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
+        "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",
+        "style": {
+            "switcher": {
+                "keep_color": "Keep colors",
+                "keep_shadows": "Keep shadows",
+                "keep_opacity": "Keep opacity",
+                "keep_roundness": "Keep roundness",
+                "keep_fonts": "Keep fonts",
+                "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
+                "reset": "Reset",
+                "clear_all": "Clear all",
+                "clear_opacity": "Clear opacity",
+                "load_theme": "Load theme",
+                "keep_as_is": "Keep as is",
+                "use_snapshot": "Old version",
+                "use_source": "New version",
+                "help": {
+                    "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
+                    "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
+                    "future_version_imported": "File you imported was made in newer version of FE.",
+                    "older_version_imported": "File you imported was made in older version of FE.",
+                    "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
+                    "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
+                    "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
+                    "fe_downgraded": "PleromaFE's version rolled back.",
+                    "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
+                    "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
+                    "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
+                }
+            },
+            "common": {
+                "color": "Color",
+                "opacity": "Opacity",
+                "contrast": {
+                    "hint": "Contrast ratio is {ratio}, it {level} {context}",
+                    "level": {
+                        "aa": "meets Level AA guideline (minimal)",
+                        "aaa": "meets Level AAA guideline (recommended)",
+                        "bad": "doesn't meet any accessibility guidelines"
+                    },
+                    "context": {
+                        "18pt": "for large (18pt+) text",
+                        "text": "for text"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Common",
+                "main": "Common colors",
+                "foreground_hint": "See \"Advanced\" tab for more detailed control",
+                "rgbo": "Icons, accents, badges"
+            },
+            "advanced_colors": {
+                "_tab_label": "Advanced",
+                "alert": "Alert background",
+                "alert_error": "Error",
+                "alert_warning": "Warning",
+                "alert_neutral": "Neutral",
+                "post": "Posts/User bios",
+                "badge": "Badge background",
+                "popover": "Tooltips, menus, popovers",
+                "badge_notification": "Notification",
+                "panel_header": "Panel header",
+                "top_bar": "Top bar",
+                "borders": "Borders",
+                "buttons": "Buttons",
+                "inputs": "Input fields",
+                "faint_text": "Faded text",
+                "underlay": "Underlay",
+                "poll": "Poll graph",
+                "icons": "Icons",
+                "highlight": "Highlighted elements",
+                "pressed": "Pressed",
+                "selectedPost": "Selected post",
+                "selectedMenu": "Selected menu item",
+                "disabled": "Disabled",
+                "toggled": "Toggled",
+                "tabs": "Tabs"
+            },
+            "radii": {
+                "_tab_label": "Roundness"
+            },
+            "shadows": {
+                "_tab_label": "Shadow and lighting",
+                "component": "Component",
+                "override": "Override",
+                "shadow_id": "Shadow #{value}",
+                "blur": "Blur",
+                "spread": "Spread",
+                "inset": "Inset",
+                "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
+                "filter_hint": {
+                    "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
+                    "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
+                    "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
+                    "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
+                    "inset_classic": "Inset shadows will be using {0}"
+                },
+                "components": {
+                    "panel": "Panel",
+                    "panelHeader": "Panel header",
+                    "topBar": "Top bar",
+                    "avatar": "User avatar (in profile view)",
+                    "avatarStatus": "User avatar (in post display)",
+                    "popup": "Popups and tooltips",
+                    "button": "Button",
+                    "buttonHover": "Button (hover)",
+                    "buttonPressed": "Button (pressed)",
+                    "buttonPressedHover": "Button (pressed+hover)",
+                    "input": "Input field"
+                }
+            },
+            "fonts": {
+                "_tab_label": "Fonts",
+                "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
+                "components": {
+                    "interface": "Interface",
+                    "input": "Input fields",
+                    "post": "Post text",
+                    "postCode": "Monospaced text in a post (rich text)"
+                },
+                "family": "Font name",
+                "size": "Size (in px)",
+                "weight": "Weight (boldness)",
+                "custom": "Custom"
+            },
+            "preview": {
+                "header": "Preview",
+                "content": "Content",
+                "error": "Example error",
+                "button": "Button",
+                "text": "A bunch of more {0} and {1}",
+                "mono": "content",
+                "input": "Just landed in L.A.",
+                "faint_link": "helpful manual",
+                "fine_print": "Read our {0} to learn nothing useful!",
+                "header_faint": "This is fine",
+                "checkbox": "I have skimmed over terms and conditions",
+                "link": "a nice lil' link"
+            }
+        },
+        "version": {
+            "title": "Version",
+            "backend_version": "Backend Version",
+            "frontend_version": "Frontend Version"
+        }
+    },
+    "time": {
+        "day": "{0} day",
+        "days": "{0} days",
+        "day_short": "{0}d",
+        "days_short": "{0}d",
+        "hour": "{0} hour",
+        "hours": "{0} hours",
+        "hour_short": "{0}h",
+        "hours_short": "{0}h",
+        "in_future": "in {0}",
+        "in_past": "{0} ago",
+        "minute": "{0} minute",
+        "minutes": "{0} minutes",
+        "minute_short": "{0}min",
+        "minutes_short": "{0}min",
+        "month": "{0} month",
+        "months": "{0} months",
+        "month_short": "{0}mo",
+        "months_short": "{0}mo",
+        "now": "just now",
+        "now_short": "now",
+        "second": "{0} second",
+        "seconds": "{0} seconds",
+        "second_short": "{0}s",
+        "seconds_short": "{0}s",
+        "week": "{0} week",
+        "weeks": "{0} weeks",
+        "week_short": "{0}w",
+        "weeks_short": "{0}w",
+        "year": "{0} year",
+        "years": "{0} years",
+        "year_short": "{0}y",
+        "years_short": "{0}y"
+    },
+    "timeline": {
+        "collapse": "Collapse",
+        "conversation": "Conversation",
+        "error_fetching": "Error fetching updates",
+        "load_older": "Load older statuses",
+        "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
+        "repeated": "repeated",
+        "show_new": "Show new",
+        "up_to_date": "Up-to-date",
+        "no_more_statuses": "No more statuses",
+        "no_statuses": "No statuses"
+    },
+    "status": {
+        "favorites": "Favorites",
+        "repeats": "Repeats",
+        "delete": "Delete status",
+        "pin": "Pin on profile",
+        "unpin": "Unpin from profile",
+        "pinned": "Pinned",
+        "delete_confirm": "Do you really want to delete this status?",
+        "reply_to": "Reply to",
+        "replies_list": "Replies:",
+        "mute_conversation": "Mute conversation",
+        "unmute_conversation": "Unmute conversation",
+        "status_unavailable": "Status unavailable",
+        "copy_link": "Copy link to status"
+    },
+    "user_card": {
+        "approve": "Approve",
+        "block": "Block",
+        "blocked": "Blocked!",
+        "deny": "Deny",
+        "favorites": "Favorites",
+        "follow": "Follow",
+        "follow_sent": "Request sent!",
+        "follow_progress": "Requesting…",
+        "follow_again": "Send request again?",
+        "follow_unfollow": "Unfollow",
+        "followees": "Following",
+        "followers": "Followers",
+        "following": "Following!",
+        "follows_you": "Follows you!",
+        "hidden": "Hidden",
+        "its_you": "It's you!",
+        "media": "Media",
+        "mention": "Mention",
+        "mute": "Mute",
+        "muted": "Muted",
+        "per_day": "per day",
+        "remote_follow": "Remote follow",
+        "report": "Report",
+        "statuses": "Statuses",
+        "subscribe": "Subscribe",
+        "unsubscribe": "Unsubscribe",
+        "unblock": "Unblock",
+        "unblock_progress": "Unblocking…",
+        "block_progress": "Blocking…",
+        "unmute": "Unmute",
+        "unmute_progress": "Unmuting…",
+        "mute_progress": "Muting…",
+        "hide_repeats": "Hide repeats",
+        "show_repeats": "Show repeats",
+        "admin_menu": {
+            "moderation": "Moderation",
+            "grant_admin": "Grant Admin",
+            "revoke_admin": "Revoke Admin",
+            "grant_moderator": "Grant Moderator",
+            "revoke_moderator": "Revoke Moderator",
+            "activate_account": "Activate account",
+            "deactivate_account": "Deactivate account",
+            "delete_account": "Delete account",
+            "force_nsfw": "Mark all posts as NSFW",
+            "strip_media": "Remove media from posts",
+            "force_unlisted": "Force posts to be unlisted",
+            "sandbox": "Force posts to be followers-only",
+            "disable_remote_subscription": "Disallow following user from remote instances",
+            "disable_any_subscription": "Disallow following user at all",
+            "quarantine": "Disallow user posts from federating",
+            "delete_user": "Delete user",
+            "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+        }
+    },
+    "user_profile": {
+        "timeline_title": "User Timeline",
+        "profile_does_not_exist": "Sorry, this profile does not exist.",
+        "profile_loading_error": "Sorry, there was an error loading this profile."
+    },
+    "user_reporting": {
+        "title": "Reporting {0}",
+        "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+        "additional_comments": "Additional comments",
+        "forward_description": "The account is from another server. Send a copy of the report there as well?",
+        "forward_to": "Forward to {0}",
+        "submit": "Submit",
+        "generic_error": "An error occurred while processing your request."
+    },
+    "who_to_follow": {
+        "more": "More",
+        "who_to_follow": "Who to follow"
+    },
+    "tool_tip": {
+        "media_upload": "Upload Media",
+        "repeat": "Repeat",
+        "reply": "Reply",
+        "favorite": "Favorite",
+        "add_reaction": "Add Reaction",
+        "user_settings": "User Settings",
+        "accept_follow_request": "Accept follow request",
+        "reject_follow_request": "Reject follow request"
+    },
+    "upload": {
+        "error": {
+            "base": "Upload failed.",
+            "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+            "default": "Try again later"
+        },
+        "file_size_units": {
+            "B": "B",
+            "KiB": "KiB",
+            "MiB": "MiB",
+            "GiB": "GiB",
+            "TiB": "TiB"
+        }
+    },
+    "search": {
+        "people": "People",
+        "hashtags": "Hashtags",
+        "person_talking": "{count} person talking",
+        "people_talking": "{count} people talking",
+        "no_results": "No results"
+    },
+    "password_reset": {
+        "forgot_password": "Forgot password?",
+        "password_reset": "Password reset",
+        "instruction": "Enter your email address or username. We will send you a link to reset your password.",
+        "placeholder": "Your email or username",
+        "check_email": "Check your email for a link to reset your password.",
+        "return_home": "Return to the home page",
+        "not_found": "We couldn't find that email or username.",
+        "too_many_requests": "You have reached the limit of attempts, try again later.",
+        "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
+        "password_reset_required": "You must reset your password to log in.",
+        "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
     }
-  },
-  "search": {
-    "people": "People",
-    "hashtags": "Hashtags",
-    "person_talking": "{count} person talking",
-    "people_talking": "{count} people talking",
-    "no_results": "No results"
-  },
-  "password_reset": {
-    "forgot_password": "Forgot password?",
-    "password_reset": "Password reset",
-    "instruction": "Enter your email address or username. We will send you a link to reset your password.",
-    "placeholder": "Your email or username",
-    "check_email": "Check your email for a link to reset your password.",
-    "return_home": "Return to the home page",
-    "not_found": "We couldn't find that email or username.",
-    "too_many_requests": "You have reached the limit of attempts, try again later.",
-    "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
-    "password_reset_required": "You must reset your password to log in.",
-    "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
-  }
 }

From a0d935649b7c579b37452bf811d050e92be909e5 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Thu, 28 May 2020 20:12:47 +0000
Subject: [PATCH 141/415] Translated using Weblate (Italian)

Currently translated at 65.0% (399 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index e1b8022c..6a87b6ad 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -35,7 +35,7 @@
         "followed_you": "ti segue",
         "notifications": "Notifiche",
         "read": "Letto!",
-        "broken_favorite": "Stato sconosciuto, lo sto cercando...",
+        "broken_favorite": "Stato sconosciuto, lo sto cercando…",
         "favorited_you": "ha gradito il tuo messaggio",
         "load_older": "Carica notifiche precedenti",
         "repeated_you": "ha condiviso il tuo messaggio",
@@ -168,7 +168,7 @@
             },
             "authentication_methods": "Metodi di accesso",
             "recovery_codes_warning": "Appuntati i codici o salvali in un posto sicuro, altrimenti rischi di non rivederli mai più. Se perderai l'accesso sia alla tua applicazione bifattoriale che ai codici di recupero non potrai più accedere al tuo profilo.",
-            "waiting_a_recovery_codes": "Ricevo codici di recupero...",
+            "waiting_a_recovery_codes": "Ricevo codici di recupero…",
             "recovery_codes": "Codici di recupero.",
             "warning_of_generate_new_codes": "Alla generazione di nuovi codici di recupero, quelli vecchi saranno disattivati.",
             "generate_new_recovery_codes": "Genera nuovi codici di recupero",
@@ -187,7 +187,12 @@
                     "older_version_imported": "Il tema importato è stato creato per una versione precedente dell'interfaccia.",
                     "future_version_imported": "Il tema importato è stato creato per una versione più recente dell'interfaccia.",
                     "v2_imported": "Il tema importato è stato creato per una vecchia interfaccia. Non tutto potrebbe essere come prima.",
-                    "upgraded_from_v2": "L'interfaccia è stata aggiornata, il tema potrebbe essere diverso da come lo intendevi."
+                    "upgraded_from_v2": "L'interfaccia è stata aggiornata, il tema potrebbe essere diverso da come lo intendevi.",
+                    "migration_snapshot_ok": "Ho caricato l'anteprima del tema. Puoi provare a caricarne i contenuti.",
+                    "fe_downgraded": "L'interfaccia è stata portata ad una versione precedente.",
+                    "fe_upgraded": "Lo schema dei temi è stato aggiornato insieme all'interfaccia.",
+                    "snapshot_missing": "Il tema non è provvisto di anteprima, quindi potrebbe essere diverso da come appare.",
+                    "snapshot_present": "Tutti i valori sono sostituiti dall'anteprima del tema. Puoi invece caricare i suoi contenuti."
                 },
                 "use_source": "Nuova versione",
                 "use_snapshot": "Versione precedente",
@@ -261,7 +266,8 @@
         "hide_muted_posts": "Nascondi messaggi degli utenti zittiti",
         "accent": "Accento",
         "emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
-        "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore"
+        "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore",
+        "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più."
     },
     "timeline": {
         "error_fetching": "Errore nell'aggiornamento",
@@ -412,9 +418,9 @@
     },
     "domain_mute_card": {
         "mute": "Zittisci",
-        "mute_progress": "Zittisco...",
+        "mute_progress": "Zittisco…",
         "unmute": "Ascolta",
-        "unmute_progress": "Procedo..."
+        "unmute_progress": "Procedo…"
     },
     "exporter": {
         "export": "Esporta",

From 654105d5c1231cfd9f9a3851ee1cb7f3102ccb3a Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Mon, 1 Jun 2020 16:23:29 +0000
Subject: [PATCH 142/415] Translated using Weblate (Dutch)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 472d11ec..768babb5 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -604,9 +604,9 @@
     },
     "domain_mute_card": {
         "mute": "Negeren",
-        "mute_progress": "Negeren...",
+        "mute_progress": "Negeren…",
         "unmute": "Negering opheffen",
-        "unmute_progress": "Negering wordt opgeheven..."
+        "unmute_progress": "Negering wordt opgeheven…"
     },
     "exporter": {
         "export": "Exporteren",

From 790825257f01a1dabefaea382a9ab96913584b9d Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Mon, 1 Jun 2020 16:23:44 +0000
Subject: [PATCH 143/415] Translated using Weblate (Dutch)

Currently translated at 100.0% (613 of 613 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 768babb5..243e9ab9 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -66,7 +66,7 @@
         "interactions": "Interacties"
     },
     "notifications": {
-        "broken_favorite": "Onbekende status, aan het zoeken...",
+        "broken_favorite": "Onbekende status, aan het zoeken…",
         "favorited_you": "vond je status leuk",
         "followed_you": "volgt jou",
         "load_older": "Laad oudere meldingen",
@@ -402,7 +402,7 @@
             "title": "Twee-factor Authenticatie",
             "generate_new_recovery_codes": "Genereer nieuwe herstelcodes",
             "recovery_codes": "Herstelcodes.",
-            "waiting_a_recovery_codes": "Backup codes ontvangen...",
+            "waiting_a_recovery_codes": "Backup codes ontvangen…",
             "authentication_methods": "Authenticatie methodes",
             "scan": {
                 "title": "Scannen",
@@ -526,11 +526,11 @@
         },
         "show_repeats": "Herhalingen tonen",
         "hide_repeats": "Herhalingen verbergen",
-        "mute_progress": "Negeren...",
-        "unmute_progress": "Negering opheffen...",
+        "mute_progress": "Negeren…",
+        "unmute_progress": "Negering opheffen…",
         "unmute": "Negering opheffen",
-        "block_progress": "Blokkeren...",
-        "unblock_progress": "Blokkade opheffen...",
+        "block_progress": "Blokkeren…",
+        "unblock_progress": "Blokkade opheffen…",
         "unblock": "Blokkade opheffen",
         "unsubscribe": "Abonnement opzeggen",
         "subscribe": "Abonneren",

From f5c4d7d989f54071ed298a8eab67b1e72411ae94 Mon Sep 17 00:00:00 2001
From: Evert Prants <evert@lunasqu.ee>
Date: Wed, 3 Jun 2020 06:57:53 +0000
Subject: [PATCH 144/415] Translated using Weblate (Estonian)

Currently translated at 54.3% (333 of 613 strings)

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

diff --git a/src/i18n/et.json b/src/i18n/et.json
index 5262b2a4..ead7ae67 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -1,83 +1,408 @@
 {
-  "finder": {
-    "error_fetching_user": "Viga kasutaja leidmisel",
-    "find_user": "Otsi kasutajaid"
-  },
-  "general": {
-    "submit": "Postita"
-  },
-  "login": {
-    "login": "Logi sisse",
-    "logout": "Logi välja",
-    "password": "Parool",
-    "placeholder": "nt lain",
-    "register": "Registreeru",
-    "username": "Kasutajanimi"
-  },
-  "nav": {
-    "mentions": "Mainimised",
-    "public_tl": "Avalik Ajajoon",
-    "timeline": "Ajajoon",
-    "twkn": "Kogu Teadaolev Võrgustik"
-  },
-  "notifications": {
-    "followed_you": "alustas sinu jälgimist",
-    "notifications": "Teavitused",
-    "read": "Loe!"
-  },
-  "post_status": {
-    "default": "Just sõitsin elektrirongiga Tallinnast Pääskülla.",
-    "posting": "Postitan"
-  },
-  "registration": {
-    "bio": "Bio",
-    "email": "E-post",
-    "fullname": "Kuvatav nimi",
-    "password_confirm": "Parooli kinnitamine",
-    "registration": "Registreerimine"
-  },
-  "settings": {
-    "attachments": "Manused",
-    "autoload": "Luba ajajoone automaatne uuendamine kui ajajoon on põhja keritud",
-    "avatar": "Profiilipilt",
-    "bio": "Bio",
-    "current_avatar": "Sinu praegune profiilipilt",
-    "current_profile_banner": "Praegune profiilibänner",
-    "filtering": "Sisu filtreerimine",
-    "filtering_explanation": "Kõiki staatuseid, mis sisaldavad neid sõnu, ei kuvata. Üks sõna reale.",
-    "hide_attachments_in_convo": "Peida manused vastlustes",
-    "hide_attachments_in_tl": "Peida manused ajajoonel",
-    "name": "Nimi",
-    "name_bio": "Nimi ja Bio",
-    "nsfw_clickthrough": "Peida tööks-mittesobivad(NSFW) manuste hiireklõpsu taha",
-    "profile_background": "Profiilitaust",
-    "profile_banner": "Profiilibänner",
-    "reply_link_preview": "Luba algpostituse kuvamine vastustes",
-    "set_new_avatar": "Vali uus profiilipilt",
-    "set_new_profile_background": "Vali uus profiilitaust",
-    "set_new_profile_banner": "Vali uus profiilibänner",
-    "settings": "Sätted",
-    "theme": "Teema",
-    "user_settings": "Kasutaja sätted"
-  },
-  "timeline": {
-    "conversation": "Vestlus",
-    "error_fetching": "Viga uuenduste laadimisel",
-    "load_older": "Kuva vanemaid staatuseid",
-    "show_new": "Näita uusi",
-    "up_to_date": "Uuendatud"
-  },
-  "user_card": {
-    "block": "Blokeeri",
-    "blocked": "Blokeeritud!",
-    "follow": "Jälgi",
-    "followees": "Jälgitavaid",
-    "followers": "Jälgijaid",
-    "following": "Jälgin!",
-    "follows_you": "Jälgib sind!",
-    "mute": "Vaigista",
-    "muted": "Vaigistatud",
-    "per_day": "päevas",
-    "statuses": "Staatuseid"
-  }
+    "finder": {
+        "error_fetching_user": "Viga kasutaja leidmisel",
+        "find_user": "Otsi kasutajaid"
+    },
+    "general": {
+        "submit": "Postita",
+        "verify": "Kinnita",
+        "confirm": "Kinnita",
+        "enable": "Luba",
+        "disable": "Keela",
+        "cancel": "Tühista",
+        "dismiss": "Olgu",
+        "show_less": "Kuva vähem",
+        "show_more": "Kuva rohkem",
+        "optional": "valikuline",
+        "generic_error": "Esines viga",
+        "more": "Rohkem",
+        "apply": "Rakenda"
+    },
+    "login": {
+        "login": "Logi sisse",
+        "logout": "Logi välja",
+        "password": "Parool",
+        "placeholder": "nt lain",
+        "register": "Registreeru",
+        "username": "Kasutajanimi",
+        "heading": {
+            "recovery": "Kaheastmelise autentimise taaste",
+            "totp": "Kaheastmeline autentimine"
+        },
+        "recovery_code": "Taastekood",
+        "enter_two_factor_code": "Sisesta kaheastmelise autentimise kood",
+        "enter_recovery_code": "Sisesta taastekood",
+        "authentication_code": "Autentimiskood",
+        "hint": "Logi sisse, et liituda vestlusega",
+        "description": "Logi sisse OAuthiga"
+    },
+    "nav": {
+        "mentions": "Mainimised",
+        "public_tl": "Avalik Ajajoon",
+        "timeline": "Ajajoon",
+        "twkn": "Kogu Teadaolev Võrgustik",
+        "preferences": "Eelistused",
+        "who_to_follow": "Keda jälgida",
+        "search": "Otsing",
+        "user_search": "Kasutajaotsing",
+        "dms": "Privaatsõnumid",
+        "interactions": "Interaktsioonid",
+        "friend_requests": "Jägimistaotlused",
+        "chat": "Kohalik vestlus",
+        "back": "Tagasi",
+        "administration": "Administreerimine",
+        "about": "Meist"
+    },
+    "notifications": {
+        "followed_you": "alustas sinu jälgimist",
+        "notifications": "Teavitused",
+        "read": "Loe!",
+        "reacted_with": "reageeris {0}",
+        "migrated_to": "migreerus",
+        "no_more_notifications": "Rohkem teavitusi ei ole",
+        "repeated_you": "taaspostitas su staatuse",
+        "load_older": "Laadi vanemad teavitused",
+        "follow_request": "soovib Teid jälgida",
+        "favorited_you": "lisas su staatuse lemmikuks",
+        "broken_favorite": "Tundmatu staatus, otsin…"
+    },
+    "post_status": {
+        "default": "Just sõitsin elektrirongiga Tallinnast Pääskülla.",
+        "posting": "Postitan",
+        "scope": {
+            "unlisted": "Peidetud - Ära postita avalikele ajajoontele",
+            "public": "Avalil - Postita avalikele ajajoontele",
+            "private": "Jälgijatele - Postita ainult jälgijatele",
+            "direct": "Privaatne - Postita ainult mainitud kasutajatele"
+        },
+        "scope_notice": {
+            "unlisted": "See postitus ei ole nähtav avalikul ega kogu võrgu ajajoonel",
+            "private": "See postitus on nähtav ainult Teie jälgijatele",
+            "public": "See postitus on nähtav kõigile"
+        },
+        "direct_warning_to_first_only": "See postitus on nähtav ainult kirja alguses mainitud kasutajatele.",
+        "direct_warning_to_all": "See postitus on nähtav kõikidele mainitud kasutajatele.",
+        "content_warning": "Pealkiri (valikuline)",
+        "content_type": {
+            "text/bbcode": "BBCode",
+            "text/markdown": "Markdown",
+            "text/html": "HTML",
+            "text/plain": "Lihttekst"
+        },
+        "attachments_sensitive": "Märgi manused sensitiivseks",
+        "account_not_locked_warning_link": "lukus",
+        "account_not_locked_warning": "Teie konto ei ole {0}. Kõik võivad Teid jälgida, et näha Teie ainult-jälgijatele postitusi.",
+        "new_status": "Postita uus staatus"
+    },
+    "registration": {
+        "bio": "Bio",
+        "email": "E-post",
+        "fullname": "Kuvatav nimi",
+        "password_confirm": "Parooli kinnitamine",
+        "registration": "Registreerimine",
+        "validations": {
+            "password_confirmation_match": "peaks olema sama kui salasõna",
+            "password_confirmation_required": "ei saa jätta tühjaks",
+            "password_required": "ei saa jätta tühjaks",
+            "email_required": "ei saa jätta tühjaks",
+            "fullname_required": "ei saa jätta tühjaks",
+            "username_required": "ei saa jätta tühjaks"
+        },
+        "fullname_placeholder": "Näiteks Lain Iwakura",
+        "username_placeholder": "Näiteks lain",
+        "new_captcha": "Vajuta pildile, et saada uus captcha",
+        "captcha": "CAPTCHA",
+        "token": "Kutse võti"
+    },
+    "settings": {
+        "attachments": "Manused",
+        "autoload": "Luba ajajoone automaatne uuendamine kui ajajoon on põhja keritud",
+        "avatar": "Profiilipilt",
+        "bio": "Bio",
+        "current_avatar": "Sinu praegune profiilipilt",
+        "current_profile_banner": "Praegune profiilibänner",
+        "filtering": "Sisu filtreerimine",
+        "filtering_explanation": "Kõiki staatuseid, mis sisaldavad neid sõnu, ei kuvata. Üks sõna reale",
+        "hide_attachments_in_convo": "Peida manused vastlustes",
+        "hide_attachments_in_tl": "Peida manused ajajoonel",
+        "name": "Nimi",
+        "name_bio": "Nimi ja Bio",
+        "nsfw_clickthrough": "Peida tööks-mittesobivad(NSFW) manuste hiireklõpsu taha",
+        "profile_background": "Profiilitaust",
+        "profile_banner": "Profiilibänner",
+        "reply_link_preview": "Luba algpostituse kuvamine vastustes",
+        "set_new_avatar": "Vali uus profiilipilt",
+        "set_new_profile_background": "Vali uus profiilitaust",
+        "set_new_profile_banner": "Vali uus profiilibänner",
+        "settings": "Sätted",
+        "theme": "Teema",
+        "user_settings": "Kasutaja sätted",
+        "subject_line_noop": "Ära kopeeri",
+        "subject_line_mastodon": "Nagu mastodon: kopeeri nagu on",
+        "subject_line_email": "Nagu e-post: \"vs: pealkiri\"",
+        "subject_line_behavior": "Kopeeri pealkiri vastamisel",
+        "subject_input_always_show": "Alati kuva pealkirja välja",
+        "minimal_scopes_mode": "Peida postituse nähtavussätted",
+        "scope_copy": "Kopeeri nähtavussätted vastamisel (Privaatsed on alati kopeeritud)",
+        "security_tab": "Turvalisus",
+        "search_user_to_mute": "Otsi, keda soovid vaigistada",
+        "search_user_to_block": "Otsi, keda soovid blokeerida",
+        "saving_ok": "Sätted salvestatud",
+        "saving_err": "Sätete salvestamine ebaõnnestus",
+        "autohide_floating_post_button": "Automaatselt peida uue postituse nupp (mobiilil)",
+        "reply_visibility_self": "Näita ainult vastuseid, mis on suunatud mulle",
+        "reply_visibility_following": "Näita ainult vastuseid, mis on suunatud mulle või kasutajatele, keda jälgin",
+        "reply_visibility_all": "Näita kõiki vastuseid",
+        "replies_in_timeline": "Vastused ajajoonel",
+        "radii_help": "Liidese ümardamine (pikslites)",
+        "profile_tab": "Profiil",
+        "presets": "Salvestatud sätted",
+        "pause_on_unfocused": "Peata reaalajas voog kui leht pole fookuses",
+        "panelRadius": "Paneelid",
+        "revoke_token": "Keela",
+        "valid_until": "Kehtiv kuni",
+        "refresh_token": "Värskendustoken",
+        "token": "Token",
+        "oauth_tokens": "OAuth tokenid",
+        "show_moderator_badge": "Näita Moderaator silti mu profiilil",
+        "show_admin_badge": "Näita Admin silti mu profiilil",
+        "hide_followers_count_description": "Ära näita minu jälgijate arvu",
+        "hide_follows_count_description": "Ära näita minu jälgimiste arvu",
+        "hide_followers_description": "Ära näita minu jälgijaid",
+        "hide_follows_description": "Ära näita minu jälgimisi",
+        "no_mutes": "Vaigistusi pole",
+        "no_blocks": "Blokeeringuid pole",
+        "no_rich_text_description": "Muuda kõik postitused lihttekstiks",
+        "notification_visibility_emoji_reactions": "Reaktsioonid",
+        "notification_visibility_moves": "Kasutaja kolimised",
+        "notification_visibility_repeats": "Taaspostitused",
+        "notification_visibility_mentions": "Mainimised",
+        "notification_visibility_likes": "Lemmikud",
+        "notification_visibility_follows": "Jälgimised",
+        "notification_visibility": "Milliseid teateid kuvatakse",
+        "new_password": "Uus salasõna",
+        "new_email": "Uus e-post",
+        "use_contain_fit": "Näita eelvaadetes täis suuruses pilte",
+        "play_videos_in_modal": "Näita videoid eraldi raamis",
+        "mutes_tab": "Vaigistused",
+        "loop_video_silent_only": "Loop videod, millel pole heli (nt. Mastodoni \"gifid\")",
+        "loop_video": "Loop videod",
+        "lock_account_description": "Piira oma konto ainult lubatud jälgijatele",
+        "links": "Lingid",
+        "limited_availability": "Pole Teie veebilehitsejas saadaval",
+        "invalid_theme_imported": "Valitud fail ei ole Pleroma kujundus. Kujundusele muudatusi ei tehtud.",
+        "interfaceLanguage": "Liidese keel",
+        "interface": "Liides",
+        "instance_default_simple": "(vaikimisi)",
+        "instance_default": "(vaikimisi: {value})",
+        "checkboxRadius": "Märkeruudud",
+        "inputRadius": "Sisestuskastid",
+        "import_theme": "Lae sätted",
+        "import_followers_from_a_csv_file": "Impordi jälgimised csv failist",
+        "import_blocks_from_a_csv_file": "Impordi blokeeringud csv failist",
+        "hide_filtered_statuses": "Peida filtreeritud staatused",
+        "hide_user_stats": "Peida kasutaja statistika (nt. jälgijate arv)",
+        "hide_post_stats": "Peida postituse statistika (nt. lemmikute arv)",
+        "use_one_click_nsfw": "Ava NSFW manused ühe klikiga",
+        "preload_images": "Piltide eellaadimine",
+        "hide_isp": "Peida instantsipõhine paneel",
+        "max_thumbnails": "Maksimaalne lubatud eelvaadete arv postituste kohta",
+        "hide_muted_posts": "Peida vaigistatud kasutajate postitused",
+        "general": "Üldine",
+        "foreground": "Esiplaan",
+        "accent": "Rõhk",
+        "follows_imported": "Jälgimised imporditud! Nende töötlemine võtab natuke aega.",
+        "follow_import_error": "Jälgimiste importimisel tekkis viga",
+        "follow_import": "Impordi jälgimised",
+        "follow_export_button": "Ekspordi oma jälgimised csv failiks",
+        "follow_export": "Ekspordi jälgimised",
+        "export_theme": "Salvesta sätted",
+        "emoji_reactions_on_timeline": "Näita reaktsioone ajajoonel",
+        "pad_emoji": "Lisa emotikonidele tühikud ette ja järgi neid menüüst valides",
+        "avatar_size_instruction": "Profiilipildi soovitatud minimaalne suurus on 150x150 pikslit.",
+        "domain_mutes": "Domeenid",
+        "discoverable": "Luba selle konto ilmumine otsingutulemustes ning muudes teenustes",
+        "delete_account_instructions": "Konto kustutamise kinnitamiseks sisestage oma salasõna.",
+        "delete_account_error": "Teie konto kustutamisel tekkis viga. Kui see jätkub, palun võtke kontakti administraatoriga.",
+        "delete_account_description": "Jäädavalt kustuta oma andmed ja konto.",
+        "delete_account": "Kustuta konto",
+        "default_vis": "Vaikimisi nähtavus",
+        "data_import_export_tab": "Andmete import / eksport",
+        "current_password": "Praegune salasõna",
+        "confirm_new_password": "Kinnita uus salasõna",
+        "composing": "Koostamine",
+        "collapse_subject": "Peida postituste pealkirjad",
+        "changed_password": "Salasõna edukalt muudetud!",
+        "change_password_error": "Esines viga salasõna muutmisel.",
+        "change_password": "Muuda salasõna",
+        "changed_email": "E-post edukalt muudetud!",
+        "change_email_error": "Esines viga e-posti muutmisel.",
+        "change_email": "Muuda e-posti",
+        "cRed": "Punane (Tühista)",
+        "cOrange": "Oranž (Lisa lemmikuks)",
+        "cGreen": "Roheline (Taaspostita)",
+        "cBlue": "Sinine (Vasta, jälgi)",
+        "btnRadius": "Nupud",
+        "blocks_tab": "Blokeeringud",
+        "blocks_imported": "Blokeeringud imporditud! Nende töötlemine võtab natuke aega.",
+        "block_import_error": "Blokeeringute importimisel esines viga",
+        "block_import": "Blokeeringute import",
+        "block_export_button": "Ekspordi oma blokeeringud csv failiks",
+        "block_export": "Blokeeringute eksport",
+        "background": "Taust",
+        "avatarRadius": "Profiilipildid",
+        "avatarAltRadius": "Profiilipildid (Teavitused)",
+        "attachmentRadius": "Manused",
+        "allow_following_move": "Luba automaatjälgimine kui jälgitav konto kolib",
+        "mfa": {
+            "verify": {
+                "desc": "Et lubada kaheastmelist autentimist, sisestage kood oma äpist:"
+            },
+            "scan": {
+                "desc": "Kasutades oma kaheastmelise autentimise äppi, skännige see QR kood või sisestage tekstiline võti:",
+                "secret_code": "Võti",
+                "title": "Skänni"
+            },
+            "authentication_methods": "Autentimismeetodid",
+            "recovery_codes_warning": "Kirjutage need koodid üles ning hoidke need kindlas kohas. Kui Te kaotate ligipääsu oma kaheastmelise autentimise äppile ning nendele koodidele, ei ole Teil võimalik oma kontosse sisse logida.",
+            "waiting_a_recovery_codes": "Laen taastekoode…",
+            "recovery_codes": "Taastekoodid.",
+            "warning_of_generate_new_codes": "Kui Te loote uued taastekoodid, Teie vanad koodid ei tööta enam.",
+            "generate_new_recovery_codes": "Loo uued taastekoodid",
+            "title": "Kaheastmeline autentimine",
+            "confirm_and_enable": "Kinnita & luba OTP",
+            "wait_pre_setup_otp": "sean üles OTP",
+            "setup_otp": "Sea üles OTP",
+            "otp": "OTP"
+        },
+        "enter_current_password_to_confirm": "Sisetage isiku tõestamiseks oma salasõna",
+        "security": "Turvalisus",
+        "app_name": "Rakenduse nimi"
+    },
+    "timeline": {
+        "conversation": "Vestlus",
+        "error_fetching": "Viga uuenduste laadimisel",
+        "load_older": "Kuva vanemaid staatuseid",
+        "show_new": "Näita uusi",
+        "up_to_date": "Uuendatud"
+    },
+    "user_card": {
+        "block": "Blokeeri",
+        "blocked": "Blokeeritud!",
+        "follow": "Jälgi",
+        "followees": "Jälgitavaid",
+        "followers": "Jälgijaid",
+        "following": "Jälgin!",
+        "follows_you": "Jälgib sind!",
+        "mute": "Vaigista",
+        "muted": "Vaigistatud",
+        "per_day": "päevas",
+        "statuses": "Staatuseid"
+    },
+    "about": {
+        "mrf": {
+            "mrf_policies_desc": "MRF poliitikad mõjutavad selle instansi föderatsiooni käitumist.    Järgmised poliitikad on lubatud:",
+            "simple": {
+                "media_nsfw_desc": "See instants määrab nendest instantsidest postituste meedia sensitiivseks:",
+                "media_nsfw": "Meedia määratakse sensitiivseks",
+                "media_removal_desc": "See instants eemaldab meedia postitustelt nendest instantsidest:",
+                "media_removal": "Meedia eemaldamine",
+                "ftl_removal_desc": "See instants eemaldab postitused nendelt instantsidest \"Kogu teatud võrgu\" ajajoonelt:",
+                "ftl_removal": "\"Kogu teatud võrgu\" ajajoonelt eemaldamine",
+                "quarantine_desc": "See instants saadab ainult avalikke postitusi järgmistele instantsidele:",
+                "quarantine": "Karantiini",
+                "reject_desc": "See instants ei luba sõnumeid nendest instantsidest:",
+                "reject": "Keela",
+                "accept_desc": "See instants lubab sõnumeid ainult nendest instantsidest:",
+                "accept": "Luba",
+                "simple_policies": "Instansi-omased poliitikad"
+            },
+            "mrf_policies": "Lubatud MRF poliitikad",
+            "keyword": {
+                "is_replaced_by": "→",
+                "replace": "Vaheta",
+                "reject": "Lükka tagasi",
+                "ftl_removal": "\"Kogu teatud võrgu\" ajajoonelt eemaldamine",
+                "keyword_policies": "Võtmesõna poliitikad"
+            },
+            "federation": "Föderatsioon"
+        },
+        "staff": "Personal"
+    },
+    "selectable_list": {
+        "select_all": "Vali kõik"
+    },
+    "remote_user_resolver": {
+        "error": "Ei leitud.",
+        "searching_for": "Otsin",
+        "remote_user_resolver": "Kaugkasutaja leidja"
+    },
+    "interactions": {
+        "load_older": "Laadi vanemad interaktsioonid",
+        "moves": "Kasutaja kolimised",
+        "follows": "Uued jälgimised",
+        "favs_repeats": "Taaspostitused ja lemmikud"
+    },
+    "emoji": {
+        "load_all": "Laen kõik {emojiAmount} emotikoni",
+        "load_all_hint": "Laadisin esimesed {saneAmount} emotikoni, kõike laadides võib esineda probleeme jõudlusega.",
+        "unicode": "Unicode emotikonid",
+        "custom": "Kohandatud emotikonid",
+        "add_emoji": "Lisa emotikon",
+        "search_emoji": "Otsi emotikone",
+        "keep_open": "Hoia valija lahti",
+        "emoji": "Emotikonid",
+        "stickers": "Kleepsud"
+    },
+    "polls": {
+        "not_enough_options": "Liiga vähe unikaalseid valikuid hääletuses",
+        "expired": "Hääletus lõppes {0} tagasi",
+        "expires_in": "Hääletus lõppeb {0}",
+        "expiry": "Hääletuse vanus",
+        "multiple_choices": "Mitu vastust",
+        "single_choice": "Üks vastus",
+        "type": "Hääletuse tüüp",
+        "vote": "Hääleta",
+        "votes": "häält",
+        "option": "Valik",
+        "add_option": "Lisa valik",
+        "add_poll": "Lisa küsitlus"
+    },
+    "media_modal": {
+        "next": "Järgmine",
+        "previous": "Eelmine"
+    },
+    "importer": {
+        "error": "Faili importimisel tekkis viga.",
+        "success": "Import õnnestus.",
+        "submit": "Esita"
+    },
+    "image_cropper": {
+        "cancel": "Tühista",
+        "save_without_cropping": "Salvesta muudatusteta",
+        "save": "Salvesta",
+        "crop_picture": "Modifitseeri pilti"
+    },
+    "features_panel": {
+        "who_to_follow": "Keda jälgida",
+        "title": "Featuurid",
+        "text_limit": "Tekstilimiit",
+        "scope_options": "Ulatuse valikud",
+        "media_proxy": "Meedia proksi",
+        "gopher": "Gopher",
+        "chat": "Vestlus"
+    },
+    "exporter": {
+        "processing": "Töötlemine, Teilt küsitakse varsti faili allalaadimist",
+        "export": "Ekspordi"
+    },
+    "domain_mute_card": {
+        "unmute_progress": "Eemaldan vaigistuse…",
+        "unmute": "Ära vaigista",
+        "mute_progress": "Vaigistan…",
+        "mute": "Vaigista"
+    },
+    "chat": {
+        "title": "Vestlus"
+    }
 }

From 49d0a056448114c4bc9daceec699abe970707382 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier"
 <contact+translate.pleroma.social@hacktivis.me>
Date: Wed, 3 Jun 2020 14:29:03 +0000
Subject: [PATCH 145/415] Translated using Weblate (French)

Currently translated at 99.8% (612 of 613 strings)

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

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 61877a3a..2bd8e91d 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -167,7 +167,7 @@
             "generate_new_recovery_codes": "Générer de nouveaux codes de récupération",
             "warning_of_generate_new_codes": "Quand vous générez de nouveauc codes de récupération, vos anciens codes ne fonctionnerons plus.",
             "recovery_codes": "Codes de récupération.",
-            "waiting_a_recovery_codes": "Récéption des codes de récupération…",
+            "waiting_a_recovery_codes": "Réception des codes de récupération…",
             "recovery_codes_warning": "Écrivez les codes ou sauvez les quelquepart sécurisé - sinon vous ne les verrez plus jamais. Si vous perdez l'accès à votre application de double authentification et codes de récupération vous serez vérouillé en dehors de votre compte.",
             "authentication_methods": "Methodes d'authentification",
             "scan": {
@@ -210,7 +210,7 @@
         "data_import_export_tab": "Import / Export des Données",
         "default_vis": "Visibilité par défaut",
         "delete_account": "Supprimer le compte",
-        "delete_account_description": "Supprimer définitivement votre compte et tous vos statuts.",
+        "delete_account_description": "Supprimer définitivement vos données et désactiver votre compte.",
         "delete_account_error": "Il y a eu un problème lors de la tentative de suppression de votre compte. Si le problème persiste, contactez l'administrateur⋅ice de cette instance.",
         "delete_account_instructions": "Indiquez votre mot de passe ci-dessous pour confirmer la suppression de votre compte.",
         "avatar_size_instruction": "La taille minimale recommandée pour l'image de l'avatar est de 150x150 pixels.",
@@ -343,7 +343,13 @@
                     "upgraded_from_v2": "PleromaFE à été mis à jour, le thème peut être un peu différent que dans vos souvenirs.",
                     "v2_imported": "Le fichier que vous avez importé vient d'un version antérieure. Nous essayons de maximizer la compatibilité mais il peu y avoir quelques incohérences.",
                     "future_version_imported": "Le fichier importé viens d'une version postérieure de PleromaFE.",
-                    "older_version_imported": "Le fichier importé viens d'une version antérieure de PleromaFE."
+                    "older_version_imported": "Le fichier importé viens d'une version antérieure de PleromaFE.",
+                    "snapshot_source_mismatch": "Conflict de version : Probablement due à un retour arrière puis remise à jour de la version de PleromaFE, si vous avez charger le thème en utilisant une version antérieure vous voulez probablement utiliser la version antérieure, autrement utiliser la version postérieure.",
+                    "migration_napshot_gone": "Pour une raison inconnue l'instantané est manquant, des parties peuvent rendre différentes que dans vos souvenirs.",
+                    "migration_snapshot_ok": "Pour être sûr un instantanée du thème à été chargé. Vos pouvez essayer de charger ses données.",
+                    "fe_downgraded": "Retour en arrière de la version de PleromaFE.",
+                    "fe_upgraded": "Le moteur de thème PleromaFE à été mis à jour après un changement de version.",
+                    "snapshot_missing": "Aucun instantané du thème à été trouvé dans le fichier, il peut y avoir un rendu différent à la vision originelle."
                 },
                 "keep_as_is": "Garder tel-quel",
                 "use_source": "Nouvelle version"
@@ -392,7 +398,10 @@
                 "selectedPost": "Message sélectionné",
                 "selectedMenu": "Objet sélectionné du menu",
                 "disabled": "Désactivé",
-                "tabs": "Onglets"
+                "tabs": "Onglets",
+                "toggled": "(Dés)activé",
+                "highlight": "Éléments mis en valeur",
+                "popover": "Infobulles, menus"
             },
             "radii": {
                 "_tab_label": "Rondeur"
@@ -482,7 +491,9 @@
         "useStreamingApi": "Recevoir les messages et notifications en temps réel",
         "notification_setting_filters": "Filtres",
         "notification_setting_privacy_option": "Masquer l'expéditeur et le contenu des notifications push",
-        "notification_setting_privacy": "Intimité"
+        "notification_setting_privacy": "Intimité",
+        "hide_followers_count_description": "Masquer le nombre d'abonnés",
+        "accent": "Accent"
     },
     "timeline": {
         "collapse": "Fermer",
@@ -666,10 +677,13 @@
         "unicode": "émoji unicode",
         "load_all": "Charger tout les {emojiAmount} émojis",
         "load_all_hint": "{saneAmount} émojis chargé, charger tout les émojis peuvent causer des problèmes de performances.",
-        "stickers": "Stickers"
+        "stickers": "Stickers",
+        "keep_open": "Garder le sélecteur ouvert"
     },
     "remote_user_resolver": {
-        "error": "Non trouvé."
+        "error": "Non trouvé.",
+        "searching_for": "Rechercher",
+        "remote_user_resolver": "Résolution de compte distant"
     },
     "time": {
         "minutes_short": "{0}min",

From 1c4be95384cc25de8c0e404599dd953ca54e2e61 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 3 Jun 2020 14:30:26 +0000
Subject: [PATCH 146/415] Translated using Weblate (French)

Currently translated at 99.8% (612 of 613 strings)

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

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 2bd8e91d..719bde76 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -31,7 +31,8 @@
         "disable": "Désactiver",
         "enable": "Activer",
         "confirm": "Confirmer",
-        "verify": "Vérifier"
+        "verify": "Vérifier",
+        "dismiss": "Rejeter"
     },
     "image_cropper": {
         "crop_picture": "Rogner l'image",

From 419fdd58a55889646607ba388aa7413faf9eea8b Mon Sep 17 00:00:00 2001
From: Evert Prants <evert@lunasqu.ee>
Date: Fri, 5 Jun 2020 08:05:11 +0000
Subject: [PATCH 147/415] Translated using Weblate (Estonian)

Currently translated at 61.5% (377 of 613 strings)

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

diff --git a/src/i18n/et.json b/src/i18n/et.json
index ead7ae67..d7bc3a9d 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -55,13 +55,13 @@
     },
     "notifications": {
         "followed_you": "alustas sinu jälgimist",
-        "notifications": "Teavitused",
+        "notifications": "Teated",
         "read": "Loe!",
         "reacted_with": "reageeris {0}",
-        "migrated_to": "migreerus",
-        "no_more_notifications": "Rohkem teavitusi ei ole",
+        "migrated_to": "kolis",
+        "no_more_notifications": "Rohkem teateid ei ole",
         "repeated_you": "taaspostitas su staatuse",
-        "load_older": "Laadi vanemad teavitused",
+        "load_older": "Laadi vanemad teated",
         "follow_request": "soovib Teid jälgida",
         "favorited_you": "lisas su staatuse lemmikuks",
         "broken_favorite": "Tundmatu staatus, otsin…"
@@ -251,7 +251,7 @@
         "block_export": "Blokeeringute eksport",
         "background": "Taust",
         "avatarRadius": "Profiilipildid",
-        "avatarAltRadius": "Profiilipildid (Teavitused)",
+        "avatarAltRadius": "Profiilipildid (Teated)",
         "attachmentRadius": "Manused",
         "allow_following_move": "Luba automaatjälgimine kui jälgitav konto kolib",
         "mfa": {
@@ -277,7 +277,60 @@
         },
         "enter_current_password_to_confirm": "Sisetage isiku tõestamiseks oma salasõna",
         "security": "Turvalisus",
-        "app_name": "Rakenduse nimi"
+        "app_name": "Rakenduse nimi",
+        "style": {
+            "switcher": {
+                "help": {
+                    "snapshot_present": "Kujunduse eelvaade on laetud, nii et kõik väärtused on üle kirjutatud. Te saate laadida ka kujunduse päris sisu.",
+                    "older_version_imported": "Teie imporditud fail oli loodud vanemas versioonis.",
+                    "future_version_imported": "Teie imporditud fail oli loodud uuemas versioonis.",
+                    "v2_imported": "Teie imporditud fail oli vanema versiooni jaoks. Me üritame hoida ühilduvust, kuid ikkagi võib esineda erinevusi.",
+                    "upgraded_from_v2": "PleromaFE-d uuendati, teie kujundus võib välja näha natuke erinev, kui mäletate."
+                },
+                "use_source": "Uus versioon",
+                "use_snapshot": "Vana versioon",
+                "keep_as_is": "Jäta nii, nagu on",
+                "load_theme": "Lae kujundus",
+                "clear_opacity": "Tühista läbipaistvus",
+                "clear_all": "Tühista kõik",
+                "reset": "Taasta algne",
+                "keep_fonts": "Jäta fondid",
+                "keep_roundness": "Jäta ümarus",
+                "keep_opacity": "Jäta läbipaistvus",
+                "keep_shadows": "Jäta varjud",
+                "keep_color": "Jäta värvid"
+            }
+        },
+        "enable_web_push_notifications": "Luba veebipõhised push-teated",
+        "notification_blocks": "Kasutaja blokeerimisel ei tule neilt enam teateid ning nendele teilt ka mitte.",
+        "notification_setting_privacy_option": "Peida saatja ning sisu push-teadetelt",
+        "notification_setting": "Saa teateid nendelt:",
+        "notifications": "Teated",
+        "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.",
+        "notification_setting_privacy": "Privaatsus",
+        "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi",
+        "notification_setting_followers": "Kasutajatelt, kes jälgivad sind",
+        "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi",
+        "notification_setting_follows": "Kasutajatelt, keda jälgid",
+        "notification_setting_filters": "Filtrid",
+        "greentext": "Meemi nooled",
+        "fun": "Naljad",
+        "values": {
+            "true": "jah",
+            "false": "ei"
+        },
+        "upload_a_photo": "Lae üles foto",
+        "type_domains_to_mute": "Trüki siia domeene, mida vaigistada",
+        "tooltipRadius": "Vihjed/hoiatused",
+        "theme_help_v2_1": "Te saate ka mõndade komponentide värvust ning läbipaistvust üle kirjutada vajutades ruudule. Kasuta \"Tühista kõik\" nuppu, et need tühistada.",
+        "theme_help": "Kasuta hex värvikoode (#rrggbb) oma kujunduse isikupärastamiseks.",
+        "text": "Tekst",
+        "useStreamingApiWarning": "(Pole soovituslik, eksperimentaalne, on teada, et jätab postitusi vahele)",
+        "useStreamingApi": "Saa postitusi ning teateid reaalajas",
+        "user_mutes": "Kasutajad",
+        "streaming": "Luba uute postituste automaatvoog kui oled lehekülje alguses",
+        "stop_gifs": "Mängi GIFid hiirega ületades",
+        "post_status_content_type": "Postituse sisutüüp"
     },
     "timeline": {
         "conversation": "Vestlus",

From 8b43893c47f4025c0fca615ad41b7cdbfc5eddbf Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Fri, 5 Jun 2020 11:19:03 +0000
Subject: [PATCH 148/415] Translated using Weblate (Italian)

Currently translated at 65.7% (403 of 613 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 6a87b6ad..cddcb489 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -192,7 +192,9 @@
                     "fe_downgraded": "L'interfaccia è stata portata ad una versione precedente.",
                     "fe_upgraded": "Lo schema dei temi è stato aggiornato insieme all'interfaccia.",
                     "snapshot_missing": "Il tema non è provvisto di anteprima, quindi potrebbe essere diverso da come appare.",
-                    "snapshot_present": "Tutti i valori sono sostituiti dall'anteprima del tema. Puoi invece caricare i suoi contenuti."
+                    "snapshot_present": "Tutti i valori sono sostituiti dall'anteprima del tema. Puoi invece caricare i suoi contenuti.",
+                    "snapshot_source_mismatch": "Conflitto di versione: probabilmente l'interfaccia è stata portata ad una versione precedente e poi aggiornata di nuovo. Se hai modificato il tema con una versione precedente dell'interfaccia, usa la vecchia versione del tema, altrimenti puoi usare la nuova.",
+                    "migration_napshot_gone": "Anteprima del tema non trovata, non tutto potrebbe essere come ricordi."
                 },
                 "use_source": "Nuova versione",
                 "use_snapshot": "Versione precedente",
@@ -207,6 +209,10 @@
                 "keep_opacity": "Mantieni opacità",
                 "keep_shadows": "Mantieni ombre",
                 "keep_color": "Mantieni colori"
+            },
+            "common": {
+                "opacity": "Opacità",
+                "color": "Colore"
             }
         },
         "enable_web_push_notifications": "Abilita notifiche web push",

From ebf2ce84fdd7e175f5715452400ec3bdf789310b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 6 Jun 2020 23:08:52 +0300
Subject: [PATCH 149/415] alignment fixes

---
 .../notifications/notifications.scss          |  6 +-
 src/components/status/status.vue              | 66 ++++++++++++++-----
 src/i18n/en.json                              |  4 +-
 3 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 9efcfcf8..b675af5a 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -36,6 +36,8 @@
   border-bottom: 1px solid;
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
+  word-wrap: break-word;
+  word-break: break-word;
 
   &:hover .animated.avatar {
     canvas {
@@ -46,10 +48,6 @@
     }
   }
 
-  .muted {
-    padding: .25em .6em;
-  }
-
   .non-mention {
     display: flex;
     flex: 1;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 3137cb9d..336f912a 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -17,7 +17,7 @@
     </div>
     <template v-if="muted && !isPreview">
       <div class="media status container muted">
-        <small>
+        <small class="username">
           <i
             v-if="muted && retweet"
             class="button-icon icon-retweet"
@@ -27,18 +27,23 @@
           </router-link>
         </small>
         <small
-          v-if="showReasonMutedThread && muteWordHits.length === 0"
-          class="muted-thread"
+          v-if="showReasonMutedThread"
+          class="mute-thread"
         >
           {{ $t('status.thread_muted') }}
         </small>
         <small
           v-if="showReasonMutedThread && muteWordHits.length > 0"
-          class="muted-Thread"
+          class="mute-thread"
         >
           {{ $t('status.thread_muted_and_words') }}
         </small>
-        <small class="mute-words">{{ muteWordHits.join(', ') }}</small>
+        <small
+          class="mute-words"
+          :title="muteWordHits.join(', ')"
+        >
+          {{ muteWordHits.join(', ') }}
+        </small>
         <a
           href="#"
           class="unmute"
@@ -653,19 +658,48 @@ $status-margin: 0.75em;
 }
 
 .muted {
-  padding: 0.25em 0.5em;
-  button {
+  padding: .25em .6em;
+  height: 1.2em;
+  line-height: 1.2em;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: flex;
+  flex-wrap: nowrap;
+
+  .username, .mute-thread, .mute-words {
+    word-wrap: normal;
+    word-break: normal;
+    white-space: nowrap;
+  }
+
+  .username, .mute-words {
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  .username {
+    flex: 0 1 auto;
+    margin-right: .2em;
+  }
+
+  .mute-thread {
+    flex: 0 0 auto;
+  }
+
+  .mute-words {
+    flex: 1 0 5em;
+    margin-left: .2em;
+    &::before {
+      content: ' '
+    }
+  }
+
+  .unmute {
+    flex: 0 0 auto;
+    margin-left: auto;
+    display: block;
     margin-left: auto;
   }
-
-  .muted-thread, .mute-words {
-    margin-left: 10px;
-  }
-}
-
-a.unmute {
-  display: block;
-  margin-left: auto;
 }
 
 .reply-body {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 61b818a6..5bcf074b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -622,8 +622,8 @@
     "unmute_conversation": "Unmute conversation",
     "status_unavailable": "Status unavailable",
     "copy_link": "Copy link to status",
-    "thread_muted": "Conversation muted",
-    "thread_muted_and_words": "Conversation muted, contains filtered words:"
+    "thread_muted": "Thread muted",
+    "thread_muted_and_words": ", has words:"
   },
   "user_card": {
     "approve": "Approve",

From 7d695fc8f285357393a669d776a1fa1313b0b16d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 6 Jun 2020 23:22:58 +0300
Subject: [PATCH 150/415] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a44fb163..721a1b76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Removed the use of with_move parameters when fetching notifications
 
+### Fixed
+- Multiple issues with muted statuses/notifications
+
 ## [Unreleased patch]
 ### Add
 - Added private notifications option for push notifications

From 03952832b4363c651266d14bf14a20a0215e6c3c Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 6 Jun 2020 22:43:56 +0200
Subject: [PATCH 151/415] Fix the cropped button shadow in 2FA settings

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

diff --git a/src/components/user_settings/mfa.vue b/src/components/user_settings/mfa.vue
index 14ea10a1..2c1c786c 100644
--- a/src/components/user_settings/mfa.vue
+++ b/src/components/user_settings/mfa.vue
@@ -144,7 +144,6 @@
 }
 .mfa-settings {
   .mfa-heading, .method-item {
-    overflow: hidden;
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;

From 68482fd3a6870514c7e8bd0fe433f24711e97ce9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 7 Jun 2020 00:15:10 +0300
Subject: [PATCH 152/415] move helpers out of tabs directory

---
 .../settings_modal/{tabs => }/helpers/shared_computed_object.js | 0
 src/components/settings_modal/tabs/filtering_tab.js             | 2 +-
 src/components/settings_modal/tabs/general_tab.js               | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/components/settings_modal/{tabs => }/helpers/shared_computed_object.js (100%)

diff --git a/src/components/settings_modal/tabs/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
similarity index 100%
rename from src/components/settings_modal/tabs/helpers/shared_computed_object.js
rename to src/components/settings_modal/helpers/shared_computed_object.js
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index dd7ecaf7..224a7f47 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,7 +1,7 @@
 import { filter, trim } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 
-import SharedComputedObject from './helpers/shared_computed_object.js'
+import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 const FilteringTab = {
   data () {
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 9df1da79..0eb37e44 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -1,7 +1,7 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
-import SharedComputedObject from './helpers/shared_computed_object.js'
+import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 const GeneralTab = {
   data () {

From 1e554ee2876c675cacc0e4f0bff59b320159432f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 7 Jun 2020 18:19:34 +0300
Subject: [PATCH 153/415] indent 2

---
 src/i18n/ar.json |  406 ++++++-------
 src/i18n/de.json | 1156 +++++++++++++++++------------------
 src/i18n/en.json | 1478 ++++++++++++++++++++++-----------------------
 src/i18n/es.json | 1270 +++++++++++++++++++--------------------
 src/i18n/et.json |  906 ++++++++++++++--------------
 src/i18n/fi.json | 1482 ++++++++++++++++++++++-----------------------
 src/i18n/fr.json | 1480 ++++++++++++++++++++++-----------------------
 src/i18n/it.json |  964 +++++++++++++++---------------
 src/i18n/nl.json | 1488 +++++++++++++++++++++++-----------------------
 src/i18n/pl.json | 1478 ++++++++++++++++++++++-----------------------
 src/i18n/ru.json |  950 ++++++++++++++---------------
 src/i18n/te.json |  700 +++++++++++-----------
 src/i18n/zh.json | 1390 +++++++++++++++++++++----------------------
 13 files changed, 7574 insertions(+), 7574 deletions(-)

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 72e3010f..8bba2b97 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -1,206 +1,206 @@
 {
-    "chat": {
-        "title": "الدردشة"
+  "chat": {
+    "title": "الدردشة"
+  },
+  "features_panel": {
+    "chat": "الدردشة",
+    "gopher": "غوفر",
+    "media_proxy": "بروكسي الوسائط",
+    "scope_options": "",
+    "text_limit": "الحد الأقصى للنص",
+    "title": "الميّزات",
+    "who_to_follow": "للمتابعة"
+  },
+  "finder": {
+    "error_fetching_user": "خطأ أثناء جلب صفحة المستخدم",
+    "find_user": "البحث عن مستخدِم"
+  },
+  "general": {
+    "apply": "تطبيق",
+    "submit": "إرسال"
+  },
+  "login": {
+    "login": "تسجيل الدخول",
+    "logout": "الخروج",
+    "password": "الكلمة السرية",
+    "placeholder": "مثال lain",
+    "register": "انشاء حساب",
+    "username": "إسم المستخدم"
+  },
+  "nav": {
+    "chat": "الدردشة المحلية",
+    "friend_requests": "طلبات المتابَعة",
+    "mentions": "الإشارات",
+    "public_tl": "الخيط الزمني العام",
+    "timeline": "الخيط الزمني",
+    "twkn": "كافة الشبكة المعروفة"
+  },
+  "notifications": {
+    "broken_favorite": "منشور مجهول، جارٍ البحث عنه…",
+    "favorited_you": "أعجِب بمنشورك",
+    "followed_you": "يُتابعك",
+    "load_older": "تحميل الإشعارات الأقدم",
+    "notifications": "الإخطارات",
+    "read": "مقروء!",
+    "repeated_you": "شارَك منشورك"
+  },
+  "post_status": {
+    "account_not_locked_warning": "",
+    "account_not_locked_warning_link": "مقفل",
+    "attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس",
+    "content_type": {
+      "text/plain": "نص صافٍ"
     },
-    "features_panel": {
-        "chat": "الدردشة",
-        "gopher": "غوفر",
-        "media_proxy": "بروكسي الوسائط",
-        "scope_options": "",
-        "text_limit": "الحد الأقصى للنص",
-        "title": "الميّزات",
-        "who_to_follow": "للمتابعة"
-    },
-    "finder": {
-        "error_fetching_user": "خطأ أثناء جلب صفحة المستخدم",
-        "find_user": "البحث عن مستخدِم"
-    },
-    "general": {
-        "apply": "تطبيق",
-        "submit": "إرسال"
-    },
-    "login": {
-        "login": "تسجيل الدخول",
-        "logout": "الخروج",
-        "password": "الكلمة السرية",
-        "placeholder": "مثال lain",
-        "register": "انشاء حساب",
-        "username": "إسم المستخدم"
-    },
-    "nav": {
-        "chat": "الدردشة المحلية",
-        "friend_requests": "طلبات المتابَعة",
-        "mentions": "الإشارات",
-        "public_tl": "الخيط الزمني العام",
-        "timeline": "الخيط الزمني",
-        "twkn": "كافة الشبكة المعروفة"
-    },
-    "notifications": {
-        "broken_favorite": "منشور مجهول، جارٍ البحث عنه…",
-        "favorited_you": "أعجِب بمنشورك",
-        "followed_you": "يُتابعك",
-        "load_older": "تحميل الإشعارات الأقدم",
-        "notifications": "الإخطارات",
-        "read": "مقروء!",
-        "repeated_you": "شارَك منشورك"
-    },
-    "post_status": {
-        "account_not_locked_warning": "",
-        "account_not_locked_warning_link": "مقفل",
-        "attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس",
-        "content_type": {
-            "text/plain": "نص صافٍ"
-        },
-        "content_warning": "الموضوع (اختياري)",
-        "default": "وصلت للتوّ إلى لوس أنجلس.",
-        "direct_warning": "",
-        "posting": "النشر",
-        "scope": {
-            "direct": "",
-            "private": "",
-            "public": "علني - يُنشر على الخيوط الزمنية العمومية",
-            "unlisted": "غير مُدرَج - لا يُنشَر على الخيوط الزمنية العمومية"
-        }
-    },
-    "registration": {
-        "bio": "السيرة الذاتية",
-        "email": "عنوان البريد الإلكتروني",
-        "fullname": "الإسم المعروض",
-        "password_confirm": "تأكيد الكلمة السرية",
-        "registration": "التسجيل",
-        "token": "رمز الدعوة"
-    },
-    "settings": {
-        "attachmentRadius": "المُرفَقات",
-        "attachments": "المُرفَقات",
-        "autoload": "",
-        "avatar": "الصورة الرمزية",
-        "avatarAltRadius": "الصور الرمزية (الإشعارات)",
-        "avatarRadius": "الصور الرمزية",
-        "background": "الخلفية",
-        "bio": "السيرة الذاتية",
-        "btnRadius": "الأزرار",
-        "cBlue": "أزرق (الرد، المتابَعة)",
-        "cGreen": "أخضر (إعادة النشر)",
-        "cOrange": "برتقالي (مفضلة)",
-        "cRed": "أحمر (إلغاء)",
-        "change_password": "تغيير كلمة السر",
-        "change_password_error": "وقع هناك خلل أثناء تعديل كلمتك السرية.",
-        "changed_password": "تم تغيير كلمة المرور بنجاح!",
-        "collapse_subject": "",
-        "confirm_new_password": "تأكيد كلمة السر الجديدة",
-        "current_avatar": "صورتك الرمزية الحالية",
-        "current_password": "كلمة السر الحالية",
-        "current_profile_banner": "الرأسية الحالية لصفحتك الشخصية",
-        "data_import_export_tab": "تصدير واستيراد البيانات",
-        "default_vis": "أسلوب العرض الافتراضي",
-        "delete_account": "حذف الحساب",
-        "delete_account_description": "حذف حسابك و كافة منشوراتك نهائيًا.",
-        "delete_account_error": "",
-        "delete_account_instructions": "يُرجى إدخال كلمتك السرية أدناه لتأكيد عملية حذف الحساب.",
-        "export_theme": "حفظ النموذج",
-        "filtering": "التصفية",
-        "filtering_explanation": "سيتم إخفاء كافة المنشورات التي تحتوي على هذه الكلمات، كلمة واحدة في كل سطر",
-        "follow_export": "تصدير الاشتراكات",
-        "follow_export_button": "تصدير الاشتراكات كملف csv",
-        "follow_export_processing": "التصدير جارٍ، سوف يُطلَب منك تنزيل ملفك بعد حين",
-        "follow_import": "استيراد الاشتراكات",
-        "follow_import_error": "خطأ أثناء استيراد المتابِعين",
-        "follows_imported": "",
-        "foreground": "الأمامية",
-        "general": "الإعدادات العامة",
-        "hide_attachments_in_convo": "إخفاء المرفقات على المحادثات",
-        "hide_attachments_in_tl": "إخفاء المرفقات على الخيط الزمني",
-        "hide_post_stats": "",
-        "hide_user_stats": "",
-        "import_followers_from_a_csv_file": "",
-        "import_theme": "تحميل نموذج",
-        "inputRadius": "",
-        "instance_default": "",
-        "interfaceLanguage": "لغة الواجهة",
-        "invalid_theme_imported": "",
-        "limited_availability": "غير متوفر على متصفحك",
-        "links": "الروابط",
-        "lock_account_description": "",
-        "loop_video": "",
-        "loop_video_silent_only": "",
-        "name": "الاسم",
-        "name_bio": "الاسم والسيرة الذاتية",
-        "new_password": "كلمة السر الجديدة",
-        "no_rich_text_description": "",
-        "notification_visibility": "نوع الإشعارات التي تريد عرضها",
-        "notification_visibility_follows": "يتابع",
-        "notification_visibility_likes": "الإعجابات",
-        "notification_visibility_mentions": "الإشارات",
-        "notification_visibility_repeats": "",
-        "nsfw_clickthrough": "",
-        "oauth_tokens": "رموز OAuth",
-        "token": "رمز",
-        "refresh_token": "رمز التحديث",
-        "valid_until": "صالح حتى",
-        "revoke_token": "سحب",
-        "panelRadius": "",
-        "pause_on_unfocused": "",
-        "presets": "النماذج",
-        "profile_background": "خلفية الصفحة الشخصية",
-        "profile_banner": "رأسية الصفحة الشخصية",
-        "profile_tab": "الملف الشخصي",
-        "radii_help": "",
-        "replies_in_timeline": "الردود على الخيط الزمني",
-        "reply_link_preview": "",
-        "reply_visibility_all": "عرض كافة الردود",
-        "reply_visibility_following": "",
-        "reply_visibility_self": "",
-        "saving_err": "خطأ أثناء حفظ الإعدادات",
-        "saving_ok": "تم حفظ الإعدادات",
-        "security_tab": "الأمان",
-        "set_new_avatar": "اختيار صورة رمزية جديدة",
-        "set_new_profile_background": "اختيار خلفية جديدة للملف الشخصي",
-        "set_new_profile_banner": "اختيار رأسية جديدة للصفحة الشخصية",
-        "settings": "الإعدادات",
-        "stop_gifs": "",
-        "streaming": "",
-        "text": "النص",
-        "theme": "المظهر",
-        "theme_help": "",
-        "tooltipRadius": "",
-        "user_settings": "إعدادات المستخدم",
-        "values": {
-            "false": "لا",
-            "true": "نعم"
-        }
-    },
-    "timeline": {
-        "collapse": "",
-        "conversation": "محادثة",
-        "error_fetching": "خطأ أثناء جلب التحديثات",
-        "load_older": "تحميل المنشورات القديمة",
-        "no_retweet_hint": "",
-        "repeated": "",
-        "show_new": "عرض الجديد",
-        "up_to_date": "تم تحديثه"
-    },
-    "user_card": {
-        "approve": "قبول",
-        "block": "حظر",
-        "blocked": "تم حظره!",
-        "deny": "رفض",
-        "follow": "اتبع",
-        "followees": "",
-        "followers": "مُتابِعون",
-        "following": "",
-        "follows_you": "يتابعك!",
-        "mute": "كتم",
-        "muted": "تم كتمه",
-        "per_day": "في اليوم",
-        "remote_follow": "مُتابَعة عن بُعد",
-        "statuses": "المنشورات"
-    },
-    "user_profile": {
-        "timeline_title": "الخيط الزمني للمستخدم"
-    },
-    "who_to_follow": {
-        "more": "المزيد",
-        "who_to_follow": "للمتابعة"
+    "content_warning": "الموضوع (اختياري)",
+    "default": "وصلت للتوّ إلى لوس أنجلس.",
+    "direct_warning": "",
+    "posting": "النشر",
+    "scope": {
+      "direct": "",
+      "private": "",
+      "public": "علني - يُنشر على الخيوط الزمنية العمومية",
+      "unlisted": "غير مُدرَج - لا يُنشَر على الخيوط الزمنية العمومية"
     }
-}
\ No newline at end of file
+  },
+  "registration": {
+    "bio": "السيرة الذاتية",
+    "email": "عنوان البريد الإلكتروني",
+    "fullname": "الإسم المعروض",
+    "password_confirm": "تأكيد الكلمة السرية",
+    "registration": "التسجيل",
+    "token": "رمز الدعوة"
+  },
+  "settings": {
+    "attachmentRadius": "المُرفَقات",
+    "attachments": "المُرفَقات",
+    "autoload": "",
+    "avatar": "الصورة الرمزية",
+    "avatarAltRadius": "الصور الرمزية (الإشعارات)",
+    "avatarRadius": "الصور الرمزية",
+    "background": "الخلفية",
+    "bio": "السيرة الذاتية",
+    "btnRadius": "الأزرار",
+    "cBlue": "أزرق (الرد، المتابَعة)",
+    "cGreen": "أخضر (إعادة النشر)",
+    "cOrange": "برتقالي (مفضلة)",
+    "cRed": "أحمر (إلغاء)",
+    "change_password": "تغيير كلمة السر",
+    "change_password_error": "وقع هناك خلل أثناء تعديل كلمتك السرية.",
+    "changed_password": "تم تغيير كلمة المرور بنجاح!",
+    "collapse_subject": "",
+    "confirm_new_password": "تأكيد كلمة السر الجديدة",
+    "current_avatar": "صورتك الرمزية الحالية",
+    "current_password": "كلمة السر الحالية",
+    "current_profile_banner": "الرأسية الحالية لصفحتك الشخصية",
+    "data_import_export_tab": "تصدير واستيراد البيانات",
+    "default_vis": "أسلوب العرض الافتراضي",
+    "delete_account": "حذف الحساب",
+    "delete_account_description": "حذف حسابك و كافة منشوراتك نهائيًا.",
+    "delete_account_error": "",
+    "delete_account_instructions": "يُرجى إدخال كلمتك السرية أدناه لتأكيد عملية حذف الحساب.",
+    "export_theme": "حفظ النموذج",
+    "filtering": "التصفية",
+    "filtering_explanation": "سيتم إخفاء كافة المنشورات التي تحتوي على هذه الكلمات، كلمة واحدة في كل سطر",
+    "follow_export": "تصدير الاشتراكات",
+    "follow_export_button": "تصدير الاشتراكات كملف csv",
+    "follow_export_processing": "التصدير جارٍ، سوف يُطلَب منك تنزيل ملفك بعد حين",
+    "follow_import": "استيراد الاشتراكات",
+    "follow_import_error": "خطأ أثناء استيراد المتابِعين",
+    "follows_imported": "",
+    "foreground": "الأمامية",
+    "general": "الإعدادات العامة",
+    "hide_attachments_in_convo": "إخفاء المرفقات على المحادثات",
+    "hide_attachments_in_tl": "إخفاء المرفقات على الخيط الزمني",
+    "hide_post_stats": "",
+    "hide_user_stats": "",
+    "import_followers_from_a_csv_file": "",
+    "import_theme": "تحميل نموذج",
+    "inputRadius": "",
+    "instance_default": "",
+    "interfaceLanguage": "لغة الواجهة",
+    "invalid_theme_imported": "",
+    "limited_availability": "غير متوفر على متصفحك",
+    "links": "الروابط",
+    "lock_account_description": "",
+    "loop_video": "",
+    "loop_video_silent_only": "",
+    "name": "الاسم",
+    "name_bio": "الاسم والسيرة الذاتية",
+    "new_password": "كلمة السر الجديدة",
+    "no_rich_text_description": "",
+    "notification_visibility": "نوع الإشعارات التي تريد عرضها",
+    "notification_visibility_follows": "يتابع",
+    "notification_visibility_likes": "الإعجابات",
+    "notification_visibility_mentions": "الإشارات",
+    "notification_visibility_repeats": "",
+    "nsfw_clickthrough": "",
+    "oauth_tokens": "رموز OAuth",
+    "token": "رمز",
+    "refresh_token": "رمز التحديث",
+    "valid_until": "صالح حتى",
+    "revoke_token": "سحب",
+    "panelRadius": "",
+    "pause_on_unfocused": "",
+    "presets": "النماذج",
+    "profile_background": "خلفية الصفحة الشخصية",
+    "profile_banner": "رأسية الصفحة الشخصية",
+    "profile_tab": "الملف الشخصي",
+    "radii_help": "",
+    "replies_in_timeline": "الردود على الخيط الزمني",
+    "reply_link_preview": "",
+    "reply_visibility_all": "عرض كافة الردود",
+    "reply_visibility_following": "",
+    "reply_visibility_self": "",
+    "saving_err": "خطأ أثناء حفظ الإعدادات",
+    "saving_ok": "تم حفظ الإعدادات",
+    "security_tab": "الأمان",
+    "set_new_avatar": "اختيار صورة رمزية جديدة",
+    "set_new_profile_background": "اختيار خلفية جديدة للملف الشخصي",
+    "set_new_profile_banner": "اختيار رأسية جديدة للصفحة الشخصية",
+    "settings": "الإعدادات",
+    "stop_gifs": "",
+    "streaming": "",
+    "text": "النص",
+    "theme": "المظهر",
+    "theme_help": "",
+    "tooltipRadius": "",
+    "user_settings": "إعدادات المستخدم",
+    "values": {
+      "false": "لا",
+      "true": "نعم"
+    }
+  },
+  "timeline": {
+    "collapse": "",
+    "conversation": "محادثة",
+    "error_fetching": "خطأ أثناء جلب التحديثات",
+    "load_older": "تحميل المنشورات القديمة",
+    "no_retweet_hint": "",
+    "repeated": "",
+    "show_new": "عرض الجديد",
+    "up_to_date": "تم تحديثه"
+  },
+  "user_card": {
+    "approve": "قبول",
+    "block": "حظر",
+    "blocked": "تم حظره!",
+    "deny": "رفض",
+    "follow": "اتبع",
+    "followees": "",
+    "followers": "مُتابِعون",
+    "following": "",
+    "follows_you": "يتابعك!",
+    "mute": "كتم",
+    "muted": "تم كتمه",
+    "per_day": "في اليوم",
+    "remote_follow": "مُتابَعة عن بُعد",
+    "statuses": "المنشورات"
+  },
+  "user_profile": {
+    "timeline_title": "الخيط الزمني للمستخدم"
+  },
+  "who_to_follow": {
+    "more": "المزيد",
+    "who_to_follow": "للمتابعة"
+  }
+}
diff --git a/src/i18n/de.json b/src/i18n/de.json
index d3eedcb6..a44e58cb 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -1,584 +1,584 @@
 {
-    "chat": {
-        "title": "Chat"
+  "chat": {
+    "title": "Chat"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Medienproxy",
+    "scope_options": "Reichweitenoptionen",
+    "text_limit": "Zeichenlimit",
+    "title": "Funktionen",
+    "who_to_follow": "Wem folgen?"
+  },
+  "finder": {
+    "error_fetching_user": "Fehler beim Suchen des Benutzers",
+    "find_user": "Finde Benutzer"
+  },
+  "general": {
+    "apply": "Anwenden",
+    "submit": "Absenden",
+    "more": "Mehr",
+    "generic_error": "Ein Fehler ist aufgetreten",
+    "optional": "Optional",
+    "show_more": "Zeige mehr",
+    "show_less": "Zeige weniger",
+    "dismiss": "Ablehnen",
+    "cancel": "Abbrechen",
+    "disable": "Deaktivieren",
+    "enable": "Aktivieren",
+    "confirm": "Bestätigen",
+    "verify": "Verifizieren"
+  },
+  "login": {
+    "login": "Anmelden",
+    "description": "Mit OAuth anmelden",
+    "logout": "Abmelden",
+    "password": "Passwort",
+    "placeholder": "z.B. lain",
+    "register": "Registrieren",
+    "username": "Benutzername",
+    "authentication_code": "Authentifizierungscode",
+    "enter_recovery_code": "Gebe einen Wiederherstellungscode ein",
+    "recovery_code": "Wiederherstellungscode",
+    "heading": {
+      "totp": "Zwei-Faktor Authentifizierung",
+      "recovery": "Zwei-Faktor Wiederherstellung"
     },
-    "features_panel": {
-        "chat": "Chat",
-        "gopher": "Gopher",
-        "media_proxy": "Medienproxy",
-        "scope_options": "Reichweitenoptionen",
-        "text_limit": "Zeichenlimit",
-        "title": "Funktionen",
-        "who_to_follow": "Wem folgen?"
+    "hint": "Anmelden um an der Diskussion teilzunehmen",
+    "enter_two_factor_code": "Gebe einen Zwei-Faktor-Code ein"
+  },
+  "nav": {
+    "about": "Über",
+    "back": "Zurück",
+    "chat": "Lokaler Chat",
+    "friend_requests": "Followanfragen",
+    "mentions": "Erwähnungen",
+    "interactions": "Interaktionen",
+    "dms": "Direktnachrichten",
+    "public_tl": "Öffentliche Zeitleiste",
+    "timeline": "Zeitleiste",
+    "twkn": "Das gesamte bekannte Netzwerk",
+    "user_search": "Benutzersuche",
+    "search": "Suche",
+    "preferences": "Voreinstellungen",
+    "administration": "Administration",
+    "who_to_follow": "Wem folgen"
+  },
+  "notifications": {
+    "broken_favorite": "Unbekannte Nachricht, suche danach...",
+    "favorited_you": "favorisierte deine Nachricht",
+    "followed_you": "folgt dir",
+    "load_older": "Ältere Benachrichtigungen laden",
+    "notifications": "Benachrichtigungen",
+    "read": "Gelesen!",
+    "repeated_you": "wiederholte deine Nachricht",
+    "follow_request": "möchte dir folgen",
+    "migrated_to": "migrierte zu",
+    "reacted_with": "reagierte mit {0}",
+    "no_more_notifications": "Keine Benachrichtigungen mehr"
+  },
+  "post_status": {
+    "new_status": "Neuen Status veröffentlichen",
+    "account_not_locked_warning": "Dein Profil ist nicht {0}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
+    "account_not_locked_warning_link": "gesperrt",
+    "attachments_sensitive": "Anhänge als heikel markieren",
+    "content_type": {
+      "text/plain": "Nur Text",
+      "text/bbcode": "BBCode",
+      "text/markdown": "Markdown",
+      "text/html": "HTML"
     },
-    "finder": {
-        "error_fetching_user": "Fehler beim Suchen des Benutzers",
-        "find_user": "Finde Benutzer"
+    "content_warning": "Betreff (optional)",
+    "default": "Sitze gerade im Hofbräuhaus.",
+    "direct_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
+    "posting": "Veröffentlichen",
+    "scope": {
+      "direct": "Direkt - Beitrag nur an erwähnte Profile",
+      "private": "Nur Follower - Beitrag nur für Follower sichtbar",
+      "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
+      "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
     },
-    "general": {
-        "apply": "Anwenden",
-        "submit": "Absenden",
-        "more": "Mehr",
-        "generic_error": "Ein Fehler ist aufgetreten",
-        "optional": "Optional",
-        "show_more": "Zeige mehr",
-        "show_less": "Zeige weniger",
-        "dismiss": "Ablehnen",
-        "cancel": "Abbrechen",
-        "disable": "Deaktivieren",
-        "enable": "Aktivieren",
-        "confirm": "Bestätigen",
-        "verify": "Verifizieren"
-    },
-    "login": {
-        "login": "Anmelden",
-        "description": "Mit OAuth anmelden",
-        "logout": "Abmelden",
-        "password": "Passwort",
-        "placeholder": "z.B. lain",
-        "register": "Registrieren",
-        "username": "Benutzername",
-        "authentication_code": "Authentifizierungscode",
-        "enter_recovery_code": "Gebe einen Wiederherstellungscode ein",
-        "recovery_code": "Wiederherstellungscode",
-        "heading": {
-            "totp": "Zwei-Faktor Authentifizierung",
-            "recovery": "Zwei-Faktor Wiederherstellung"
-        },
-        "hint": "Anmelden um an der Diskussion teilzunehmen",
-        "enter_two_factor_code": "Gebe einen Zwei-Faktor-Code ein"
-    },
-    "nav": {
-        "about": "Über",
-        "back": "Zurück",
-        "chat": "Lokaler Chat",
-        "friend_requests": "Followanfragen",
-        "mentions": "Erwähnungen",
-        "interactions": "Interaktionen",
-        "dms": "Direktnachrichten",
-        "public_tl": "Öffentliche Zeitleiste",
-        "timeline": "Zeitleiste",
-        "twkn": "Das gesamte bekannte Netzwerk",
-        "user_search": "Benutzersuche",
-        "search": "Suche",
-        "preferences": "Voreinstellungen",
-        "administration": "Administration",
-        "who_to_follow": "Wem folgen"
-    },
-    "notifications": {
-        "broken_favorite": "Unbekannte Nachricht, suche danach...",
-        "favorited_you": "favorisierte deine Nachricht",
-        "followed_you": "folgt dir",
-        "load_older": "Ältere Benachrichtigungen laden",
-        "notifications": "Benachrichtigungen",
-        "read": "Gelesen!",
-        "repeated_you": "wiederholte deine Nachricht",
-        "follow_request": "möchte dir folgen",
-        "migrated_to": "migrierte zu",
-        "reacted_with": "reagierte mit {0}",
-        "no_more_notifications": "Keine Benachrichtigungen mehr"
-    },
-    "post_status": {
-        "new_status": "Neuen Status veröffentlichen",
-        "account_not_locked_warning": "Dein Profil ist nicht {0}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
-        "account_not_locked_warning_link": "gesperrt",
-        "attachments_sensitive": "Anhänge als heikel markieren",
-        "content_type": {
-            "text/plain": "Nur Text",
-            "text/bbcode": "BBCode",
-            "text/markdown": "Markdown",
-            "text/html": "HTML"
-        },
-        "content_warning": "Betreff (optional)",
-        "default": "Sitze gerade im Hofbräuhaus.",
-        "direct_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
-        "posting": "Veröffentlichen",
-        "scope": {
-            "direct": "Direkt - Beitrag nur an erwähnte Profile",
-            "private": "Nur Follower - Beitrag nur für Follower sichtbar",
-            "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
-            "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
-        },
-        "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
-        "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
-        "scope_notice": {
-            "public": "Dieser Beitrag wird für alle sichtbar sein",
-            "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein",
-            "unlisted": "Dieser Beitrag wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
-        }
-    },
-    "registration": {
-        "bio": "Bio",
-        "email": "Email",
-        "fullname": "Angezeigter Name",
-        "password_confirm": "Passwort bestätigen",
-        "registration": "Registrierung",
-        "token": "Einladungsschlüssel",
-        "captcha": "CAPTCHA",
-        "new_captcha": "Zum Erstellen eines neuen Captcha auf das Bild klicken.",
-        "validations": {
-            "username_required": "darf nicht leer sein",
-            "fullname_required": "darf nicht leer sein",
-            "email_required": "darf nicht leer sein",
-            "password_required": "darf nicht leer sein",
-            "password_confirmation_required": "darf nicht leer sein",
-            "password_confirmation_match": "sollte mit dem Passwort identisch sein"
-        },
-        "bio_placeholder": "z.B.\nHallo, ich bin Lain.\nIch bin ein Anime Mödchen aus dem vorstädtischen Japan. Du kennst mich vielleicht vom Wired.",
-        "fullname_placeholder": "z.B. Lain Iwakura",
-        "username_placeholder": "z.B. lain"
-    },
-    "settings": {
-        "attachmentRadius": "Anhänge",
-        "attachments": "Anhänge",
-        "autoload": "Aktiviere automatisches Laden von älteren Beiträgen beim scrollen",
-        "avatar": "Avatar",
-        "avatarAltRadius": "Avatare (Benachrichtigungen)",
-        "avatarRadius": "Avatare",
-        "background": "Hintergrund",
-        "bio": "Bio",
-        "btnRadius": "Buttons",
-        "cBlue": "Blau (Antworten, folgt dir)",
-        "cGreen": "Grün (Retweet)",
-        "cOrange": "Orange (Favorisieren)",
-        "cRed": "Rot (Abbrechen)",
-        "change_password": "Passwort ändern",
-        "change_password_error": "Es gab ein Problem bei der Änderung des Passworts.",
-        "changed_password": "Passwort erfolgreich geändert!",
-        "collapse_subject": "Beiträge mit Betreff einklappen",
-        "composing": "Verfassen",
-        "confirm_new_password": "Neues Passwort bestätigen",
-        "current_avatar": "Dein derzeitiger Avatar",
-        "current_password": "Aktuelles Passwort",
-        "current_profile_banner": "Der derzeitige Banner deines Profils",
-        "data_import_export_tab": "Datenimport/-export",
-        "default_vis": "Standard-Sichtbarkeitsumfang",
-        "delete_account": "Account löschen",
-        "delete_account_description": "Lösche deine Daten und deaktiviere deinen Account unwiderruflich.",
-        "delete_account_error": "Es ist ein Fehler beim Löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.",
-        "delete_account_instructions": "Tippe dein Passwort unten in das Feld ein, um die Löschung deines Accounts zu bestätigen.",
-        "discoverable": "Erlaube, dass dieser Account in Suchergebnissen auftaucht",
-        "avatar_size_instruction": "Die empfohlene minimale Größe für Avatare ist 150x150 Pixel.",
-        "pad_emoji": "Emojis mit Leerzeichen umrahmen",
-        "export_theme": "Farbschema speichern",
-        "filtering": "Filtern",
-        "filtering_explanation": "Alle Beiträge, welche diese Wörter enthalten, werden ausgeblendet. Ein Wort pro Zeile.",
-        "follow_export": "Follower exportieren",
-        "follow_export_button": "Exportiere deine Follows in eine csv-Datei",
-        "follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.",
-        "follow_import": "Follower importieren",
-        "follow_import_error": "Fehler beim Importieren der Follower",
-        "follows_imported": "Follower importiert! Die Bearbeitung kann einen Moment dauern.",
-        "foreground": "Vordergrund",
-        "general": "Allgemein",
-        "hide_attachments_in_convo": "Anhänge in Unterhaltungen ausblenden",
-        "hide_attachments_in_tl": "Anhänge in der Zeitleiste ausblenden",
-        "hide_muted_posts": "Verberge Beiträge stummgeschalteter Nutzer",
-        "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Beitrag",
-        "hide_isp": "Instanz-spezifisches Panel ausblenden",
-        "preload_images": "Bilder vorausladen",
-        "use_one_click_nsfw": "Heikle Anhänge mit nur einem Klick öffnen",
-        "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
-        "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
-        "hide_filtered_statuses": "Gefilterte Beiträge verbergen",
-        "import_followers_from_a_csv_file": "Importiere Follower aus einer CSV-Datei",
-        "import_theme": "Farbschema laden",
-        "inputRadius": "Eingabefelder",
-        "checkboxRadius": "Auswahlfelder",
-        "instance_default": "(Standard: {value})",
-        "instance_default_simple": "(Standard)",
-        "interface": "Oberfläche",
-        "interfaceLanguage": "Sprache der Oberfläche",
-        "invalid_theme_imported": "Die ausgewählte Datei ist kein unterstütztes Pleroma-Theme. Keine Änderungen wurden vorgenommen.",
-        "limited_availability": "In deinem Browser nicht verfügbar",
-        "links": "Links",
-        "lock_account_description": "Sperre deinen Account, um neue Follower zu genehmigen oder abzulehnen",
-        "loop_video": "Videos wiederholen",
-        "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
-        "mutes_tab": "Stummschaltungen",
-        "play_videos_in_modal": "Videos in größerem Medienfenster abspielen",
-        "use_contain_fit": "Vorschaubilder nicht zuschneiden",
-        "name": "Name",
-        "name_bio": "Name & Bio",
-        "new_password": "Neues Passwort",
-        "notification_visibility": "Benachrichtigungstypen, die angezeigt werden sollen",
-        "notification_visibility_follows": "Follows",
-        "notification_visibility_likes": "Favoriten",
-        "notification_visibility_mentions": "Erwähnungen",
-        "notification_visibility_repeats": "Wiederholungen",
-        "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
-        "hide_follows_description": "Zeige nicht, wem ich folge",
-        "hide_followers_description": "Zeige nicht, wer mir folgt",
-        "hide_follows_count_description": "Verberge die Anzahl deiner Gefolgten",
-        "hide_followers_count_description": "Verberge die Anzahl deiner Folgenden",
-        "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
-        "oauth_tokens": "OAuth-Token",
-        "token": "Zeichen",
-        "refresh_token": "Token aktualisieren",
-        "valid_until": "Gültig bis",
-        "revoke_token": "Widerrufen",
-        "panelRadius": "Panel",
-        "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
-        "presets": "Voreinstellungen",
-        "profile_background": "Profilhintergrund",
-        "profile_banner": "Profilbanner",
-        "profile_tab": "Profil",
-        "radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen",
-        "replies_in_timeline": "Antworten in der Zeitleiste",
-        "reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren",
-        "reply_visibility_all": "Alle Antworten zeigen",
-        "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
-        "reply_visibility_self": "Nur Antworten an mich anzeigen",
-        "autohide_floating_post_button": "Automatisches Verbergen des Knopfs für neue Beiträge (mobil)",
-        "saving_err": "Fehler beim Speichern der Einstellungen",
-        "saving_ok": "Einstellungen gespeichert",
-        "security_tab": "Sicherheit",
-        "scope_copy": "Reichweite beim Antworten übernehmen (Direktnachrichten werden immer kopiert)",
-        "minimal_scopes_mode": "Minimiere Reichweitenoptionen",
-        "set_new_avatar": "Setze einen neuen Avatar",
-        "set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil",
-        "set_new_profile_banner": "Setze einen neuen Banner für dein Profil",
-        "settings": "Einstellungen",
-        "subject_input_always_show": "Betreff-Feld immer anzeigen",
-        "subject_line_behavior": "Betreff beim Antworten kopieren",
-        "subject_line_email": "Wie Email: \"re: Betreff\"",
-        "subject_line_mastodon": "Wie Mastodon: unverändert kopieren",
-        "subject_line_noop": "Nicht kopieren",
-        "post_status_content_type": "Beitragsart",
-        "stop_gifs": "Animationen nur beim Darüberfahren abspielen",
-        "streaming": "Aktiviere automatisches Laden (Streaming) von neuen Beiträgen",
-        "text": "Text",
-        "theme": "Farbschema",
-        "theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen",
-        "theme_help_v2_1": "Du kannst auch die Farben und die Deckkraft bestimmter Komponenten überschreiben, indem du das Kontrollkästchen umschaltest. Verwende die Schaltfläche \"Alle löschen\", um alle Überschreibungen zurückzusetzen.",
-        "theme_help_v2_2": "Unter einigen Einträgen befinden sich Symbole für Hintergrund-/Textkontrastindikatoren, für detaillierte Informationen fahre mit der Maus darüber. Bitte beachte, dass bei der Verwendung von Transparenz Kontrastindikatoren den schlechtest möglichen Fall darstellen.",
-        "tooltipRadius": "Tooltips/Warnungen",
-        "user_settings": "Benutzereinstellungen",
-        "values": {
-            "false": "nein",
-            "true": "Ja"
-        },
-        "notifications": "Benachrichtigungen",
-        "enable_web_push_notifications": "Web-Pushbenachrichtigungen aktivieren",
-        "style": {
-            "switcher": {
-                "keep_color": "Farben beibehalten",
-                "keep_shadows": "Schatten beibehalten",
-                "keep_opacity": "Deckkraft beibehalten",
-                "keep_roundness": "Abrundungen beibehalten",
-                "keep_fonts": "Schriften beibehalten",
-                "save_load_hint": "Die \"Beibehalten\"-Optionen behalten die aktuell eingestellten Optionen beim Auswählen oder Laden von Designs bei, sie speichern diese Optionen auch beim Exportieren eines Designs. Wenn alle Kontrollkästchen deaktiviert sind, wird beim Exportieren des Designs alles gespeichert.",
-                "reset": "Zurücksetzen",
-                "clear_all": "Alles leeren",
-                "clear_opacity": "Deckkraft leeren"
-            },
-            "common": {
-                "color": "Farbe",
-                "opacity": "Deckkraft",
-                "contrast": {
-                    "hint": "Das Kontrastverhältnis ist {ratio}, es {level} {context}",
-                    "level": {
-                        "aa": "entspricht Level AA Richtlinie (minimum)",
-                        "aaa": "entspricht Level AAA Richtlinie (empfohlen)",
-                        "bad": "entspricht keiner Richtlinien zur Barrierefreiheit"
-                    },
-                    "context": {
-                        "18pt": "für großen (18pt+) Text",
-                        "text": "für Text"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Allgemein",
-                "main": "Allgemeine Farben",
-                "foreground_hint": "Siehe Reiter \"Erweitert\" für eine detailliertere Einstellungen",
-                "rgbo": "Symbole, Betonungen, Kennzeichnungen"
-            },
-            "advanced_colors": {
-                "_tab_label": "Erweitert",
-                "alert": "Warnhinweis-Hintergrund",
-                "alert_error": "Fehler",
-                "badge": "Kennzeichnungs-Hintergrund",
-                "badge_notification": "Benachrichtigung",
-                "panel_header": "Panel-Kopf",
-                "top_bar": "Obere Leiste",
-                "borders": "Rahmen",
-                "buttons": "Schaltflächen",
-                "inputs": "Eingabefelder",
-                "faint_text": "Verblasster Text"
-            },
-            "radii": {
-                "_tab_label": "Abrundungen"
-            },
-            "shadows": {
-                "_tab_label": "Schatten und Beleuchtung",
-                "component": "Komponente",
-                "override": "Überschreiben",
-                "shadow_id": "Schatten #{value}",
-                "blur": "Unschärfe",
-                "spread": "Streuung",
-                "inset": "Einsatz",
-                "hint": "Für Schatten kannst du auch --variable als Farbwert verwenden, um CSS3-Variablen zu verwenden. Bitte beachte, dass die Einstellung der Deckkraft in diesem Fall nicht funktioniert.",
-                "filter_hint": {
-                    "always_drop_shadow": "Achtung, dieser Schatten verwendet immer {0}, wenn der Browser dies unterstützt.",
-                    "drop_shadow_syntax": "{0} unterstützt Parameter {1} und Schlüsselwort {2} nicht.",
-                    "avatar_inset": "Bitte beachte, dass die Kombination von eingesetzten und nicht eingesetzten Schatten auf Avataren zu unerwarteten Ergebnissen bei transparenten Avataren führen kann.",
-                    "spread_zero": "Schatten mit einer Streuung > 0 erscheinen so, als ob sie auf Null gesetzt wären.",
-                    "inset_classic": "Eingesetzte Schatten werden mit {0} verwendet"
-                },
-                "components": {
-                    "panel": "Panel",
-                    "panelHeader": "Panel-Kopf",
-                    "topBar": "Obere Leiste",
-                    "avatar": "Benutzer-Avatar (in der Profilansicht)",
-                    "avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
-                    "popup": "Dialogfenster und Hinweistexte",
-                    "button": "Schaltfläche",
-                    "buttonHover": "Schaltfläche (hover)",
-                    "buttonPressed": "Schaltfläche (gedrückt)",
-                    "buttonPressedHover": "Schaltfläche (gedrückt+hover)",
-                    "input": "Input field"
-                }
-            },
-            "fonts": {
-                "_tab_label": "Schriften",
-                "help": "Wähl die Schriftart, die für Elemente der Benutzeroberfläche verwendet werden soll. Für \" Benutzerdefiniert\" musst du den genauen Schriftnamen eingeben, wie er im System angezeigt wird.",
-                "components": {
-                    "interface": "Oberfläche",
-                    "input": "Eingabefelder",
-                    "post": "Beitragstext",
-                    "postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
-                },
-                "family": "Schriftname",
-                "size": "Größe (in px)",
-                "weight": "Gewicht (Dicke)",
-                "custom": "Benutzerdefiniert"
-            },
-            "preview": {
-                "header": "Vorschau",
-                "content": "Inhalt",
-                "error": "Beispielfehler",
-                "button": "Schaltfläche",
-                "text": "Ein Haufen mehr von {0} und {1}",
-                "mono": "Inhalt",
-                "input": "Sitze gerade im Hofbräuhaus.",
-                "faint_link": "Hilfreiche Anleitung",
-                "fine_print": "Lies unser {0}, um nichts Nützliches zu lernen!",
-                "header_faint": "Das ist in Ordnung",
-                "checkbox": "Ich habe die Allgemeinen Geschäftsbedingungen überflogen",
-                "link": "ein netter kleiner Link"
-            }
-        },
-        "app_name": "Anwendungsname",
-        "mfa": {
-            "otp": "OTP",
-            "recovery_codes_warning": "Schreibe dir die Codes auf oder speichere sie an einem sicheren Ort - ansonsten wirst du sie nicht wiederfinden. Wenn du den Zugriff zu deiner 2FA App und die Wiederherstellungs-Codes verlierst, wirst du aus deinem Account ausgeschlossen sein.",
-            "recovery_codes": "Wiederherstellungs-Codes.",
-            "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
-            "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
-            "title": "Zwei-Faktor Authentifizierung",
-            "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes...",
-            "authentication_methods": "Authentifizierungsmethoden",
-            "scan": {
-                "title": "Scan",
-                "secret_code": "Schlüssel",
-                "desc": "Wenn du deine 2FA App verwendest, scanne diesen QR Code oder gebe den Schlüssel ein:"
-            },
-            "verify": {
-                "desc": "Um 2FA zu aktivieren, gib den Code von deiner 2FA-App ein:"
-            }
-        },
-        "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
-        "security": "Sicherheit",
-        "allow_following_move": "Erlaube automatisches Folgen, sobald ein gefolgter Nutzer umzieht",
-        "blocks_imported": "Blocks importiert! Die Verarbeitung wird einen Moment brauchen.",
-        "block_import_error": "Fehler beim Importieren der Blocks",
-        "block_import": "Block Import",
-        "block_export_button": "Exportiere deine Blocks in eine csv Datei",
-        "block_export": "Block Export",
-        "emoji_reactions_on_timeline": "Zeige Emoji-Reaktionen auf der Zeitleiste",
-        "domain_mutes": "Domains",
-        "changed_email": "Email Adresse erfolgreich geändert!",
-        "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
-        "change_email": "Ändere Email",
-        "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
-        "notification_setting_followers": "Nutzer, die dir folgen",
-        "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
-        "accent": "Akzent"
-    },
-    "timeline": {
-        "collapse": "Einklappen",
-        "conversation": "Unterhaltung",
-        "error_fetching": "Fehler beim Laden",
-        "load_older": "Lade ältere Beiträge",
-        "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden.",
-        "repeated": "wiederholte",
-        "show_new": "Zeige Neuere",
-        "up_to_date": "Aktuell"
-    },
-    "user_card": {
-        "approve": "Genehmigen",
-        "block": "Blockieren",
-        "blocked": "Blockiert!",
-        "deny": "Ablehnen",
-        "follow": "Folgen",
-        "follow_sent": "Anfrage gesendet!",
-        "follow_progress": "Anfragen…",
-        "follow_again": "Anfrage erneut senden?",
-        "follow_unfollow": "Folgen beenden",
-        "followees": "Folgt",
-        "followers": "Folgende",
-        "following": "Folgst du!",
-        "follows_you": "Folgt dir!",
-        "its_you": "Das bist du!",
-        "mute": "Stummschalten",
-        "muted": "Stummgeschaltet",
-        "per_day": "pro Tag",
-        "remote_follow": "Folgen",
-        "statuses": "Beiträge",
-        "admin_menu": {
-            "sandbox": "Erzwinge Beiträge nur für Follower sichtbar zu sein"
-        }
-    },
-    "user_profile": {
-        "timeline_title": "Beiträge"
-    },
-    "who_to_follow": {
-        "more": "Mehr",
-        "who_to_follow": "Wem soll ich folgen"
-    },
-    "tool_tip": {
-        "media_upload": "Medien hochladen",
-        "repeat": "Wiederholen",
-        "reply": "Antworten",
-        "favorite": "Favorisieren",
-        "user_settings": "Benutzereinstellungen"
-    },
-    "upload": {
-        "error": {
-            "base": "Hochladen fehlgeschlagen.",
-            "file_too_big": "Datei ist zu groß [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Bitte versuche es später erneut"
-        },
-        "file_size_units": {
-            "B": "B",
-            "KiB": "KiB",
-            "MiB": "MiB",
-            "GiB": "GiB",
-            "TiB": "TiB"
-        }
-    },
-    "search": {
-        "people": "Leute",
-        "hashtags": "Hashtags",
-        "person_talking": "{count} Person spricht darüber",
-        "people_talking": "{count} Leute sprechen darüber",
-        "no_results": "Keine Ergebnisse"
-    },
-    "password_reset": {
-        "forgot_password": "Passwort vergessen?",
-        "password_reset": "Password zurücksetzen",
-        "instruction": "Wenn du hier deinen Benutznamen oder die zugehörige E-Mail-Adresse eingibst, kann dir der Server einen Link zum Passwortzurücksetzen zuschicken.",
-        "placeholder": "Dein Benutzername oder die zugehörige E-Mail-Adresse",
-        "check_email": "Im E-Mail-Posteingang des angebenen Kontos müsste sich jetzt (oder zumindest in Kürze) die E-Mail mit dem Link zum Passwortzurücksetzen befinden.",
-        "return_home": "Zurück zur Heimseite",
-        "not_found": "Benutzername/E-Mail-Adresse nicht gefunden. Vertippt?",
-        "too_many_requests": "Kurze Pause. Zu viele Versuche. Bitte, später nochmal probieren.",
-        "password_reset_disabled": "Passwortzurücksetzen deaktiviert. Bitte Administrator kontaktieren.",
-        "password_reset_required": "Passwortzurücksetzen erforderlich",
-        "password_reset_required_but_mailer_is_disabled": "Passwortzurücksetzen wäre erforderlich, ist aber deaktiviert. Bitte Administrator kontaktieren."
-    },
-    "about": {
-        "mrf": {
-            "federation": "Föderation",
-            "mrf_policies": "Aktivierte MRF Richtlinien",
-            "simple": {
-                "simple_policies": "Instanzspezifische Richtlinien",
-                "accept": "Akzeptieren",
-                "reject": "Ablehnen",
-                "reject_desc": "Diese Instanz akzeptiert keine Nachrichten der folgenden Instanzen:",
-                "quarantine": "Quarantäne",
-                "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen",
-                "media_removal": "Medienentfernung",
-                "media_removal_desc": "Diese Instanz entfernt Medien von den Beiträgen der folgenden Instanzen:",
-                "media_nsfw": "Erzwingen Medien als heikel zu makieren",
-                "media_nsfw_desc": "Diese Instanz makiert die Medien in Beiträgen der folgenden Instanzen als heikel:",
-                "accept_desc": "Diese Instanz akzeptiert nur Nachrichten von den folgenden Instanzen:",
-                "quarantine_desc": "Diese Instanz sendet nur öffentliche Beiträge zu den folgenden Instanzen:",
-                "ftl_removal_desc": "Dieser Instanz entfernt folgende Instanzen von der \"Das gesamte bekannte Netzwerk\" Zeitleiste:"
-            },
-            "keyword": {
-                "keyword_policies": "Keyword Richtlinien",
-                "reject": "Ablehnen",
-                "replace": "Ersetzen",
-                "is_replaced_by": "→",
-                "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen"
-            },
-            "mrf_policies_desc": "MRF Richtlinien manipulieren das Föderationsverhalten dieser Instanz. Die folgenden Richtlinien sind aktiv:"
-        },
-        "staff": "Mitarbeiter"
-    },
-    "domain_mute_card": {
-        "mute": "Stummschalten",
-        "mute_progress": "Wird stummgeschaltet..",
-        "unmute": "Stummschaltung aufheben",
-        "unmute_progress": "Stummschaltung wird aufgehoben.."
-    },
-    "exporter": {
-        "export": "Exportieren",
-        "processing": "Verarbeitung läuft, bald wird Du dazu aufgefordert, deine Datei herunterzuladen"
-    },
-    "image_cropper": {
-        "crop_picture": "Bild zuschneiden",
-        "save": "Speichern",
-        "cancel": "Abbrechen",
-        "save_without_cropping": "Ohne Zuschneiden speichern"
-    },
-    "importer": {
-        "submit": "Absenden",
-        "success": "Erfolgreich importiert.",
-        "error": "Ein Fehler ist beim Verabeiten der Datei aufgetreten."
-    },
-    "media_modal": {
-        "previous": "Zurück",
-        "next": "Weiter"
-    },
-    "polls": {
-        "add_poll": "Umfrage hinzufügen",
-        "add_option": "Option hinzufügen",
-        "option": "Option",
-        "votes": "Stimmen",
-        "vote": "Abstimmen",
-        "type": "Umfragetyp",
-        "multiple_choices": "Mehrere Auswahlmöglichkeiten",
-        "single_choice": "Eine Auswahlmöglichkeit",
-        "expiry": "Alter der Umfrage",
-        "expired": "Die Umfrage endete vor {0}",
-        "not_enough_options": "Zu wenig einzigartige Auswahlmöglichkeiten in der Umfrage",
-        "expires_in": "Die Umfrage endet in {0}"
-    },
-    "emoji": {
-        "stickers": "Sticker",
-        "emoji": "Emoji",
-        "search_emoji": "Nach einem Emoji suchen",
-        "custom": "Benutzerdefinierter Emoji",
-        "keep_open": "Auswahlfenster offen halten",
-        "add_emoji": "Emoji einfügen",
-        "load_all": "Lade alle {emojiAmount} Emoji",
-        "load_all_hint": "Erfolgreich erste {saneAmount} Emoji geladen, alle Emojis zu laden würde Leistungsprobleme hervorrufen.",
-        "unicode": "Unicode Emoji"
-    },
-    "interactions": {
-        "load_older": "Lade ältere Interaktionen",
-        "follows": "Neue Follows",
-        "favs_repeats": "Wiederholungen und Favoriten",
-        "moves": "Benutzer migriert zu"
-    },
-    "selectable_list": {
-        "select_all": "Wähle alle"
-    },
-    "remote_user_resolver": {
-        "searching_for": "Suche nach",
-        "error": "Nicht gefunden."
+    "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
+    "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
+    "scope_notice": {
+      "public": "Dieser Beitrag wird für alle sichtbar sein",
+      "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein",
+      "unlisted": "Dieser Beitrag wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
     }
+  },
+  "registration": {
+    "bio": "Bio",
+    "email": "Email",
+    "fullname": "Angezeigter Name",
+    "password_confirm": "Passwort bestätigen",
+    "registration": "Registrierung",
+    "token": "Einladungsschlüssel",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Zum Erstellen eines neuen Captcha auf das Bild klicken.",
+    "validations": {
+      "username_required": "darf nicht leer sein",
+      "fullname_required": "darf nicht leer sein",
+      "email_required": "darf nicht leer sein",
+      "password_required": "darf nicht leer sein",
+      "password_confirmation_required": "darf nicht leer sein",
+      "password_confirmation_match": "sollte mit dem Passwort identisch sein"
+    },
+    "bio_placeholder": "z.B.\nHallo, ich bin Lain.\nIch bin ein Anime Mödchen aus dem vorstädtischen Japan. Du kennst mich vielleicht vom Wired.",
+    "fullname_placeholder": "z.B. Lain Iwakura",
+    "username_placeholder": "z.B. lain"
+  },
+  "settings": {
+    "attachmentRadius": "Anhänge",
+    "attachments": "Anhänge",
+    "autoload": "Aktiviere automatisches Laden von älteren Beiträgen beim scrollen",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatare (Benachrichtigungen)",
+    "avatarRadius": "Avatare",
+    "background": "Hintergrund",
+    "bio": "Bio",
+    "btnRadius": "Buttons",
+    "cBlue": "Blau (Antworten, folgt dir)",
+    "cGreen": "Grün (Retweet)",
+    "cOrange": "Orange (Favorisieren)",
+    "cRed": "Rot (Abbrechen)",
+    "change_password": "Passwort ändern",
+    "change_password_error": "Es gab ein Problem bei der Änderung des Passworts.",
+    "changed_password": "Passwort erfolgreich geändert!",
+    "collapse_subject": "Beiträge mit Betreff einklappen",
+    "composing": "Verfassen",
+    "confirm_new_password": "Neues Passwort bestätigen",
+    "current_avatar": "Dein derzeitiger Avatar",
+    "current_password": "Aktuelles Passwort",
+    "current_profile_banner": "Der derzeitige Banner deines Profils",
+    "data_import_export_tab": "Datenimport/-export",
+    "default_vis": "Standard-Sichtbarkeitsumfang",
+    "delete_account": "Account löschen",
+    "delete_account_description": "Lösche deine Daten und deaktiviere deinen Account unwiderruflich.",
+    "delete_account_error": "Es ist ein Fehler beim Löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.",
+    "delete_account_instructions": "Tippe dein Passwort unten in das Feld ein, um die Löschung deines Accounts zu bestätigen.",
+    "discoverable": "Erlaube, dass dieser Account in Suchergebnissen auftaucht",
+    "avatar_size_instruction": "Die empfohlene minimale Größe für Avatare ist 150x150 Pixel.",
+    "pad_emoji": "Emojis mit Leerzeichen umrahmen",
+    "export_theme": "Farbschema speichern",
+    "filtering": "Filtern",
+    "filtering_explanation": "Alle Beiträge, welche diese Wörter enthalten, werden ausgeblendet. Ein Wort pro Zeile.",
+    "follow_export": "Follower exportieren",
+    "follow_export_button": "Exportiere deine Follows in eine csv-Datei",
+    "follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.",
+    "follow_import": "Follower importieren",
+    "follow_import_error": "Fehler beim Importieren der Follower",
+    "follows_imported": "Follower importiert! Die Bearbeitung kann einen Moment dauern.",
+    "foreground": "Vordergrund",
+    "general": "Allgemein",
+    "hide_attachments_in_convo": "Anhänge in Unterhaltungen ausblenden",
+    "hide_attachments_in_tl": "Anhänge in der Zeitleiste ausblenden",
+    "hide_muted_posts": "Verberge Beiträge stummgeschalteter Nutzer",
+    "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Beitrag",
+    "hide_isp": "Instanz-spezifisches Panel ausblenden",
+    "preload_images": "Bilder vorausladen",
+    "use_one_click_nsfw": "Heikle Anhänge mit nur einem Klick öffnen",
+    "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
+    "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
+    "hide_filtered_statuses": "Gefilterte Beiträge verbergen",
+    "import_followers_from_a_csv_file": "Importiere Follower aus einer CSV-Datei",
+    "import_theme": "Farbschema laden",
+    "inputRadius": "Eingabefelder",
+    "checkboxRadius": "Auswahlfelder",
+    "instance_default": "(Standard: {value})",
+    "instance_default_simple": "(Standard)",
+    "interface": "Oberfläche",
+    "interfaceLanguage": "Sprache der Oberfläche",
+    "invalid_theme_imported": "Die ausgewählte Datei ist kein unterstütztes Pleroma-Theme. Keine Änderungen wurden vorgenommen.",
+    "limited_availability": "In deinem Browser nicht verfügbar",
+    "links": "Links",
+    "lock_account_description": "Sperre deinen Account, um neue Follower zu genehmigen oder abzulehnen",
+    "loop_video": "Videos wiederholen",
+    "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
+    "mutes_tab": "Stummschaltungen",
+    "play_videos_in_modal": "Videos in größerem Medienfenster abspielen",
+    "use_contain_fit": "Vorschaubilder nicht zuschneiden",
+    "name": "Name",
+    "name_bio": "Name & Bio",
+    "new_password": "Neues Passwort",
+    "notification_visibility": "Benachrichtigungstypen, die angezeigt werden sollen",
+    "notification_visibility_follows": "Follows",
+    "notification_visibility_likes": "Favoriten",
+    "notification_visibility_mentions": "Erwähnungen",
+    "notification_visibility_repeats": "Wiederholungen",
+    "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
+    "hide_follows_description": "Zeige nicht, wem ich folge",
+    "hide_followers_description": "Zeige nicht, wer mir folgt",
+    "hide_follows_count_description": "Verberge die Anzahl deiner Gefolgten",
+    "hide_followers_count_description": "Verberge die Anzahl deiner Folgenden",
+    "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
+    "oauth_tokens": "OAuth-Token",
+    "token": "Zeichen",
+    "refresh_token": "Token aktualisieren",
+    "valid_until": "Gültig bis",
+    "revoke_token": "Widerrufen",
+    "panelRadius": "Panel",
+    "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
+    "presets": "Voreinstellungen",
+    "profile_background": "Profilhintergrund",
+    "profile_banner": "Profilbanner",
+    "profile_tab": "Profil",
+    "radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen",
+    "replies_in_timeline": "Antworten in der Zeitleiste",
+    "reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren",
+    "reply_visibility_all": "Alle Antworten zeigen",
+    "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
+    "reply_visibility_self": "Nur Antworten an mich anzeigen",
+    "autohide_floating_post_button": "Automatisches Verbergen des Knopfs für neue Beiträge (mobil)",
+    "saving_err": "Fehler beim Speichern der Einstellungen",
+    "saving_ok": "Einstellungen gespeichert",
+    "security_tab": "Sicherheit",
+    "scope_copy": "Reichweite beim Antworten übernehmen (Direktnachrichten werden immer kopiert)",
+    "minimal_scopes_mode": "Minimiere Reichweitenoptionen",
+    "set_new_avatar": "Setze einen neuen Avatar",
+    "set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil",
+    "set_new_profile_banner": "Setze einen neuen Banner für dein Profil",
+    "settings": "Einstellungen",
+    "subject_input_always_show": "Betreff-Feld immer anzeigen",
+    "subject_line_behavior": "Betreff beim Antworten kopieren",
+    "subject_line_email": "Wie Email: \"re: Betreff\"",
+    "subject_line_mastodon": "Wie Mastodon: unverändert kopieren",
+    "subject_line_noop": "Nicht kopieren",
+    "post_status_content_type": "Beitragsart",
+    "stop_gifs": "Animationen nur beim Darüberfahren abspielen",
+    "streaming": "Aktiviere automatisches Laden (Streaming) von neuen Beiträgen",
+    "text": "Text",
+    "theme": "Farbschema",
+    "theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen",
+    "theme_help_v2_1": "Du kannst auch die Farben und die Deckkraft bestimmter Komponenten überschreiben, indem du das Kontrollkästchen umschaltest. Verwende die Schaltfläche \"Alle löschen\", um alle Überschreibungen zurückzusetzen.",
+    "theme_help_v2_2": "Unter einigen Einträgen befinden sich Symbole für Hintergrund-/Textkontrastindikatoren, für detaillierte Informationen fahre mit der Maus darüber. Bitte beachte, dass bei der Verwendung von Transparenz Kontrastindikatoren den schlechtest möglichen Fall darstellen.",
+    "tooltipRadius": "Tooltips/Warnungen",
+    "user_settings": "Benutzereinstellungen",
+    "values": {
+      "false": "nein",
+      "true": "Ja"
+    },
+    "notifications": "Benachrichtigungen",
+    "enable_web_push_notifications": "Web-Pushbenachrichtigungen aktivieren",
+    "style": {
+      "switcher": {
+        "keep_color": "Farben beibehalten",
+        "keep_shadows": "Schatten beibehalten",
+        "keep_opacity": "Deckkraft beibehalten",
+        "keep_roundness": "Abrundungen beibehalten",
+        "keep_fonts": "Schriften beibehalten",
+        "save_load_hint": "Die \"Beibehalten\"-Optionen behalten die aktuell eingestellten Optionen beim Auswählen oder Laden von Designs bei, sie speichern diese Optionen auch beim Exportieren eines Designs. Wenn alle Kontrollkästchen deaktiviert sind, wird beim Exportieren des Designs alles gespeichert.",
+        "reset": "Zurücksetzen",
+        "clear_all": "Alles leeren",
+        "clear_opacity": "Deckkraft leeren"
+      },
+      "common": {
+        "color": "Farbe",
+        "opacity": "Deckkraft",
+        "contrast": {
+          "hint": "Das Kontrastverhältnis ist {ratio}, es {level} {context}",
+          "level": {
+            "aa": "entspricht Level AA Richtlinie (minimum)",
+            "aaa": "entspricht Level AAA Richtlinie (empfohlen)",
+            "bad": "entspricht keiner Richtlinien zur Barrierefreiheit"
+          },
+          "context": {
+            "18pt": "für großen (18pt+) Text",
+            "text": "für Text"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Allgemein",
+        "main": "Allgemeine Farben",
+        "foreground_hint": "Siehe Reiter \"Erweitert\" für eine detailliertere Einstellungen",
+        "rgbo": "Symbole, Betonungen, Kennzeichnungen"
+      },
+      "advanced_colors": {
+        "_tab_label": "Erweitert",
+        "alert": "Warnhinweis-Hintergrund",
+        "alert_error": "Fehler",
+        "badge": "Kennzeichnungs-Hintergrund",
+        "badge_notification": "Benachrichtigung",
+        "panel_header": "Panel-Kopf",
+        "top_bar": "Obere Leiste",
+        "borders": "Rahmen",
+        "buttons": "Schaltflächen",
+        "inputs": "Eingabefelder",
+        "faint_text": "Verblasster Text"
+      },
+      "radii": {
+        "_tab_label": "Abrundungen"
+      },
+      "shadows": {
+        "_tab_label": "Schatten und Beleuchtung",
+        "component": "Komponente",
+        "override": "Überschreiben",
+        "shadow_id": "Schatten #{value}",
+        "blur": "Unschärfe",
+        "spread": "Streuung",
+        "inset": "Einsatz",
+        "hint": "Für Schatten kannst du auch --variable als Farbwert verwenden, um CSS3-Variablen zu verwenden. Bitte beachte, dass die Einstellung der Deckkraft in diesem Fall nicht funktioniert.",
+        "filter_hint": {
+          "always_drop_shadow": "Achtung, dieser Schatten verwendet immer {0}, wenn der Browser dies unterstützt.",
+          "drop_shadow_syntax": "{0} unterstützt Parameter {1} und Schlüsselwort {2} nicht.",
+          "avatar_inset": "Bitte beachte, dass die Kombination von eingesetzten und nicht eingesetzten Schatten auf Avataren zu unerwarteten Ergebnissen bei transparenten Avataren führen kann.",
+          "spread_zero": "Schatten mit einer Streuung > 0 erscheinen so, als ob sie auf Null gesetzt wären.",
+          "inset_classic": "Eingesetzte Schatten werden mit {0} verwendet"
+        },
+        "components": {
+          "panel": "Panel",
+          "panelHeader": "Panel-Kopf",
+          "topBar": "Obere Leiste",
+          "avatar": "Benutzer-Avatar (in der Profilansicht)",
+          "avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
+          "popup": "Dialogfenster und Hinweistexte",
+          "button": "Schaltfläche",
+          "buttonHover": "Schaltfläche (hover)",
+          "buttonPressed": "Schaltfläche (gedrückt)",
+          "buttonPressedHover": "Schaltfläche (gedrückt+hover)",
+          "input": "Input field"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Schriften",
+        "help": "Wähl die Schriftart, die für Elemente der Benutzeroberfläche verwendet werden soll. Für \" Benutzerdefiniert\" musst du den genauen Schriftnamen eingeben, wie er im System angezeigt wird.",
+        "components": {
+          "interface": "Oberfläche",
+          "input": "Eingabefelder",
+          "post": "Beitragstext",
+          "postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
+        },
+        "family": "Schriftname",
+        "size": "Größe (in px)",
+        "weight": "Gewicht (Dicke)",
+        "custom": "Benutzerdefiniert"
+      },
+      "preview": {
+        "header": "Vorschau",
+        "content": "Inhalt",
+        "error": "Beispielfehler",
+        "button": "Schaltfläche",
+        "text": "Ein Haufen mehr von {0} und {1}",
+        "mono": "Inhalt",
+        "input": "Sitze gerade im Hofbräuhaus.",
+        "faint_link": "Hilfreiche Anleitung",
+        "fine_print": "Lies unser {0}, um nichts Nützliches zu lernen!",
+        "header_faint": "Das ist in Ordnung",
+        "checkbox": "Ich habe die Allgemeinen Geschäftsbedingungen überflogen",
+        "link": "ein netter kleiner Link"
+      }
+    },
+    "app_name": "Anwendungsname",
+    "mfa": {
+      "otp": "OTP",
+      "recovery_codes_warning": "Schreibe dir die Codes auf oder speichere sie an einem sicheren Ort - ansonsten wirst du sie nicht wiederfinden. Wenn du den Zugriff zu deiner 2FA App und die Wiederherstellungs-Codes verlierst, wirst du aus deinem Account ausgeschlossen sein.",
+      "recovery_codes": "Wiederherstellungs-Codes.",
+      "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
+      "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
+      "title": "Zwei-Faktor Authentifizierung",
+      "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes...",
+      "authentication_methods": "Authentifizierungsmethoden",
+      "scan": {
+        "title": "Scan",
+        "secret_code": "Schlüssel",
+        "desc": "Wenn du deine 2FA App verwendest, scanne diesen QR Code oder gebe den Schlüssel ein:"
+      },
+      "verify": {
+        "desc": "Um 2FA zu aktivieren, gib den Code von deiner 2FA-App ein:"
+      }
+    },
+    "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
+    "security": "Sicherheit",
+    "allow_following_move": "Erlaube automatisches Folgen, sobald ein gefolgter Nutzer umzieht",
+    "blocks_imported": "Blocks importiert! Die Verarbeitung wird einen Moment brauchen.",
+    "block_import_error": "Fehler beim Importieren der Blocks",
+    "block_import": "Block Import",
+    "block_export_button": "Exportiere deine Blocks in eine csv Datei",
+    "block_export": "Block Export",
+    "emoji_reactions_on_timeline": "Zeige Emoji-Reaktionen auf der Zeitleiste",
+    "domain_mutes": "Domains",
+    "changed_email": "Email Adresse erfolgreich geändert!",
+    "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
+    "change_email": "Ändere Email",
+    "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
+    "notification_setting_followers": "Nutzer, die dir folgen",
+    "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
+    "accent": "Akzent"
+  },
+  "timeline": {
+    "collapse": "Einklappen",
+    "conversation": "Unterhaltung",
+    "error_fetching": "Fehler beim Laden",
+    "load_older": "Lade ältere Beiträge",
+    "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden.",
+    "repeated": "wiederholte",
+    "show_new": "Zeige Neuere",
+    "up_to_date": "Aktuell"
+  },
+  "user_card": {
+    "approve": "Genehmigen",
+    "block": "Blockieren",
+    "blocked": "Blockiert!",
+    "deny": "Ablehnen",
+    "follow": "Folgen",
+    "follow_sent": "Anfrage gesendet!",
+    "follow_progress": "Anfragen…",
+    "follow_again": "Anfrage erneut senden?",
+    "follow_unfollow": "Folgen beenden",
+    "followees": "Folgt",
+    "followers": "Folgende",
+    "following": "Folgst du!",
+    "follows_you": "Folgt dir!",
+    "its_you": "Das bist du!",
+    "mute": "Stummschalten",
+    "muted": "Stummgeschaltet",
+    "per_day": "pro Tag",
+    "remote_follow": "Folgen",
+    "statuses": "Beiträge",
+    "admin_menu": {
+      "sandbox": "Erzwinge Beiträge nur für Follower sichtbar zu sein"
+    }
+  },
+  "user_profile": {
+    "timeline_title": "Beiträge"
+  },
+  "who_to_follow": {
+    "more": "Mehr",
+    "who_to_follow": "Wem soll ich folgen"
+  },
+  "tool_tip": {
+    "media_upload": "Medien hochladen",
+    "repeat": "Wiederholen",
+    "reply": "Antworten",
+    "favorite": "Favorisieren",
+    "user_settings": "Benutzereinstellungen"
+  },
+  "upload": {
+    "error": {
+      "base": "Hochladen fehlgeschlagen.",
+      "file_too_big": "Datei ist zu groß [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Bitte versuche es später erneut"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "Leute",
+    "hashtags": "Hashtags",
+    "person_talking": "{count} Person spricht darüber",
+    "people_talking": "{count} Leute sprechen darüber",
+    "no_results": "Keine Ergebnisse"
+  },
+  "password_reset": {
+    "forgot_password": "Passwort vergessen?",
+    "password_reset": "Password zurücksetzen",
+    "instruction": "Wenn du hier deinen Benutznamen oder die zugehörige E-Mail-Adresse eingibst, kann dir der Server einen Link zum Passwortzurücksetzen zuschicken.",
+    "placeholder": "Dein Benutzername oder die zugehörige E-Mail-Adresse",
+    "check_email": "Im E-Mail-Posteingang des angebenen Kontos müsste sich jetzt (oder zumindest in Kürze) die E-Mail mit dem Link zum Passwortzurücksetzen befinden.",
+    "return_home": "Zurück zur Heimseite",
+    "not_found": "Benutzername/E-Mail-Adresse nicht gefunden. Vertippt?",
+    "too_many_requests": "Kurze Pause. Zu viele Versuche. Bitte, später nochmal probieren.",
+    "password_reset_disabled": "Passwortzurücksetzen deaktiviert. Bitte Administrator kontaktieren.",
+    "password_reset_required": "Passwortzurücksetzen erforderlich",
+    "password_reset_required_but_mailer_is_disabled": "Passwortzurücksetzen wäre erforderlich, ist aber deaktiviert. Bitte Administrator kontaktieren."
+  },
+  "about": {
+    "mrf": {
+      "federation": "Föderation",
+      "mrf_policies": "Aktivierte MRF Richtlinien",
+      "simple": {
+        "simple_policies": "Instanzspezifische Richtlinien",
+        "accept": "Akzeptieren",
+        "reject": "Ablehnen",
+        "reject_desc": "Diese Instanz akzeptiert keine Nachrichten der folgenden Instanzen:",
+        "quarantine": "Quarantäne",
+        "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen",
+        "media_removal": "Medienentfernung",
+        "media_removal_desc": "Diese Instanz entfernt Medien von den Beiträgen der folgenden Instanzen:",
+        "media_nsfw": "Erzwingen Medien als heikel zu makieren",
+        "media_nsfw_desc": "Diese Instanz makiert die Medien in Beiträgen der folgenden Instanzen als heikel:",
+        "accept_desc": "Diese Instanz akzeptiert nur Nachrichten von den folgenden Instanzen:",
+        "quarantine_desc": "Diese Instanz sendet nur öffentliche Beiträge zu den folgenden Instanzen:",
+        "ftl_removal_desc": "Dieser Instanz entfernt folgende Instanzen von der \"Das gesamte bekannte Netzwerk\" Zeitleiste:"
+      },
+      "keyword": {
+        "keyword_policies": "Keyword Richtlinien",
+        "reject": "Ablehnen",
+        "replace": "Ersetzen",
+        "is_replaced_by": "→",
+        "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen"
+      },
+      "mrf_policies_desc": "MRF Richtlinien manipulieren das Föderationsverhalten dieser Instanz. Die folgenden Richtlinien sind aktiv:"
+    },
+    "staff": "Mitarbeiter"
+  },
+  "domain_mute_card": {
+    "mute": "Stummschalten",
+    "mute_progress": "Wird stummgeschaltet..",
+    "unmute": "Stummschaltung aufheben",
+    "unmute_progress": "Stummschaltung wird aufgehoben.."
+  },
+  "exporter": {
+    "export": "Exportieren",
+    "processing": "Verarbeitung läuft, bald wird Du dazu aufgefordert, deine Datei herunterzuladen"
+  },
+  "image_cropper": {
+    "crop_picture": "Bild zuschneiden",
+    "save": "Speichern",
+    "cancel": "Abbrechen",
+    "save_without_cropping": "Ohne Zuschneiden speichern"
+  },
+  "importer": {
+    "submit": "Absenden",
+    "success": "Erfolgreich importiert.",
+    "error": "Ein Fehler ist beim Verabeiten der Datei aufgetreten."
+  },
+  "media_modal": {
+    "previous": "Zurück",
+    "next": "Weiter"
+  },
+  "polls": {
+    "add_poll": "Umfrage hinzufügen",
+    "add_option": "Option hinzufügen",
+    "option": "Option",
+    "votes": "Stimmen",
+    "vote": "Abstimmen",
+    "type": "Umfragetyp",
+    "multiple_choices": "Mehrere Auswahlmöglichkeiten",
+    "single_choice": "Eine Auswahlmöglichkeit",
+    "expiry": "Alter der Umfrage",
+    "expired": "Die Umfrage endete vor {0}",
+    "not_enough_options": "Zu wenig einzigartige Auswahlmöglichkeiten in der Umfrage",
+    "expires_in": "Die Umfrage endet in {0}"
+  },
+  "emoji": {
+    "stickers": "Sticker",
+    "emoji": "Emoji",
+    "search_emoji": "Nach einem Emoji suchen",
+    "custom": "Benutzerdefinierter Emoji",
+    "keep_open": "Auswahlfenster offen halten",
+    "add_emoji": "Emoji einfügen",
+    "load_all": "Lade alle {emojiAmount} Emoji",
+    "load_all_hint": "Erfolgreich erste {saneAmount} Emoji geladen, alle Emojis zu laden würde Leistungsprobleme hervorrufen.",
+    "unicode": "Unicode Emoji"
+  },
+  "interactions": {
+    "load_older": "Lade ältere Interaktionen",
+    "follows": "Neue Follows",
+    "favs_repeats": "Wiederholungen und Favoriten",
+    "moves": "Benutzer migriert zu"
+  },
+  "selectable_list": {
+    "select_all": "Wähle alle"
+  },
+  "remote_user_resolver": {
+    "searching_for": "Suche nach",
+    "error": "Nicht gefunden."
+  }
 }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9a4bd154..364e3b70 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1,743 +1,743 @@
 {
-    "about": {
-        "mrf": {
-            "federation": "Federation",
-            "keyword": {
-                "keyword_policies": "Keyword Policies",
-                "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
-                "reject": "Reject",
-                "replace": "Replace",
-                "is_replaced_by": "→"
-            },
-            "mrf_policies": "Enabled MRF Policies",
-            "mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance.  The following policies are enabled:",
-            "simple": {
-                "simple_policies": "Instance-specific Policies",
-                "accept": "Accept",
-                "accept_desc": "This instance only accepts messages from the following instances:",
-                "reject": "Reject",
-                "reject_desc": "This instance will not accept messages from the following instances:",
-                "quarantine": "Quarantine",
-                "quarantine_desc": "This instance will send only public posts to the following instances:",
-                "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
-                "ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
-                "media_removal": "Media Removal",
-                "media_removal_desc": "This instance removes media from posts on the following instances:",
-                "media_nsfw": "Media Force-set As Sensitive",
-                "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
-            }
-        },
-        "staff": "Staff"
+  "about": {
+    "mrf": {
+      "federation": "Federation",
+      "keyword": {
+        "keyword_policies": "Keyword Policies",
+        "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
+        "reject": "Reject",
+        "replace": "Replace",
+        "is_replaced_by": "→"
+      },
+      "mrf_policies": "Enabled MRF Policies",
+      "mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance.  The following policies are enabled:",
+      "simple": {
+        "simple_policies": "Instance-specific Policies",
+        "accept": "Accept",
+        "accept_desc": "This instance only accepts messages from the following instances:",
+        "reject": "Reject",
+        "reject_desc": "This instance will not accept messages from the following instances:",
+        "quarantine": "Quarantine",
+        "quarantine_desc": "This instance will send only public posts to the following instances:",
+        "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
+        "ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
+        "media_removal": "Media Removal",
+        "media_removal_desc": "This instance removes media from posts on the following instances:",
+        "media_nsfw": "Media Force-set As Sensitive",
+        "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
+      }
     },
-    "chat": {
-        "title": "Chat"
-    },
-    "domain_mute_card": {
-        "mute": "Mute",
-        "mute_progress": "Muting…",
-        "unmute": "Unmute",
-        "unmute_progress": "Unmuting…"
-    },
-    "exporter": {
-        "export": "Export",
-        "processing": "Processing, you'll soon be asked to download your file"
-    },
-    "features_panel": {
-        "chat": "Chat",
-        "gopher": "Gopher",
-        "media_proxy": "Media proxy",
-        "scope_options": "Scope options",
-        "text_limit": "Text limit",
-        "title": "Features",
-        "who_to_follow": "Who to follow"
-    },
-    "finder": {
-        "error_fetching_user": "Error fetching user",
-        "find_user": "Find user"
-    },
-    "general": {
-        "apply": "Apply",
-        "submit": "Submit",
-        "more": "More",
-        "generic_error": "An error occured",
-        "optional": "optional",
-        "show_more": "Show more",
-        "show_less": "Show less",
-        "dismiss": "Dismiss",
-        "cancel": "Cancel",
-        "disable": "Disable",
-        "enable": "Enable",
-        "confirm": "Confirm",
-        "verify": "Verify"
-    },
-    "image_cropper": {
-        "crop_picture": "Crop picture",
-        "save": "Save",
-        "save_without_cropping": "Save without cropping",
-        "cancel": "Cancel"
-    },
-    "importer": {
-        "submit": "Submit",
-        "success": "Imported successfully.",
-        "error": "An error occured while importing this file."
-    },
-    "login": {
-        "login": "Log in",
-        "description": "Log in with OAuth",
-        "logout": "Log out",
-        "password": "Password",
-        "placeholder": "e.g. lain",
-        "register": "Register",
-        "username": "Username",
-        "hint": "Log in to join the discussion",
-        "authentication_code": "Authentication code",
-        "enter_recovery_code": "Enter a recovery code",
-        "enter_two_factor_code": "Enter a two-factor code",
-        "recovery_code": "Recovery code",
-        "heading": {
-            "totp": "Two-factor authentication",
-            "recovery": "Two-factor recovery"
-        }
-    },
-    "media_modal": {
-        "previous": "Previous",
-        "next": "Next"
-    },
-    "nav": {
-        "about": "About",
-        "administration": "Administration",
-        "back": "Back",
-        "chat": "Local Chat",
-        "friend_requests": "Follow Requests",
-        "mentions": "Mentions",
-        "interactions": "Interactions",
-        "dms": "Direct Messages",
-        "public_tl": "Public Timeline",
-        "timeline": "Timeline",
-        "twkn": "The Whole Known Network",
-        "user_search": "User Search",
-        "search": "Search",
-        "who_to_follow": "Who to follow",
-        "preferences": "Preferences"
-    },
-    "notifications": {
-        "broken_favorite": "Unknown status, searching for it…",
-        "favorited_you": "favorited your status",
-        "followed_you": "followed you",
-        "follow_request": "wants to follow you",
-        "load_older": "Load older notifications",
-        "notifications": "Notifications",
-        "read": "Read!",
-        "repeated_you": "repeated your status",
-        "no_more_notifications": "No more notifications",
-        "migrated_to": "migrated to",
-        "reacted_with": "reacted with {0}"
-    },
-    "polls": {
-        "add_poll": "Add Poll",
-        "add_option": "Add Option",
-        "option": "Option",
-        "votes": "votes",
-        "vote": "Vote",
-        "type": "Poll type",
-        "single_choice": "Single choice",
-        "multiple_choices": "Multiple choices",
-        "expiry": "Poll age",
-        "expires_in": "Poll ends in {0}",
-        "expired": "Poll ended {0} ago",
-        "not_enough_options": "Too few unique options in poll"
-    },
-    "emoji": {
-        "stickers": "Stickers",
-        "emoji": "Emoji",
-        "keep_open": "Keep picker open",
-        "search_emoji": "Search for an emoji",
-        "add_emoji": "Insert emoji",
-        "custom": "Custom emoji",
-        "unicode": "Unicode emoji",
-        "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
-        "load_all": "Loading all {emojiAmount} emoji"
-    },
-    "interactions": {
-        "favs_repeats": "Repeats and Favorites",
-        "follows": "New follows",
-        "moves": "User migrates",
-        "load_older": "Load older interactions"
-    },
-    "post_status": {
-        "new_status": "Post new status",
-        "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
-        "account_not_locked_warning_link": "locked",
-        "attachments_sensitive": "Mark attachments as sensitive",
-        "content_type": {
-            "text/plain": "Plain text",
-            "text/html": "HTML",
-            "text/markdown": "Markdown",
-            "text/bbcode": "BBCode"
-        },
-        "content_warning": "Subject (optional)",
-        "default": "Just landed in L.A.",
-        "direct_warning_to_all": "This post will be visible to all the mentioned users.",
-        "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
-        "posting": "Posting",
-        "scope_notice": {
-            "public": "This post will be visible to everyone",
-            "private": "This post will be visible to your followers only",
-            "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
-        },
-        "scope": {
-            "direct": "Direct - Post to mentioned users only",
-            "private": "Followers-only - Post to followers only",
-            "public": "Public - Post to public timelines",
-            "unlisted": "Unlisted - Do not post to public timelines"
-        }
-    },
-    "registration": {
-        "bio": "Bio",
-        "email": "Email",
-        "fullname": "Display name",
-        "password_confirm": "Password confirmation",
-        "registration": "Registration",
-        "token": "Invite token",
-        "captcha": "CAPTCHA",
-        "new_captcha": "Click the image to get a new captcha",
-        "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.",
-        "validations": {
-            "username_required": "cannot be left blank",
-            "fullname_required": "cannot be left blank",
-            "email_required": "cannot be left blank",
-            "password_required": "cannot be left blank",
-            "password_confirmation_required": "cannot be left blank",
-            "password_confirmation_match": "should be the same as password"
-        }
-    },
-    "remote_user_resolver": {
-        "remote_user_resolver": "Remote user resolver",
-        "searching_for": "Searching for",
-        "error": "Not found."
-    },
-    "selectable_list": {
-        "select_all": "Select all"
-    },
-    "settings": {
-        "app_name": "App name",
-        "security": "Security",
-        "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "Setup OTP",
-            "wait_pre_setup_otp": "presetting OTP",
-            "confirm_and_enable": "Confirm & enable OTP",
-            "title": "Two-factor Authentication",
-            "generate_new_recovery_codes": "Generate new recovery codes",
-            "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
-            "recovery_codes": "Recovery codes.",
-            "waiting_a_recovery_codes": "Receiving backup codes…",
-            "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
-            "authentication_methods": "Authentication methods",
-            "scan": {
-                "title": "Scan",
-                "desc": "Using your two-factor app, scan this QR code or enter text key:",
-                "secret_code": "Key"
-            },
-            "verify": {
-                "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
-            }
-        },
-        "allow_following_move": "Allow auto-follow when following account moves",
-        "attachmentRadius": "Attachments",
-        "attachments": "Attachments",
-        "autoload": "Enable automatic loading when scrolled to the bottom",
-        "avatar": "Avatar",
-        "avatarAltRadius": "Avatars (Notifications)",
-        "avatarRadius": "Avatars",
-        "background": "Background",
-        "bio": "Bio",
-        "block_export": "Block export",
-        "block_export_button": "Export your blocks to a csv file",
-        "block_import": "Block import",
-        "block_import_error": "Error importing blocks",
-        "blocks_imported": "Blocks imported! Processing them will take a while.",
-        "blocks_tab": "Blocks",
-        "btnRadius": "Buttons",
-        "cBlue": "Blue (Reply, follow)",
-        "cGreen": "Green (Retweet)",
-        "cOrange": "Orange (Favorite)",
-        "cRed": "Red (Cancel)",
-        "change_email": "Change Email",
-        "change_email_error": "There was an issue changing your email.",
-        "changed_email": "Email changed successfully!",
-        "change_password": "Change Password",
-        "change_password_error": "There was an issue changing your password.",
-        "changed_password": "Password changed successfully!",
-        "collapse_subject": "Collapse posts with subjects",
-        "composing": "Composing",
-        "confirm_new_password": "Confirm new password",
-        "current_avatar": "Your current avatar",
-        "current_password": "Current password",
-        "current_profile_banner": "Your current profile banner",
-        "data_import_export_tab": "Data Import / Export",
-        "default_vis": "Default visibility scope",
-        "delete_account": "Delete Account",
-        "delete_account_description": "Permanently delete your data and deactivate your account.",
-        "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
-        "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
-        "discoverable": "Allow discovery of this account in search results and other services",
-        "domain_mutes": "Domains",
-        "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
-        "pad_emoji": "Pad emoji with spaces when adding from picker",
-        "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
-        "export_theme": "Save preset",
-        "filtering": "Filtering",
-        "filtering_explanation": "All statuses containing these words will be muted, one per line",
-        "follow_export": "Follow export",
-        "follow_export_button": "Export your follows to a csv file",
-        "follow_import": "Follow import",
-        "follow_import_error": "Error importing followers",
-        "follows_imported": "Follows imported! Processing them will take a while.",
-        "accent": "Accent",
-        "foreground": "Foreground",
-        "general": "General",
-        "hide_attachments_in_convo": "Hide attachments in conversations",
-        "hide_attachments_in_tl": "Hide attachments in timeline",
-        "hide_muted_posts": "Hide posts of muted users",
-        "max_thumbnails": "Maximum amount of thumbnails per post",
-        "hide_isp": "Hide instance-specific panel",
-        "preload_images": "Preload images",
-        "use_one_click_nsfw": "Open NSFW attachments with just one click",
-        "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
-        "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
-        "hide_filtered_statuses": "Hide filtered statuses",
-        "import_blocks_from_a_csv_file": "Import blocks from a csv file",
-        "import_followers_from_a_csv_file": "Import follows from a csv file",
-        "import_theme": "Load preset",
-        "inputRadius": "Input fields",
-        "checkboxRadius": "Checkboxes",
-        "instance_default": "(default: {value})",
-        "instance_default_simple": "(default)",
-        "interface": "Interface",
-        "interfaceLanguage": "Interface language",
-        "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
-        "limited_availability": "Unavailable in your browser",
-        "links": "Links",
-        "lock_account_description": "Restrict your account to approved followers only",
-        "loop_video": "Loop videos",
-        "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
-        "mutes_tab": "Mutes",
-        "play_videos_in_modal": "Play videos in a popup frame",
-        "use_contain_fit": "Don't crop the attachment in thumbnails",
-        "name": "Name",
-        "name_bio": "Name & Bio",
-        "new_email": "New Email",
-        "new_password": "New password",
-        "notification_visibility": "Types of notifications to show",
-        "notification_visibility_follows": "Follows",
-        "notification_visibility_likes": "Likes",
-        "notification_visibility_mentions": "Mentions",
-        "notification_visibility_repeats": "Repeats",
-        "notification_visibility_moves": "User Migrates",
-        "notification_visibility_emoji_reactions": "Reactions",
-        "no_rich_text_description": "Strip rich text formatting from all posts",
-        "no_blocks": "No blocks",
-        "no_mutes": "No mutes",
-        "hide_follows_description": "Don't show who I'm following",
-        "hide_followers_description": "Don't show who's following me",
-        "hide_follows_count_description": "Don't show follow count",
-        "hide_followers_count_description": "Don't show follower count",
-        "show_admin_badge": "Show Admin badge in my profile",
-        "show_moderator_badge": "Show Moderator badge in my profile",
-        "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
-        "oauth_tokens": "OAuth tokens",
-        "token": "Token",
-        "refresh_token": "Refresh Token",
-        "valid_until": "Valid Until",
-        "revoke_token": "Revoke",
-        "panelRadius": "Panels",
-        "pause_on_unfocused": "Pause streaming when tab is not focused",
-        "presets": "Presets",
-        "profile_background": "Profile Background",
-        "profile_banner": "Profile Banner",
-        "profile_tab": "Profile",
-        "radii_help": "Set up interface edge rounding (in pixels)",
-        "replies_in_timeline": "Replies in timeline",
-        "reply_link_preview": "Enable reply-link preview on mouse hover",
-        "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",
-        "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
-        "saving_err": "Error saving settings",
-        "saving_ok": "Settings saved",
-        "search_user_to_block": "Search whom you want to block",
-        "search_user_to_mute": "Search whom you want to mute",
-        "security_tab": "Security",
-        "scope_copy": "Copy scope when replying (DMs are always copied)",
-        "minimal_scopes_mode": "Minimize post scope selection options",
-        "set_new_avatar": "Set new avatar",
-        "set_new_profile_background": "Set new profile background",
-        "set_new_profile_banner": "Set new profile banner",
-        "settings": "Settings",
-        "subject_input_always_show": "Always show subject field",
-        "subject_line_behavior": "Copy subject when replying",
-        "subject_line_email": "Like email: \"re: subject\"",
-        "subject_line_mastodon": "Like mastodon: copy as is",
-        "subject_line_noop": "Do not copy",
-        "post_status_content_type": "Post status content type",
-        "stop_gifs": "Play-on-hover GIFs",
-        "streaming": "Enable automatic streaming of new posts when scrolled to the top",
-        "user_mutes": "Users",
-        "useStreamingApi": "Receive posts and notifications real-time",
-        "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)",
-        "text": "Text",
-        "theme": "Theme",
-        "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
-        "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
-        "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
-        "tooltipRadius": "Tooltips/alerts",
-        "type_domains_to_mute": "Type in domains to mute",
-        "upload_a_photo": "Upload a photo",
-        "user_settings": "User Settings",
-        "values": {
-            "false": "no",
-            "true": "yes"
-        },
-        "fun": "Fun",
-        "greentext": "Meme arrows",
-        "notifications": "Notifications",
-        "notification_setting_filters": "Filters",
-        "notification_setting": "Receive notifications from:",
-        "notification_setting_follows": "Users you follow",
-        "notification_setting_non_follows": "Users you do not follow",
-        "notification_setting_followers": "Users who follow you",
-        "notification_setting_non_followers": "Users who do not follow you",
-        "notification_setting_privacy": "Privacy",
-        "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
-        "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",
-        "style": {
-            "switcher": {
-                "keep_color": "Keep colors",
-                "keep_shadows": "Keep shadows",
-                "keep_opacity": "Keep opacity",
-                "keep_roundness": "Keep roundness",
-                "keep_fonts": "Keep fonts",
-                "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
-                "reset": "Reset",
-                "clear_all": "Clear all",
-                "clear_opacity": "Clear opacity",
-                "load_theme": "Load theme",
-                "keep_as_is": "Keep as is",
-                "use_snapshot": "Old version",
-                "use_source": "New version",
-                "help": {
-                    "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
-                    "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
-                    "future_version_imported": "File you imported was made in newer version of FE.",
-                    "older_version_imported": "File you imported was made in older version of FE.",
-                    "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
-                    "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
-                    "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
-                    "fe_downgraded": "PleromaFE's version rolled back.",
-                    "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
-                    "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
-                    "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
-                }
-            },
-            "common": {
-                "color": "Color",
-                "opacity": "Opacity",
-                "contrast": {
-                    "hint": "Contrast ratio is {ratio}, it {level} {context}",
-                    "level": {
-                        "aa": "meets Level AA guideline (minimal)",
-                        "aaa": "meets Level AAA guideline (recommended)",
-                        "bad": "doesn't meet any accessibility guidelines"
-                    },
-                    "context": {
-                        "18pt": "for large (18pt+) text",
-                        "text": "for text"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Common",
-                "main": "Common colors",
-                "foreground_hint": "See \"Advanced\" tab for more detailed control",
-                "rgbo": "Icons, accents, badges"
-            },
-            "advanced_colors": {
-                "_tab_label": "Advanced",
-                "alert": "Alert background",
-                "alert_error": "Error",
-                "alert_warning": "Warning",
-                "alert_neutral": "Neutral",
-                "post": "Posts/User bios",
-                "badge": "Badge background",
-                "popover": "Tooltips, menus, popovers",
-                "badge_notification": "Notification",
-                "panel_header": "Panel header",
-                "top_bar": "Top bar",
-                "borders": "Borders",
-                "buttons": "Buttons",
-                "inputs": "Input fields",
-                "faint_text": "Faded text",
-                "underlay": "Underlay",
-                "poll": "Poll graph",
-                "icons": "Icons",
-                "highlight": "Highlighted elements",
-                "pressed": "Pressed",
-                "selectedPost": "Selected post",
-                "selectedMenu": "Selected menu item",
-                "disabled": "Disabled",
-                "toggled": "Toggled",
-                "tabs": "Tabs"
-            },
-            "radii": {
-                "_tab_label": "Roundness"
-            },
-            "shadows": {
-                "_tab_label": "Shadow and lighting",
-                "component": "Component",
-                "override": "Override",
-                "shadow_id": "Shadow #{value}",
-                "blur": "Blur",
-                "spread": "Spread",
-                "inset": "Inset",
-                "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
-                "filter_hint": {
-                    "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
-                    "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
-                    "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
-                    "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
-                    "inset_classic": "Inset shadows will be using {0}"
-                },
-                "components": {
-                    "panel": "Panel",
-                    "panelHeader": "Panel header",
-                    "topBar": "Top bar",
-                    "avatar": "User avatar (in profile view)",
-                    "avatarStatus": "User avatar (in post display)",
-                    "popup": "Popups and tooltips",
-                    "button": "Button",
-                    "buttonHover": "Button (hover)",
-                    "buttonPressed": "Button (pressed)",
-                    "buttonPressedHover": "Button (pressed+hover)",
-                    "input": "Input field"
-                }
-            },
-            "fonts": {
-                "_tab_label": "Fonts",
-                "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
-                "components": {
-                    "interface": "Interface",
-                    "input": "Input fields",
-                    "post": "Post text",
-                    "postCode": "Monospaced text in a post (rich text)"
-                },
-                "family": "Font name",
-                "size": "Size (in px)",
-                "weight": "Weight (boldness)",
-                "custom": "Custom"
-            },
-            "preview": {
-                "header": "Preview",
-                "content": "Content",
-                "error": "Example error",
-                "button": "Button",
-                "text": "A bunch of more {0} and {1}",
-                "mono": "content",
-                "input": "Just landed in L.A.",
-                "faint_link": "helpful manual",
-                "fine_print": "Read our {0} to learn nothing useful!",
-                "header_faint": "This is fine",
-                "checkbox": "I have skimmed over terms and conditions",
-                "link": "a nice lil' link"
-            }
-        },
-        "version": {
-            "title": "Version",
-            "backend_version": "Backend Version",
-            "frontend_version": "Frontend Version"
-        }
-    },
-    "time": {
-        "day": "{0} day",
-        "days": "{0} days",
-        "day_short": "{0}d",
-        "days_short": "{0}d",
-        "hour": "{0} hour",
-        "hours": "{0} hours",
-        "hour_short": "{0}h",
-        "hours_short": "{0}h",
-        "in_future": "in {0}",
-        "in_past": "{0} ago",
-        "minute": "{0} minute",
-        "minutes": "{0} minutes",
-        "minute_short": "{0}min",
-        "minutes_short": "{0}min",
-        "month": "{0} month",
-        "months": "{0} months",
-        "month_short": "{0}mo",
-        "months_short": "{0}mo",
-        "now": "just now",
-        "now_short": "now",
-        "second": "{0} second",
-        "seconds": "{0} seconds",
-        "second_short": "{0}s",
-        "seconds_short": "{0}s",
-        "week": "{0} week",
-        "weeks": "{0} weeks",
-        "week_short": "{0}w",
-        "weeks_short": "{0}w",
-        "year": "{0} year",
-        "years": "{0} years",
-        "year_short": "{0}y",
-        "years_short": "{0}y"
-    },
-    "timeline": {
-        "collapse": "Collapse",
-        "conversation": "Conversation",
-        "error_fetching": "Error fetching updates",
-        "load_older": "Load older statuses",
-        "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
-        "repeated": "repeated",
-        "show_new": "Show new",
-        "up_to_date": "Up-to-date",
-        "no_more_statuses": "No more statuses",
-        "no_statuses": "No statuses"
-    },
-    "status": {
-        "favorites": "Favorites",
-        "repeats": "Repeats",
-        "delete": "Delete status",
-        "pin": "Pin on profile",
-        "unpin": "Unpin from profile",
-        "pinned": "Pinned",
-        "delete_confirm": "Do you really want to delete this status?",
-        "reply_to": "Reply to",
-        "replies_list": "Replies:",
-        "mute_conversation": "Mute conversation",
-        "unmute_conversation": "Unmute conversation",
-        "status_unavailable": "Status unavailable",
-        "copy_link": "Copy link to status"
-    },
-    "user_card": {
-        "approve": "Approve",
-        "block": "Block",
-        "blocked": "Blocked!",
-        "deny": "Deny",
-        "favorites": "Favorites",
-        "follow": "Follow",
-        "follow_sent": "Request sent!",
-        "follow_progress": "Requesting…",
-        "follow_again": "Send request again?",
-        "follow_unfollow": "Unfollow",
-        "followees": "Following",
-        "followers": "Followers",
-        "following": "Following!",
-        "follows_you": "Follows you!",
-        "hidden": "Hidden",
-        "its_you": "It's you!",
-        "media": "Media",
-        "mention": "Mention",
-        "mute": "Mute",
-        "muted": "Muted",
-        "per_day": "per day",
-        "remote_follow": "Remote follow",
-        "report": "Report",
-        "statuses": "Statuses",
-        "subscribe": "Subscribe",
-        "unsubscribe": "Unsubscribe",
-        "unblock": "Unblock",
-        "unblock_progress": "Unblocking…",
-        "block_progress": "Blocking…",
-        "unmute": "Unmute",
-        "unmute_progress": "Unmuting…",
-        "mute_progress": "Muting…",
-        "hide_repeats": "Hide repeats",
-        "show_repeats": "Show repeats",
-        "admin_menu": {
-            "moderation": "Moderation",
-            "grant_admin": "Grant Admin",
-            "revoke_admin": "Revoke Admin",
-            "grant_moderator": "Grant Moderator",
-            "revoke_moderator": "Revoke Moderator",
-            "activate_account": "Activate account",
-            "deactivate_account": "Deactivate account",
-            "delete_account": "Delete account",
-            "force_nsfw": "Mark all posts as NSFW",
-            "strip_media": "Remove media from posts",
-            "force_unlisted": "Force posts to be unlisted",
-            "sandbox": "Force posts to be followers-only",
-            "disable_remote_subscription": "Disallow following user from remote instances",
-            "disable_any_subscription": "Disallow following user at all",
-            "quarantine": "Disallow user posts from federating",
-            "delete_user": "Delete user",
-            "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
-        }
-    },
-    "user_profile": {
-        "timeline_title": "User Timeline",
-        "profile_does_not_exist": "Sorry, this profile does not exist.",
-        "profile_loading_error": "Sorry, there was an error loading this profile."
-    },
-    "user_reporting": {
-        "title": "Reporting {0}",
-        "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
-        "additional_comments": "Additional comments",
-        "forward_description": "The account is from another server. Send a copy of the report there as well?",
-        "forward_to": "Forward to {0}",
-        "submit": "Submit",
-        "generic_error": "An error occurred while processing your request."
-    },
-    "who_to_follow": {
-        "more": "More",
-        "who_to_follow": "Who to follow"
-    },
-    "tool_tip": {
-        "media_upload": "Upload Media",
-        "repeat": "Repeat",
-        "reply": "Reply",
-        "favorite": "Favorite",
-        "add_reaction": "Add Reaction",
-        "user_settings": "User Settings",
-        "accept_follow_request": "Accept follow request",
-        "reject_follow_request": "Reject follow request"
-    },
-    "upload": {
-        "error": {
-            "base": "Upload failed.",
-            "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Try again later"
-        },
-        "file_size_units": {
-            "B": "B",
-            "KiB": "KiB",
-            "MiB": "MiB",
-            "GiB": "GiB",
-            "TiB": "TiB"
-        }
-    },
-    "search": {
-        "people": "People",
-        "hashtags": "Hashtags",
-        "person_talking": "{count} person talking",
-        "people_talking": "{count} people talking",
-        "no_results": "No results"
-    },
-    "password_reset": {
-        "forgot_password": "Forgot password?",
-        "password_reset": "Password reset",
-        "instruction": "Enter your email address or username. We will send you a link to reset your password.",
-        "placeholder": "Your email or username",
-        "check_email": "Check your email for a link to reset your password.",
-        "return_home": "Return to the home page",
-        "not_found": "We couldn't find that email or username.",
-        "too_many_requests": "You have reached the limit of attempts, try again later.",
-        "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
-        "password_reset_required": "You must reset your password to log in.",
-        "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
+    "staff": "Staff"
+  },
+  "chat": {
+    "title": "Chat"
+  },
+  "domain_mute_card": {
+    "mute": "Mute",
+    "mute_progress": "Muting…",
+    "unmute": "Unmute",
+    "unmute_progress": "Unmuting…"
+  },
+  "exporter": {
+    "export": "Export",
+    "processing": "Processing, you'll soon be asked to download your file"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Media proxy",
+    "scope_options": "Scope options",
+    "text_limit": "Text limit",
+    "title": "Features",
+    "who_to_follow": "Who to follow"
+  },
+  "finder": {
+    "error_fetching_user": "Error fetching user",
+    "find_user": "Find user"
+  },
+  "general": {
+    "apply": "Apply",
+    "submit": "Submit",
+    "more": "More",
+    "generic_error": "An error occured",
+    "optional": "optional",
+    "show_more": "Show more",
+    "show_less": "Show less",
+    "dismiss": "Dismiss",
+    "cancel": "Cancel",
+    "disable": "Disable",
+    "enable": "Enable",
+    "confirm": "Confirm",
+    "verify": "Verify"
+  },
+  "image_cropper": {
+    "crop_picture": "Crop picture",
+    "save": "Save",
+    "save_without_cropping": "Save without cropping",
+    "cancel": "Cancel"
+  },
+  "importer": {
+    "submit": "Submit",
+    "success": "Imported successfully.",
+    "error": "An error occured while importing this file."
+  },
+  "login": {
+    "login": "Log in",
+    "description": "Log in with OAuth",
+    "logout": "Log out",
+    "password": "Password",
+    "placeholder": "e.g. lain",
+    "register": "Register",
+    "username": "Username",
+    "hint": "Log in to join the discussion",
+    "authentication_code": "Authentication code",
+    "enter_recovery_code": "Enter a recovery code",
+    "enter_two_factor_code": "Enter a two-factor code",
+    "recovery_code": "Recovery code",
+    "heading": {
+      "totp": "Two-factor authentication",
+      "recovery": "Two-factor recovery"
     }
+  },
+  "media_modal": {
+    "previous": "Previous",
+    "next": "Next"
+  },
+  "nav": {
+    "about": "About",
+    "administration": "Administration",
+    "back": "Back",
+    "chat": "Local Chat",
+    "friend_requests": "Follow Requests",
+    "mentions": "Mentions",
+    "interactions": "Interactions",
+    "dms": "Direct Messages",
+    "public_tl": "Public Timeline",
+    "timeline": "Timeline",
+    "twkn": "The Whole Known Network",
+    "user_search": "User Search",
+    "search": "Search",
+    "who_to_follow": "Who to follow",
+    "preferences": "Preferences"
+  },
+  "notifications": {
+    "broken_favorite": "Unknown status, searching for it…",
+    "favorited_you": "favorited your status",
+    "followed_you": "followed you",
+    "follow_request": "wants to follow you",
+    "load_older": "Load older notifications",
+    "notifications": "Notifications",
+    "read": "Read!",
+    "repeated_you": "repeated your status",
+    "no_more_notifications": "No more notifications",
+    "migrated_to": "migrated to",
+    "reacted_with": "reacted with {0}"
+  },
+  "polls": {
+    "add_poll": "Add Poll",
+    "add_option": "Add Option",
+    "option": "Option",
+    "votes": "votes",
+    "vote": "Vote",
+    "type": "Poll type",
+    "single_choice": "Single choice",
+    "multiple_choices": "Multiple choices",
+    "expiry": "Poll age",
+    "expires_in": "Poll ends in {0}",
+    "expired": "Poll ended {0} ago",
+    "not_enough_options": "Too few unique options in poll"
+  },
+  "emoji": {
+    "stickers": "Stickers",
+    "emoji": "Emoji",
+    "keep_open": "Keep picker open",
+    "search_emoji": "Search for an emoji",
+    "add_emoji": "Insert emoji",
+    "custom": "Custom emoji",
+    "unicode": "Unicode emoji",
+    "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
+    "load_all": "Loading all {emojiAmount} emoji"
+  },
+  "interactions": {
+    "favs_repeats": "Repeats and Favorites",
+    "follows": "New follows",
+    "moves": "User migrates",
+    "load_older": "Load older interactions"
+  },
+  "post_status": {
+    "new_status": "Post new status",
+    "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
+    "account_not_locked_warning_link": "locked",
+    "attachments_sensitive": "Mark attachments as sensitive",
+    "content_type": {
+      "text/plain": "Plain text",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_warning": "Subject (optional)",
+    "default": "Just landed in L.A.",
+    "direct_warning_to_all": "This post will be visible to all the mentioned users.",
+    "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
+    "posting": "Posting",
+    "scope_notice": {
+      "public": "This post will be visible to everyone",
+      "private": "This post will be visible to your followers only",
+      "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
+    },
+    "scope": {
+      "direct": "Direct - Post to mentioned users only",
+      "private": "Followers-only - Post to followers only",
+      "public": "Public - Post to public timelines",
+      "unlisted": "Unlisted - Do not post to public timelines"
+    }
+  },
+  "registration": {
+    "bio": "Bio",
+    "email": "Email",
+    "fullname": "Display name",
+    "password_confirm": "Password confirmation",
+    "registration": "Registration",
+    "token": "Invite token",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Click the image to get a new captcha",
+    "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.",
+    "validations": {
+      "username_required": "cannot be left blank",
+      "fullname_required": "cannot be left blank",
+      "email_required": "cannot be left blank",
+      "password_required": "cannot be left blank",
+      "password_confirmation_required": "cannot be left blank",
+      "password_confirmation_match": "should be the same as password"
+    }
+  },
+  "remote_user_resolver": {
+    "remote_user_resolver": "Remote user resolver",
+    "searching_for": "Searching for",
+    "error": "Not found."
+  },
+  "selectable_list": {
+    "select_all": "Select all"
+  },
+  "settings": {
+    "app_name": "App name",
+    "security": "Security",
+    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "Setup OTP",
+      "wait_pre_setup_otp": "presetting OTP",
+      "confirm_and_enable": "Confirm & enable OTP",
+      "title": "Two-factor Authentication",
+      "generate_new_recovery_codes": "Generate new recovery codes",
+      "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
+      "recovery_codes": "Recovery codes.",
+      "waiting_a_recovery_codes": "Receiving backup codes…",
+      "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
+      "authentication_methods": "Authentication methods",
+      "scan": {
+        "title": "Scan",
+        "desc": "Using your two-factor app, scan this QR code or enter text key:",
+        "secret_code": "Key"
+      },
+      "verify": {
+        "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
+      }
+    },
+    "allow_following_move": "Allow auto-follow when following account moves",
+    "attachmentRadius": "Attachments",
+    "attachments": "Attachments",
+    "autoload": "Enable automatic loading when scrolled to the bottom",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatars (Notifications)",
+    "avatarRadius": "Avatars",
+    "background": "Background",
+    "bio": "Bio",
+    "block_export": "Block export",
+    "block_export_button": "Export your blocks to a csv file",
+    "block_import": "Block import",
+    "block_import_error": "Error importing blocks",
+    "blocks_imported": "Blocks imported! Processing them will take a while.",
+    "blocks_tab": "Blocks",
+    "btnRadius": "Buttons",
+    "cBlue": "Blue (Reply, follow)",
+    "cGreen": "Green (Retweet)",
+    "cOrange": "Orange (Favorite)",
+    "cRed": "Red (Cancel)",
+    "change_email": "Change Email",
+    "change_email_error": "There was an issue changing your email.",
+    "changed_email": "Email changed successfully!",
+    "change_password": "Change Password",
+    "change_password_error": "There was an issue changing your password.",
+    "changed_password": "Password changed successfully!",
+    "collapse_subject": "Collapse posts with subjects",
+    "composing": "Composing",
+    "confirm_new_password": "Confirm new password",
+    "current_avatar": "Your current avatar",
+    "current_password": "Current password",
+    "current_profile_banner": "Your current profile banner",
+    "data_import_export_tab": "Data Import / Export",
+    "default_vis": "Default visibility scope",
+    "delete_account": "Delete Account",
+    "delete_account_description": "Permanently delete your data and deactivate your account.",
+    "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
+    "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
+    "discoverable": "Allow discovery of this account in search results and other services",
+    "domain_mutes": "Domains",
+    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
+    "pad_emoji": "Pad emoji with spaces when adding from picker",
+    "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
+    "export_theme": "Save preset",
+    "filtering": "Filtering",
+    "filtering_explanation": "All statuses containing these words will be muted, one per line",
+    "follow_export": "Follow export",
+    "follow_export_button": "Export your follows to a csv file",
+    "follow_import": "Follow import",
+    "follow_import_error": "Error importing followers",
+    "follows_imported": "Follows imported! Processing them will take a while.",
+    "accent": "Accent",
+    "foreground": "Foreground",
+    "general": "General",
+    "hide_attachments_in_convo": "Hide attachments in conversations",
+    "hide_attachments_in_tl": "Hide attachments in timeline",
+    "hide_muted_posts": "Hide posts of muted users",
+    "max_thumbnails": "Maximum amount of thumbnails per post",
+    "hide_isp": "Hide instance-specific panel",
+    "preload_images": "Preload images",
+    "use_one_click_nsfw": "Open NSFW attachments with just one click",
+    "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
+    "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+    "hide_filtered_statuses": "Hide filtered statuses",
+    "import_blocks_from_a_csv_file": "Import blocks from a csv file",
+    "import_followers_from_a_csv_file": "Import follows from a csv file",
+    "import_theme": "Load preset",
+    "inputRadius": "Input fields",
+    "checkboxRadius": "Checkboxes",
+    "instance_default": "(default: {value})",
+    "instance_default_simple": "(default)",
+    "interface": "Interface",
+    "interfaceLanguage": "Interface language",
+    "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
+    "limited_availability": "Unavailable in your browser",
+    "links": "Links",
+    "lock_account_description": "Restrict your account to approved followers only",
+    "loop_video": "Loop videos",
+    "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
+    "mutes_tab": "Mutes",
+    "play_videos_in_modal": "Play videos in a popup frame",
+    "use_contain_fit": "Don't crop the attachment in thumbnails",
+    "name": "Name",
+    "name_bio": "Name & Bio",
+    "new_email": "New Email",
+    "new_password": "New password",
+    "notification_visibility": "Types of notifications to show",
+    "notification_visibility_follows": "Follows",
+    "notification_visibility_likes": "Likes",
+    "notification_visibility_mentions": "Mentions",
+    "notification_visibility_repeats": "Repeats",
+    "notification_visibility_moves": "User Migrates",
+    "notification_visibility_emoji_reactions": "Reactions",
+    "no_rich_text_description": "Strip rich text formatting from all posts",
+    "no_blocks": "No blocks",
+    "no_mutes": "No mutes",
+    "hide_follows_description": "Don't show who I'm following",
+    "hide_followers_description": "Don't show who's following me",
+    "hide_follows_count_description": "Don't show follow count",
+    "hide_followers_count_description": "Don't show follower count",
+    "show_admin_badge": "Show Admin badge in my profile",
+    "show_moderator_badge": "Show Moderator badge in my profile",
+    "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
+    "oauth_tokens": "OAuth tokens",
+    "token": "Token",
+    "refresh_token": "Refresh Token",
+    "valid_until": "Valid Until",
+    "revoke_token": "Revoke",
+    "panelRadius": "Panels",
+    "pause_on_unfocused": "Pause streaming when tab is not focused",
+    "presets": "Presets",
+    "profile_background": "Profile Background",
+    "profile_banner": "Profile Banner",
+    "profile_tab": "Profile",
+    "radii_help": "Set up interface edge rounding (in pixels)",
+    "replies_in_timeline": "Replies in timeline",
+    "reply_link_preview": "Enable reply-link preview on mouse hover",
+    "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",
+    "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
+    "saving_err": "Error saving settings",
+    "saving_ok": "Settings saved",
+    "search_user_to_block": "Search whom you want to block",
+    "search_user_to_mute": "Search whom you want to mute",
+    "security_tab": "Security",
+    "scope_copy": "Copy scope when replying (DMs are always copied)",
+    "minimal_scopes_mode": "Minimize post scope selection options",
+    "set_new_avatar": "Set new avatar",
+    "set_new_profile_background": "Set new profile background",
+    "set_new_profile_banner": "Set new profile banner",
+    "settings": "Settings",
+    "subject_input_always_show": "Always show subject field",
+    "subject_line_behavior": "Copy subject when replying",
+    "subject_line_email": "Like email: \"re: subject\"",
+    "subject_line_mastodon": "Like mastodon: copy as is",
+    "subject_line_noop": "Do not copy",
+    "post_status_content_type": "Post status content type",
+    "stop_gifs": "Play-on-hover GIFs",
+    "streaming": "Enable automatic streaming of new posts when scrolled to the top",
+    "user_mutes": "Users",
+    "useStreamingApi": "Receive posts and notifications real-time",
+    "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)",
+    "text": "Text",
+    "theme": "Theme",
+    "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
+    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
+    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
+    "tooltipRadius": "Tooltips/alerts",
+    "type_domains_to_mute": "Type in domains to mute",
+    "upload_a_photo": "Upload a photo",
+    "user_settings": "User Settings",
+    "values": {
+      "false": "no",
+      "true": "yes"
+    },
+    "fun": "Fun",
+    "greentext": "Meme arrows",
+    "notifications": "Notifications",
+    "notification_setting_filters": "Filters",
+    "notification_setting": "Receive notifications from:",
+    "notification_setting_follows": "Users you follow",
+    "notification_setting_non_follows": "Users you do not follow",
+    "notification_setting_followers": "Users who follow you",
+    "notification_setting_non_followers": "Users who do not follow you",
+    "notification_setting_privacy": "Privacy",
+    "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
+    "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",
+    "style": {
+      "switcher": {
+        "keep_color": "Keep colors",
+        "keep_shadows": "Keep shadows",
+        "keep_opacity": "Keep opacity",
+        "keep_roundness": "Keep roundness",
+        "keep_fonts": "Keep fonts",
+        "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
+        "reset": "Reset",
+        "clear_all": "Clear all",
+        "clear_opacity": "Clear opacity",
+        "load_theme": "Load theme",
+        "keep_as_is": "Keep as is",
+        "use_snapshot": "Old version",
+        "use_source": "New version",
+        "help": {
+          "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
+          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
+          "future_version_imported": "File you imported was made in newer version of FE.",
+          "older_version_imported": "File you imported was made in older version of FE.",
+          "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
+          "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
+          "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
+          "fe_downgraded": "PleromaFE's version rolled back.",
+          "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
+          "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
+          "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
+        }
+      },
+      "common": {
+        "color": "Color",
+        "opacity": "Opacity",
+        "contrast": {
+          "hint": "Contrast ratio is {ratio}, it {level} {context}",
+          "level": {
+            "aa": "meets Level AA guideline (minimal)",
+            "aaa": "meets Level AAA guideline (recommended)",
+            "bad": "doesn't meet any accessibility guidelines"
+          },
+          "context": {
+            "18pt": "for large (18pt+) text",
+            "text": "for text"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Common",
+        "main": "Common colors",
+        "foreground_hint": "See \"Advanced\" tab for more detailed control",
+        "rgbo": "Icons, accents, badges"
+      },
+      "advanced_colors": {
+        "_tab_label": "Advanced",
+        "alert": "Alert background",
+        "alert_error": "Error",
+        "alert_warning": "Warning",
+        "alert_neutral": "Neutral",
+        "post": "Posts/User bios",
+        "badge": "Badge background",
+        "popover": "Tooltips, menus, popovers",
+        "badge_notification": "Notification",
+        "panel_header": "Panel header",
+        "top_bar": "Top bar",
+        "borders": "Borders",
+        "buttons": "Buttons",
+        "inputs": "Input fields",
+        "faint_text": "Faded text",
+        "underlay": "Underlay",
+        "poll": "Poll graph",
+        "icons": "Icons",
+        "highlight": "Highlighted elements",
+        "pressed": "Pressed",
+        "selectedPost": "Selected post",
+        "selectedMenu": "Selected menu item",
+        "disabled": "Disabled",
+        "toggled": "Toggled",
+        "tabs": "Tabs"
+      },
+      "radii": {
+        "_tab_label": "Roundness"
+      },
+      "shadows": {
+        "_tab_label": "Shadow and lighting",
+        "component": "Component",
+        "override": "Override",
+        "shadow_id": "Shadow #{value}",
+        "blur": "Blur",
+        "spread": "Spread",
+        "inset": "Inset",
+        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
+        "filter_hint": {
+          "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
+          "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
+          "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
+          "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
+          "inset_classic": "Inset shadows will be using {0}"
+        },
+        "components": {
+          "panel": "Panel",
+          "panelHeader": "Panel header",
+          "topBar": "Top bar",
+          "avatar": "User avatar (in profile view)",
+          "avatarStatus": "User avatar (in post display)",
+          "popup": "Popups and tooltips",
+          "button": "Button",
+          "buttonHover": "Button (hover)",
+          "buttonPressed": "Button (pressed)",
+          "buttonPressedHover": "Button (pressed+hover)",
+          "input": "Input field"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Fonts",
+        "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
+        "components": {
+          "interface": "Interface",
+          "input": "Input fields",
+          "post": "Post text",
+          "postCode": "Monospaced text in a post (rich text)"
+        },
+        "family": "Font name",
+        "size": "Size (in px)",
+        "weight": "Weight (boldness)",
+        "custom": "Custom"
+      },
+      "preview": {
+        "header": "Preview",
+        "content": "Content",
+        "error": "Example error",
+        "button": "Button",
+        "text": "A bunch of more {0} and {1}",
+        "mono": "content",
+        "input": "Just landed in L.A.",
+        "faint_link": "helpful manual",
+        "fine_print": "Read our {0} to learn nothing useful!",
+        "header_faint": "This is fine",
+        "checkbox": "I have skimmed over terms and conditions",
+        "link": "a nice lil' link"
+      }
+    },
+    "version": {
+      "title": "Version",
+      "backend_version": "Backend Version",
+      "frontend_version": "Frontend Version"
+    }
+  },
+  "time": {
+    "day": "{0} day",
+    "days": "{0} days",
+    "day_short": "{0}d",
+    "days_short": "{0}d",
+    "hour": "{0} hour",
+    "hours": "{0} hours",
+    "hour_short": "{0}h",
+    "hours_short": "{0}h",
+    "in_future": "in {0}",
+    "in_past": "{0} ago",
+    "minute": "{0} minute",
+    "minutes": "{0} minutes",
+    "minute_short": "{0}min",
+    "minutes_short": "{0}min",
+    "month": "{0} month",
+    "months": "{0} months",
+    "month_short": "{0}mo",
+    "months_short": "{0}mo",
+    "now": "just now",
+    "now_short": "now",
+    "second": "{0} second",
+    "seconds": "{0} seconds",
+    "second_short": "{0}s",
+    "seconds_short": "{0}s",
+    "week": "{0} week",
+    "weeks": "{0} weeks",
+    "week_short": "{0}w",
+    "weeks_short": "{0}w",
+    "year": "{0} year",
+    "years": "{0} years",
+    "year_short": "{0}y",
+    "years_short": "{0}y"
+  },
+  "timeline": {
+    "collapse": "Collapse",
+    "conversation": "Conversation",
+    "error_fetching": "Error fetching updates",
+    "load_older": "Load older statuses",
+    "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
+    "repeated": "repeated",
+    "show_new": "Show new",
+    "up_to_date": "Up-to-date",
+    "no_more_statuses": "No more statuses",
+    "no_statuses": "No statuses"
+  },
+  "status": {
+    "favorites": "Favorites",
+    "repeats": "Repeats",
+    "delete": "Delete status",
+    "pin": "Pin on profile",
+    "unpin": "Unpin from profile",
+    "pinned": "Pinned",
+    "delete_confirm": "Do you really want to delete this status?",
+    "reply_to": "Reply to",
+    "replies_list": "Replies:",
+    "mute_conversation": "Mute conversation",
+    "unmute_conversation": "Unmute conversation",
+    "status_unavailable": "Status unavailable",
+    "copy_link": "Copy link to status"
+  },
+  "user_card": {
+    "approve": "Approve",
+    "block": "Block",
+    "blocked": "Blocked!",
+    "deny": "Deny",
+    "favorites": "Favorites",
+    "follow": "Follow",
+    "follow_sent": "Request sent!",
+    "follow_progress": "Requesting…",
+    "follow_again": "Send request again?",
+    "follow_unfollow": "Unfollow",
+    "followees": "Following",
+    "followers": "Followers",
+    "following": "Following!",
+    "follows_you": "Follows you!",
+    "hidden": "Hidden",
+    "its_you": "It's you!",
+    "media": "Media",
+    "mention": "Mention",
+    "mute": "Mute",
+    "muted": "Muted",
+    "per_day": "per day",
+    "remote_follow": "Remote follow",
+    "report": "Report",
+    "statuses": "Statuses",
+    "subscribe": "Subscribe",
+    "unsubscribe": "Unsubscribe",
+    "unblock": "Unblock",
+    "unblock_progress": "Unblocking…",
+    "block_progress": "Blocking…",
+    "unmute": "Unmute",
+    "unmute_progress": "Unmuting…",
+    "mute_progress": "Muting…",
+    "hide_repeats": "Hide repeats",
+    "show_repeats": "Show repeats",
+    "admin_menu": {
+      "moderation": "Moderation",
+      "grant_admin": "Grant Admin",
+      "revoke_admin": "Revoke Admin",
+      "grant_moderator": "Grant Moderator",
+      "revoke_moderator": "Revoke Moderator",
+      "activate_account": "Activate account",
+      "deactivate_account": "Deactivate account",
+      "delete_account": "Delete account",
+      "force_nsfw": "Mark all posts as NSFW",
+      "strip_media": "Remove media from posts",
+      "force_unlisted": "Force posts to be unlisted",
+      "sandbox": "Force posts to be followers-only",
+      "disable_remote_subscription": "Disallow following user from remote instances",
+      "disable_any_subscription": "Disallow following user at all",
+      "quarantine": "Disallow user posts from federating",
+      "delete_user": "Delete user",
+      "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    }
+  },
+  "user_profile": {
+    "timeline_title": "User Timeline",
+    "profile_does_not_exist": "Sorry, this profile does not exist.",
+    "profile_loading_error": "Sorry, there was an error loading this profile."
+  },
+  "user_reporting": {
+    "title": "Reporting {0}",
+    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+    "additional_comments": "Additional comments",
+    "forward_description": "The account is from another server. Send a copy of the report there as well?",
+    "forward_to": "Forward to {0}",
+    "submit": "Submit",
+    "generic_error": "An error occurred while processing your request."
+  },
+  "who_to_follow": {
+    "more": "More",
+    "who_to_follow": "Who to follow"
+  },
+  "tool_tip": {
+    "media_upload": "Upload Media",
+    "repeat": "Repeat",
+    "reply": "Reply",
+    "favorite": "Favorite",
+    "add_reaction": "Add Reaction",
+    "user_settings": "User Settings",
+    "accept_follow_request": "Accept follow request",
+    "reject_follow_request": "Reject follow request"
+  },
+  "upload": {
+    "error": {
+      "base": "Upload failed.",
+      "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Try again later"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "People",
+    "hashtags": "Hashtags",
+    "person_talking": "{count} person talking",
+    "people_talking": "{count} people talking",
+    "no_results": "No results"
+  },
+  "password_reset": {
+    "forgot_password": "Forgot password?",
+    "password_reset": "Password reset",
+    "instruction": "Enter your email address or username. We will send you a link to reset your password.",
+    "placeholder": "Your email or username",
+    "check_email": "Check your email for a link to reset your password.",
+    "return_home": "Return to the home page",
+    "not_found": "We couldn't find that email or username.",
+    "too_many_requests": "You have reached the limit of attempts, try again later.",
+    "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
+    "password_reset_required": "You must reset your password to log in.",
+    "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
+  }
 }
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 08de345c..931d4c64 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -1,638 +1,638 @@
 {
-    "chat": {
-        "title": "Chat"
-    },
-    "exporter": {
-        "export": "Exportar",
-        "processing": "Procesando. Pronto se te pedirá que descargues tu archivo"
-    },
-    "features_panel": {
-        "chat": "Chat",
-        "gopher": "Gopher",
-        "media_proxy": "Proxy de medios",
-        "scope_options": "Opciones del alcance de la visibilidad",
-        "text_limit": "Límite de caracteres",
-        "title": "Características",
-        "who_to_follow": "A quién seguir"
-    },
-    "finder": {
-        "error_fetching_user": "Error al buscar usuario",
-        "find_user": "Encontrar usuario"
-    },
-    "general": {
-        "apply": "Aplicar",
-        "submit": "Enviar",
-        "more": "Más",
-        "generic_error": "Ha ocurrido un error",
-        "optional": "opcional",
-        "show_more": "Mostrar más",
-        "show_less": "Mostrar menos",
-        "cancel": "Cancelar",
-        "disable": "Inhabilitar",
-        "enable": "Habilitar",
-        "confirm": "Confirmar",
-        "verify": "Verificar"
-    },
-    "image_cropper": {
-        "crop_picture": "Recortar la foto",
-        "save": "Guardar",
-        "save_without_cropping": "Guardar sin recortar",
-        "cancel": "Cancelar"
-    },
-    "importer": {
-        "submit": "Enviar",
-        "success": "Importado con éxito",
-        "error": "Se ha producido un error al importar el archivo."
-    },
-    "login": {
-        "login": "Identificarse",
-        "description": "Identificarse con OAuth",
-        "logout": "Cerrar sesión",
-        "password": "Contraseña",
-        "placeholder": "p.ej. lain",
-        "register": "Registrarse",
-        "username": "Usuario",
-        "hint": "Inicia sesión para unirte a la discusión",
-        "authentication_code": "Código de autenticación",
-        "enter_recovery_code": "Inserta el código de recuperación",
-        "enter_two_factor_code": "Inserta el código de dos factores",
-        "recovery_code": "Código de recuperación",
-        "heading": {
-            "totp": "Autenticación de dos factores",
-            "recovery": "Recuperación de dos factores"
-        }
-    },
-    "media_modal": {
-        "previous": "Anterior",
-        "next": "Siguiente"
-    },
-    "nav": {
-        "about": "Acerca de",
-        "administration": "Administración",
-        "back": "Volver",
-        "chat": "Chat Local",
-        "friend_requests": "Solicitudes de seguimiento",
-        "mentions": "Menciones",
-        "interactions": "Interacciones",
-        "dms": "Mensajes Directos",
-        "public_tl": "Línea Temporal Pública",
-        "timeline": "Línea Temporal",
-        "twkn": "Toda La Red Conocida",
-        "user_search": "Búsqueda de Usuarios",
-        "search": "Buscar",
-        "who_to_follow": "A quién seguir",
-        "preferences": "Preferencias"
-    },
-    "notifications": {
-        "broken_favorite": "Estado desconocido, buscándolo...",
-        "favorited_you": "le gusta tu estado",
-        "followed_you": "empezó a seguirte",
-        "load_older": "Cargar notificaciones antiguas",
-        "notifications": "Notificaciones",
-        "read": "¡Leído!",
-        "repeated_you": "repitió tu estado",
-        "no_more_notifications": "No hay más notificaciones"
-    },
-    "polls": {
-        "add_poll": "Añadir encuesta",
-        "add_option": "Añadir opción",
-        "option": "Opción",
-        "votes": "votos",
-        "vote": "Votar",
-        "type": "Tipo de encuesta",
-        "single_choice": "Elección única",
-        "multiple_choices": "Elección múltiple",
-        "expiry": "Tiempo de vida de la encuesta",
-        "expires_in": "La encuesta termina en {0}",
-        "expired": "La encuesta terminó hace {0}",
-        "not_enough_options": "Muy pocas opciones únicas en la encuesta"
-    },
-    "emoji": {
-        "stickers": "Pegatinas",
-        "emoji": "Emoji",
-        "keep_open": "Mantener el selector abierto",
-        "search_emoji": "Buscar un emoji",
-        "add_emoji": "Insertar un emoji",
-        "custom": "Emojis personalizados",
-        "unicode": "Emojis unicode"
-    },
-    "stickers": {
-        "add_sticker": "Añadir Pegatina"
-    },
-    "interactions": {
-        "favs_repeats": "Favoritos y Repetidos",
-        "follows": "Nuevos seguidores",
-        "load_older": "Cargar interacciones más antiguas"
-    },
-    "post_status": {
-        "new_status": "Publicar un nuevo estado",
-        "account_not_locked_warning": "Tu cuenta no está {0}. Cualquiera puede seguirte y leer las entradas para Solo-Seguidores.",
-        "account_not_locked_warning_link": "bloqueada",
-        "attachments_sensitive": "Contenido sensible",
-        "content_type": {
-            "text/plain": "Texto Plano",
-            "text/html": "HTML",
-            "text/markdown": "Markdown",
-            "text/bbcode": "BBCode"
-        },
-        "content_warning": "Tema (opcional)",
-        "default": "Acabo de aterrizar en L.A.",
-        "direct_warning_to_all": "Esta publicación será visible para todos los usuarios mencionados.",
-        "direct_warning_to_first_only": "Esta publicación solo será visible para los usuarios mencionados al comienzo del mensaje.",
-        "posting": "Publicando",
-        "scope_notice": {
-            "public": "Esta publicación será visible para todo el mundo",
-            "private": "Esta publicación solo será visible para tus seguidores.",
-            "unlisted": "Esta publicación no será visible en la Línea Temporal Pública ni en Toda La Red Conocida"
-        },
-        "scope": {
-            "direct": "Directo - Solo para los usuarios mencionados",
-            "private": "Solo-seguidores - Solo tus seguidores leerán la publicación",
-            "public": "Público - Entradas visibles en las Líneas Temporales Públicas",
-            "unlisted": "Sin listar - Entradas no visibles en las Líneas Temporales Públicas"
-        }
-    },
-    "registration": {
-        "bio": "Biografía",
-        "email": "Correo electrónico",
-        "fullname": "Nombre a mostrar",
-        "password_confirm": "Confirmar contraseña",
-        "registration": "Registro",
-        "token": "Token de invitación",
-        "captcha": "CAPTCHA",
-        "new_captcha": "Haz click en la imagen para obtener un nuevo captcha",
-        "username_placeholder": "p.ej. lain",
-        "fullname_placeholder": "p.ej. Lain Iwakura",
-        "bio_placeholder": "e.g.\nHola, soy un ejemplo.\nAquí puedes poner algo representativo tuyo... o no.",
-        "validations": {
-            "username_required": "no puede estar vacío",
-            "fullname_required": "no puede estar vacío",
-            "email_required": "no puede estar vacío",
-            "password_required": "no puede estar vacío",
-            "password_confirmation_required": "no puede estar vacío",
-            "password_confirmation_match": "la contraseña no coincide"
-        }
-    },
-    "selectable_list": {
-        "select_all": "Seleccionar todo"
-    },
-    "settings": {
-        "app_name": "Nombre de la aplicación",
-        "security": "Seguridad",
-        "enter_current_password_to_confirm": "Introduce la contraseña actual para confirmar tu identidad",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "Configurar OTP",
-            "wait_pre_setup_otp": "preconfiguración OTP",
-            "confirm_and_enable": "Confirmar y habilitar OTP",
-            "title": "Autentificación de dos factores",
-            "generate_new_recovery_codes": "Generar códigos de recuperación nuevos",
-            "warning_of_generate_new_codes": "Cuando generas nuevos códigos de recuperación, los antiguos dejarán de funcionar.",
-            "recovery_codes": "Códigos de recuperación.",
-            "waiting_a_recovery_codes": "Recibiendo códigos de respaldo",
-            "recovery_codes_warning": "Anote los códigos o guárdelos en un lugar seguro, de lo contrario no los volverá a ver. Si pierde el acceso a su aplicación 2FA y los códigos de recuperación, su cuenta quedará bloqueada.",
-            "authentication_methods": "Métodos de autentificación",
-            "scan": {
-                "title": "Escanear",
-                "desc": "Usando su aplicación de dos factores, escanee este código QR o ingrese la clave de texto:",
-                "secret_code": "Clave"
-            },
-            "verify": {
-                "desc": "Para habilitar la autenticación de dos factores, ingrese el código de su aplicación 2FA:"
-            }
-        },
-        "attachmentRadius": "Adjuntos",
-        "attachments": "Adjuntos",
-        "autoload": "Habilitar carga automática al llegar al final de la página",
-        "avatar": "Avatar",
-        "avatarAltRadius": "Avatares (Notificaciones)",
-        "avatarRadius": "Avatares",
-        "background": "Fondo",
-        "bio": "Biografía",
-        "block_export": "Exportar usuarios bloqueados",
-        "block_export_button": "Exporta la lista de tus usuarios bloqueados a un archivo csv",
-        "block_import": "Importar usuarios bloqueados",
-        "block_import_error": "Error importando la lista de usuarios bloqueados",
-        "blocks_imported": "¡Lista de usuarios bloqueados importada! El procesado puede tardar un poco.",
-        "blocks_tab": "Bloqueados",
-        "btnRadius": "Botones",
-        "cBlue": "Azul (Responder, seguir)",
-        "cGreen": "Verde (Retweet)",
-        "cOrange": "Naranja (Favorito)",
-        "cRed": "Rojo (Cancelar)",
-        "change_password": "Cambiar contraseña",
-        "change_password_error": "Hubo un problema cambiando la contraseña.",
-        "changed_password": "¡Contraseña cambiada correctamente!",
-        "collapse_subject": "Colapsar entradas con tema",
-        "composing": "Redactando",
-        "confirm_new_password": "Confirmar la nueva contraseña",
-        "current_avatar": "Tu avatar actual",
-        "current_password": "Contraseña actual",
-        "current_profile_banner": "Tu cabecera actual",
-        "data_import_export_tab": "Importar / Exportar Datos",
-        "default_vis": "Alcance de visibilidad por defecto",
-        "delete_account": "Eliminar la cuenta",
-        "discoverable": "Permitir la aparición de esta cuenta en los resultados de búsqueda y otros servicios",
-        "delete_account_description": "Eliminar para siempre la cuenta y todos los mensajes.",
-        "pad_emoji": "Rellenar con espacios al agregar emojis desde el selector",
-        "delete_account_error": "Hubo un error al eliminar tu cuenta. Si el fallo persiste, ponte en contacto con el administrador de tu instancia.",
-        "delete_account_instructions": "Escribe tu contraseña para confirmar la eliminación de tu cuenta.",
-        "avatar_size_instruction": "El tamaño mínimo recomendado para el avatar es de 150X150 píxeles.",
-        "export_theme": "Exportar tema",
-        "filtering": "Filtrado",
-        "filtering_explanation": "Todos los estados que contengan estas palabras serán silenciados, una por línea",
-        "follow_export": "Exportar personas que tú sigues",
-        "follow_export_button": "Exporta tus seguidores a un fichero csv",
-        "follow_import": "Importar personas que tú sigues",
-        "follow_import_error": "Error al importar el fichero",
-        "follows_imported": "¡Importado! Procesarlos llevará tiempo.",
-        "foreground": "Primer plano",
-        "general": "General",
-        "hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
-        "hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
-        "hide_muted_posts": "Ocultar las publicaciones de los usuarios silenciados",
-        "max_thumbnails": "Cantidad máxima de miniaturas por publicación",
-        "hide_isp": "Ocultar el panel específico de la instancia",
-        "preload_images": "Precargar las imágenes",
-        "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
-        "hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
-        "hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
-        "hide_filtered_statuses": "Ocultar estados filtrados",
-        "import_blocks_from_a_csv_file": "Importar lista de usuarios bloqueados dese un archivo csv",
-        "import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
-        "import_theme": "Importar tema",
-        "inputRadius": "Campos de entrada",
-        "checkboxRadius": "Casillas de verificación",
-        "instance_default": "(por defecto: {value})",
-        "instance_default_simple": "(por defecto)",
-        "interface": "Interfaz",
-        "interfaceLanguage": "Idioma",
-        "invalid_theme_imported": "El archivo importado no es un tema válido de Pleroma. No se han realizado cambios.",
-        "limited_availability": "No disponible en tu navegador",
-        "links": "Enlaces",
-        "lock_account_description": "Restringir el acceso a tu cuenta solo a seguidores admitidos",
-        "loop_video": "Vídeos en bucle",
-        "loop_video_silent_only": "Bucle solo en vídeos sin sonido (p.ej. \"gifs\" de Mastodon)",
-        "mutes_tab": "Silenciados",
-        "play_videos_in_modal": "Reproducir los vídeos en un marco emergente",
-        "use_contain_fit": "No recortar los adjuntos en miniaturas",
-        "name": "Nombre",
-        "name_bio": "Nombre y Biografía",
-        "new_password": "Nueva contraseña",
-        "notification_visibility": "Tipos de notificaciones a mostrar",
-        "notification_visibility_follows": "Nuevos seguidores",
-        "notification_visibility_likes": "Me gustan (Likes)",
-        "notification_visibility_mentions": "Menciones",
-        "notification_visibility_repeats": "Repeticiones (Repeats)",
-        "no_rich_text_description": "Eliminar el formato de texto enriquecido de todas las entradas",
-        "no_blocks": "No hay usuarios bloqueados",
-        "no_mutes": "No hay usuarios silenciados",
-        "hide_follows_description": "No mostrar a quién sigo",
-        "hide_followers_description": "No mostrar quién me sigue",
-        "hide_follows_count_description": "No mostrar el número de cuentas que sigo",
-        "hide_followers_count_description": "No mostrar el número de cuentas que me siguen",
-        "show_admin_badge": "Mostrar la insignia de Administrador en mi perfil",
-        "show_moderator_badge": "Mostrar la insignia de Moderador en mi perfil",
-        "nsfw_clickthrough": "Activar el clic para ocultar los adjuntos NSFW",
-        "oauth_tokens": "Tokens de OAuth",
-        "token": "Token",
-        "refresh_token": "Actualizar el token",
-        "valid_until": "Válido hasta",
-        "revoke_token": "Revocar",
-        "panelRadius": "Paneles",
-        "pause_on_unfocused": "Parar la transmisión cuando no estés en foco.",
-        "presets": "Por defecto",
-        "profile_background": "Fondo del Perfil",
-        "profile_banner": "Cabecera del Perfil",
-        "profile_tab": "Perfil",
-        "radii_help": "Establezca el redondeo de las esquinas de la interfaz (en píxeles)",
-        "replies_in_timeline": "Réplicas en la línea temporal",
-        "reply_link_preview": "Activar la previsualización del enlace de responder al pasar el ratón por encima",
-        "reply_visibility_all": "Mostrar todas las réplicas",
-        "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
-        "reply_visibility_self": "Solo mostrar réplicas para mí",
-        "autohide_floating_post_button": "Ocultar automáticamente el botón 'Nueva Publicación' (para móviles)",
-        "saving_err": "Error al guardar los ajustes",
-        "saving_ok": "Ajustes guardados",
-        "search_user_to_block": "Buscar usuarios a bloquear",
-        "search_user_to_mute": "Buscar usuarios a silenciar",
-        "security_tab": "Seguridad",
-        "scope_copy": "Copiar la visibilidad de la publicación cuando contestamos (En los mensajes directos (MDs) siempre se copia)",
-        "minimal_scopes_mode": "Minimizar las opciones de publicación",
-        "set_new_avatar": "Cambiar avatar",
-        "set_new_profile_background": "Cambiar el fondo del perfil",
-        "set_new_profile_banner": "Cambiar la cabecera del perfil",
-        "settings": "Ajustes",
-        "subject_input_always_show": "Mostrar siempre el campo del tema",
-        "subject_line_behavior": "Copiar el tema en las respuestas",
-        "subject_line_email": "Como email: \"re: tema\"",
-        "subject_line_mastodon": "Como mastodon: copiar como es",
-        "subject_line_noop": "No copiar",
-        "post_status_content_type": "Formato de publicación",
-        "stop_gifs": "Iniciar GIFs al pasar el ratón",
-        "streaming": "Habilitar la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
-        "text": "Texto",
-        "theme": "Tema",
-        "theme_help": "Use códigos de color hexadecimales (#rrggbb) para personalizar su tema de colores.",
-        "theme_help_v2_1": "También puede invalidar los colores y la opacidad de ciertos componentes si activa la casilla de verificación. Use el botón \"Borrar todo\" para deshacer los cambios.",
-        "theme_help_v2_2": "Los iconos debajo de algunas entradas son indicadores de contraste de fondo/texto, desplace el ratón por encima para obtener información más detallada. Tenga en cuenta que cuando se utilizan indicadores de contraste de transparencia se muestra el peor caso posible.",
-        "tooltipRadius": "Información/alertas",
-        "upload_a_photo": "Subir una foto",
-        "user_settings": "Ajustes del Usuario",
-        "values": {
-            "false": "no",
-            "true": "sí"
-        },
-        "notifications": "Notificaciones",
-        "notification_setting": "Recibir notificaciones de:",
-        "notification_setting_follows": "Usuarios que sigues",
-        "notification_setting_non_follows": "Usuarios que no sigues",
-        "notification_setting_followers": "Usuarios que te siguen",
-        "notification_setting_non_followers": "Usuarios que no te siguen",
-        "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
-        "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.",
-        "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
-        "style": {
-            "switcher": {
-                "keep_color": "Mantener colores",
-                "keep_shadows": "Mantener sombras",
-                "keep_opacity": "Mantener opacidad",
-                "keep_roundness": "Mantener redondeces",
-                "keep_fonts": "Mantener fuentes",
-                "save_load_hint": "Las opciones \"Mantener\" conservan las opciones configuradas actualmente al seleccionar o cargar temas, también almacena dichas opciones al exportar un tema. Cuando se desactiven todas las casillas de verificación, el tema de exportación lo guardará todo.",
-                "reset": "Reiniciar",
-                "clear_all": "Limpiar todo",
-                "clear_opacity": "Limpiar opacidad"
-            },
-            "common": {
-                "color": "Color",
-                "opacity": "Opacidad",
-                "contrast": {
-                    "hint": "El ratio de contraste es {ratio}. {level} {context}",
-                    "level": {
-                        "aa": "Cumple con la pauta de nivel AA (mínimo)",
-                        "aaa": "Cumple con la pauta de nivel AAA (recomendado)",
-                        "bad": "No cumple con las pautas de accesibilidad"
-                    },
-                    "context": {
-                        "18pt": "para textos grandes (+18pt)",
-                        "text": "para textos"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Común",
-                "main": "Colores comunes",
-                "foreground_hint": "Vea la pestaña \"Avanzado\" para un control más detallado",
-                "rgbo": "Iconos, acentos, insignias"
-            },
-            "advanced_colors": {
-                "_tab_label": "Avanzado",
-                "alert": "Fondo de Alertas",
-                "alert_error": "Error",
-                "badge": "Fondo de Insignias",
-                "badge_notification": "Notificaciones",
-                "panel_header": "Cabecera del panel",
-                "top_bar": "Barra superior",
-                "borders": "Bordes",
-                "buttons": "Botones",
-                "inputs": "Campos de entrada",
-                "faint_text": "Texto desvanecido"
-            },
-            "radii": {
-                "_tab_label": "Redondez"
-            },
-            "shadows": {
-                "_tab_label": "Sombra e iluminación",
-                "component": "Componente",
-                "override": "Sobreescribir",
-                "shadow_id": "Sombra #{value}",
-                "blur": "Difuminar",
-                "spread": "Cantidad",
-                "inset": "Sombra interior",
-                "hint": "Para las sombras, también puede usar --variable como un valor de color para usar las variables CSS3. Tenga en cuenta que establecer la opacidad no funcionará en este caso.",
-                "filter_hint": {
-                    "always_drop_shadow": "Advertencia, esta sombra siempre usa {0} cuando el navegador lo soporta.",
-                    "drop_shadow_syntax": "{0} no soporta el parámetro {1} y la palabra clave {2}.",
-                    "avatar_inset": "Tenga en cuenta que la combinación de sombras interiores como no-interiores en los avatares, puede dar resultados inesperados con los avatares transparentes.",
-                    "spread_zero": "Sombras con una cantidad > 0 aparecerá como si estuviera puesto a cero",
-                    "inset_classic": "Las sombras interiores estarán usando {0}"
-                },
-                "components": {
-                    "panel": "Panel",
-                    "panelHeader": "Cabecera del panel",
-                    "topBar": "Barra superior",
-                    "avatar": "Avatar del usuario (en la vista del perfil)",
-                    "avatarStatus": "Avatar del usuario (en la vista de la entrada)",
-                    "popup": "Ventanas y textos emergentes (popups & tooltips)",
-                    "button": "Botones",
-                    "buttonHover": "Botón (encima)",
-                    "buttonPressed": "Botón (presionado)",
-                    "buttonPressedHover": "Botón (presionado+encima)",
-                    "input": "Campo de entrada"
-                }
-            },
-            "fonts": {
-                "_tab_label": "Fuentes",
-                "help": "Seleccione la fuente a utilizar para los elementos de la interfaz de usuario. Para \"personalizar\", debe ingresar el nombre exacto de la fuente tal como aparece en el sistema.",
-                "components": {
-                    "interface": "Interfaz",
-                    "input": "Campos de entrada",
-                    "post": "Texto de publicaciones",
-                    "postCode": "Texto monoespaciado en publicación (texto enriquecido)"
-                },
-                "family": "Nombre de la fuente",
-                "size": "Tamaño (en px)",
-                "weight": "Peso (negrita)",
-                "custom": "Personalizado"
-            },
-            "preview": {
-                "header": "Vista previa",
-                "content": "Contenido",
-                "error": "Ejemplo de error",
-                "button": "Botón",
-                "text": "Un montón de {0} y {1}",
-                "mono": "contenido",
-                "input": "Acaba de aterrizar en L.A.",
-                "faint_link": "manual útil",
-                "fine_print": "¡Lea nuestro {0} para aprender nada útil!",
-                "header_faint": "Esto está bien",
-                "checkbox": "He revisado los términos y condiciones",
-                "link": "un bonito enlace"
-            }
-        },
-        "version": {
-            "title": "Versión",
-            "backend_version": "Versión del Backend",
-            "frontend_version": "Versión del Frontend"
-        }
-    },
-    "time": {
-        "day": "{0} día",
-        "days": "{0} días",
-        "day_short": "{0}d",
-        "days_short": "{0}d",
-        "hour": "{0} hora",
-        "hours": "{0} horas",
-        "hour_short": "{0}h",
-        "hours_short": "{0}h",
-        "in_future": "en {0}",
-        "in_past": "hace {0}",
-        "minute": "{0} minuto",
-        "minutes": "{0} minutos",
-        "minute_short": "{0}min",
-        "minutes_short": "{0}min",
-        "month": "{0} mes",
-        "months": "{0} meses",
-        "month_short": "{0}m",
-        "months_short": "{0}m",
-        "now": "justo ahora",
-        "now_short": "ahora",
-        "second": "{0} segundo",
-        "seconds": "{0} segundos",
-        "second_short": "{0}s",
-        "seconds_short": "{0}s",
-        "week": "{0} semana",
-        "weeks": "{0} semanas",
-        "week_short": "{0}sem",
-        "weeks_short": "{0}sem",
-        "year": "{0} año",
-        "years": "{0} años",
-        "year_short": "{0}a",
-        "years_short": "{0}a"
-    },
-    "timeline": {
-        "collapse": "Colapsar",
-        "conversation": "Conversación",
-        "error_fetching": "Error al cargar las actualizaciones",
-        "load_older": "Cargar actualizaciones anteriores",
-        "no_retweet_hint": "La publicación está marcada como solo para seguidores o directa y no se puede repetir",
-        "repeated": "repetida",
-        "show_new": "Mostrar lo nuevo",
-        "up_to_date": "Actualizado",
-        "no_more_statuses": "No hay más estados",
-        "no_statuses": "Sin estados"
-    },
-    "status": {
-        "favorites": "Favoritos",
-        "repeats": "Repetidos",
-        "delete": "Eliminar publicación",
-        "pin": "Fijar en tu perfil",
-        "unpin": "Desclavar de tu perfil",
-        "pinned": "Fijado",
-        "delete_confirm": "¿Realmente quieres borrar la publicación?",
-        "reply_to": "Respondiendo a",
-        "replies_list": "Respuestas:",
-        "mute_conversation": "Silenciar la conversación",
-        "unmute_conversation": "Mostrar la conversación"
-    },
-    "user_card": {
-        "approve": "Aprobar",
-        "block": "Bloquear",
-        "blocked": "¡Bloqueado!",
-        "deny": "Denegar",
-        "favorites": "Favoritos",
-        "follow": "Seguir",
-        "follow_sent": "¡Solicitud enviada!",
-        "follow_progress": "Solicitando…",
-        "follow_again": "¿Enviar solicitud de nuevo?",
-        "follow_unfollow": "Dejar de seguir",
-        "followees": "Siguiendo",
-        "followers": "Seguidores",
-        "following": "¡Siguiendo!",
-        "follows_you": "¡Te sigue!",
-        "its_you": "¡Eres tú!",
-        "media": "Media",
-        "mention": "Mencionar",
-        "mute": "Silenciar",
-        "muted": "Silenciado",
-        "per_day": "por día",
-        "remote_follow": "Seguir",
-        "report": "Reportar",
-        "statuses": "Estados",
-        "subscribe": "Suscribirse",
-        "unsubscribe": "Desuscribirse",
-        "unblock": "Desbloquear",
-        "unblock_progress": "Desbloqueando...",
-        "block_progress": "Bloqueando...",
-        "unmute": "Quitar silencio",
-        "unmute_progress": "Quitando silencio...",
-        "mute_progress": "Silenciando...",
-        "admin_menu": {
-            "moderation": "Moderación",
-            "grant_admin": "Conceder permisos de Administrador",
-            "revoke_admin": "Revocar permisos de Administrador",
-            "grant_moderator": "Conceder permisos de Moderador",
-            "revoke_moderator": "Revocar permisos de Moderador",
-            "activate_account": "Activar cuenta",
-            "deactivate_account": "Desactivar cuenta",
-            "delete_account": "Eliminar cuenta",
-            "force_nsfw": "Marcar todas las publicaciones como NSFW (no es seguro/apropiado para el trabajo)",
-            "strip_media": "Eliminar archivos multimedia de las publicaciones",
-            "force_unlisted": "Forzar que se publique en el modo -Sin Listar-",
-            "sandbox": "Forzar que se publique solo para tus seguidores",
-            "disable_remote_subscription": "No permitir que usuarios de instancias remotas te siga.",
-            "disable_any_subscription": "No permitir que ningún usuario te siga",
-            "quarantine": "No permitir publicaciones de usuarios de instancias remotas",
-            "delete_user": "Eliminar usuario",
-            "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer."
-        }
-    },
-    "user_profile": {
-        "timeline_title": "Linea Temporal del Usuario",
-        "profile_does_not_exist": "Lo sentimos, este perfil no existe.",
-        "profile_loading_error": "Lo sentimos, hubo un error al cargar este perfil."
-    },
-    "user_reporting": {
-        "title": "Reportando a {0}",
-        "add_comment_description": "El informe será enviado a los moderadores de su instancia. Puedes proporcionar una explicación de por qué estás reportando esta cuenta a continuación:",
-        "additional_comments": "Comentarios adicionales",
-        "forward_description": "La cuenta es de otro servidor. ¿Enviar una copia del informe allí también?",
-        "forward_to": "Reenviar a {0}",
-        "submit": "Enviar",
-        "generic_error": "Se produjo un error al procesar la solicitud."
-    },
-    "who_to_follow": {
-        "more": "Más",
-        "who_to_follow": "A quién seguir"
-    },
-    "tool_tip": {
-        "media_upload": "Subir Medios",
-        "repeat": "Repetir",
-        "reply": "Contestar",
-        "favorite": "Favorito",
-        "user_settings": "Ajustes de usuario"
-    },
-    "upload": {
-        "error": {
-            "base": "Subida fallida.",
-            "file_too_big": "Archivo demasiado grande [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Inténtalo más tarde"
-        },
-        "file_size_units": {
-            "B": "B",
-            "KiB": "KiB",
-            "MiB": "MiB",
-            "GiB": "GiB",
-            "TiB": "TiB"
-        }
-    },
-    "search": {
-        "people": "Personas",
-        "hashtags": "Etiquetas",
-        "person_talking": "{count} personas hablando",
-        "people_talking": "{count} gente hablando",
-        "no_results": "Sin resultados"
-    },
-    "password_reset": {
-        "forgot_password": "¿Contraseña olvidada?",
-        "password_reset": "Restablecer la contraseña",
-        "instruction": "Ingrese su dirección de correo electrónico o nombre de usuario. Le enviaremos un enlace para restablecer su contraseña.",
-        "placeholder": "Su correo electrónico o nombre de usuario",
-        "check_email": "Revise su correo electrónico para obtener un enlace para restablecer su contraseña.",
-        "return_home": "Volver a la página de inicio",
-        "not_found": "No pudimos encontrar ese correo electrónico o nombre de usuario.",
-        "too_many_requests": "Has alcanzado el límite de intentos, vuelve a intentarlo más tarde.",
-        "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia."
+  "chat": {
+    "title": "Chat"
+  },
+  "exporter": {
+    "export": "Exportar",
+    "processing": "Procesando. Pronto se te pedirá que descargues tu archivo"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Proxy de medios",
+    "scope_options": "Opciones del alcance de la visibilidad",
+    "text_limit": "Límite de caracteres",
+    "title": "Características",
+    "who_to_follow": "A quién seguir"
+  },
+  "finder": {
+    "error_fetching_user": "Error al buscar usuario",
+    "find_user": "Encontrar usuario"
+  },
+  "general": {
+    "apply": "Aplicar",
+    "submit": "Enviar",
+    "more": "Más",
+    "generic_error": "Ha ocurrido un error",
+    "optional": "opcional",
+    "show_more": "Mostrar más",
+    "show_less": "Mostrar menos",
+    "cancel": "Cancelar",
+    "disable": "Inhabilitar",
+    "enable": "Habilitar",
+    "confirm": "Confirmar",
+    "verify": "Verificar"
+  },
+  "image_cropper": {
+    "crop_picture": "Recortar la foto",
+    "save": "Guardar",
+    "save_without_cropping": "Guardar sin recortar",
+    "cancel": "Cancelar"
+  },
+  "importer": {
+    "submit": "Enviar",
+    "success": "Importado con éxito",
+    "error": "Se ha producido un error al importar el archivo."
+  },
+  "login": {
+    "login": "Identificarse",
+    "description": "Identificarse con OAuth",
+    "logout": "Cerrar sesión",
+    "password": "Contraseña",
+    "placeholder": "p.ej. lain",
+    "register": "Registrarse",
+    "username": "Usuario",
+    "hint": "Inicia sesión para unirte a la discusión",
+    "authentication_code": "Código de autenticación",
+    "enter_recovery_code": "Inserta el código de recuperación",
+    "enter_two_factor_code": "Inserta el código de dos factores",
+    "recovery_code": "Código de recuperación",
+    "heading": {
+      "totp": "Autenticación de dos factores",
+      "recovery": "Recuperación de dos factores"
     }
+  },
+  "media_modal": {
+    "previous": "Anterior",
+    "next": "Siguiente"
+  },
+  "nav": {
+    "about": "Acerca de",
+    "administration": "Administración",
+    "back": "Volver",
+    "chat": "Chat Local",
+    "friend_requests": "Solicitudes de seguimiento",
+    "mentions": "Menciones",
+    "interactions": "Interacciones",
+    "dms": "Mensajes Directos",
+    "public_tl": "Línea Temporal Pública",
+    "timeline": "Línea Temporal",
+    "twkn": "Toda La Red Conocida",
+    "user_search": "Búsqueda de Usuarios",
+    "search": "Buscar",
+    "who_to_follow": "A quién seguir",
+    "preferences": "Preferencias"
+  },
+  "notifications": {
+    "broken_favorite": "Estado desconocido, buscándolo...",
+    "favorited_you": "le gusta tu estado",
+    "followed_you": "empezó a seguirte",
+    "load_older": "Cargar notificaciones antiguas",
+    "notifications": "Notificaciones",
+    "read": "¡Leído!",
+    "repeated_you": "repitió tu estado",
+    "no_more_notifications": "No hay más notificaciones"
+  },
+  "polls": {
+    "add_poll": "Añadir encuesta",
+    "add_option": "Añadir opción",
+    "option": "Opción",
+    "votes": "votos",
+    "vote": "Votar",
+    "type": "Tipo de encuesta",
+    "single_choice": "Elección única",
+    "multiple_choices": "Elección múltiple",
+    "expiry": "Tiempo de vida de la encuesta",
+    "expires_in": "La encuesta termina en {0}",
+    "expired": "La encuesta terminó hace {0}",
+    "not_enough_options": "Muy pocas opciones únicas en la encuesta"
+  },
+  "emoji": {
+    "stickers": "Pegatinas",
+    "emoji": "Emoji",
+    "keep_open": "Mantener el selector abierto",
+    "search_emoji": "Buscar un emoji",
+    "add_emoji": "Insertar un emoji",
+    "custom": "Emojis personalizados",
+    "unicode": "Emojis unicode"
+  },
+  "stickers": {
+    "add_sticker": "Añadir Pegatina"
+  },
+  "interactions": {
+    "favs_repeats": "Favoritos y Repetidos",
+    "follows": "Nuevos seguidores",
+    "load_older": "Cargar interacciones más antiguas"
+  },
+  "post_status": {
+    "new_status": "Publicar un nuevo estado",
+    "account_not_locked_warning": "Tu cuenta no está {0}. Cualquiera puede seguirte y leer las entradas para Solo-Seguidores.",
+    "account_not_locked_warning_link": "bloqueada",
+    "attachments_sensitive": "Contenido sensible",
+    "content_type": {
+      "text/plain": "Texto Plano",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_warning": "Tema (opcional)",
+    "default": "Acabo de aterrizar en L.A.",
+    "direct_warning_to_all": "Esta publicación será visible para todos los usuarios mencionados.",
+    "direct_warning_to_first_only": "Esta publicación solo será visible para los usuarios mencionados al comienzo del mensaje.",
+    "posting": "Publicando",
+    "scope_notice": {
+      "public": "Esta publicación será visible para todo el mundo",
+      "private": "Esta publicación solo será visible para tus seguidores.",
+      "unlisted": "Esta publicación no será visible en la Línea Temporal Pública ni en Toda La Red Conocida"
+    },
+    "scope": {
+      "direct": "Directo - Solo para los usuarios mencionados",
+      "private": "Solo-seguidores - Solo tus seguidores leerán la publicación",
+      "public": "Público - Entradas visibles en las Líneas Temporales Públicas",
+      "unlisted": "Sin listar - Entradas no visibles en las Líneas Temporales Públicas"
+    }
+  },
+  "registration": {
+    "bio": "Biografía",
+    "email": "Correo electrónico",
+    "fullname": "Nombre a mostrar",
+    "password_confirm": "Confirmar contraseña",
+    "registration": "Registro",
+    "token": "Token de invitación",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Haz click en la imagen para obtener un nuevo captcha",
+    "username_placeholder": "p.ej. lain",
+    "fullname_placeholder": "p.ej. Lain Iwakura",
+    "bio_placeholder": "e.g.\nHola, soy un ejemplo.\nAquí puedes poner algo representativo tuyo... o no.",
+    "validations": {
+      "username_required": "no puede estar vacío",
+      "fullname_required": "no puede estar vacío",
+      "email_required": "no puede estar vacío",
+      "password_required": "no puede estar vacío",
+      "password_confirmation_required": "no puede estar vacío",
+      "password_confirmation_match": "la contraseña no coincide"
+    }
+  },
+  "selectable_list": {
+    "select_all": "Seleccionar todo"
+  },
+  "settings": {
+    "app_name": "Nombre de la aplicación",
+    "security": "Seguridad",
+    "enter_current_password_to_confirm": "Introduce la contraseña actual para confirmar tu identidad",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "Configurar OTP",
+      "wait_pre_setup_otp": "preconfiguración OTP",
+      "confirm_and_enable": "Confirmar y habilitar OTP",
+      "title": "Autentificación de dos factores",
+      "generate_new_recovery_codes": "Generar códigos de recuperación nuevos",
+      "warning_of_generate_new_codes": "Cuando generas nuevos códigos de recuperación, los antiguos dejarán de funcionar.",
+      "recovery_codes": "Códigos de recuperación.",
+      "waiting_a_recovery_codes": "Recibiendo códigos de respaldo",
+      "recovery_codes_warning": "Anote los códigos o guárdelos en un lugar seguro, de lo contrario no los volverá a ver. Si pierde el acceso a su aplicación 2FA y los códigos de recuperación, su cuenta quedará bloqueada.",
+      "authentication_methods": "Métodos de autentificación",
+      "scan": {
+        "title": "Escanear",
+        "desc": "Usando su aplicación de dos factores, escanee este código QR o ingrese la clave de texto:",
+        "secret_code": "Clave"
+      },
+      "verify": {
+        "desc": "Para habilitar la autenticación de dos factores, ingrese el código de su aplicación 2FA:"
+      }
+    },
+    "attachmentRadius": "Adjuntos",
+    "attachments": "Adjuntos",
+    "autoload": "Habilitar carga automática al llegar al final de la página",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatares (Notificaciones)",
+    "avatarRadius": "Avatares",
+    "background": "Fondo",
+    "bio": "Biografía",
+    "block_export": "Exportar usuarios bloqueados",
+    "block_export_button": "Exporta la lista de tus usuarios bloqueados a un archivo csv",
+    "block_import": "Importar usuarios bloqueados",
+    "block_import_error": "Error importando la lista de usuarios bloqueados",
+    "blocks_imported": "¡Lista de usuarios bloqueados importada! El procesado puede tardar un poco.",
+    "blocks_tab": "Bloqueados",
+    "btnRadius": "Botones",
+    "cBlue": "Azul (Responder, seguir)",
+    "cGreen": "Verde (Retweet)",
+    "cOrange": "Naranja (Favorito)",
+    "cRed": "Rojo (Cancelar)",
+    "change_password": "Cambiar contraseña",
+    "change_password_error": "Hubo un problema cambiando la contraseña.",
+    "changed_password": "¡Contraseña cambiada correctamente!",
+    "collapse_subject": "Colapsar entradas con tema",
+    "composing": "Redactando",
+    "confirm_new_password": "Confirmar la nueva contraseña",
+    "current_avatar": "Tu avatar actual",
+    "current_password": "Contraseña actual",
+    "current_profile_banner": "Tu cabecera actual",
+    "data_import_export_tab": "Importar / Exportar Datos",
+    "default_vis": "Alcance de visibilidad por defecto",
+    "delete_account": "Eliminar la cuenta",
+    "discoverable": "Permitir la aparición de esta cuenta en los resultados de búsqueda y otros servicios",
+    "delete_account_description": "Eliminar para siempre la cuenta y todos los mensajes.",
+    "pad_emoji": "Rellenar con espacios al agregar emojis desde el selector",
+    "delete_account_error": "Hubo un error al eliminar tu cuenta. Si el fallo persiste, ponte en contacto con el administrador de tu instancia.",
+    "delete_account_instructions": "Escribe tu contraseña para confirmar la eliminación de tu cuenta.",
+    "avatar_size_instruction": "El tamaño mínimo recomendado para el avatar es de 150X150 píxeles.",
+    "export_theme": "Exportar tema",
+    "filtering": "Filtrado",
+    "filtering_explanation": "Todos los estados que contengan estas palabras serán silenciados, una por línea",
+    "follow_export": "Exportar personas que tú sigues",
+    "follow_export_button": "Exporta tus seguidores a un fichero csv",
+    "follow_import": "Importar personas que tú sigues",
+    "follow_import_error": "Error al importar el fichero",
+    "follows_imported": "¡Importado! Procesarlos llevará tiempo.",
+    "foreground": "Primer plano",
+    "general": "General",
+    "hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
+    "hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
+    "hide_muted_posts": "Ocultar las publicaciones de los usuarios silenciados",
+    "max_thumbnails": "Cantidad máxima de miniaturas por publicación",
+    "hide_isp": "Ocultar el panel específico de la instancia",
+    "preload_images": "Precargar las imágenes",
+    "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click.",
+    "hide_post_stats": "Ocultar las estadísticas de las entradas (p.ej. el número de favoritos)",
+    "hide_user_stats": "Ocultar las estadísticas del usuario (p.ej. el número de seguidores)",
+    "hide_filtered_statuses": "Ocultar estados filtrados",
+    "import_blocks_from_a_csv_file": "Importar lista de usuarios bloqueados dese un archivo csv",
+    "import_followers_from_a_csv_file": "Importar personas que tú sigues a partir de un archivo csv",
+    "import_theme": "Importar tema",
+    "inputRadius": "Campos de entrada",
+    "checkboxRadius": "Casillas de verificación",
+    "instance_default": "(por defecto: {value})",
+    "instance_default_simple": "(por defecto)",
+    "interface": "Interfaz",
+    "interfaceLanguage": "Idioma",
+    "invalid_theme_imported": "El archivo importado no es un tema válido de Pleroma. No se han realizado cambios.",
+    "limited_availability": "No disponible en tu navegador",
+    "links": "Enlaces",
+    "lock_account_description": "Restringir el acceso a tu cuenta solo a seguidores admitidos",
+    "loop_video": "Vídeos en bucle",
+    "loop_video_silent_only": "Bucle solo en vídeos sin sonido (p.ej. \"gifs\" de Mastodon)",
+    "mutes_tab": "Silenciados",
+    "play_videos_in_modal": "Reproducir los vídeos en un marco emergente",
+    "use_contain_fit": "No recortar los adjuntos en miniaturas",
+    "name": "Nombre",
+    "name_bio": "Nombre y Biografía",
+    "new_password": "Nueva contraseña",
+    "notification_visibility": "Tipos de notificaciones a mostrar",
+    "notification_visibility_follows": "Nuevos seguidores",
+    "notification_visibility_likes": "Me gustan (Likes)",
+    "notification_visibility_mentions": "Menciones",
+    "notification_visibility_repeats": "Repeticiones (Repeats)",
+    "no_rich_text_description": "Eliminar el formato de texto enriquecido de todas las entradas",
+    "no_blocks": "No hay usuarios bloqueados",
+    "no_mutes": "No hay usuarios silenciados",
+    "hide_follows_description": "No mostrar a quién sigo",
+    "hide_followers_description": "No mostrar quién me sigue",
+    "hide_follows_count_description": "No mostrar el número de cuentas que sigo",
+    "hide_followers_count_description": "No mostrar el número de cuentas que me siguen",
+    "show_admin_badge": "Mostrar la insignia de Administrador en mi perfil",
+    "show_moderator_badge": "Mostrar la insignia de Moderador en mi perfil",
+    "nsfw_clickthrough": "Activar el clic para ocultar los adjuntos NSFW",
+    "oauth_tokens": "Tokens de OAuth",
+    "token": "Token",
+    "refresh_token": "Actualizar el token",
+    "valid_until": "Válido hasta",
+    "revoke_token": "Revocar",
+    "panelRadius": "Paneles",
+    "pause_on_unfocused": "Parar la transmisión cuando no estés en foco.",
+    "presets": "Por defecto",
+    "profile_background": "Fondo del Perfil",
+    "profile_banner": "Cabecera del Perfil",
+    "profile_tab": "Perfil",
+    "radii_help": "Establezca el redondeo de las esquinas de la interfaz (en píxeles)",
+    "replies_in_timeline": "Réplicas en la línea temporal",
+    "reply_link_preview": "Activar la previsualización del enlace de responder al pasar el ratón por encima",
+    "reply_visibility_all": "Mostrar todas las réplicas",
+    "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
+    "reply_visibility_self": "Solo mostrar réplicas para mí",
+    "autohide_floating_post_button": "Ocultar automáticamente el botón 'Nueva Publicación' (para móviles)",
+    "saving_err": "Error al guardar los ajustes",
+    "saving_ok": "Ajustes guardados",
+    "search_user_to_block": "Buscar usuarios a bloquear",
+    "search_user_to_mute": "Buscar usuarios a silenciar",
+    "security_tab": "Seguridad",
+    "scope_copy": "Copiar la visibilidad de la publicación cuando contestamos (En los mensajes directos (MDs) siempre se copia)",
+    "minimal_scopes_mode": "Minimizar las opciones de publicación",
+    "set_new_avatar": "Cambiar avatar",
+    "set_new_profile_background": "Cambiar el fondo del perfil",
+    "set_new_profile_banner": "Cambiar la cabecera del perfil",
+    "settings": "Ajustes",
+    "subject_input_always_show": "Mostrar siempre el campo del tema",
+    "subject_line_behavior": "Copiar el tema en las respuestas",
+    "subject_line_email": "Como email: \"re: tema\"",
+    "subject_line_mastodon": "Como mastodon: copiar como es",
+    "subject_line_noop": "No copiar",
+    "post_status_content_type": "Formato de publicación",
+    "stop_gifs": "Iniciar GIFs al pasar el ratón",
+    "streaming": "Habilitar la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
+    "text": "Texto",
+    "theme": "Tema",
+    "theme_help": "Use códigos de color hexadecimales (#rrggbb) para personalizar su tema de colores.",
+    "theme_help_v2_1": "También puede invalidar los colores y la opacidad de ciertos componentes si activa la casilla de verificación. Use el botón \"Borrar todo\" para deshacer los cambios.",
+    "theme_help_v2_2": "Los iconos debajo de algunas entradas son indicadores de contraste de fondo/texto, desplace el ratón por encima para obtener información más detallada. Tenga en cuenta que cuando se utilizan indicadores de contraste de transparencia se muestra el peor caso posible.",
+    "tooltipRadius": "Información/alertas",
+    "upload_a_photo": "Subir una foto",
+    "user_settings": "Ajustes del Usuario",
+    "values": {
+      "false": "no",
+      "true": "sí"
+    },
+    "notifications": "Notificaciones",
+    "notification_setting": "Recibir notificaciones de:",
+    "notification_setting_follows": "Usuarios que sigues",
+    "notification_setting_non_follows": "Usuarios que no sigues",
+    "notification_setting_followers": "Usuarios que te siguen",
+    "notification_setting_non_followers": "Usuarios que no te siguen",
+    "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
+    "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.",
+    "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
+    "style": {
+      "switcher": {
+        "keep_color": "Mantener colores",
+        "keep_shadows": "Mantener sombras",
+        "keep_opacity": "Mantener opacidad",
+        "keep_roundness": "Mantener redondeces",
+        "keep_fonts": "Mantener fuentes",
+        "save_load_hint": "Las opciones \"Mantener\" conservan las opciones configuradas actualmente al seleccionar o cargar temas, también almacena dichas opciones al exportar un tema. Cuando se desactiven todas las casillas de verificación, el tema de exportación lo guardará todo.",
+        "reset": "Reiniciar",
+        "clear_all": "Limpiar todo",
+        "clear_opacity": "Limpiar opacidad"
+      },
+      "common": {
+        "color": "Color",
+        "opacity": "Opacidad",
+        "contrast": {
+          "hint": "El ratio de contraste es {ratio}. {level} {context}",
+          "level": {
+            "aa": "Cumple con la pauta de nivel AA (mínimo)",
+            "aaa": "Cumple con la pauta de nivel AAA (recomendado)",
+            "bad": "No cumple con las pautas de accesibilidad"
+          },
+          "context": {
+            "18pt": "para textos grandes (+18pt)",
+            "text": "para textos"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Común",
+        "main": "Colores comunes",
+        "foreground_hint": "Vea la pestaña \"Avanzado\" para un control más detallado",
+        "rgbo": "Iconos, acentos, insignias"
+      },
+      "advanced_colors": {
+        "_tab_label": "Avanzado",
+        "alert": "Fondo de Alertas",
+        "alert_error": "Error",
+        "badge": "Fondo de Insignias",
+        "badge_notification": "Notificaciones",
+        "panel_header": "Cabecera del panel",
+        "top_bar": "Barra superior",
+        "borders": "Bordes",
+        "buttons": "Botones",
+        "inputs": "Campos de entrada",
+        "faint_text": "Texto desvanecido"
+      },
+      "radii": {
+        "_tab_label": "Redondez"
+      },
+      "shadows": {
+        "_tab_label": "Sombra e iluminación",
+        "component": "Componente",
+        "override": "Sobreescribir",
+        "shadow_id": "Sombra #{value}",
+        "blur": "Difuminar",
+        "spread": "Cantidad",
+        "inset": "Sombra interior",
+        "hint": "Para las sombras, también puede usar --variable como un valor de color para usar las variables CSS3. Tenga en cuenta que establecer la opacidad no funcionará en este caso.",
+        "filter_hint": {
+          "always_drop_shadow": "Advertencia, esta sombra siempre usa {0} cuando el navegador lo soporta.",
+          "drop_shadow_syntax": "{0} no soporta el parámetro {1} y la palabra clave {2}.",
+          "avatar_inset": "Tenga en cuenta que la combinación de sombras interiores como no-interiores en los avatares, puede dar resultados inesperados con los avatares transparentes.",
+          "spread_zero": "Sombras con una cantidad > 0 aparecerá como si estuviera puesto a cero",
+          "inset_classic": "Las sombras interiores estarán usando {0}"
+        },
+        "components": {
+          "panel": "Panel",
+          "panelHeader": "Cabecera del panel",
+          "topBar": "Barra superior",
+          "avatar": "Avatar del usuario (en la vista del perfil)",
+          "avatarStatus": "Avatar del usuario (en la vista de la entrada)",
+          "popup": "Ventanas y textos emergentes (popups & tooltips)",
+          "button": "Botones",
+          "buttonHover": "Botón (encima)",
+          "buttonPressed": "Botón (presionado)",
+          "buttonPressedHover": "Botón (presionado+encima)",
+          "input": "Campo de entrada"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Fuentes",
+        "help": "Seleccione la fuente a utilizar para los elementos de la interfaz de usuario. Para \"personalizar\", debe ingresar el nombre exacto de la fuente tal como aparece en el sistema.",
+        "components": {
+          "interface": "Interfaz",
+          "input": "Campos de entrada",
+          "post": "Texto de publicaciones",
+          "postCode": "Texto monoespaciado en publicación (texto enriquecido)"
+        },
+        "family": "Nombre de la fuente",
+        "size": "Tamaño (en px)",
+        "weight": "Peso (negrita)",
+        "custom": "Personalizado"
+      },
+      "preview": {
+        "header": "Vista previa",
+        "content": "Contenido",
+        "error": "Ejemplo de error",
+        "button": "Botón",
+        "text": "Un montón de {0} y {1}",
+        "mono": "contenido",
+        "input": "Acaba de aterrizar en L.A.",
+        "faint_link": "manual útil",
+        "fine_print": "¡Lea nuestro {0} para aprender nada útil!",
+        "header_faint": "Esto está bien",
+        "checkbox": "He revisado los términos y condiciones",
+        "link": "un bonito enlace"
+      }
+    },
+    "version": {
+      "title": "Versión",
+      "backend_version": "Versión del Backend",
+      "frontend_version": "Versión del Frontend"
+    }
+  },
+  "time": {
+    "day": "{0} día",
+    "days": "{0} días",
+    "day_short": "{0}d",
+    "days_short": "{0}d",
+    "hour": "{0} hora",
+    "hours": "{0} horas",
+    "hour_short": "{0}h",
+    "hours_short": "{0}h",
+    "in_future": "en {0}",
+    "in_past": "hace {0}",
+    "minute": "{0} minuto",
+    "minutes": "{0} minutos",
+    "minute_short": "{0}min",
+    "minutes_short": "{0}min",
+    "month": "{0} mes",
+    "months": "{0} meses",
+    "month_short": "{0}m",
+    "months_short": "{0}m",
+    "now": "justo ahora",
+    "now_short": "ahora",
+    "second": "{0} segundo",
+    "seconds": "{0} segundos",
+    "second_short": "{0}s",
+    "seconds_short": "{0}s",
+    "week": "{0} semana",
+    "weeks": "{0} semanas",
+    "week_short": "{0}sem",
+    "weeks_short": "{0}sem",
+    "year": "{0} año",
+    "years": "{0} años",
+    "year_short": "{0}a",
+    "years_short": "{0}a"
+  },
+  "timeline": {
+    "collapse": "Colapsar",
+    "conversation": "Conversación",
+    "error_fetching": "Error al cargar las actualizaciones",
+    "load_older": "Cargar actualizaciones anteriores",
+    "no_retweet_hint": "La publicación está marcada como solo para seguidores o directa y no se puede repetir",
+    "repeated": "repetida",
+    "show_new": "Mostrar lo nuevo",
+    "up_to_date": "Actualizado",
+    "no_more_statuses": "No hay más estados",
+    "no_statuses": "Sin estados"
+  },
+  "status": {
+    "favorites": "Favoritos",
+    "repeats": "Repetidos",
+    "delete": "Eliminar publicación",
+    "pin": "Fijar en tu perfil",
+    "unpin": "Desclavar de tu perfil",
+    "pinned": "Fijado",
+    "delete_confirm": "¿Realmente quieres borrar la publicación?",
+    "reply_to": "Respondiendo a",
+    "replies_list": "Respuestas:",
+    "mute_conversation": "Silenciar la conversación",
+    "unmute_conversation": "Mostrar la conversación"
+  },
+  "user_card": {
+    "approve": "Aprobar",
+    "block": "Bloquear",
+    "blocked": "¡Bloqueado!",
+    "deny": "Denegar",
+    "favorites": "Favoritos",
+    "follow": "Seguir",
+    "follow_sent": "¡Solicitud enviada!",
+    "follow_progress": "Solicitando…",
+    "follow_again": "¿Enviar solicitud de nuevo?",
+    "follow_unfollow": "Dejar de seguir",
+    "followees": "Siguiendo",
+    "followers": "Seguidores",
+    "following": "¡Siguiendo!",
+    "follows_you": "¡Te sigue!",
+    "its_you": "¡Eres tú!",
+    "media": "Media",
+    "mention": "Mencionar",
+    "mute": "Silenciar",
+    "muted": "Silenciado",
+    "per_day": "por día",
+    "remote_follow": "Seguir",
+    "report": "Reportar",
+    "statuses": "Estados",
+    "subscribe": "Suscribirse",
+    "unsubscribe": "Desuscribirse",
+    "unblock": "Desbloquear",
+    "unblock_progress": "Desbloqueando...",
+    "block_progress": "Bloqueando...",
+    "unmute": "Quitar silencio",
+    "unmute_progress": "Quitando silencio...",
+    "mute_progress": "Silenciando...",
+    "admin_menu": {
+      "moderation": "Moderación",
+      "grant_admin": "Conceder permisos de Administrador",
+      "revoke_admin": "Revocar permisos de Administrador",
+      "grant_moderator": "Conceder permisos de Moderador",
+      "revoke_moderator": "Revocar permisos de Moderador",
+      "activate_account": "Activar cuenta",
+      "deactivate_account": "Desactivar cuenta",
+      "delete_account": "Eliminar cuenta",
+      "force_nsfw": "Marcar todas las publicaciones como NSFW (no es seguro/apropiado para el trabajo)",
+      "strip_media": "Eliminar archivos multimedia de las publicaciones",
+      "force_unlisted": "Forzar que se publique en el modo -Sin Listar-",
+      "sandbox": "Forzar que se publique solo para tus seguidores",
+      "disable_remote_subscription": "No permitir que usuarios de instancias remotas te siga.",
+      "disable_any_subscription": "No permitir que ningún usuario te siga",
+      "quarantine": "No permitir publicaciones de usuarios de instancias remotas",
+      "delete_user": "Eliminar usuario",
+      "delete_user_confirmation": "¿Estás completamente seguro? Esta acción no se puede deshacer."
+    }
+  },
+  "user_profile": {
+    "timeline_title": "Linea Temporal del Usuario",
+    "profile_does_not_exist": "Lo sentimos, este perfil no existe.",
+    "profile_loading_error": "Lo sentimos, hubo un error al cargar este perfil."
+  },
+  "user_reporting": {
+    "title": "Reportando a {0}",
+    "add_comment_description": "El informe será enviado a los moderadores de su instancia. Puedes proporcionar una explicación de por qué estás reportando esta cuenta a continuación:",
+    "additional_comments": "Comentarios adicionales",
+    "forward_description": "La cuenta es de otro servidor. ¿Enviar una copia del informe allí también?",
+    "forward_to": "Reenviar a {0}",
+    "submit": "Enviar",
+    "generic_error": "Se produjo un error al procesar la solicitud."
+  },
+  "who_to_follow": {
+    "more": "Más",
+    "who_to_follow": "A quién seguir"
+  },
+  "tool_tip": {
+    "media_upload": "Subir Medios",
+    "repeat": "Repetir",
+    "reply": "Contestar",
+    "favorite": "Favorito",
+    "user_settings": "Ajustes de usuario"
+  },
+  "upload": {
+    "error": {
+      "base": "Subida fallida.",
+      "file_too_big": "Archivo demasiado grande [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Inténtalo más tarde"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "Personas",
+    "hashtags": "Etiquetas",
+    "person_talking": "{count} personas hablando",
+    "people_talking": "{count} gente hablando",
+    "no_results": "Sin resultados"
+  },
+  "password_reset": {
+    "forgot_password": "¿Contraseña olvidada?",
+    "password_reset": "Restablecer la contraseña",
+    "instruction": "Ingrese su dirección de correo electrónico o nombre de usuario. Le enviaremos un enlace para restablecer su contraseña.",
+    "placeholder": "Su correo electrónico o nombre de usuario",
+    "check_email": "Revise su correo electrónico para obtener un enlace para restablecer su contraseña.",
+    "return_home": "Volver a la página de inicio",
+    "not_found": "No pudimos encontrar ese correo electrónico o nombre de usuario.",
+    "too_many_requests": "Has alcanzado el límite de intentos, vuelve a intentarlo más tarde.",
+    "password_reset_disabled": "El restablecimiento de contraseñas está deshabilitado. Póngase en contacto con el administrador de su instancia."
+  }
 }
diff --git a/src/i18n/et.json b/src/i18n/et.json
index d7bc3a9d..b5ae4275 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -1,461 +1,461 @@
 {
-    "finder": {
-        "error_fetching_user": "Viga kasutaja leidmisel",
-        "find_user": "Otsi kasutajaid"
+  "finder": {
+    "error_fetching_user": "Viga kasutaja leidmisel",
+    "find_user": "Otsi kasutajaid"
+  },
+  "general": {
+    "submit": "Postita",
+    "verify": "Kinnita",
+    "confirm": "Kinnita",
+    "enable": "Luba",
+    "disable": "Keela",
+    "cancel": "Tühista",
+    "dismiss": "Olgu",
+    "show_less": "Kuva vähem",
+    "show_more": "Kuva rohkem",
+    "optional": "valikuline",
+    "generic_error": "Esines viga",
+    "more": "Rohkem",
+    "apply": "Rakenda"
+  },
+  "login": {
+    "login": "Logi sisse",
+    "logout": "Logi välja",
+    "password": "Parool",
+    "placeholder": "nt lain",
+    "register": "Registreeru",
+    "username": "Kasutajanimi",
+    "heading": {
+      "recovery": "Kaheastmelise autentimise taaste",
+      "totp": "Kaheastmeline autentimine"
     },
-    "general": {
-        "submit": "Postita",
-        "verify": "Kinnita",
-        "confirm": "Kinnita",
-        "enable": "Luba",
-        "disable": "Keela",
-        "cancel": "Tühista",
-        "dismiss": "Olgu",
-        "show_less": "Kuva vähem",
-        "show_more": "Kuva rohkem",
-        "optional": "valikuline",
-        "generic_error": "Esines viga",
-        "more": "Rohkem",
-        "apply": "Rakenda"
+    "recovery_code": "Taastekood",
+    "enter_two_factor_code": "Sisesta kaheastmelise autentimise kood",
+    "enter_recovery_code": "Sisesta taastekood",
+    "authentication_code": "Autentimiskood",
+    "hint": "Logi sisse, et liituda vestlusega",
+    "description": "Logi sisse OAuthiga"
+  },
+  "nav": {
+    "mentions": "Mainimised",
+    "public_tl": "Avalik Ajajoon",
+    "timeline": "Ajajoon",
+    "twkn": "Kogu Teadaolev Võrgustik",
+    "preferences": "Eelistused",
+    "who_to_follow": "Keda jälgida",
+    "search": "Otsing",
+    "user_search": "Kasutajaotsing",
+    "dms": "Privaatsõnumid",
+    "interactions": "Interaktsioonid",
+    "friend_requests": "Jägimistaotlused",
+    "chat": "Kohalik vestlus",
+    "back": "Tagasi",
+    "administration": "Administreerimine",
+    "about": "Meist"
+  },
+  "notifications": {
+    "followed_you": "alustas sinu jälgimist",
+    "notifications": "Teated",
+    "read": "Loe!",
+    "reacted_with": "reageeris {0}",
+    "migrated_to": "kolis",
+    "no_more_notifications": "Rohkem teateid ei ole",
+    "repeated_you": "taaspostitas su staatuse",
+    "load_older": "Laadi vanemad teated",
+    "follow_request": "soovib Teid jälgida",
+    "favorited_you": "lisas su staatuse lemmikuks",
+    "broken_favorite": "Tundmatu staatus, otsin…"
+  },
+  "post_status": {
+    "default": "Just sõitsin elektrirongiga Tallinnast Pääskülla.",
+    "posting": "Postitan",
+    "scope": {
+      "unlisted": "Peidetud - Ära postita avalikele ajajoontele",
+      "public": "Avalil - Postita avalikele ajajoontele",
+      "private": "Jälgijatele - Postita ainult jälgijatele",
+      "direct": "Privaatne - Postita ainult mainitud kasutajatele"
     },
-    "login": {
-        "login": "Logi sisse",
-        "logout": "Logi välja",
-        "password": "Parool",
-        "placeholder": "nt lain",
-        "register": "Registreeru",
-        "username": "Kasutajanimi",
-        "heading": {
-            "recovery": "Kaheastmelise autentimise taaste",
-            "totp": "Kaheastmeline autentimine"
+    "scope_notice": {
+      "unlisted": "See postitus ei ole nähtav avalikul ega kogu võrgu ajajoonel",
+      "private": "See postitus on nähtav ainult Teie jälgijatele",
+      "public": "See postitus on nähtav kõigile"
+    },
+    "direct_warning_to_first_only": "See postitus on nähtav ainult kirja alguses mainitud kasutajatele.",
+    "direct_warning_to_all": "See postitus on nähtav kõikidele mainitud kasutajatele.",
+    "content_warning": "Pealkiri (valikuline)",
+    "content_type": {
+      "text/bbcode": "BBCode",
+      "text/markdown": "Markdown",
+      "text/html": "HTML",
+      "text/plain": "Lihttekst"
+    },
+    "attachments_sensitive": "Märgi manused sensitiivseks",
+    "account_not_locked_warning_link": "lukus",
+    "account_not_locked_warning": "Teie konto ei ole {0}. Kõik võivad Teid jälgida, et näha Teie ainult-jälgijatele postitusi.",
+    "new_status": "Postita uus staatus"
+  },
+  "registration": {
+    "bio": "Bio",
+    "email": "E-post",
+    "fullname": "Kuvatav nimi",
+    "password_confirm": "Parooli kinnitamine",
+    "registration": "Registreerimine",
+    "validations": {
+      "password_confirmation_match": "peaks olema sama kui salasõna",
+      "password_confirmation_required": "ei saa jätta tühjaks",
+      "password_required": "ei saa jätta tühjaks",
+      "email_required": "ei saa jätta tühjaks",
+      "fullname_required": "ei saa jätta tühjaks",
+      "username_required": "ei saa jätta tühjaks"
+    },
+    "fullname_placeholder": "Näiteks Lain Iwakura",
+    "username_placeholder": "Näiteks lain",
+    "new_captcha": "Vajuta pildile, et saada uus captcha",
+    "captcha": "CAPTCHA",
+    "token": "Kutse võti"
+  },
+  "settings": {
+    "attachments": "Manused",
+    "autoload": "Luba ajajoone automaatne uuendamine kui ajajoon on põhja keritud",
+    "avatar": "Profiilipilt",
+    "bio": "Bio",
+    "current_avatar": "Sinu praegune profiilipilt",
+    "current_profile_banner": "Praegune profiilibänner",
+    "filtering": "Sisu filtreerimine",
+    "filtering_explanation": "Kõiki staatuseid, mis sisaldavad neid sõnu, ei kuvata. Üks sõna reale",
+    "hide_attachments_in_convo": "Peida manused vastlustes",
+    "hide_attachments_in_tl": "Peida manused ajajoonel",
+    "name": "Nimi",
+    "name_bio": "Nimi ja Bio",
+    "nsfw_clickthrough": "Peida tööks-mittesobivad(NSFW) manuste hiireklõpsu taha",
+    "profile_background": "Profiilitaust",
+    "profile_banner": "Profiilibänner",
+    "reply_link_preview": "Luba algpostituse kuvamine vastustes",
+    "set_new_avatar": "Vali uus profiilipilt",
+    "set_new_profile_background": "Vali uus profiilitaust",
+    "set_new_profile_banner": "Vali uus profiilibänner",
+    "settings": "Sätted",
+    "theme": "Teema",
+    "user_settings": "Kasutaja sätted",
+    "subject_line_noop": "Ära kopeeri",
+    "subject_line_mastodon": "Nagu mastodon: kopeeri nagu on",
+    "subject_line_email": "Nagu e-post: \"vs: pealkiri\"",
+    "subject_line_behavior": "Kopeeri pealkiri vastamisel",
+    "subject_input_always_show": "Alati kuva pealkirja välja",
+    "minimal_scopes_mode": "Peida postituse nähtavussätted",
+    "scope_copy": "Kopeeri nähtavussätted vastamisel (Privaatsed on alati kopeeritud)",
+    "security_tab": "Turvalisus",
+    "search_user_to_mute": "Otsi, keda soovid vaigistada",
+    "search_user_to_block": "Otsi, keda soovid blokeerida",
+    "saving_ok": "Sätted salvestatud",
+    "saving_err": "Sätete salvestamine ebaõnnestus",
+    "autohide_floating_post_button": "Automaatselt peida uue postituse nupp (mobiilil)",
+    "reply_visibility_self": "Näita ainult vastuseid, mis on suunatud mulle",
+    "reply_visibility_following": "Näita ainult vastuseid, mis on suunatud mulle või kasutajatele, keda jälgin",
+    "reply_visibility_all": "Näita kõiki vastuseid",
+    "replies_in_timeline": "Vastused ajajoonel",
+    "radii_help": "Liidese ümardamine (pikslites)",
+    "profile_tab": "Profiil",
+    "presets": "Salvestatud sätted",
+    "pause_on_unfocused": "Peata reaalajas voog kui leht pole fookuses",
+    "panelRadius": "Paneelid",
+    "revoke_token": "Keela",
+    "valid_until": "Kehtiv kuni",
+    "refresh_token": "Värskendustoken",
+    "token": "Token",
+    "oauth_tokens": "OAuth tokenid",
+    "show_moderator_badge": "Näita Moderaator silti mu profiilil",
+    "show_admin_badge": "Näita Admin silti mu profiilil",
+    "hide_followers_count_description": "Ära näita minu jälgijate arvu",
+    "hide_follows_count_description": "Ära näita minu jälgimiste arvu",
+    "hide_followers_description": "Ära näita minu jälgijaid",
+    "hide_follows_description": "Ära näita minu jälgimisi",
+    "no_mutes": "Vaigistusi pole",
+    "no_blocks": "Blokeeringuid pole",
+    "no_rich_text_description": "Muuda kõik postitused lihttekstiks",
+    "notification_visibility_emoji_reactions": "Reaktsioonid",
+    "notification_visibility_moves": "Kasutaja kolimised",
+    "notification_visibility_repeats": "Taaspostitused",
+    "notification_visibility_mentions": "Mainimised",
+    "notification_visibility_likes": "Lemmikud",
+    "notification_visibility_follows": "Jälgimised",
+    "notification_visibility": "Milliseid teateid kuvatakse",
+    "new_password": "Uus salasõna",
+    "new_email": "Uus e-post",
+    "use_contain_fit": "Näita eelvaadetes täis suuruses pilte",
+    "play_videos_in_modal": "Näita videoid eraldi raamis",
+    "mutes_tab": "Vaigistused",
+    "loop_video_silent_only": "Loop videod, millel pole heli (nt. Mastodoni \"gifid\")",
+    "loop_video": "Loop videod",
+    "lock_account_description": "Piira oma konto ainult lubatud jälgijatele",
+    "links": "Lingid",
+    "limited_availability": "Pole Teie veebilehitsejas saadaval",
+    "invalid_theme_imported": "Valitud fail ei ole Pleroma kujundus. Kujundusele muudatusi ei tehtud.",
+    "interfaceLanguage": "Liidese keel",
+    "interface": "Liides",
+    "instance_default_simple": "(vaikimisi)",
+    "instance_default": "(vaikimisi: {value})",
+    "checkboxRadius": "Märkeruudud",
+    "inputRadius": "Sisestuskastid",
+    "import_theme": "Lae sätted",
+    "import_followers_from_a_csv_file": "Impordi jälgimised csv failist",
+    "import_blocks_from_a_csv_file": "Impordi blokeeringud csv failist",
+    "hide_filtered_statuses": "Peida filtreeritud staatused",
+    "hide_user_stats": "Peida kasutaja statistika (nt. jälgijate arv)",
+    "hide_post_stats": "Peida postituse statistika (nt. lemmikute arv)",
+    "use_one_click_nsfw": "Ava NSFW manused ühe klikiga",
+    "preload_images": "Piltide eellaadimine",
+    "hide_isp": "Peida instantsipõhine paneel",
+    "max_thumbnails": "Maksimaalne lubatud eelvaadete arv postituste kohta",
+    "hide_muted_posts": "Peida vaigistatud kasutajate postitused",
+    "general": "Üldine",
+    "foreground": "Esiplaan",
+    "accent": "Rõhk",
+    "follows_imported": "Jälgimised imporditud! Nende töötlemine võtab natuke aega.",
+    "follow_import_error": "Jälgimiste importimisel tekkis viga",
+    "follow_import": "Impordi jälgimised",
+    "follow_export_button": "Ekspordi oma jälgimised csv failiks",
+    "follow_export": "Ekspordi jälgimised",
+    "export_theme": "Salvesta sätted",
+    "emoji_reactions_on_timeline": "Näita reaktsioone ajajoonel",
+    "pad_emoji": "Lisa emotikonidele tühikud ette ja järgi neid menüüst valides",
+    "avatar_size_instruction": "Profiilipildi soovitatud minimaalne suurus on 150x150 pikslit.",
+    "domain_mutes": "Domeenid",
+    "discoverable": "Luba selle konto ilmumine otsingutulemustes ning muudes teenustes",
+    "delete_account_instructions": "Konto kustutamise kinnitamiseks sisestage oma salasõna.",
+    "delete_account_error": "Teie konto kustutamisel tekkis viga. Kui see jätkub, palun võtke kontakti administraatoriga.",
+    "delete_account_description": "Jäädavalt kustuta oma andmed ja konto.",
+    "delete_account": "Kustuta konto",
+    "default_vis": "Vaikimisi nähtavus",
+    "data_import_export_tab": "Andmete import / eksport",
+    "current_password": "Praegune salasõna",
+    "confirm_new_password": "Kinnita uus salasõna",
+    "composing": "Koostamine",
+    "collapse_subject": "Peida postituste pealkirjad",
+    "changed_password": "Salasõna edukalt muudetud!",
+    "change_password_error": "Esines viga salasõna muutmisel.",
+    "change_password": "Muuda salasõna",
+    "changed_email": "E-post edukalt muudetud!",
+    "change_email_error": "Esines viga e-posti muutmisel.",
+    "change_email": "Muuda e-posti",
+    "cRed": "Punane (Tühista)",
+    "cOrange": "Oranž (Lisa lemmikuks)",
+    "cGreen": "Roheline (Taaspostita)",
+    "cBlue": "Sinine (Vasta, jälgi)",
+    "btnRadius": "Nupud",
+    "blocks_tab": "Blokeeringud",
+    "blocks_imported": "Blokeeringud imporditud! Nende töötlemine võtab natuke aega.",
+    "block_import_error": "Blokeeringute importimisel esines viga",
+    "block_import": "Blokeeringute import",
+    "block_export_button": "Ekspordi oma blokeeringud csv failiks",
+    "block_export": "Blokeeringute eksport",
+    "background": "Taust",
+    "avatarRadius": "Profiilipildid",
+    "avatarAltRadius": "Profiilipildid (Teated)",
+    "attachmentRadius": "Manused",
+    "allow_following_move": "Luba automaatjälgimine kui jälgitav konto kolib",
+    "mfa": {
+      "verify": {
+        "desc": "Et lubada kaheastmelist autentimist, sisestage kood oma äpist:"
+      },
+      "scan": {
+        "desc": "Kasutades oma kaheastmelise autentimise äppi, skännige see QR kood või sisestage tekstiline võti:",
+        "secret_code": "Võti",
+        "title": "Skänni"
+      },
+      "authentication_methods": "Autentimismeetodid",
+      "recovery_codes_warning": "Kirjutage need koodid üles ning hoidke need kindlas kohas. Kui Te kaotate ligipääsu oma kaheastmelise autentimise äppile ning nendele koodidele, ei ole Teil võimalik oma kontosse sisse logida.",
+      "waiting_a_recovery_codes": "Laen taastekoode…",
+      "recovery_codes": "Taastekoodid.",
+      "warning_of_generate_new_codes": "Kui Te loote uued taastekoodid, Teie vanad koodid ei tööta enam.",
+      "generate_new_recovery_codes": "Loo uued taastekoodid",
+      "title": "Kaheastmeline autentimine",
+      "confirm_and_enable": "Kinnita & luba OTP",
+      "wait_pre_setup_otp": "sean üles OTP",
+      "setup_otp": "Sea üles OTP",
+      "otp": "OTP"
+    },
+    "enter_current_password_to_confirm": "Sisetage isiku tõestamiseks oma salasõna",
+    "security": "Turvalisus",
+    "app_name": "Rakenduse nimi",
+    "style": {
+      "switcher": {
+        "help": {
+          "snapshot_present": "Kujunduse eelvaade on laetud, nii et kõik väärtused on üle kirjutatud. Te saate laadida ka kujunduse päris sisu.",
+          "older_version_imported": "Teie imporditud fail oli loodud vanemas versioonis.",
+          "future_version_imported": "Teie imporditud fail oli loodud uuemas versioonis.",
+          "v2_imported": "Teie imporditud fail oli vanema versiooni jaoks. Me üritame hoida ühilduvust, kuid ikkagi võib esineda erinevusi.",
+          "upgraded_from_v2": "PleromaFE-d uuendati, teie kujundus võib välja näha natuke erinev, kui mäletate."
         },
-        "recovery_code": "Taastekood",
-        "enter_two_factor_code": "Sisesta kaheastmelise autentimise kood",
-        "enter_recovery_code": "Sisesta taastekood",
-        "authentication_code": "Autentimiskood",
-        "hint": "Logi sisse, et liituda vestlusega",
-        "description": "Logi sisse OAuthiga"
+        "use_source": "Uus versioon",
+        "use_snapshot": "Vana versioon",
+        "keep_as_is": "Jäta nii, nagu on",
+        "load_theme": "Lae kujundus",
+        "clear_opacity": "Tühista läbipaistvus",
+        "clear_all": "Tühista kõik",
+        "reset": "Taasta algne",
+        "keep_fonts": "Jäta fondid",
+        "keep_roundness": "Jäta ümarus",
+        "keep_opacity": "Jäta läbipaistvus",
+        "keep_shadows": "Jäta varjud",
+        "keep_color": "Jäta värvid"
+      }
     },
-    "nav": {
-        "mentions": "Mainimised",
-        "public_tl": "Avalik Ajajoon",
-        "timeline": "Ajajoon",
-        "twkn": "Kogu Teadaolev Võrgustik",
-        "preferences": "Eelistused",
-        "who_to_follow": "Keda jälgida",
-        "search": "Otsing",
-        "user_search": "Kasutajaotsing",
-        "dms": "Privaatsõnumid",
-        "interactions": "Interaktsioonid",
-        "friend_requests": "Jägimistaotlused",
-        "chat": "Kohalik vestlus",
-        "back": "Tagasi",
-        "administration": "Administreerimine",
-        "about": "Meist"
+    "enable_web_push_notifications": "Luba veebipõhised push-teated",
+    "notification_blocks": "Kasutaja blokeerimisel ei tule neilt enam teateid ning nendele teilt ka mitte.",
+    "notification_setting_privacy_option": "Peida saatja ning sisu push-teadetelt",
+    "notification_setting": "Saa teateid nendelt:",
+    "notifications": "Teated",
+    "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.",
+    "notification_setting_privacy": "Privaatsus",
+    "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi",
+    "notification_setting_followers": "Kasutajatelt, kes jälgivad sind",
+    "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi",
+    "notification_setting_follows": "Kasutajatelt, keda jälgid",
+    "notification_setting_filters": "Filtrid",
+    "greentext": "Meemi nooled",
+    "fun": "Naljad",
+    "values": {
+      "true": "jah",
+      "false": "ei"
     },
-    "notifications": {
-        "followed_you": "alustas sinu jälgimist",
-        "notifications": "Teated",
-        "read": "Loe!",
-        "reacted_with": "reageeris {0}",
-        "migrated_to": "kolis",
-        "no_more_notifications": "Rohkem teateid ei ole",
-        "repeated_you": "taaspostitas su staatuse",
-        "load_older": "Laadi vanemad teated",
-        "follow_request": "soovib Teid jälgida",
-        "favorited_you": "lisas su staatuse lemmikuks",
-        "broken_favorite": "Tundmatu staatus, otsin…"
+    "upload_a_photo": "Lae üles foto",
+    "type_domains_to_mute": "Trüki siia domeene, mida vaigistada",
+    "tooltipRadius": "Vihjed/hoiatused",
+    "theme_help_v2_1": "Te saate ka mõndade komponentide värvust ning läbipaistvust üle kirjutada vajutades ruudule. Kasuta \"Tühista kõik\" nuppu, et need tühistada.",
+    "theme_help": "Kasuta hex värvikoode (#rrggbb) oma kujunduse isikupärastamiseks.",
+    "text": "Tekst",
+    "useStreamingApiWarning": "(Pole soovituslik, eksperimentaalne, on teada, et jätab postitusi vahele)",
+    "useStreamingApi": "Saa postitusi ning teateid reaalajas",
+    "user_mutes": "Kasutajad",
+    "streaming": "Luba uute postituste automaatvoog kui oled lehekülje alguses",
+    "stop_gifs": "Mängi GIFid hiirega ületades",
+    "post_status_content_type": "Postituse sisutüüp"
+  },
+  "timeline": {
+    "conversation": "Vestlus",
+    "error_fetching": "Viga uuenduste laadimisel",
+    "load_older": "Kuva vanemaid staatuseid",
+    "show_new": "Näita uusi",
+    "up_to_date": "Uuendatud"
+  },
+  "user_card": {
+    "block": "Blokeeri",
+    "blocked": "Blokeeritud!",
+    "follow": "Jälgi",
+    "followees": "Jälgitavaid",
+    "followers": "Jälgijaid",
+    "following": "Jälgin!",
+    "follows_you": "Jälgib sind!",
+    "mute": "Vaigista",
+    "muted": "Vaigistatud",
+    "per_day": "päevas",
+    "statuses": "Staatuseid"
+  },
+  "about": {
+    "mrf": {
+      "mrf_policies_desc": "MRF poliitikad mõjutavad selle instansi föderatsiooni käitumist.    Järgmised poliitikad on lubatud:",
+      "simple": {
+        "media_nsfw_desc": "See instants määrab nendest instantsidest postituste meedia sensitiivseks:",
+        "media_nsfw": "Meedia määratakse sensitiivseks",
+        "media_removal_desc": "See instants eemaldab meedia postitustelt nendest instantsidest:",
+        "media_removal": "Meedia eemaldamine",
+        "ftl_removal_desc": "See instants eemaldab postitused nendelt instantsidest \"Kogu teatud võrgu\" ajajoonelt:",
+        "ftl_removal": "\"Kogu teatud võrgu\" ajajoonelt eemaldamine",
+        "quarantine_desc": "See instants saadab ainult avalikke postitusi järgmistele instantsidele:",
+        "quarantine": "Karantiini",
+        "reject_desc": "See instants ei luba sõnumeid nendest instantsidest:",
+        "reject": "Keela",
+        "accept_desc": "See instants lubab sõnumeid ainult nendest instantsidest:",
+        "accept": "Luba",
+        "simple_policies": "Instansi-omased poliitikad"
+      },
+      "mrf_policies": "Lubatud MRF poliitikad",
+      "keyword": {
+        "is_replaced_by": "→",
+        "replace": "Vaheta",
+        "reject": "Lükka tagasi",
+        "ftl_removal": "\"Kogu teatud võrgu\" ajajoonelt eemaldamine",
+        "keyword_policies": "Võtmesõna poliitikad"
+      },
+      "federation": "Föderatsioon"
     },
-    "post_status": {
-        "default": "Just sõitsin elektrirongiga Tallinnast Pääskülla.",
-        "posting": "Postitan",
-        "scope": {
-            "unlisted": "Peidetud - Ära postita avalikele ajajoontele",
-            "public": "Avalil - Postita avalikele ajajoontele",
-            "private": "Jälgijatele - Postita ainult jälgijatele",
-            "direct": "Privaatne - Postita ainult mainitud kasutajatele"
-        },
-        "scope_notice": {
-            "unlisted": "See postitus ei ole nähtav avalikul ega kogu võrgu ajajoonel",
-            "private": "See postitus on nähtav ainult Teie jälgijatele",
-            "public": "See postitus on nähtav kõigile"
-        },
-        "direct_warning_to_first_only": "See postitus on nähtav ainult kirja alguses mainitud kasutajatele.",
-        "direct_warning_to_all": "See postitus on nähtav kõikidele mainitud kasutajatele.",
-        "content_warning": "Pealkiri (valikuline)",
-        "content_type": {
-            "text/bbcode": "BBCode",
-            "text/markdown": "Markdown",
-            "text/html": "HTML",
-            "text/plain": "Lihttekst"
-        },
-        "attachments_sensitive": "Märgi manused sensitiivseks",
-        "account_not_locked_warning_link": "lukus",
-        "account_not_locked_warning": "Teie konto ei ole {0}. Kõik võivad Teid jälgida, et näha Teie ainult-jälgijatele postitusi.",
-        "new_status": "Postita uus staatus"
-    },
-    "registration": {
-        "bio": "Bio",
-        "email": "E-post",
-        "fullname": "Kuvatav nimi",
-        "password_confirm": "Parooli kinnitamine",
-        "registration": "Registreerimine",
-        "validations": {
-            "password_confirmation_match": "peaks olema sama kui salasõna",
-            "password_confirmation_required": "ei saa jätta tühjaks",
-            "password_required": "ei saa jätta tühjaks",
-            "email_required": "ei saa jätta tühjaks",
-            "fullname_required": "ei saa jätta tühjaks",
-            "username_required": "ei saa jätta tühjaks"
-        },
-        "fullname_placeholder": "Näiteks Lain Iwakura",
-        "username_placeholder": "Näiteks lain",
-        "new_captcha": "Vajuta pildile, et saada uus captcha",
-        "captcha": "CAPTCHA",
-        "token": "Kutse võti"
-    },
-    "settings": {
-        "attachments": "Manused",
-        "autoload": "Luba ajajoone automaatne uuendamine kui ajajoon on põhja keritud",
-        "avatar": "Profiilipilt",
-        "bio": "Bio",
-        "current_avatar": "Sinu praegune profiilipilt",
-        "current_profile_banner": "Praegune profiilibänner",
-        "filtering": "Sisu filtreerimine",
-        "filtering_explanation": "Kõiki staatuseid, mis sisaldavad neid sõnu, ei kuvata. Üks sõna reale",
-        "hide_attachments_in_convo": "Peida manused vastlustes",
-        "hide_attachments_in_tl": "Peida manused ajajoonel",
-        "name": "Nimi",
-        "name_bio": "Nimi ja Bio",
-        "nsfw_clickthrough": "Peida tööks-mittesobivad(NSFW) manuste hiireklõpsu taha",
-        "profile_background": "Profiilitaust",
-        "profile_banner": "Profiilibänner",
-        "reply_link_preview": "Luba algpostituse kuvamine vastustes",
-        "set_new_avatar": "Vali uus profiilipilt",
-        "set_new_profile_background": "Vali uus profiilitaust",
-        "set_new_profile_banner": "Vali uus profiilibänner",
-        "settings": "Sätted",
-        "theme": "Teema",
-        "user_settings": "Kasutaja sätted",
-        "subject_line_noop": "Ära kopeeri",
-        "subject_line_mastodon": "Nagu mastodon: kopeeri nagu on",
-        "subject_line_email": "Nagu e-post: \"vs: pealkiri\"",
-        "subject_line_behavior": "Kopeeri pealkiri vastamisel",
-        "subject_input_always_show": "Alati kuva pealkirja välja",
-        "minimal_scopes_mode": "Peida postituse nähtavussätted",
-        "scope_copy": "Kopeeri nähtavussätted vastamisel (Privaatsed on alati kopeeritud)",
-        "security_tab": "Turvalisus",
-        "search_user_to_mute": "Otsi, keda soovid vaigistada",
-        "search_user_to_block": "Otsi, keda soovid blokeerida",
-        "saving_ok": "Sätted salvestatud",
-        "saving_err": "Sätete salvestamine ebaõnnestus",
-        "autohide_floating_post_button": "Automaatselt peida uue postituse nupp (mobiilil)",
-        "reply_visibility_self": "Näita ainult vastuseid, mis on suunatud mulle",
-        "reply_visibility_following": "Näita ainult vastuseid, mis on suunatud mulle või kasutajatele, keda jälgin",
-        "reply_visibility_all": "Näita kõiki vastuseid",
-        "replies_in_timeline": "Vastused ajajoonel",
-        "radii_help": "Liidese ümardamine (pikslites)",
-        "profile_tab": "Profiil",
-        "presets": "Salvestatud sätted",
-        "pause_on_unfocused": "Peata reaalajas voog kui leht pole fookuses",
-        "panelRadius": "Paneelid",
-        "revoke_token": "Keela",
-        "valid_until": "Kehtiv kuni",
-        "refresh_token": "Värskendustoken",
-        "token": "Token",
-        "oauth_tokens": "OAuth tokenid",
-        "show_moderator_badge": "Näita Moderaator silti mu profiilil",
-        "show_admin_badge": "Näita Admin silti mu profiilil",
-        "hide_followers_count_description": "Ära näita minu jälgijate arvu",
-        "hide_follows_count_description": "Ära näita minu jälgimiste arvu",
-        "hide_followers_description": "Ära näita minu jälgijaid",
-        "hide_follows_description": "Ära näita minu jälgimisi",
-        "no_mutes": "Vaigistusi pole",
-        "no_blocks": "Blokeeringuid pole",
-        "no_rich_text_description": "Muuda kõik postitused lihttekstiks",
-        "notification_visibility_emoji_reactions": "Reaktsioonid",
-        "notification_visibility_moves": "Kasutaja kolimised",
-        "notification_visibility_repeats": "Taaspostitused",
-        "notification_visibility_mentions": "Mainimised",
-        "notification_visibility_likes": "Lemmikud",
-        "notification_visibility_follows": "Jälgimised",
-        "notification_visibility": "Milliseid teateid kuvatakse",
-        "new_password": "Uus salasõna",
-        "new_email": "Uus e-post",
-        "use_contain_fit": "Näita eelvaadetes täis suuruses pilte",
-        "play_videos_in_modal": "Näita videoid eraldi raamis",
-        "mutes_tab": "Vaigistused",
-        "loop_video_silent_only": "Loop videod, millel pole heli (nt. Mastodoni \"gifid\")",
-        "loop_video": "Loop videod",
-        "lock_account_description": "Piira oma konto ainult lubatud jälgijatele",
-        "links": "Lingid",
-        "limited_availability": "Pole Teie veebilehitsejas saadaval",
-        "invalid_theme_imported": "Valitud fail ei ole Pleroma kujundus. Kujundusele muudatusi ei tehtud.",
-        "interfaceLanguage": "Liidese keel",
-        "interface": "Liides",
-        "instance_default_simple": "(vaikimisi)",
-        "instance_default": "(vaikimisi: {value})",
-        "checkboxRadius": "Märkeruudud",
-        "inputRadius": "Sisestuskastid",
-        "import_theme": "Lae sätted",
-        "import_followers_from_a_csv_file": "Impordi jälgimised csv failist",
-        "import_blocks_from_a_csv_file": "Impordi blokeeringud csv failist",
-        "hide_filtered_statuses": "Peida filtreeritud staatused",
-        "hide_user_stats": "Peida kasutaja statistika (nt. jälgijate arv)",
-        "hide_post_stats": "Peida postituse statistika (nt. lemmikute arv)",
-        "use_one_click_nsfw": "Ava NSFW manused ühe klikiga",
-        "preload_images": "Piltide eellaadimine",
-        "hide_isp": "Peida instantsipõhine paneel",
-        "max_thumbnails": "Maksimaalne lubatud eelvaadete arv postituste kohta",
-        "hide_muted_posts": "Peida vaigistatud kasutajate postitused",
-        "general": "Üldine",
-        "foreground": "Esiplaan",
-        "accent": "Rõhk",
-        "follows_imported": "Jälgimised imporditud! Nende töötlemine võtab natuke aega.",
-        "follow_import_error": "Jälgimiste importimisel tekkis viga",
-        "follow_import": "Impordi jälgimised",
-        "follow_export_button": "Ekspordi oma jälgimised csv failiks",
-        "follow_export": "Ekspordi jälgimised",
-        "export_theme": "Salvesta sätted",
-        "emoji_reactions_on_timeline": "Näita reaktsioone ajajoonel",
-        "pad_emoji": "Lisa emotikonidele tühikud ette ja järgi neid menüüst valides",
-        "avatar_size_instruction": "Profiilipildi soovitatud minimaalne suurus on 150x150 pikslit.",
-        "domain_mutes": "Domeenid",
-        "discoverable": "Luba selle konto ilmumine otsingutulemustes ning muudes teenustes",
-        "delete_account_instructions": "Konto kustutamise kinnitamiseks sisestage oma salasõna.",
-        "delete_account_error": "Teie konto kustutamisel tekkis viga. Kui see jätkub, palun võtke kontakti administraatoriga.",
-        "delete_account_description": "Jäädavalt kustuta oma andmed ja konto.",
-        "delete_account": "Kustuta konto",
-        "default_vis": "Vaikimisi nähtavus",
-        "data_import_export_tab": "Andmete import / eksport",
-        "current_password": "Praegune salasõna",
-        "confirm_new_password": "Kinnita uus salasõna",
-        "composing": "Koostamine",
-        "collapse_subject": "Peida postituste pealkirjad",
-        "changed_password": "Salasõna edukalt muudetud!",
-        "change_password_error": "Esines viga salasõna muutmisel.",
-        "change_password": "Muuda salasõna",
-        "changed_email": "E-post edukalt muudetud!",
-        "change_email_error": "Esines viga e-posti muutmisel.",
-        "change_email": "Muuda e-posti",
-        "cRed": "Punane (Tühista)",
-        "cOrange": "Oranž (Lisa lemmikuks)",
-        "cGreen": "Roheline (Taaspostita)",
-        "cBlue": "Sinine (Vasta, jälgi)",
-        "btnRadius": "Nupud",
-        "blocks_tab": "Blokeeringud",
-        "blocks_imported": "Blokeeringud imporditud! Nende töötlemine võtab natuke aega.",
-        "block_import_error": "Blokeeringute importimisel esines viga",
-        "block_import": "Blokeeringute import",
-        "block_export_button": "Ekspordi oma blokeeringud csv failiks",
-        "block_export": "Blokeeringute eksport",
-        "background": "Taust",
-        "avatarRadius": "Profiilipildid",
-        "avatarAltRadius": "Profiilipildid (Teated)",
-        "attachmentRadius": "Manused",
-        "allow_following_move": "Luba automaatjälgimine kui jälgitav konto kolib",
-        "mfa": {
-            "verify": {
-                "desc": "Et lubada kaheastmelist autentimist, sisestage kood oma äpist:"
-            },
-            "scan": {
-                "desc": "Kasutades oma kaheastmelise autentimise äppi, skännige see QR kood või sisestage tekstiline võti:",
-                "secret_code": "Võti",
-                "title": "Skänni"
-            },
-            "authentication_methods": "Autentimismeetodid",
-            "recovery_codes_warning": "Kirjutage need koodid üles ning hoidke need kindlas kohas. Kui Te kaotate ligipääsu oma kaheastmelise autentimise äppile ning nendele koodidele, ei ole Teil võimalik oma kontosse sisse logida.",
-            "waiting_a_recovery_codes": "Laen taastekoode…",
-            "recovery_codes": "Taastekoodid.",
-            "warning_of_generate_new_codes": "Kui Te loote uued taastekoodid, Teie vanad koodid ei tööta enam.",
-            "generate_new_recovery_codes": "Loo uued taastekoodid",
-            "title": "Kaheastmeline autentimine",
-            "confirm_and_enable": "Kinnita & luba OTP",
-            "wait_pre_setup_otp": "sean üles OTP",
-            "setup_otp": "Sea üles OTP",
-            "otp": "OTP"
-        },
-        "enter_current_password_to_confirm": "Sisetage isiku tõestamiseks oma salasõna",
-        "security": "Turvalisus",
-        "app_name": "Rakenduse nimi",
-        "style": {
-            "switcher": {
-                "help": {
-                    "snapshot_present": "Kujunduse eelvaade on laetud, nii et kõik väärtused on üle kirjutatud. Te saate laadida ka kujunduse päris sisu.",
-                    "older_version_imported": "Teie imporditud fail oli loodud vanemas versioonis.",
-                    "future_version_imported": "Teie imporditud fail oli loodud uuemas versioonis.",
-                    "v2_imported": "Teie imporditud fail oli vanema versiooni jaoks. Me üritame hoida ühilduvust, kuid ikkagi võib esineda erinevusi.",
-                    "upgraded_from_v2": "PleromaFE-d uuendati, teie kujundus võib välja näha natuke erinev, kui mäletate."
-                },
-                "use_source": "Uus versioon",
-                "use_snapshot": "Vana versioon",
-                "keep_as_is": "Jäta nii, nagu on",
-                "load_theme": "Lae kujundus",
-                "clear_opacity": "Tühista läbipaistvus",
-                "clear_all": "Tühista kõik",
-                "reset": "Taasta algne",
-                "keep_fonts": "Jäta fondid",
-                "keep_roundness": "Jäta ümarus",
-                "keep_opacity": "Jäta läbipaistvus",
-                "keep_shadows": "Jäta varjud",
-                "keep_color": "Jäta värvid"
-            }
-        },
-        "enable_web_push_notifications": "Luba veebipõhised push-teated",
-        "notification_blocks": "Kasutaja blokeerimisel ei tule neilt enam teateid ning nendele teilt ka mitte.",
-        "notification_setting_privacy_option": "Peida saatja ning sisu push-teadetelt",
-        "notification_setting": "Saa teateid nendelt:",
-        "notifications": "Teated",
-        "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.",
-        "notification_setting_privacy": "Privaatsus",
-        "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi",
-        "notification_setting_followers": "Kasutajatelt, kes jälgivad sind",
-        "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi",
-        "notification_setting_follows": "Kasutajatelt, keda jälgid",
-        "notification_setting_filters": "Filtrid",
-        "greentext": "Meemi nooled",
-        "fun": "Naljad",
-        "values": {
-            "true": "jah",
-            "false": "ei"
-        },
-        "upload_a_photo": "Lae üles foto",
-        "type_domains_to_mute": "Trüki siia domeene, mida vaigistada",
-        "tooltipRadius": "Vihjed/hoiatused",
-        "theme_help_v2_1": "Te saate ka mõndade komponentide värvust ning läbipaistvust üle kirjutada vajutades ruudule. Kasuta \"Tühista kõik\" nuppu, et need tühistada.",
-        "theme_help": "Kasuta hex värvikoode (#rrggbb) oma kujunduse isikupärastamiseks.",
-        "text": "Tekst",
-        "useStreamingApiWarning": "(Pole soovituslik, eksperimentaalne, on teada, et jätab postitusi vahele)",
-        "useStreamingApi": "Saa postitusi ning teateid reaalajas",
-        "user_mutes": "Kasutajad",
-        "streaming": "Luba uute postituste automaatvoog kui oled lehekülje alguses",
-        "stop_gifs": "Mängi GIFid hiirega ületades",
-        "post_status_content_type": "Postituse sisutüüp"
-    },
-    "timeline": {
-        "conversation": "Vestlus",
-        "error_fetching": "Viga uuenduste laadimisel",
-        "load_older": "Kuva vanemaid staatuseid",
-        "show_new": "Näita uusi",
-        "up_to_date": "Uuendatud"
-    },
-    "user_card": {
-        "block": "Blokeeri",
-        "blocked": "Blokeeritud!",
-        "follow": "Jälgi",
-        "followees": "Jälgitavaid",
-        "followers": "Jälgijaid",
-        "following": "Jälgin!",
-        "follows_you": "Jälgib sind!",
-        "mute": "Vaigista",
-        "muted": "Vaigistatud",
-        "per_day": "päevas",
-        "statuses": "Staatuseid"
-    },
-    "about": {
-        "mrf": {
-            "mrf_policies_desc": "MRF poliitikad mõjutavad selle instansi föderatsiooni käitumist.    Järgmised poliitikad on lubatud:",
-            "simple": {
-                "media_nsfw_desc": "See instants määrab nendest instantsidest postituste meedia sensitiivseks:",
-                "media_nsfw": "Meedia määratakse sensitiivseks",
-                "media_removal_desc": "See instants eemaldab meedia postitustelt nendest instantsidest:",
-                "media_removal": "Meedia eemaldamine",
-                "ftl_removal_desc": "See instants eemaldab postitused nendelt instantsidest \"Kogu teatud võrgu\" ajajoonelt:",
-                "ftl_removal": "\"Kogu teatud võrgu\" ajajoonelt eemaldamine",
-                "quarantine_desc": "See instants saadab ainult avalikke postitusi järgmistele instantsidele:",
-                "quarantine": "Karantiini",
-                "reject_desc": "See instants ei luba sõnumeid nendest instantsidest:",
-                "reject": "Keela",
-                "accept_desc": "See instants lubab sõnumeid ainult nendest instantsidest:",
-                "accept": "Luba",
-                "simple_policies": "Instansi-omased poliitikad"
-            },
-            "mrf_policies": "Lubatud MRF poliitikad",
-            "keyword": {
-                "is_replaced_by": "→",
-                "replace": "Vaheta",
-                "reject": "Lükka tagasi",
-                "ftl_removal": "\"Kogu teatud võrgu\" ajajoonelt eemaldamine",
-                "keyword_policies": "Võtmesõna poliitikad"
-            },
-            "federation": "Föderatsioon"
-        },
-        "staff": "Personal"
-    },
-    "selectable_list": {
-        "select_all": "Vali kõik"
-    },
-    "remote_user_resolver": {
-        "error": "Ei leitud.",
-        "searching_for": "Otsin",
-        "remote_user_resolver": "Kaugkasutaja leidja"
-    },
-    "interactions": {
-        "load_older": "Laadi vanemad interaktsioonid",
-        "moves": "Kasutaja kolimised",
-        "follows": "Uued jälgimised",
-        "favs_repeats": "Taaspostitused ja lemmikud"
-    },
-    "emoji": {
-        "load_all": "Laen kõik {emojiAmount} emotikoni",
-        "load_all_hint": "Laadisin esimesed {saneAmount} emotikoni, kõike laadides võib esineda probleeme jõudlusega.",
-        "unicode": "Unicode emotikonid",
-        "custom": "Kohandatud emotikonid",
-        "add_emoji": "Lisa emotikon",
-        "search_emoji": "Otsi emotikone",
-        "keep_open": "Hoia valija lahti",
-        "emoji": "Emotikonid",
-        "stickers": "Kleepsud"
-    },
-    "polls": {
-        "not_enough_options": "Liiga vähe unikaalseid valikuid hääletuses",
-        "expired": "Hääletus lõppes {0} tagasi",
-        "expires_in": "Hääletus lõppeb {0}",
-        "expiry": "Hääletuse vanus",
-        "multiple_choices": "Mitu vastust",
-        "single_choice": "Üks vastus",
-        "type": "Hääletuse tüüp",
-        "vote": "Hääleta",
-        "votes": "häält",
-        "option": "Valik",
-        "add_option": "Lisa valik",
-        "add_poll": "Lisa küsitlus"
-    },
-    "media_modal": {
-        "next": "Järgmine",
-        "previous": "Eelmine"
-    },
-    "importer": {
-        "error": "Faili importimisel tekkis viga.",
-        "success": "Import õnnestus.",
-        "submit": "Esita"
-    },
-    "image_cropper": {
-        "cancel": "Tühista",
-        "save_without_cropping": "Salvesta muudatusteta",
-        "save": "Salvesta",
-        "crop_picture": "Modifitseeri pilti"
-    },
-    "features_panel": {
-        "who_to_follow": "Keda jälgida",
-        "title": "Featuurid",
-        "text_limit": "Tekstilimiit",
-        "scope_options": "Ulatuse valikud",
-        "media_proxy": "Meedia proksi",
-        "gopher": "Gopher",
-        "chat": "Vestlus"
-    },
-    "exporter": {
-        "processing": "Töötlemine, Teilt küsitakse varsti faili allalaadimist",
-        "export": "Ekspordi"
-    },
-    "domain_mute_card": {
-        "unmute_progress": "Eemaldan vaigistuse…",
-        "unmute": "Ära vaigista",
-        "mute_progress": "Vaigistan…",
-        "mute": "Vaigista"
-    },
-    "chat": {
-        "title": "Vestlus"
-    }
+    "staff": "Personal"
+  },
+  "selectable_list": {
+    "select_all": "Vali kõik"
+  },
+  "remote_user_resolver": {
+    "error": "Ei leitud.",
+    "searching_for": "Otsin",
+    "remote_user_resolver": "Kaugkasutaja leidja"
+  },
+  "interactions": {
+    "load_older": "Laadi vanemad interaktsioonid",
+    "moves": "Kasutaja kolimised",
+    "follows": "Uued jälgimised",
+    "favs_repeats": "Taaspostitused ja lemmikud"
+  },
+  "emoji": {
+    "load_all": "Laen kõik {emojiAmount} emotikoni",
+    "load_all_hint": "Laadisin esimesed {saneAmount} emotikoni, kõike laadides võib esineda probleeme jõudlusega.",
+    "unicode": "Unicode emotikonid",
+    "custom": "Kohandatud emotikonid",
+    "add_emoji": "Lisa emotikon",
+    "search_emoji": "Otsi emotikone",
+    "keep_open": "Hoia valija lahti",
+    "emoji": "Emotikonid",
+    "stickers": "Kleepsud"
+  },
+  "polls": {
+    "not_enough_options": "Liiga vähe unikaalseid valikuid hääletuses",
+    "expired": "Hääletus lõppes {0} tagasi",
+    "expires_in": "Hääletus lõppeb {0}",
+    "expiry": "Hääletuse vanus",
+    "multiple_choices": "Mitu vastust",
+    "single_choice": "Üks vastus",
+    "type": "Hääletuse tüüp",
+    "vote": "Hääleta",
+    "votes": "häält",
+    "option": "Valik",
+    "add_option": "Lisa valik",
+    "add_poll": "Lisa küsitlus"
+  },
+  "media_modal": {
+    "next": "Järgmine",
+    "previous": "Eelmine"
+  },
+  "importer": {
+    "error": "Faili importimisel tekkis viga.",
+    "success": "Import õnnestus.",
+    "submit": "Esita"
+  },
+  "image_cropper": {
+    "cancel": "Tühista",
+    "save_without_cropping": "Salvesta muudatusteta",
+    "save": "Salvesta",
+    "crop_picture": "Modifitseeri pilti"
+  },
+  "features_panel": {
+    "who_to_follow": "Keda jälgida",
+    "title": "Featuurid",
+    "text_limit": "Tekstilimiit",
+    "scope_options": "Ulatuse valikud",
+    "media_proxy": "Meedia proksi",
+    "gopher": "Gopher",
+    "chat": "Vestlus"
+  },
+  "exporter": {
+    "processing": "Töötlemine, Teilt küsitakse varsti faili allalaadimist",
+    "export": "Ekspordi"
+  },
+  "domain_mute_card": {
+    "unmute_progress": "Eemaldan vaigistuse…",
+    "unmute": "Ära vaigista",
+    "mute_progress": "Vaigistan…",
+    "mute": "Vaigista"
+  },
+  "chat": {
+    "title": "Vestlus"
+  }
 }
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 7248c049..99a1b53a 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -1,747 +1,747 @@
 {
-    "chat": {
-        "title": "Chat"
+  "chat": {
+    "title": "Chat"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Media-välityspalvelin",
+    "scope_options": "Näkyvyyden rajaus",
+    "text_limit": "Tekstin pituusraja",
+    "title": "Ominaisuudet",
+    "who_to_follow": "Seurausehdotukset"
+  },
+  "finder": {
+    "error_fetching_user": "Virhe hakiessa käyttäjää",
+    "find_user": "Hae käyttäjä"
+  },
+  "general": {
+    "apply": "Aseta",
+    "submit": "Lähetä",
+    "more": "Lisää",
+    "generic_error": "Virhe tapahtui",
+    "optional": "valinnainen",
+    "show_more": "Näytä lisää",
+    "show_less": "Näytä vähemmän",
+    "dismiss": "Sulje",
+    "cancel": "Peruuta",
+    "disable": "Poista käytöstä",
+    "confirm": "Hyväksy",
+    "verify": "Varmenna",
+    "enable": "Ota käyttöön"
+  },
+  "login": {
+    "login": "Kirjaudu sisään",
+    "description": "Kirjaudu sisään OAuthilla",
+    "logout": "Kirjaudu ulos",
+    "password": "Salasana",
+    "placeholder": "esim. Seppo",
+    "register": "Rekisteröidy",
+    "username": "Käyttäjänimi",
+    "hint": "Kirjaudu sisään liittyäksesi keskusteluun",
+    "authentication_code": "Todennuskoodi",
+    "enter_recovery_code": "Syötä palautuskoodi",
+    "recovery_code": "Palautuskoodi",
+    "heading": {
+      "totp": "Monivaihetodennus",
+      "recovery": "Monivaihepalautus"
     },
-    "features_panel": {
-        "chat": "Chat",
-        "gopher": "Gopher",
-        "media_proxy": "Media-välityspalvelin",
-        "scope_options": "Näkyvyyden rajaus",
-        "text_limit": "Tekstin pituusraja",
-        "title": "Ominaisuudet",
-        "who_to_follow": "Seurausehdotukset"
+    "enter_two_factor_code": "Syötä monivaihetodennuskoodi"
+  },
+  "nav": {
+    "about": "Tietoja",
+    "back": "Takaisin",
+    "chat": "Paikallinen Chat",
+    "friend_requests": "Seurauspyynnöt",
+    "mentions": "Maininnat",
+    "interactions": "Interaktiot",
+    "dms": "Yksityisviestit",
+    "public_tl": "Julkinen Aikajana",
+    "timeline": "Aikajana",
+    "twkn": "Koko Tunnettu Verkosto",
+    "user_search": "Käyttäjähaku",
+    "who_to_follow": "Seurausehdotukset",
+    "preferences": "Asetukset",
+    "administration": "Ylläpito",
+    "search": "Haku"
+  },
+  "notifications": {
+    "broken_favorite": "Viestiä ei löydetty...",
+    "favorited_you": "tykkäsi viestistäsi",
+    "followed_you": "seuraa sinua",
+    "load_older": "Lataa vanhempia ilmoituksia",
+    "notifications": "Ilmoitukset",
+    "read": "Lue!",
+    "repeated_you": "toisti viestisi",
+    "no_more_notifications": "Ei enempää ilmoituksia",
+    "reacted_with": "lisäsi reaktion {0}",
+    "migrated_to": "siirtyi sivulle",
+    "follow_request": "haluaa seurata sinua"
+  },
+  "polls": {
+    "add_poll": "Lisää äänestys",
+    "add_option": "Lisää vaihtoehto",
+    "option": "Vaihtoehto",
+    "votes": "ääntä",
+    "vote": "Äänestä",
+    "type": "Äänestyksen tyyppi",
+    "single_choice": "Yksi valinta",
+    "multiple_choices": "Monivalinta",
+    "expiry": "Äänestyksen kesto",
+    "expires_in": "Päättyy {0} päästä",
+    "expired": "Päättyi {0} sitten",
+    "not_enough_option": "Liian vähän uniikkeja vaihtoehtoja äänestyksessä",
+    "not_enough_options": "Liian vähän ainutkertaisia vaihtoehtoja"
+  },
+  "interactions": {
+    "favs_repeats": "Toistot ja tykkäykset",
+    "follows": "Uudet seuraukset",
+    "load_older": "Lataa vanhempia interaktioita",
+    "moves": "Käyttäjien siirtymiset"
+  },
+  "post_status": {
+    "new_status": "Uusi viesti",
+    "account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
+    "account_not_locked_warning_link": "lukittu",
+    "attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
+    "content_type": {
+      "text/plain": "Tavallinen teksti",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
     },
-    "finder": {
-        "error_fetching_user": "Virhe hakiessa käyttäjää",
-        "find_user": "Hae käyttäjä"
+    "content_warning": "Aihe (valinnainen)",
+    "default": "Tulin juuri saunasta.",
+    "direct_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
+    "posting": "Lähetetään",
+    "scope": {
+      "direct": "Yksityisviesti - Näkyy vain mainituille käyttäjille",
+      "private": "Vain-seuraajille - Näkyy vain seuraajillesi",
+      "public": "Julkinen - Näkyy julkisilla aikajanoilla",
+      "unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
     },
-    "general": {
-        "apply": "Aseta",
-        "submit": "Lähetä",
-        "more": "Lisää",
-        "generic_error": "Virhe tapahtui",
-        "optional": "valinnainen",
-        "show_more": "Näytä lisää",
-        "show_less": "Näytä vähemmän",
-        "dismiss": "Sulje",
-        "cancel": "Peruuta",
-        "disable": "Poista käytöstä",
-        "confirm": "Hyväksy",
-        "verify": "Varmenna",
-        "enable": "Ota käyttöön"
-    },
-    "login": {
-        "login": "Kirjaudu sisään",
-        "description": "Kirjaudu sisään OAuthilla",
-        "logout": "Kirjaudu ulos",
-        "password": "Salasana",
-        "placeholder": "esim. Seppo",
-        "register": "Rekisteröidy",
-        "username": "Käyttäjänimi",
-        "hint": "Kirjaudu sisään liittyäksesi keskusteluun",
-        "authentication_code": "Todennuskoodi",
-        "enter_recovery_code": "Syötä palautuskoodi",
-        "recovery_code": "Palautuskoodi",
-        "heading": {
-            "totp": "Monivaihetodennus",
-            "recovery": "Monivaihepalautus"
-        },
-        "enter_two_factor_code": "Syötä monivaihetodennuskoodi"
-    },
-    "nav": {
-        "about": "Tietoja",
-        "back": "Takaisin",
-        "chat": "Paikallinen Chat",
-        "friend_requests": "Seurauspyynnöt",
-        "mentions": "Maininnat",
-        "interactions": "Interaktiot",
-        "dms": "Yksityisviestit",
-        "public_tl": "Julkinen Aikajana",
-        "timeline": "Aikajana",
-        "twkn": "Koko Tunnettu Verkosto",
-        "user_search": "Käyttäjähaku",
-        "who_to_follow": "Seurausehdotukset",
-        "preferences": "Asetukset",
-        "administration": "Ylläpito",
-        "search": "Haku"
-    },
-    "notifications": {
-        "broken_favorite": "Viestiä ei löydetty...",
-        "favorited_you": "tykkäsi viestistäsi",
-        "followed_you": "seuraa sinua",
-        "load_older": "Lataa vanhempia ilmoituksia",
-        "notifications": "Ilmoitukset",
-        "read": "Lue!",
-        "repeated_you": "toisti viestisi",
-        "no_more_notifications": "Ei enempää ilmoituksia",
-        "reacted_with": "lisäsi reaktion {0}",
-        "migrated_to": "siirtyi sivulle",
-        "follow_request": "haluaa seurata sinua"
-    },
-    "polls": {
-        "add_poll": "Lisää äänestys",
-        "add_option": "Lisää vaihtoehto",
-        "option": "Vaihtoehto",
-        "votes": "ääntä",
-        "vote": "Äänestä",
-        "type": "Äänestyksen tyyppi",
-        "single_choice": "Yksi valinta",
-        "multiple_choices": "Monivalinta",
-        "expiry": "Äänestyksen kesto",
-        "expires_in": "Päättyy {0} päästä",
-        "expired": "Päättyi {0} sitten",
-        "not_enough_option": "Liian vähän uniikkeja vaihtoehtoja äänestyksessä",
-        "not_enough_options": "Liian vähän ainutkertaisia vaihtoehtoja"
-    },
-    "interactions": {
-        "favs_repeats": "Toistot ja tykkäykset",
-        "follows": "Uudet seuraukset",
-        "load_older": "Lataa vanhempia interaktioita",
-        "moves": "Käyttäjien siirtymiset"
-    },
-    "post_status": {
-        "new_status": "Uusi viesti",
-        "account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
-        "account_not_locked_warning_link": "lukittu",
-        "attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
-        "content_type": {
-            "text/plain": "Tavallinen teksti",
-            "text/html": "HTML",
-            "text/markdown": "Markdown",
-            "text/bbcode": "BBCode"
-        },
-        "content_warning": "Aihe (valinnainen)",
-        "default": "Tulin juuri saunasta.",
-        "direct_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
-        "posting": "Lähetetään",
-        "scope": {
-            "direct": "Yksityisviesti - Näkyy vain mainituille käyttäjille",
-            "private": "Vain-seuraajille - Näkyy vain seuraajillesi",
-            "public": "Julkinen - Näkyy julkisilla aikajanoilla",
-            "unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
-        },
-        "direct_warning_to_all": "Tämä viesti näkyy vain viestissä mainituille käyttäjille.",
-        "direct_warning_to_first_only": "Tämä viesti näkyy vain viestin alussa mainituille käyttäjille.",
-        "scope_notice": {
-            "public": "Tämä viesti näkyy kaikille",
-            "private": "Tämä viesti näkyy vain sinun seuraajillesi",
-            "unlisted": "Tämä viesti ei näy Julkisella Aikajanalla tai Koko Tunnettu Verkosto -aikajanalla"
-        }
-    },
-    "registration": {
-        "bio": "Kuvaus",
-        "email": "Sähköposti",
-        "fullname": "Koko nimi",
-        "password_confirm": "Salasanan vahvistaminen",
-        "registration": "Rekisteröityminen",
-        "token": "Kutsuvaltuus",
-        "captcha": "Varmenne",
-        "new_captcha": "Paina kuvaa saadaksesi uuden varmenteen",
-        "validations": {
-            "username_required": "ei voi olla tyhjä",
-            "fullname_required": "ei voi olla tyhjä",
-            "email_required": "ei voi olla tyhjä",
-            "password_required": "ei voi olla tyhjä",
-            "password_confirmation_required": "ei voi olla tyhjä",
-            "password_confirmation_match": "pitää vastata salasanaa"
-        },
-        "username_placeholder": "esim. peke",
-        "fullname_placeholder": "esim. Pekka Postaaja",
-        "bio_placeholder": "esim.\nHei, olen Pekka.\nOlen esimerkkikäyttäjä tässä verkostossa."
-    },
-    "settings": {
-        "attachmentRadius": "Liitteet",
-        "attachments": "Liitteet",
-        "autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
-        "avatar": "Profiilikuva",
-        "avatarAltRadius": "Profiilikuvat (ilmoitukset)",
-        "avatarRadius": "Profiilikuvat",
-        "background": "Tausta",
-        "bio": "Kuvaus",
-        "btnRadius": "Napit",
-        "cBlue": "Sininen (Vastaukset, seuraukset)",
-        "cGreen": "Vihreä (Toistot)",
-        "cOrange": "Oranssi (Tykkäykset)",
-        "cRed": "Punainen (Peruminen)",
-        "change_password": "Vaihda salasana",
-        "change_password_error": "Virhe vaihtaessa salasanaa.",
-        "changed_password": "Salasana vaihdettu!",
-        "collapse_subject": "Minimoi viestit, joille on asetettu aihe",
-        "composing": "Viestien laatiminen",
-        "confirm_new_password": "Vahvista uusi salasana",
-        "current_avatar": "Nykyinen profiilikuvasi",
-        "current_password": "Nykyinen salasana",
-        "current_profile_banner": "Nykyinen julisteesi",
-        "data_import_export_tab": "Tietojen tuonti / vienti",
-        "default_vis": "Oletusnäkyvyysrajaus",
-        "delete_account": "Poista tili",
-        "delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
-        "delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
-        "delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
-        "emoji_reactions_on_timeline": "Näytä emojireaktiot aikajanalla",
-        "export_theme": "Tallenna teema",
-        "filtering": "Suodatus",
-        "filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.",
-        "follow_export": "Seurausten vienti",
-        "follow_export_button": "Vie seurauksesi CSV-tiedostoon",
-        "follow_export_processing": "Käsitellään, sinua pyydetään lataamaan tiedosto hetken päästä",
-        "follow_import": "Seurausten tuonti",
-        "follow_import_error": "Virhe tuodessa seuraksia",
-        "follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
-        "foreground": "Etuala",
-        "general": "Yleinen",
-        "hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
-        "hide_attachments_in_tl": "Piilota liitteet aikajanalla",
-        "max_thumbnails": "Suurin sallittu määrä liitteitä esikatselussa",
-        "hide_isp": "Piilota palvelimenkohtainen ruutu",
-        "preload_images": "Esilataa kuvat",
-        "use_one_click_nsfw": "Avaa NSFW-liitteet yhdellä painalluksella",
-        "hide_post_stats": "Piilota viestien statistiikka (esim. tykkäysten määrä)",
-        "hide_user_stats": "Piilota käyttäjien statistiikka (esim. seuraajien määrä)",
-        "import_followers_from_a_csv_file": "Tuo seuraukset CSV-tiedostosta",
-        "import_theme": "Tuo tallennettu teema",
-        "inputRadius": "Syöttökentät",
-        "checkboxRadius": "Valintalaatikot",
-        "instance_default": "(oletus: {value})",
-        "instance_default_simple": "(oletus)",
-        "interface": "Käyttöliittymä",
-        "interfaceLanguage": "Käyttöliittymän kieli",
-        "invalid_theme_imported": "Tuotu tallennettu teema on epäkelpo, muutoksia ei tehty nykyiseen teemaasi.",
-        "limited_availability": "Ei saatavilla selaimessasi",
-        "links": "Linkit",
-        "lock_account_description": "Vain erikseen hyväksytyt käyttäjät voivat seurata tiliäsi",
-        "loop_video": "Uudelleentoista videot",
-        "loop_video_silent_only": "Uudelleentoista ainoastaan äänettömät videot (Video-\"giffit\")",
-        "play_videos_in_modal": "Toista videot modaalissa",
-        "use_contain_fit": "Älä rajaa liitteitä esikatselussa",
-        "name": "Nimi",
-        "name_bio": "Nimi ja kuvaus",
-        "new_password": "Uusi salasana",
-        "notification_visibility": "Ilmoitusten näkyvyys",
-        "notification_visibility_follows": "Seuraukset",
-        "notification_visibility_likes": "Tykkäykset",
-        "notification_visibility_mentions": "Maininnat",
-        "notification_visibility_repeats": "Toistot",
-        "notification_visibility_emoji_reactions": "Reaktiot",
-        "no_rich_text_description": "Älä näytä tekstin muotoilua",
-        "hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
-        "nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
-        "oauth_tokens": "OAuth-merkit",
-        "token": "Token",
-        "refresh_token": "Päivitä token",
-        "valid_until": "Voimassa asti",
-        "revoke_token": "Peruuta",
-        "panelRadius": "Ruudut",
-        "pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
-        "presets": "Valmiit teemat",
-        "profile_background": "Taustakuva",
-        "profile_banner": "Juliste",
-        "profile_tab": "Profiili",
-        "radii_help": "Aseta reunojen pyöristys (pikseleinä)",
-        "replies_in_timeline": "Keskustelut aikajanalla",
-        "reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
-        "reply_visibility_all": "Näytä kaikki vastaukset",
-        "reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
-        "reply_visibility_self": "Näytä vain vastaukset minulle",
-        "saving_err": "Virhe tallentaessa asetuksia",
-        "saving_ok": "Asetukset tallennettu",
-        "security_tab": "Tietoturva",
-        "scope_copy": "Kopioi näkyvyysrajaus vastatessa (Yksityisviestit aina kopioivat)",
-        "set_new_avatar": "Aseta uusi profiilikuva",
-        "set_new_profile_background": "Aseta uusi taustakuva",
-        "set_new_profile_banner": "Aseta uusi juliste",
-        "settings": "Asetukset",
-        "subject_input_always_show": "Näytä aihe-kenttä",
-        "subject_line_behavior": "Aihe-kentän kopiointi",
-        "subject_line_email": "Kuten sähköposti: \"re: aihe\"",
-        "subject_line_mastodon": "Kopioi sellaisenaan",
-        "subject_line_noop": "Älä kopioi",
-        "stop_gifs": "Toista giffit vain kohdistaessa",
-        "streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla",
-        "text": "Teksti",
-        "theme": "Teema",
-        "theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.",
-        "theme_help_v2_1": "Voit asettaa tiettyjen osien värin tai läpinäkyvyyden täyttämällä valintalaatikon, käytä \"Tyhjennä kaikki\"-nappia tyhjentääksesi kaiken.",
-        "theme_help_v2_2": "Ikonit kenttien alla ovat kontrasti-indikaattoreita, lisätietoa kohdistamalla. Käyttäessä läpinäkyvyyttä ne näyttävät pahimman skenaarion.",
-        "tooltipRadius": "Ohje- tai huomioviestit",
-        "user_settings": "Käyttäjän asetukset",
-        "values": {
-            "false": "pois päältä",
-            "true": "päällä"
-        },
-        "hide_follows_description": "Älä näytä ketä seuraan",
-        "show_moderator_badge": "Näytä Moderaattori-merkki profiilissani",
-        "useStreamingApi": "Vastaanota viestiejä ja ilmoituksia reaaliajassa",
-        "notification_setting_filters": "Suodattimet",
-        "notification_setting": "Vastaanota ilmoituksia seuraavista:",
-        "notification_setting_privacy_option": "Piilota lähettäjä ja sisältö sovelluksen ulkopuolisista ilmoituksista",
-        "enable_web_push_notifications": "Ota käyttöön sovelluksen ulkopuoliset ilmoitukset",
-        "app_name": "Sovelluksen nimi",
-        "security": "Turvallisuus",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "OTP-asetukset",
-            "wait_pre_setup_otp": "esiasetetaan OTP:ta",
-            "confirm_and_enable": "Hyväksy ja käytä OTP",
-            "title": "Monivaihetodennus",
-            "generate_new_recovery_codes": "Luo uudet palautuskoodit",
-            "authentication_methods": "Todennus",
-            "warning_of_generate_new_codes": "Luodessasi uudet palautuskoodit, vanhat koodisi lakkaavat toimimasta.",
-            "recovery_codes": "Palautuskoodit.",
-            "waiting_a_recovery_codes": "Odotetaan palautuskoodeja...",
-            "recovery_codes_warning": "Kirjoita koodit ylös tai tallenna ne turvallisesti, muuten et näe niitä uudestaan. Jos et voi käyttää monivaihetodennusta ja sinulla ei ole palautuskoodeja, et voi enää kirjautua sisään tilillesi.",
-            "scan": {
-                "title": "Skannaa",
-                "secret_code": "Avain",
-                "desc": "Käytä monivaihetodennus-sovellusta skannakksesi tämän QR-kooding, tai syötä avain:"
-            },
-            "verify": {
-                "desc": "Kytkeäksesi päälle monivaihetodennuksen, syötä koodi monivaihetodennussovellksesta:"
-            }
-        },
-        "allow_following_move": "Salli automaattinen seuraaminen kun käyttäjä siirtää tilinsä",
-        "block_export": "Estojen vienti",
-        "block_export_button": "Vie estosi CSV-tiedostoon",
-        "block_import": "Estojen tuonti",
-        "block_import_error": "Virhe tuodessa estoja",
-        "blocks_imported": "Estot tuotu! Käsittely vie hetken.",
-        "blocks_tab": "Estot",
-        "change_email": "Vaihda sähköpostiosoite",
-        "change_email_error": "Virhe vaihtaessa sähköpostiosoitetta.",
-        "changed_email": "Sähköpostiosoite vaihdettu!",
-        "domain_mutes": "Sivut",
-        "avatar_size_instruction": "Suositeltu vähimmäiskoko profiilikuville on 150x150 pikseliä.",
-        "accent": "Korostus",
-        "hide_muted_posts": "Piilota mykistettyjen käyttäjien viestit",
-        "hide_filtered_statuses": "Piilota mykistetyt viestit",
-        "import_blocks_from_a_csv_file": "Tuo estot CSV-tiedostosta",
-        "no_blocks": "Ei estoja",
-        "no_mutes": "Ei mykistyksiä",
-        "notification_visibility_moves": "Käyttäjien siirtymiset",
-        "hide_followers_description": "Älä näytä ketkä seuraavat minua",
-        "hide_follows_count_description": "Älä näytä seurauksien määrää",
-        "hide_followers_count_description": "Älä näytä seuraajien määrää",
-        "show_admin_badge": "Näytä Ylläpitäjä-merkki proofilissani",
-        "autohide_floating_post_button": "Piilota Uusi Viesti -nappi automaattisesti (mobiili)",
-        "search_user_to_block": "Hae estettäviä käyttäjiä",
-        "search_user_to_mute": "Hae mykistettäviä käyttäjiä",
-        "minimal_scopes_mode": "Yksinkertaista näkyvyydenrajauksen vaihtoehdot",
-        "post_status_content_type": "Uuden viestin sisällön muoto",
-        "user_mutes": "Käyttäjät",
-        "useStreamingApiWarning": "(Kokeellinen)",
-        "type_domains_to_mute": "Syötä mykistettäviä sivustoja",
-        "upload_a_photo": "Lataa kuva",
-        "fun": "Hupi",
-        "greentext": "Meeminuolet",
-        "notifications": "Ilmoitukset",
-        "style": {
-            "switcher": {
-                "save_load_hint": "\"Säilytä\" asetukset säilyttävät tällä hetkellä asetetut asetukset valittaessa tai ladatessa teemaa, se myös tallentaa kyseiset asetukset viedessä teemaa. Kun kaikki laatikot ovat tyhjänä, viety teema tallentaa kaiken.",
-                "help": {
-                    "older_version_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla.",
-                    "fe_upgraded": "PleromaFE:n teemaus päivitetty versiopäivityksen yhteydessä.",
-                    "migration_snapshot_ok": "Varmuuden vuoksi teeman kaappaus ladattu. Voit koittaa ladata teeman sisällön.",
-                    "migration_napshot_gone": "Jostain syystä teeman kaappaus puuttuu, kaikki asiat eivät välttämättä näytä oikealta.",
-                    "snapshot_source_mismatch": "Versiot eivät täsmää: todennäköisesti versio vaihdettu vanhempaan ja päivitetty uudestaan, jos vaihdoit teemaa vanhalla versiolla, sinun tulisi käyttää vanhaa versiota, muutoin uutta.",
-                    "upgraded_from_v2": "PleromaFE on päivitetty, teemasi saattaa näyttää erilaiselta kuin muistat.",
-                    "v2_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla. Yhteensopivuus ei välttämättä ole täydellinen.",
-                    "future_version_imported": "Tuomasi tiedosto on luotu uudemmalla versiolla.",
-                    "snapshot_present": "Teeman kaappaus ladattu, joten kaikki arvot ovat ylikirjoitettu. Voit sen sijaan ladata teeman sisällön.",
-                    "snapshot_missing": "Teeman kaappausta ei tiedostossa, joten se voi näyttää erilaiselta kuin suunniteltu.",
-                    "fe_downgraded": "PleromaFE:n versio vaihtunut vanhempaan."
-                },
-                "keep_color": "Säilytä värit",
-                "keep_shadows": "Säilytä varjot",
-                "keep_opacity": "Säilytä läpinäkyvyys",
-                "keep_roundness": "Säilytä pyöristys",
-                "keep_fonts": "Säilytä fontit",
-                "reset": "Palauta",
-                "clear_all": "Tyhjennä kaikki",
-                "clear_opacity": "Tyhjennä läpinäkyvyys",
-                "load_theme": "Lataa teema",
-                "keep_as_is": "Pidä sellaisenaan",
-                "use_snapshot": "Vanha",
-                "use_source": "Uusi"
-            },
-            "advanced_colors": {
-                "selectedPost": "Valittu viesti",
-                "_tab_label": "Edistynyt",
-                "alert": "Varoituksen tausta",
-                "alert_error": "Virhe",
-                "alert_warning": "Varoitus",
-                "alert_neutral": "Neutraali",
-                "post": "Viestit/Käyttäjien kuvaukset",
-                "badge": "Merkin tausta",
-                "badge_notification": "Ilmoitus",
-                "panel_header": "Ruudun otsikko",
-                "top_bar": "Yläpalkki",
-                "borders": "Reunat",
-                "buttons": "Napit",
-                "inputs": "Syöttökentät",
-                "faint_text": "Häivytetty teksti",
-                "underlay": "Taustapeite",
-                "poll": "Äänestyksen kuvaaja",
-                "icons": "Ikonit",
-                "highlight": "Korostetut elementit",
-                "pressed": "Painettu",
-                "selectedMenu": "Valikon valinta",
-                "disabled": "Pois käytöstä",
-                "toggled": "Kytketty",
-                "tabs": "Välilehdet",
-                "popover": "Työkaluvinkit, valikot, ponnahdusviestit"
-            },
-            "common": {
-                "color": "Väri",
-                "opacity": "Läpinäkyvyys",
-                "contrast": {
-                    "level": {
-                        "aaa": "saavuttaa AAA-tason (suositeltu)",
-                        "aa": "saavuttaa AA-tason (minimi)",
-                        "bad": "ei saavuta mitään helppokäyttöisyyssuosituksia"
-                    },
-                    "hint": "Kontrastisuhde on {ratio}, se {level} {context}",
-                    "context": {
-                        "18pt": "suurella (18pt+) tekstillä",
-                        "text": "tekstillä"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Yleinen",
-                "main": "Yleiset värit",
-                "foreground_hint": "Löydät \"Edistynyt\"-välilehdeltä tarkemmat asetukset",
-                "rgbo": "Ikonit, korostukset, merkit"
-            },
-            "shadows": {
-                "filter_hint": {
-                    "always_drop_shadow": "Varoitus, tämä varjo käyttää aina {0} kun selain tukee sitä.",
-                    "avatar_inset": "Huom. sisennettyjen ja ei-sisennettyjen varjojen yhdistelmät saattavat luoda ei-odotettuja lopputuloksia läpinäkyvillä profiilikuvilla.",
-                    "drop_shadow_syntax": "{0} ei tue {1} parametria ja {2} avainsanaa.",
-                    "spread_zero": "Varjot joiden levitys > 0 näyttävät samalta kuin se olisi nolla",
-                    "inset_classic": "Sisennetyt varjot käyttävät {0}"
-                },
-                "components": {
-                    "buttonPressedHover": "Nappi (painettu ja kohdistettu)",
-                    "panel": "Ruutu",
-                    "panelHeader": "Ruudun otsikko",
-                    "topBar": "Yläpalkki",
-                    "avatar": "Profiilikuva (profiilinäkymässä)",
-                    "avatarStatus": "Profiilikuva (viestin yhtyedessä)",
-                    "popup": "Ponnahdusviestit ja työkaluvinkit",
-                    "button": "Nappi",
-                    "buttonHover": "Nappi (kohdistus)",
-                    "buttonPressed": "Nappi (painettu)",
-                    "input": "Syöttökenttä"
-                },
-                "hintV3": "Voit käyttää {0} merkintää varjoille käyttääksesi väriä toisesta asetuksesta.",
-                "_tab_label": "Valo ja varjostus",
-                "component": "Komponentti",
-                "override": "Ylikirjoita",
-                "shadow_id": "Varjo #{value}",
-                "blur": "Sumennus",
-                "spread": "Levitys",
-                "inset": "Sisennys"
-            },
-            "fonts": {
-                "help": "Valitse fontti käyttöliittymälle. \"Oma\"-vaihtohdolle on syötettävä fontin nimi tarkalleen samana kuin se on järjestelmässäsi.",
-                "_tab_label": "Fontit",
-                "components": {
-                    "interface": "Käyttöliittymä",
-                    "input": "Syöttökentät",
-                    "post": "Viestin teksti",
-                    "postCode": "Tasavälistetty teksti viestissä"
-                },
-                "family": "Fontin nimi",
-                "size": "Koko (pikseleissä)",
-                "weight": "Painostus (paksuus)",
-                "custom": "Oma"
-            },
-            "preview": {
-                "input": "Tulin juuri saunasta.",
-                "header": "Esikatselu",
-                "content": "Sisältö",
-                "error": "Esimerkkivirhe",
-                "button": "Nappi",
-                "text": "Vähän lisää {0} ja {1}",
-                "mono": "sisältöä",
-                "faint_link": "manuaali",
-                "fine_print": "Lue meidän {0} vaikka huvin vuoksi!",
-                "header_faint": "Tämä on OK",
-                "checkbox": "Olen silmäillyt käyttöehdot",
-                "link": "kiva linkki"
-            },
-            "radii": {
-                "_tab_label": "Pyöristys"
-            }
-        },
-        "enter_current_password_to_confirm": "Syötä nykyinen salasanasi todentaaksesi henkilöllisyytesi",
-        "discoverable": "Salli tilisi näkyvyys hakukoneisiin ja muihin palveluihin",
-        "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
-        "mutes_tab": "Mykistykset",
-        "new_email": "Uusi sähköpostiosoite",
-        "notification_setting_follows": "Käyttäjät joita seuraat",
-        "notification_setting_non_follows": "Käyttäjät joita et seuraa",
-        "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
-        "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
-        "notification_setting_privacy": "Yksityisyys",
-        "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
-        "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
-        "version": {
-            "title": "Versio",
-            "backend_version": "Palvelimen versio",
-            "frontend_version": "Käyttöliittymän versio"
-        }
-    },
-    "time": {
-        "day": "{0} päivä",
-        "days": "{0} päivää",
-        "day_short": "{0}pv",
-        "days_short": "{0}pv",
-        "hour": "{0} tunti",
-        "hours": "{0} tuntia",
-        "hour_short": "{0}t",
-        "hours_short": "{0}t",
-        "in_future": "{0} tulevaisuudessa",
-        "in_past": "{0} sitten",
-        "minute": "{0} minuutti",
-        "minutes": "{0} minuuttia",
-        "minute_short": "{0}min",
-        "minutes_short": "{0}min",
-        "month": "{0} kuukausi",
-        "months": "{0} kuukautta",
-        "month_short": "{0}kk",
-        "months_short": "{0}kk",
-        "now": "juuri nyt",
-        "now_short": "nyt",
-        "second": "{0} sekunti",
-        "seconds": "{0} sekuntia",
-        "second_short": "{0}s",
-        "seconds_short": "{0}s",
-        "week": "{0} viikko",
-        "weeks": "{0} viikkoa",
-        "week_short": "{0}vk",
-        "weeks_short": "{0}vk",
-        "year": "{0} vuosi",
-        "years": "{0} vuotta",
-        "year_short": "{0}v",
-        "years_short": "{0}v"
-    },
-    "timeline": {
-        "collapse": "Sulje",
-        "conversation": "Keskustelu",
-        "error_fetching": "Virhe ladatessa viestejä",
-        "load_older": "Lataa vanhempia viestejä",
-        "no_retweet_hint": "Viesti ei ole julkinen, eikä sitä voi toistaa",
-        "repeated": "toisti",
-        "show_new": "Näytä uudet",
-        "up_to_date": "Ajantasalla",
-        "no_more_statuses": "Ei enempää viestejä",
-        "no_statuses": "Ei viestejä"
-    },
-    "status": {
-        "favorites": "Tykkäykset",
-        "repeats": "Toistot",
-        "delete": "Poista",
-        "pin": "Kiinnitä profiiliisi",
-        "unpin": "Poista kiinnitys",
-        "pinned": "Kiinnitetty",
-        "delete_confirm": "Haluatko varmasti postaa viestin?",
-        "reply_to": "Vastaus",
-        "replies_list": "Vastaukset:",
-        "mute_conversation": "Mykistä keskustelu",
-        "unmute_conversation": "Poista mykistys",
-        "status_unavailable": "Viesti ei saatavissa",
-        "copy_link": "Kopioi linkki"
-    },
-    "user_card": {
-        "approve": "Hyväksy",
-        "block": "Estä",
-        "blocked": "Estetty!",
-        "deny": "Älä hyväksy",
-        "follow": "Seuraa",
-        "follow_sent": "Pyyntö lähetetty!",
-        "follow_progress": "Pyydetään…",
-        "follow_again": "Lähetä pyyntö uudestaan",
-        "follow_unfollow": "Älä seuraa",
-        "followees": "Seuraa",
-        "followers": "Seuraajat",
-        "following": "Seuraat!",
-        "follows_you": "Seuraa sinua!",
-        "its_you": "Sinun tili!",
-        "mute": "Mykistä",
-        "muted": "Mykistetty",
-        "per_day": "päivässä",
-        "remote_follow": "Seuraa muualta",
-        "statuses": "Viestit",
-        "hidden": "Piilotettu",
-        "media": "Media",
-        "block_progress": "Estetään...",
-        "admin_menu": {
-            "grant_admin": "Anna Ylläpitöoikeudet",
-            "force_nsfw": "Merkitse kaikki viestit NSFW:nä",
-            "disable_any_subscription": "Estä käyttäjän seuraaminen",
-            "moderation": "Moderaatio",
-            "revoke_admin": "Poista Ylläpitöoikeudet",
-            "grant_moderator": "Anna Moderaattorioikeudet",
-            "revoke_moderator": "Poista Moderaattorioikeudet",
-            "activate_account": "Aktivoi tili",
-            "deactivate_account": "Deaktivoi tili",
-            "delete_account": "Poista tili",
-            "strip_media": "Poista media viesteistä",
-            "force_unlisted": "Pakota viestit listaamattomiksi",
-            "sandbox": "Pakota viestit vain seuraajille",
-            "disable_remote_subscription": "Estä seuraaminen ulkopuolisilta sivuilta",
-            "quarantine": "Estä käyttäjän viestin federoituminen",
-            "delete_user": "Poista käyttäjä",
-            "delete_user_confirmation": "Oletko aivan varma? Tätä ei voi kumota."
-        },
-        "favorites": "Tykkäykset",
-        "mention": "Mainitse",
-        "report": "Ilmianna",
-        "subscribe": "Tilaa",
-        "unsubscribe": "Poista tilaus",
-        "unblock": "Poista esto",
-        "unblock_progress": "Postetaan estoa...",
-        "unmute": "Poista mykistys",
-        "unmute_progress": "Poistetaan mykistystä...",
-        "mute_progress": "Mykistetään...",
-        "hide_repeats": "Piilota toistot",
-        "show_repeats": "Näytä toistot"
-    },
-    "user_profile": {
-        "timeline_title": "Käyttäjän aikajana",
-        "profile_does_not_exist": "Tätä profiilia ei ole.",
-        "profile_loading_error": "Virhe ladatessa profiilia."
-    },
-    "who_to_follow": {
-        "more": "Lisää",
-        "who_to_follow": "Seurausehdotukset"
-    },
-    "tool_tip": {
-        "media_upload": "Lataa tiedosto",
-        "repeat": "Toista",
-        "reply": "Vastaa",
-        "favorite": "Tykkää",
-        "user_settings": "Käyttäjäasetukset",
-        "add_reaction": "Lisää Reaktio",
-        "accept_follow_request": "Hyväksy seurauspyyntö",
-        "reject_follow_request": "Hylkää seurauspyyntö"
-    },
-    "upload": {
-        "error": {
-            "base": "Lataus epäonnistui.",
-            "file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Yritä uudestaan myöhemmin"
-        },
-        "file_size_units": {
-            "B": "tavua",
-            "KiB": "kt",
-            "MiB": "Mt",
-            "GiB": "Gt",
-            "TiB": "Tt"
-        }
-    },
-    "about": {
-        "mrf": {
-            "keyword": {
-                "keyword_policies": "Avainsanasäännöt",
-                "ftl_removal": "Poistettu \"Koko Tunnettu Verkosto\" -aikajanalta",
-                "reject": "Hylkää",
-                "replace": "Korvaa",
-                "is_replaced_by": "→"
-            },
-            "simple": {
-                "accept": "Hyväksy",
-                "reject": "Hylkää",
-                "quarantine": "Karanteeni",
-                "ftl_removal": "Poisto \"Koko Tunnettu Verkosto\" -aikajanalta",
-                "media_removal": "Media-tiedostojen poisto",
-                "simple_policies": "Palvelinkohtaiset Säännöt",
-                "accept_desc": "Tämä palvelin hyväksyy viestit vain seuraavilta palvelimilta:",
-                "reject_desc": "Tämä palvelin ei hyväksy viestejä seuraavilta palvelimilta:",
-                "quarantine_desc": "Tämä palvelin lähettää vain julkisia viestejä seuraaville palvelimille:",
-                "ftl_removal_desc": "Tämä palvelin poistaa nämä palvelimet \"Koko Tunnettu Verkosto\"-aikajanalta:",
-                "media_removal_desc": "Tämä palvelin postaa mediatiedostot viesteistä seuraavilta palvelimilta:",
-                "media_nsfw": "Pakota Media Arkaluontoiseksi",
-                "media_nsfw_desc": "Tämä palvelin pakottaa mediatiedostot arkaluonteisiksi seuraavilta palvelimilta:"
-            },
-            "federation": "Federaatio",
-            "mrf_policies": "Aktivoidut MRF-säännöt",
-            "mrf_policies_desc": "MRF-säännöt muuttavat federaation toimintaa sivulla. Seuraavat säännöt ovat kytketty päälle:"
-        },
-        "staff": "Henkilökunta"
-    },
-    "domain_mute_card": {
-        "mute": "Mykistä",
-        "unmute": "Poista mykistys",
-        "mute_progress": "Mykistetään...",
-        "unmute_progress": "Poistetaan mykistyst..."
-    },
-    "exporter": {
-        "export": "Vie",
-        "processing": "Käsitellään, hetken päästä voit tallentaa tiedoston"
-    },
-    "image_cropper": {
-        "crop_picture": "Rajaa kuva",
-        "save": "Tallenna",
-        "save_without_cropping": "Tallenna rajaamatta",
-        "cancel": "Peruuta"
-    },
-    "importer": {
-        "submit": "Hyväksy",
-        "error": "Virhe tapahtui tietoja tuodessa.",
-        "success": "Tuonti onnistui."
-    },
-    "media_modal": {
-        "previous": "Edellinen",
-        "next": "Seuraava"
-    },
-    "emoji": {
-        "stickers": "Tarrat",
-        "emoji": "Emoji",
-        "keep_open": "Pidä valitsin auki",
-        "search_emoji": "Hae emojia",
-        "add_emoji": "Lisää emoji",
-        "custom": "Custom-emoji",
-        "load_all": "Ladataan kaikkia {emojiAmount} emojia",
-        "unicode": "Unicode-emoji",
-        "load_all_hint": "Ensimmäiset {saneAmount} emojia ladattu, kaikkien emojien lataaminen voi aiheuttaa hidastelua."
-    },
-    "remote_user_resolver": {
-        "remote_user_resolver": "Ulkopuolinen käyttäjä",
-        "searching_for": "Etsitään käyttäjää",
-        "error": "Ei löytynyt."
-    },
-    "selectable_list": {
-        "select_all": "Valitse kaikki"
-    },
-    "password_reset": {
-        "check_email": "Tarkista sähköpostisi salasanannollausta varten.",
-        "instruction": "Syötä sähköpostiosoite tai käyttäjänimi. Lähetämme linkin salasanan nollausta varten.",
-        "password_reset_disabled": "Salasanan nollaus ei käytössä. Ota yhteyttä sivun ylläpitäjään.",
-        "password_reset_required_but_mailer_is_disabled": "Sinun täytyy vaihtaa salasana, mutta salasanan nollaus on pois käytöstä. Ota yhteyttä sivun ylläpitäjään.",
-        "forgot_password": "Unohditko salasanan?",
-        "password_reset": "Salasanan nollaus",
-        "placeholder": "Sähköpostiosoite tai käyttäjänimi",
-        "return_home": "Palaa etusivulle",
-        "not_found": "Sähköpostiosoitetta tai käyttäjänimeä ei löytynyt.",
-        "too_many_requests": "Olet käyttänyt kaikki yritykset, yritä uudelleen myöhemmin.",
-        "password_reset_required": "Sinun täytyy vaihtaa salasana kirjautuaksesi."
-    },
-    "user_reporting": {
-        "add_comment_description": "Tämä raportti lähetetään sivun moderaattoreille. Voit antaa selityksen miksi ilmiannoit tilin:",
-        "title": "Ilmiannetaan {0}",
-        "additional_comments": "Lisäkommentit",
-        "forward_description": "Tämä tili on toiselta palvelimelta. Lähetä kopio ilmiannosta sinnekin?",
-        "forward_to": "Lähetä eteenpäin: {0}",
-        "submit": "Lähetä",
-        "generic_error": "Virhe käsitellessä pyyntöä."
-    },
-    "search": {
-        "people": "Käyttäjät",
-        "hashtags": "Aihetunnisteet",
-        "people_talking": "{0} käyttäjää puhuvat",
-        "person_talking": "{0} käyttäjä puhuu",
-        "no_results": "Ei tuloksia"
+    "direct_warning_to_all": "Tämä viesti näkyy vain viestissä mainituille käyttäjille.",
+    "direct_warning_to_first_only": "Tämä viesti näkyy vain viestin alussa mainituille käyttäjille.",
+    "scope_notice": {
+      "public": "Tämä viesti näkyy kaikille",
+      "private": "Tämä viesti näkyy vain sinun seuraajillesi",
+      "unlisted": "Tämä viesti ei näy Julkisella Aikajanalla tai Koko Tunnettu Verkosto -aikajanalla"
     }
+  },
+  "registration": {
+    "bio": "Kuvaus",
+    "email": "Sähköposti",
+    "fullname": "Koko nimi",
+    "password_confirm": "Salasanan vahvistaminen",
+    "registration": "Rekisteröityminen",
+    "token": "Kutsuvaltuus",
+    "captcha": "Varmenne",
+    "new_captcha": "Paina kuvaa saadaksesi uuden varmenteen",
+    "validations": {
+      "username_required": "ei voi olla tyhjä",
+      "fullname_required": "ei voi olla tyhjä",
+      "email_required": "ei voi olla tyhjä",
+      "password_required": "ei voi olla tyhjä",
+      "password_confirmation_required": "ei voi olla tyhjä",
+      "password_confirmation_match": "pitää vastata salasanaa"
+    },
+    "username_placeholder": "esim. peke",
+    "fullname_placeholder": "esim. Pekka Postaaja",
+    "bio_placeholder": "esim.\nHei, olen Pekka.\nOlen esimerkkikäyttäjä tässä verkostossa."
+  },
+  "settings": {
+    "attachmentRadius": "Liitteet",
+    "attachments": "Liitteet",
+    "autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
+    "avatar": "Profiilikuva",
+    "avatarAltRadius": "Profiilikuvat (ilmoitukset)",
+    "avatarRadius": "Profiilikuvat",
+    "background": "Tausta",
+    "bio": "Kuvaus",
+    "btnRadius": "Napit",
+    "cBlue": "Sininen (Vastaukset, seuraukset)",
+    "cGreen": "Vihreä (Toistot)",
+    "cOrange": "Oranssi (Tykkäykset)",
+    "cRed": "Punainen (Peruminen)",
+    "change_password": "Vaihda salasana",
+    "change_password_error": "Virhe vaihtaessa salasanaa.",
+    "changed_password": "Salasana vaihdettu!",
+    "collapse_subject": "Minimoi viestit, joille on asetettu aihe",
+    "composing": "Viestien laatiminen",
+    "confirm_new_password": "Vahvista uusi salasana",
+    "current_avatar": "Nykyinen profiilikuvasi",
+    "current_password": "Nykyinen salasana",
+    "current_profile_banner": "Nykyinen julisteesi",
+    "data_import_export_tab": "Tietojen tuonti / vienti",
+    "default_vis": "Oletusnäkyvyysrajaus",
+    "delete_account": "Poista tili",
+    "delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
+    "delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
+    "delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
+    "emoji_reactions_on_timeline": "Näytä emojireaktiot aikajanalla",
+    "export_theme": "Tallenna teema",
+    "filtering": "Suodatus",
+    "filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.",
+    "follow_export": "Seurausten vienti",
+    "follow_export_button": "Vie seurauksesi CSV-tiedostoon",
+    "follow_export_processing": "Käsitellään, sinua pyydetään lataamaan tiedosto hetken päästä",
+    "follow_import": "Seurausten tuonti",
+    "follow_import_error": "Virhe tuodessa seuraksia",
+    "follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
+    "foreground": "Etuala",
+    "general": "Yleinen",
+    "hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
+    "hide_attachments_in_tl": "Piilota liitteet aikajanalla",
+    "max_thumbnails": "Suurin sallittu määrä liitteitä esikatselussa",
+    "hide_isp": "Piilota palvelimenkohtainen ruutu",
+    "preload_images": "Esilataa kuvat",
+    "use_one_click_nsfw": "Avaa NSFW-liitteet yhdellä painalluksella",
+    "hide_post_stats": "Piilota viestien statistiikka (esim. tykkäysten määrä)",
+    "hide_user_stats": "Piilota käyttäjien statistiikka (esim. seuraajien määrä)",
+    "import_followers_from_a_csv_file": "Tuo seuraukset CSV-tiedostosta",
+    "import_theme": "Tuo tallennettu teema",
+    "inputRadius": "Syöttökentät",
+    "checkboxRadius": "Valintalaatikot",
+    "instance_default": "(oletus: {value})",
+    "instance_default_simple": "(oletus)",
+    "interface": "Käyttöliittymä",
+    "interfaceLanguage": "Käyttöliittymän kieli",
+    "invalid_theme_imported": "Tuotu tallennettu teema on epäkelpo, muutoksia ei tehty nykyiseen teemaasi.",
+    "limited_availability": "Ei saatavilla selaimessasi",
+    "links": "Linkit",
+    "lock_account_description": "Vain erikseen hyväksytyt käyttäjät voivat seurata tiliäsi",
+    "loop_video": "Uudelleentoista videot",
+    "loop_video_silent_only": "Uudelleentoista ainoastaan äänettömät videot (Video-\"giffit\")",
+    "play_videos_in_modal": "Toista videot modaalissa",
+    "use_contain_fit": "Älä rajaa liitteitä esikatselussa",
+    "name": "Nimi",
+    "name_bio": "Nimi ja kuvaus",
+    "new_password": "Uusi salasana",
+    "notification_visibility": "Ilmoitusten näkyvyys",
+    "notification_visibility_follows": "Seuraukset",
+    "notification_visibility_likes": "Tykkäykset",
+    "notification_visibility_mentions": "Maininnat",
+    "notification_visibility_repeats": "Toistot",
+    "notification_visibility_emoji_reactions": "Reaktiot",
+    "no_rich_text_description": "Älä näytä tekstin muotoilua",
+    "hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
+    "nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
+    "oauth_tokens": "OAuth-merkit",
+    "token": "Token",
+    "refresh_token": "Päivitä token",
+    "valid_until": "Voimassa asti",
+    "revoke_token": "Peruuta",
+    "panelRadius": "Ruudut",
+    "pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
+    "presets": "Valmiit teemat",
+    "profile_background": "Taustakuva",
+    "profile_banner": "Juliste",
+    "profile_tab": "Profiili",
+    "radii_help": "Aseta reunojen pyöristys (pikseleinä)",
+    "replies_in_timeline": "Keskustelut aikajanalla",
+    "reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
+    "reply_visibility_all": "Näytä kaikki vastaukset",
+    "reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
+    "reply_visibility_self": "Näytä vain vastaukset minulle",
+    "saving_err": "Virhe tallentaessa asetuksia",
+    "saving_ok": "Asetukset tallennettu",
+    "security_tab": "Tietoturva",
+    "scope_copy": "Kopioi näkyvyysrajaus vastatessa (Yksityisviestit aina kopioivat)",
+    "set_new_avatar": "Aseta uusi profiilikuva",
+    "set_new_profile_background": "Aseta uusi taustakuva",
+    "set_new_profile_banner": "Aseta uusi juliste",
+    "settings": "Asetukset",
+    "subject_input_always_show": "Näytä aihe-kenttä",
+    "subject_line_behavior": "Aihe-kentän kopiointi",
+    "subject_line_email": "Kuten sähköposti: \"re: aihe\"",
+    "subject_line_mastodon": "Kopioi sellaisenaan",
+    "subject_line_noop": "Älä kopioi",
+    "stop_gifs": "Toista giffit vain kohdistaessa",
+    "streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla",
+    "text": "Teksti",
+    "theme": "Teema",
+    "theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.",
+    "theme_help_v2_1": "Voit asettaa tiettyjen osien värin tai läpinäkyvyyden täyttämällä valintalaatikon, käytä \"Tyhjennä kaikki\"-nappia tyhjentääksesi kaiken.",
+    "theme_help_v2_2": "Ikonit kenttien alla ovat kontrasti-indikaattoreita, lisätietoa kohdistamalla. Käyttäessä läpinäkyvyyttä ne näyttävät pahimman skenaarion.",
+    "tooltipRadius": "Ohje- tai huomioviestit",
+    "user_settings": "Käyttäjän asetukset",
+    "values": {
+      "false": "pois päältä",
+      "true": "päällä"
+    },
+    "hide_follows_description": "Älä näytä ketä seuraan",
+    "show_moderator_badge": "Näytä Moderaattori-merkki profiilissani",
+    "useStreamingApi": "Vastaanota viestiejä ja ilmoituksia reaaliajassa",
+    "notification_setting_filters": "Suodattimet",
+    "notification_setting": "Vastaanota ilmoituksia seuraavista:",
+    "notification_setting_privacy_option": "Piilota lähettäjä ja sisältö sovelluksen ulkopuolisista ilmoituksista",
+    "enable_web_push_notifications": "Ota käyttöön sovelluksen ulkopuoliset ilmoitukset",
+    "app_name": "Sovelluksen nimi",
+    "security": "Turvallisuus",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "OTP-asetukset",
+      "wait_pre_setup_otp": "esiasetetaan OTP:ta",
+      "confirm_and_enable": "Hyväksy ja käytä OTP",
+      "title": "Monivaihetodennus",
+      "generate_new_recovery_codes": "Luo uudet palautuskoodit",
+      "authentication_methods": "Todennus",
+      "warning_of_generate_new_codes": "Luodessasi uudet palautuskoodit, vanhat koodisi lakkaavat toimimasta.",
+      "recovery_codes": "Palautuskoodit.",
+      "waiting_a_recovery_codes": "Odotetaan palautuskoodeja...",
+      "recovery_codes_warning": "Kirjoita koodit ylös tai tallenna ne turvallisesti, muuten et näe niitä uudestaan. Jos et voi käyttää monivaihetodennusta ja sinulla ei ole palautuskoodeja, et voi enää kirjautua sisään tilillesi.",
+      "scan": {
+        "title": "Skannaa",
+        "secret_code": "Avain",
+        "desc": "Käytä monivaihetodennus-sovellusta skannakksesi tämän QR-kooding, tai syötä avain:"
+      },
+      "verify": {
+        "desc": "Kytkeäksesi päälle monivaihetodennuksen, syötä koodi monivaihetodennussovellksesta:"
+      }
+    },
+    "allow_following_move": "Salli automaattinen seuraaminen kun käyttäjä siirtää tilinsä",
+    "block_export": "Estojen vienti",
+    "block_export_button": "Vie estosi CSV-tiedostoon",
+    "block_import": "Estojen tuonti",
+    "block_import_error": "Virhe tuodessa estoja",
+    "blocks_imported": "Estot tuotu! Käsittely vie hetken.",
+    "blocks_tab": "Estot",
+    "change_email": "Vaihda sähköpostiosoite",
+    "change_email_error": "Virhe vaihtaessa sähköpostiosoitetta.",
+    "changed_email": "Sähköpostiosoite vaihdettu!",
+    "domain_mutes": "Sivut",
+    "avatar_size_instruction": "Suositeltu vähimmäiskoko profiilikuville on 150x150 pikseliä.",
+    "accent": "Korostus",
+    "hide_muted_posts": "Piilota mykistettyjen käyttäjien viestit",
+    "hide_filtered_statuses": "Piilota mykistetyt viestit",
+    "import_blocks_from_a_csv_file": "Tuo estot CSV-tiedostosta",
+    "no_blocks": "Ei estoja",
+    "no_mutes": "Ei mykistyksiä",
+    "notification_visibility_moves": "Käyttäjien siirtymiset",
+    "hide_followers_description": "Älä näytä ketkä seuraavat minua",
+    "hide_follows_count_description": "Älä näytä seurauksien määrää",
+    "hide_followers_count_description": "Älä näytä seuraajien määrää",
+    "show_admin_badge": "Näytä Ylläpitäjä-merkki proofilissani",
+    "autohide_floating_post_button": "Piilota Uusi Viesti -nappi automaattisesti (mobiili)",
+    "search_user_to_block": "Hae estettäviä käyttäjiä",
+    "search_user_to_mute": "Hae mykistettäviä käyttäjiä",
+    "minimal_scopes_mode": "Yksinkertaista näkyvyydenrajauksen vaihtoehdot",
+    "post_status_content_type": "Uuden viestin sisällön muoto",
+    "user_mutes": "Käyttäjät",
+    "useStreamingApiWarning": "(Kokeellinen)",
+    "type_domains_to_mute": "Syötä mykistettäviä sivustoja",
+    "upload_a_photo": "Lataa kuva",
+    "fun": "Hupi",
+    "greentext": "Meeminuolet",
+    "notifications": "Ilmoitukset",
+    "style": {
+      "switcher": {
+        "save_load_hint": "\"Säilytä\" asetukset säilyttävät tällä hetkellä asetetut asetukset valittaessa tai ladatessa teemaa, se myös tallentaa kyseiset asetukset viedessä teemaa. Kun kaikki laatikot ovat tyhjänä, viety teema tallentaa kaiken.",
+        "help": {
+          "older_version_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla.",
+          "fe_upgraded": "PleromaFE:n teemaus päivitetty versiopäivityksen yhteydessä.",
+          "migration_snapshot_ok": "Varmuuden vuoksi teeman kaappaus ladattu. Voit koittaa ladata teeman sisällön.",
+          "migration_napshot_gone": "Jostain syystä teeman kaappaus puuttuu, kaikki asiat eivät välttämättä näytä oikealta.",
+          "snapshot_source_mismatch": "Versiot eivät täsmää: todennäköisesti versio vaihdettu vanhempaan ja päivitetty uudestaan, jos vaihdoit teemaa vanhalla versiolla, sinun tulisi käyttää vanhaa versiota, muutoin uutta.",
+          "upgraded_from_v2": "PleromaFE on päivitetty, teemasi saattaa näyttää erilaiselta kuin muistat.",
+          "v2_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla. Yhteensopivuus ei välttämättä ole täydellinen.",
+          "future_version_imported": "Tuomasi tiedosto on luotu uudemmalla versiolla.",
+          "snapshot_present": "Teeman kaappaus ladattu, joten kaikki arvot ovat ylikirjoitettu. Voit sen sijaan ladata teeman sisällön.",
+          "snapshot_missing": "Teeman kaappausta ei tiedostossa, joten se voi näyttää erilaiselta kuin suunniteltu.",
+          "fe_downgraded": "PleromaFE:n versio vaihtunut vanhempaan."
+        },
+        "keep_color": "Säilytä värit",
+        "keep_shadows": "Säilytä varjot",
+        "keep_opacity": "Säilytä läpinäkyvyys",
+        "keep_roundness": "Säilytä pyöristys",
+        "keep_fonts": "Säilytä fontit",
+        "reset": "Palauta",
+        "clear_all": "Tyhjennä kaikki",
+        "clear_opacity": "Tyhjennä läpinäkyvyys",
+        "load_theme": "Lataa teema",
+        "keep_as_is": "Pidä sellaisenaan",
+        "use_snapshot": "Vanha",
+        "use_source": "Uusi"
+      },
+      "advanced_colors": {
+        "selectedPost": "Valittu viesti",
+        "_tab_label": "Edistynyt",
+        "alert": "Varoituksen tausta",
+        "alert_error": "Virhe",
+        "alert_warning": "Varoitus",
+        "alert_neutral": "Neutraali",
+        "post": "Viestit/Käyttäjien kuvaukset",
+        "badge": "Merkin tausta",
+        "badge_notification": "Ilmoitus",
+        "panel_header": "Ruudun otsikko",
+        "top_bar": "Yläpalkki",
+        "borders": "Reunat",
+        "buttons": "Napit",
+        "inputs": "Syöttökentät",
+        "faint_text": "Häivytetty teksti",
+        "underlay": "Taustapeite",
+        "poll": "Äänestyksen kuvaaja",
+        "icons": "Ikonit",
+        "highlight": "Korostetut elementit",
+        "pressed": "Painettu",
+        "selectedMenu": "Valikon valinta",
+        "disabled": "Pois käytöstä",
+        "toggled": "Kytketty",
+        "tabs": "Välilehdet",
+        "popover": "Työkaluvinkit, valikot, ponnahdusviestit"
+      },
+      "common": {
+        "color": "Väri",
+        "opacity": "Läpinäkyvyys",
+        "contrast": {
+          "level": {
+            "aaa": "saavuttaa AAA-tason (suositeltu)",
+            "aa": "saavuttaa AA-tason (minimi)",
+            "bad": "ei saavuta mitään helppokäyttöisyyssuosituksia"
+          },
+          "hint": "Kontrastisuhde on {ratio}, se {level} {context}",
+          "context": {
+            "18pt": "suurella (18pt+) tekstillä",
+            "text": "tekstillä"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Yleinen",
+        "main": "Yleiset värit",
+        "foreground_hint": "Löydät \"Edistynyt\"-välilehdeltä tarkemmat asetukset",
+        "rgbo": "Ikonit, korostukset, merkit"
+      },
+      "shadows": {
+        "filter_hint": {
+          "always_drop_shadow": "Varoitus, tämä varjo käyttää aina {0} kun selain tukee sitä.",
+          "avatar_inset": "Huom. sisennettyjen ja ei-sisennettyjen varjojen yhdistelmät saattavat luoda ei-odotettuja lopputuloksia läpinäkyvillä profiilikuvilla.",
+          "drop_shadow_syntax": "{0} ei tue {1} parametria ja {2} avainsanaa.",
+          "spread_zero": "Varjot joiden levitys > 0 näyttävät samalta kuin se olisi nolla",
+          "inset_classic": "Sisennetyt varjot käyttävät {0}"
+        },
+        "components": {
+          "buttonPressedHover": "Nappi (painettu ja kohdistettu)",
+          "panel": "Ruutu",
+          "panelHeader": "Ruudun otsikko",
+          "topBar": "Yläpalkki",
+          "avatar": "Profiilikuva (profiilinäkymässä)",
+          "avatarStatus": "Profiilikuva (viestin yhtyedessä)",
+          "popup": "Ponnahdusviestit ja työkaluvinkit",
+          "button": "Nappi",
+          "buttonHover": "Nappi (kohdistus)",
+          "buttonPressed": "Nappi (painettu)",
+          "input": "Syöttökenttä"
+        },
+        "hintV3": "Voit käyttää {0} merkintää varjoille käyttääksesi väriä toisesta asetuksesta.",
+        "_tab_label": "Valo ja varjostus",
+        "component": "Komponentti",
+        "override": "Ylikirjoita",
+        "shadow_id": "Varjo #{value}",
+        "blur": "Sumennus",
+        "spread": "Levitys",
+        "inset": "Sisennys"
+      },
+      "fonts": {
+        "help": "Valitse fontti käyttöliittymälle. \"Oma\"-vaihtohdolle on syötettävä fontin nimi tarkalleen samana kuin se on järjestelmässäsi.",
+        "_tab_label": "Fontit",
+        "components": {
+          "interface": "Käyttöliittymä",
+          "input": "Syöttökentät",
+          "post": "Viestin teksti",
+          "postCode": "Tasavälistetty teksti viestissä"
+        },
+        "family": "Fontin nimi",
+        "size": "Koko (pikseleissä)",
+        "weight": "Painostus (paksuus)",
+        "custom": "Oma"
+      },
+      "preview": {
+        "input": "Tulin juuri saunasta.",
+        "header": "Esikatselu",
+        "content": "Sisältö",
+        "error": "Esimerkkivirhe",
+        "button": "Nappi",
+        "text": "Vähän lisää {0} ja {1}",
+        "mono": "sisältöä",
+        "faint_link": "manuaali",
+        "fine_print": "Lue meidän {0} vaikka huvin vuoksi!",
+        "header_faint": "Tämä on OK",
+        "checkbox": "Olen silmäillyt käyttöehdot",
+        "link": "kiva linkki"
+      },
+      "radii": {
+        "_tab_label": "Pyöristys"
+      }
+    },
+    "enter_current_password_to_confirm": "Syötä nykyinen salasanasi todentaaksesi henkilöllisyytesi",
+    "discoverable": "Salli tilisi näkyvyys hakukoneisiin ja muihin palveluihin",
+    "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
+    "mutes_tab": "Mykistykset",
+    "new_email": "Uusi sähköpostiosoite",
+    "notification_setting_follows": "Käyttäjät joita seuraat",
+    "notification_setting_non_follows": "Käyttäjät joita et seuraa",
+    "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
+    "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
+    "notification_setting_privacy": "Yksityisyys",
+    "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
+    "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
+    "version": {
+      "title": "Versio",
+      "backend_version": "Palvelimen versio",
+      "frontend_version": "Käyttöliittymän versio"
+    }
+  },
+  "time": {
+    "day": "{0} päivä",
+    "days": "{0} päivää",
+    "day_short": "{0}pv",
+    "days_short": "{0}pv",
+    "hour": "{0} tunti",
+    "hours": "{0} tuntia",
+    "hour_short": "{0}t",
+    "hours_short": "{0}t",
+    "in_future": "{0} tulevaisuudessa",
+    "in_past": "{0} sitten",
+    "minute": "{0} minuutti",
+    "minutes": "{0} minuuttia",
+    "minute_short": "{0}min",
+    "minutes_short": "{0}min",
+    "month": "{0} kuukausi",
+    "months": "{0} kuukautta",
+    "month_short": "{0}kk",
+    "months_short": "{0}kk",
+    "now": "juuri nyt",
+    "now_short": "nyt",
+    "second": "{0} sekunti",
+    "seconds": "{0} sekuntia",
+    "second_short": "{0}s",
+    "seconds_short": "{0}s",
+    "week": "{0} viikko",
+    "weeks": "{0} viikkoa",
+    "week_short": "{0}vk",
+    "weeks_short": "{0}vk",
+    "year": "{0} vuosi",
+    "years": "{0} vuotta",
+    "year_short": "{0}v",
+    "years_short": "{0}v"
+  },
+  "timeline": {
+    "collapse": "Sulje",
+    "conversation": "Keskustelu",
+    "error_fetching": "Virhe ladatessa viestejä",
+    "load_older": "Lataa vanhempia viestejä",
+    "no_retweet_hint": "Viesti ei ole julkinen, eikä sitä voi toistaa",
+    "repeated": "toisti",
+    "show_new": "Näytä uudet",
+    "up_to_date": "Ajantasalla",
+    "no_more_statuses": "Ei enempää viestejä",
+    "no_statuses": "Ei viestejä"
+  },
+  "status": {
+    "favorites": "Tykkäykset",
+    "repeats": "Toistot",
+    "delete": "Poista",
+    "pin": "Kiinnitä profiiliisi",
+    "unpin": "Poista kiinnitys",
+    "pinned": "Kiinnitetty",
+    "delete_confirm": "Haluatko varmasti postaa viestin?",
+    "reply_to": "Vastaus",
+    "replies_list": "Vastaukset:",
+    "mute_conversation": "Mykistä keskustelu",
+    "unmute_conversation": "Poista mykistys",
+    "status_unavailable": "Viesti ei saatavissa",
+    "copy_link": "Kopioi linkki"
+  },
+  "user_card": {
+    "approve": "Hyväksy",
+    "block": "Estä",
+    "blocked": "Estetty!",
+    "deny": "Älä hyväksy",
+    "follow": "Seuraa",
+    "follow_sent": "Pyyntö lähetetty!",
+    "follow_progress": "Pyydetään…",
+    "follow_again": "Lähetä pyyntö uudestaan",
+    "follow_unfollow": "Älä seuraa",
+    "followees": "Seuraa",
+    "followers": "Seuraajat",
+    "following": "Seuraat!",
+    "follows_you": "Seuraa sinua!",
+    "its_you": "Sinun tili!",
+    "mute": "Mykistä",
+    "muted": "Mykistetty",
+    "per_day": "päivässä",
+    "remote_follow": "Seuraa muualta",
+    "statuses": "Viestit",
+    "hidden": "Piilotettu",
+    "media": "Media",
+    "block_progress": "Estetään...",
+    "admin_menu": {
+      "grant_admin": "Anna Ylläpitöoikeudet",
+      "force_nsfw": "Merkitse kaikki viestit NSFW:nä",
+      "disable_any_subscription": "Estä käyttäjän seuraaminen",
+      "moderation": "Moderaatio",
+      "revoke_admin": "Poista Ylläpitöoikeudet",
+      "grant_moderator": "Anna Moderaattorioikeudet",
+      "revoke_moderator": "Poista Moderaattorioikeudet",
+      "activate_account": "Aktivoi tili",
+      "deactivate_account": "Deaktivoi tili",
+      "delete_account": "Poista tili",
+      "strip_media": "Poista media viesteistä",
+      "force_unlisted": "Pakota viestit listaamattomiksi",
+      "sandbox": "Pakota viestit vain seuraajille",
+      "disable_remote_subscription": "Estä seuraaminen ulkopuolisilta sivuilta",
+      "quarantine": "Estä käyttäjän viestin federoituminen",
+      "delete_user": "Poista käyttäjä",
+      "delete_user_confirmation": "Oletko aivan varma? Tätä ei voi kumota."
+    },
+    "favorites": "Tykkäykset",
+    "mention": "Mainitse",
+    "report": "Ilmianna",
+    "subscribe": "Tilaa",
+    "unsubscribe": "Poista tilaus",
+    "unblock": "Poista esto",
+    "unblock_progress": "Postetaan estoa...",
+    "unmute": "Poista mykistys",
+    "unmute_progress": "Poistetaan mykistystä...",
+    "mute_progress": "Mykistetään...",
+    "hide_repeats": "Piilota toistot",
+    "show_repeats": "Näytä toistot"
+  },
+  "user_profile": {
+    "timeline_title": "Käyttäjän aikajana",
+    "profile_does_not_exist": "Tätä profiilia ei ole.",
+    "profile_loading_error": "Virhe ladatessa profiilia."
+  },
+  "who_to_follow": {
+    "more": "Lisää",
+    "who_to_follow": "Seurausehdotukset"
+  },
+  "tool_tip": {
+    "media_upload": "Lataa tiedosto",
+    "repeat": "Toista",
+    "reply": "Vastaa",
+    "favorite": "Tykkää",
+    "user_settings": "Käyttäjäasetukset",
+    "add_reaction": "Lisää Reaktio",
+    "accept_follow_request": "Hyväksy seurauspyyntö",
+    "reject_follow_request": "Hylkää seurauspyyntö"
+  },
+  "upload": {
+    "error": {
+      "base": "Lataus epäonnistui.",
+      "file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Yritä uudestaan myöhemmin"
+    },
+    "file_size_units": {
+      "B": "tavua",
+      "KiB": "kt",
+      "MiB": "Mt",
+      "GiB": "Gt",
+      "TiB": "Tt"
+    }
+  },
+  "about": {
+    "mrf": {
+      "keyword": {
+        "keyword_policies": "Avainsanasäännöt",
+        "ftl_removal": "Poistettu \"Koko Tunnettu Verkosto\" -aikajanalta",
+        "reject": "Hylkää",
+        "replace": "Korvaa",
+        "is_replaced_by": "→"
+      },
+      "simple": {
+        "accept": "Hyväksy",
+        "reject": "Hylkää",
+        "quarantine": "Karanteeni",
+        "ftl_removal": "Poisto \"Koko Tunnettu Verkosto\" -aikajanalta",
+        "media_removal": "Media-tiedostojen poisto",
+        "simple_policies": "Palvelinkohtaiset Säännöt",
+        "accept_desc": "Tämä palvelin hyväksyy viestit vain seuraavilta palvelimilta:",
+        "reject_desc": "Tämä palvelin ei hyväksy viestejä seuraavilta palvelimilta:",
+        "quarantine_desc": "Tämä palvelin lähettää vain julkisia viestejä seuraaville palvelimille:",
+        "ftl_removal_desc": "Tämä palvelin poistaa nämä palvelimet \"Koko Tunnettu Verkosto\"-aikajanalta:",
+        "media_removal_desc": "Tämä palvelin postaa mediatiedostot viesteistä seuraavilta palvelimilta:",
+        "media_nsfw": "Pakota Media Arkaluontoiseksi",
+        "media_nsfw_desc": "Tämä palvelin pakottaa mediatiedostot arkaluonteisiksi seuraavilta palvelimilta:"
+      },
+      "federation": "Federaatio",
+      "mrf_policies": "Aktivoidut MRF-säännöt",
+      "mrf_policies_desc": "MRF-säännöt muuttavat federaation toimintaa sivulla. Seuraavat säännöt ovat kytketty päälle:"
+    },
+    "staff": "Henkilökunta"
+  },
+  "domain_mute_card": {
+    "mute": "Mykistä",
+    "unmute": "Poista mykistys",
+    "mute_progress": "Mykistetään...",
+    "unmute_progress": "Poistetaan mykistyst..."
+  },
+  "exporter": {
+    "export": "Vie",
+    "processing": "Käsitellään, hetken päästä voit tallentaa tiedoston"
+  },
+  "image_cropper": {
+    "crop_picture": "Rajaa kuva",
+    "save": "Tallenna",
+    "save_without_cropping": "Tallenna rajaamatta",
+    "cancel": "Peruuta"
+  },
+  "importer": {
+    "submit": "Hyväksy",
+    "error": "Virhe tapahtui tietoja tuodessa.",
+    "success": "Tuonti onnistui."
+  },
+  "media_modal": {
+    "previous": "Edellinen",
+    "next": "Seuraava"
+  },
+  "emoji": {
+    "stickers": "Tarrat",
+    "emoji": "Emoji",
+    "keep_open": "Pidä valitsin auki",
+    "search_emoji": "Hae emojia",
+    "add_emoji": "Lisää emoji",
+    "custom": "Custom-emoji",
+    "load_all": "Ladataan kaikkia {emojiAmount} emojia",
+    "unicode": "Unicode-emoji",
+    "load_all_hint": "Ensimmäiset {saneAmount} emojia ladattu, kaikkien emojien lataaminen voi aiheuttaa hidastelua."
+  },
+  "remote_user_resolver": {
+    "remote_user_resolver": "Ulkopuolinen käyttäjä",
+    "searching_for": "Etsitään käyttäjää",
+    "error": "Ei löytynyt."
+  },
+  "selectable_list": {
+    "select_all": "Valitse kaikki"
+  },
+  "password_reset": {
+    "check_email": "Tarkista sähköpostisi salasanannollausta varten.",
+    "instruction": "Syötä sähköpostiosoite tai käyttäjänimi. Lähetämme linkin salasanan nollausta varten.",
+    "password_reset_disabled": "Salasanan nollaus ei käytössä. Ota yhteyttä sivun ylläpitäjään.",
+    "password_reset_required_but_mailer_is_disabled": "Sinun täytyy vaihtaa salasana, mutta salasanan nollaus on pois käytöstä. Ota yhteyttä sivun ylläpitäjään.",
+    "forgot_password": "Unohditko salasanan?",
+    "password_reset": "Salasanan nollaus",
+    "placeholder": "Sähköpostiosoite tai käyttäjänimi",
+    "return_home": "Palaa etusivulle",
+    "not_found": "Sähköpostiosoitetta tai käyttäjänimeä ei löytynyt.",
+    "too_many_requests": "Olet käyttänyt kaikki yritykset, yritä uudelleen myöhemmin.",
+    "password_reset_required": "Sinun täytyy vaihtaa salasana kirjautuaksesi."
+  },
+  "user_reporting": {
+    "add_comment_description": "Tämä raportti lähetetään sivun moderaattoreille. Voit antaa selityksen miksi ilmiannoit tilin:",
+    "title": "Ilmiannetaan {0}",
+    "additional_comments": "Lisäkommentit",
+    "forward_description": "Tämä tili on toiselta palvelimelta. Lähetä kopio ilmiannosta sinnekin?",
+    "forward_to": "Lähetä eteenpäin: {0}",
+    "submit": "Lähetä",
+    "generic_error": "Virhe käsitellessä pyyntöä."
+  },
+  "search": {
+    "people": "Käyttäjät",
+    "hashtags": "Aihetunnisteet",
+    "people_talking": "{0} käyttäjää puhuvat",
+    "person_talking": "{0} käyttäjä puhuu",
+    "no_results": "Ei tuloksia"
+  }
 }
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 719bde76..31b69a0f 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -1,743 +1,743 @@
 {
-    "chat": {
-        "title": "Chat"
-    },
-    "exporter": {
-        "export": "Exporter",
-        "processing": "En cours de traitement, vous pourrez bientôt télécharger votre fichier"
-    },
-    "features_panel": {
-        "chat": "Chat",
-        "gopher": "Gopher",
-        "media_proxy": "Proxy média",
-        "scope_options": "Options de visibilité",
-        "text_limit": "Limite de texte",
-        "title": "Caractéristiques",
-        "who_to_follow": "Personnes à suivre"
-    },
-    "finder": {
-        "error_fetching_user": "Erreur lors de la recherche de l'utilisateur·ice",
-        "find_user": "Chercher un-e utilisateur·ice"
-    },
-    "general": {
-        "apply": "Appliquer",
-        "submit": "Envoyer",
-        "more": "Plus",
-        "generic_error": "Une erreur s'est produite",
-        "optional": "optionnel",
-        "show_more": "Montrer plus",
-        "show_less": "Montrer moins",
-        "cancel": "Annuler",
-        "disable": "Désactiver",
-        "enable": "Activer",
-        "confirm": "Confirmer",
-        "verify": "Vérifier",
-        "dismiss": "Rejeter"
-    },
-    "image_cropper": {
-        "crop_picture": "Rogner l'image",
-        "save": "Sauvegarder",
-        "save_without_cropping": "Sauvegarder sans rogner",
-        "cancel": "Annuler"
-    },
-    "importer": {
-        "submit": "Soumettre",
-        "success": "Importé avec succès.",
-        "error": "Une erreur est survenue pendant l'import de ce fichier."
-    },
-    "login": {
-        "login": "Connexion",
-        "description": "Connexion avec OAuth",
-        "logout": "Déconnexion",
-        "password": "Mot de passe",
-        "placeholder": "p.e. lain",
-        "register": "S'inscrire",
-        "username": "Identifiant",
-        "hint": "Connectez-vous pour rejoindre la discussion",
-        "authentication_code": "Code d'authentification",
-        "enter_recovery_code": "Entrez un code de récupération",
-        "enter_two_factor_code": "Entrez un code à double authentification",
-        "recovery_code": "Code de récupération",
-        "heading": {
-            "totp": "Authentification à double authentification",
-            "recovery": "Récuperation de la double authentification"
-        }
-    },
-    "media_modal": {
-        "previous": "Précédent",
-        "next": "Suivant"
-    },
-    "nav": {
-        "about": "À propos",
-        "back": "Retour",
-        "chat": "Chat local",
-        "friend_requests": "Demandes de suivi",
-        "mentions": "Notifications",
-        "interactions": "Interactions",
-        "dms": "Messages directs",
-        "public_tl": "Fil d'actualité public",
-        "timeline": "Fil d'actualité",
-        "twkn": "Ensemble du réseau connu",
-        "user_search": "Recherche d'utilisateur·ice",
-        "who_to_follow": "Qui suivre",
-        "preferences": "Préférences",
-        "search": "Recherche",
-        "administration": "Administration"
-    },
-    "notifications": {
-        "broken_favorite": "Chargement d'un message inconnu…",
-        "favorited_you": "a aimé votre statut",
-        "followed_you": "a commencé à vous suivre",
-        "load_older": "Charger les notifications précédentes",
-        "notifications": "Notifications",
-        "read": "Lu !",
-        "repeated_you": "a partagé votre statut",
-        "no_more_notifications": "Aucune notification supplémentaire",
-        "migrated_to": "a migré à",
-        "reacted_with": "a réagi avec {0}",
-        "follow_request": "veut vous suivre"
-    },
-    "interactions": {
-        "favs_repeats": "Partages et favoris",
-        "follows": "Nouveaux suivis",
-        "load_older": "Chargez d'anciennes interactions",
-        "moves": "Migrations de comptes"
-    },
-    "post_status": {
-        "new_status": "Poster un nouveau statut",
-        "account_not_locked_warning": "Votre compte n'est pas {0}. N'importe qui peut vous suivre pour voir vos billets en Abonné·e·s uniquement.",
-        "account_not_locked_warning_link": "verrouillé",
-        "attachments_sensitive": "Marquer le média comme sensible",
-        "content_type": {
-            "text/plain": "Texte brut",
-            "text/html": "HTML",
-            "text/markdown": "Markdown",
-            "text/bbcode": "BBCode"
-        },
-        "content_warning": "Sujet (optionnel)",
-        "default": "Écrivez ici votre prochain statut.",
-        "direct_warning_to_all": "Ce message sera visible pour toutes les personnes mentionnées.",
-        "direct_warning_to_first_only": "Ce message sera visible uniquement pour personnes mentionnées au début du message.",
-        "posting": "Envoi en cours",
-        "scope_notice": {
-            "public": "Ce statut sera visible par tout le monde",
-            "private": "Ce statut sera visible par seulement vos abonné⋅e⋅s",
-            "unlisted": "Ce statut ne sera pas visible dans le Fil d'actualité public et l'Ensemble du réseau connu"
-        },
-        "scope": {
-            "direct": "Direct - N'envoyer qu'aux personnes mentionnées",
-            "private": "Abonné·e·s uniquement - Seul·e·s vos abonné·e·s verront vos billets",
-            "public": "Publique - Afficher dans les fils publics",
-            "unlisted": "Non-Listé - Ne pas afficher dans les fils publics"
-        }
-    },
-    "registration": {
-        "bio": "Biographie",
-        "email": "Adresse mail",
-        "fullname": "Pseudonyme",
-        "password_confirm": "Confirmation du mot de passe",
-        "registration": "Inscription",
-        "token": "Jeton d'invitation",
-        "captcha": "CAPTCHA",
-        "new_captcha": "Cliquez sur l'image pour avoir un nouveau captcha",
-        "username_placeholder": "p.e. lain",
-        "fullname_placeholder": "p.e. Lain Iwakura",
-        "bio_placeholder": "p.e.\nSalut, je suis Lain\nJe suis une héroïne d'animé qui vit dans une banlieue japonaise. Vous me connaissez peut-être du Wired.",
-        "validations": {
-            "username_required": "ne peut pas être laissé vide",
-            "fullname_required": "ne peut pas être laissé vide",
-            "email_required": "ne peut pas être laissé vide",
-            "password_required": "ne peut pas être laissé vide",
-            "password_confirmation_required": "ne peut pas être laissé vide",
-            "password_confirmation_match": "doit être identique au mot de passe"
-        }
-    },
-    "selectable_list": {
-        "select_all": "Tout selectionner"
-    },
-    "settings": {
-        "app_name": "Nom de l'application",
-        "security": "Sécurité",
-        "enter_current_password_to_confirm": "Entrez votre mot de passe actuel pour confirmer votre identité",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "Configurer OTP",
-            "wait_pre_setup_otp": "préconfiguration OTP",
-            "confirm_and_enable": "Confirmer & activer OTP",
-            "title": "Double authentification",
-            "generate_new_recovery_codes": "Générer de nouveaux codes de récupération",
-            "warning_of_generate_new_codes": "Quand vous générez de nouveauc codes de récupération, vos anciens codes ne fonctionnerons plus.",
-            "recovery_codes": "Codes de récupération.",
-            "waiting_a_recovery_codes": "Réception des codes de récupération…",
-            "recovery_codes_warning": "Écrivez les codes ou sauvez les quelquepart sécurisé - sinon vous ne les verrez plus jamais. Si vous perdez l'accès à votre application de double authentification et codes de récupération vous serez vérouillé en dehors de votre compte.",
-            "authentication_methods": "Methodes d'authentification",
-            "scan": {
-                "title": "Scanner",
-                "desc": "En utilisant votre application de double authentification, scannez ce QR code ou entrez la clé textuelle :",
-                "secret_code": "Clé"
-            },
-            "verify": {
-                "desc": "Pour activer la double authentification, entrez le code depuis votre application :"
-            }
-        },
-        "attachmentRadius": "Pièces jointes",
-        "attachments": "Pièces jointes",
-        "autoload": "Charger la suite automatiquement une fois le bas de la page atteint",
-        "avatar": "Avatar",
-        "avatarAltRadius": "Avatars (Notifications)",
-        "avatarRadius": "Avatars",
-        "background": "Arrière-plan",
-        "bio": "Biographie",
-        "block_export": "Export des comptes bloqués",
-        "block_export_button": "Export des comptes bloqués vers un fichier csv",
-        "block_import": "Import des comptes bloqués",
-        "block_import_error": "Erreur lors de l'import des comptes bloqués",
-        "blocks_imported": "Blocks importés ! Le traitement va prendre un moment.",
-        "blocks_tab": "Bloqué·e·s",
-        "btnRadius": "Boutons",
-        "cBlue": "Bleu (répondre, suivre)",
-        "cGreen": "Vert (partager)",
-        "cOrange": "Orange (aimer)",
-        "cRed": "Rouge (annuler)",
-        "change_password": "Changez votre mot de passe",
-        "change_password_error": "Il y a eu un problème pour changer votre mot de passe.",
-        "changed_password": "Mot de passe modifié avec succès !",
-        "collapse_subject": "Réduire les messages avec des sujets",
-        "composing": "Composition",
-        "confirm_new_password": "Confirmation du nouveau mot de passe",
-        "current_avatar": "Avatar actuel",
-        "current_password": "Mot de passe actuel",
-        "current_profile_banner": "Bannière de profil actuelle",
-        "data_import_export_tab": "Import / Export des Données",
-        "default_vis": "Visibilité par défaut",
-        "delete_account": "Supprimer le compte",
-        "delete_account_description": "Supprimer définitivement vos données et désactiver votre compte.",
-        "delete_account_error": "Il y a eu un problème lors de la tentative de suppression de votre compte. Si le problème persiste, contactez l'administrateur⋅ice de cette instance.",
-        "delete_account_instructions": "Indiquez votre mot de passe ci-dessous pour confirmer la suppression de votre compte.",
-        "avatar_size_instruction": "La taille minimale recommandée pour l'image de l'avatar est de 150x150 pixels.",
-        "export_theme": "Enregistrer le thème",
-        "filtering": "Filtre",
-        "filtering_explanation": "Tous les statuts contenant ces mots seront masqués. Un mot par ligne",
-        "follow_export": "Exporter les abonnements",
-        "follow_export_button": "Exporter les abonnements en csv",
-        "follow_import": "Importer des abonnements",
-        "follow_import_error": "Erreur lors de l'importation des abonnements",
-        "follows_imported": "Abonnements importés ! Le traitement peut prendre un moment.",
-        "foreground": "Premier plan",
-        "general": "Général",
-        "hide_attachments_in_convo": "Masquer les pièces jointes dans les conversations",
-        "hide_attachments_in_tl": "Masquer les pièces jointes dans le journal",
-        "hide_muted_posts": "Masquer les statuts des utilisateurs masqués",
-        "max_thumbnails": "Nombre maximum de miniatures par statuts",
-        "hide_isp": "Masquer le panneau spécifique a l'instance",
-        "preload_images": "Précharger les images",
-        "use_one_click_nsfw": "Ouvrir les pièces-jointes NSFW avec un seul clic",
-        "hide_post_stats": "Masquer les statistiques de publication (le nombre de favoris)",
-        "hide_user_stats": "Masquer les statistiques de profil (le nombre d'amis)",
-        "hide_filtered_statuses": "Masquer les statuts filtrés",
-        "import_blocks_from_a_csv_file": "Importer les blocages depuis un fichier csv",
-        "import_followers_from_a_csv_file": "Importer des abonnements depuis un fichier csv",
-        "import_theme": "Charger le thème",
-        "inputRadius": "Champs de texte",
-        "checkboxRadius": "Cases à cocher",
-        "instance_default": "(default : {value})",
-        "instance_default_simple": "(default)",
-        "interface": "Interface",
-        "interfaceLanguage": "Langue de l'interface",
-        "invalid_theme_imported": "Le fichier sélectionné n'est pas un thème Pleroma pris en charge. Aucun changement n'a été apporté à votre thème.",
-        "limited_availability": "Non disponible dans votre navigateur",
-        "links": "Liens",
-        "lock_account_description": "Limitez votre compte aux abonnés acceptés uniquement",
-        "loop_video": "Vidéos en boucle",
-        "loop_video_silent_only": "Boucle uniquement les vidéos sans le son (les « gifs » de Mastodon)",
-        "mutes_tab": "Comptes silenciés",
-        "play_videos_in_modal": "Jouer les vidéos directement dans le visionneur de médias",
-        "use_contain_fit": "Ne pas rogner les miniatures des pièces-jointes",
-        "name": "Nom",
-        "name_bio": "Nom & Bio",
-        "new_password": "Nouveau mot de passe",
-        "notification_visibility": "Types de notifications à afficher",
-        "notification_visibility_follows": "Abonnements",
-        "notification_visibility_likes": "J'aime",
-        "notification_visibility_mentions": "Mentionnés",
-        "notification_visibility_repeats": "Partages",
-        "no_rich_text_description": "Ne formatez pas le texte",
-        "no_blocks": "Aucun bloqués",
-        "no_mutes": "Aucun masqués",
-        "hide_follows_description": "Ne pas afficher à qui je suis abonné",
-        "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",
-        "oauth_tokens": "Jetons OAuth",
-        "token": "Jeton",
-        "refresh_token": "Rafraichir le jeton",
-        "valid_until": "Valable jusque",
-        "revoke_token": "Révoquer",
-        "panelRadius": "Fenêtres",
-        "pause_on_unfocused": "Suspendre le streaming lorsque l'onglet n'est pas actif",
-        "presets": "Thèmes prédéfinis",
-        "profile_background": "Image de fond",
-        "profile_banner": "Bannière de profil",
-        "profile_tab": "Profil",
-        "radii_help": "Vous pouvez ici choisir le niveau d'arrondi des angles de l'interface (en pixels)",
-        "replies_in_timeline": "Réponses au journal",
-        "reply_link_preview": "Afficher un aperçu lors du survol de liens vers une réponse",
-        "reply_visibility_all": "Montrer toutes les réponses",
-        "reply_visibility_following": "Afficher uniquement les réponses adressées à moi ou aux personnes que je suis",
-        "reply_visibility_self": "Afficher uniquement les réponses adressées à moi",
-        "autohide_floating_post_button": "Automatiquement cacher le bouton de Nouveau Statut (sur mobile)",
-        "saving_err": "Erreur lors de l'enregistrement des paramètres",
-        "saving_ok": "Paramètres enregistrés",
-        "search_user_to_block": "Rechercher qui vous voulez bloquer",
-        "search_user_to_mute": "Rechercher qui vous voulez masquer",
-        "security_tab": "Sécurité",
-        "scope_copy": "Garder la même visibilité en répondant (les DMs restent toujours des DMs)",
-        "minimal_scopes_mode": "Rétrécir les options de séléction de la portée",
-        "set_new_avatar": "Changer d'avatar",
-        "set_new_profile_background": "Changer d'image de fond",
-        "set_new_profile_banner": "Changer de bannière",
-        "settings": "Paramètres",
-        "subject_input_always_show": "Toujours copier le champ de sujet",
-        "subject_line_behavior": "Copier le sujet en répondant",
-        "subject_line_email": "Similaire au courriel : « re : sujet »",
-        "subject_line_mastodon": "Comme mastodon : copier tel quel",
-        "subject_line_noop": "Ne pas copier",
-        "post_status_content_type": "Type de contenu du statuts",
-        "stop_gifs": "N'animer les GIFS que lors du survol du curseur de la souris",
-        "streaming": "Charger automatiquement les nouveaux statuts lorsque vous êtes au haut de la page",
-        "text": "Texte",
-        "theme": "Thème",
-        "theme_help": "Spécifiez des codes couleur hexadécimaux (#rrvvbb) pour personnaliser les couleurs du thème.",
-        "theme_help_v2_1": "Vous pouvez aussi surcharger certaines couleurs de composants et transparence via la case à cocher, utilisez le bouton « Vider tout » pour effacer toutes les surcharges.",
-        "theme_help_v2_2": "Les icônes sous certaines des entrées ont un indicateur de contraste du fond/texte, survolez les pour plus d'informations détailles. Veuillez garder a l'esprit que lors de l'utilisation de transparence l'indicateur de contraste indique le pire des cas.",
-        "tooltipRadius": "Info-bulles/alertes",
-        "upload_a_photo": "Envoyer une photo",
-        "user_settings": "Paramètres utilisateur",
-        "values": {
-            "false": "non",
-            "true": "oui"
-        },
-        "notifications": "Notifications",
-        "notification_setting": "Reçevoir les notifications de :",
-        "notification_setting_follows": "Utilisateurs que vous suivez",
-        "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
-        "notification_setting_followers": "Utilisateurs qui vous suivent",
-        "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas",
-        "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.",
-        "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.",
-        "enable_web_push_notifications": "Activer les notifications de push web",
-        "style": {
-            "switcher": {
-                "keep_color": "Garder les couleurs",
-                "keep_shadows": "Garder les ombres",
-                "keep_opacity": "Garder la transparence",
-                "keep_roundness": "Garder la rondeur",
-                "keep_fonts": "Garder les polices",
-                "save_load_hint": "L'option « Garder » préserve les options activés en cours lors de la séléction ou chargement des thèmes, il sauve aussi les dites options lors de l'export d'un thème. Quand toutes les cases sont décochés, exporter un thème sauvera tout.",
-                "reset": "Remise à zéro",
-                "clear_all": "Tout vider",
-                "clear_opacity": "Vider la transparence",
-                "load_theme": "Charger le thème",
-                "use_snapshot": "Ancienne version",
-                "help": {
-                    "upgraded_from_v2": "PleromaFE à été mis à jour, le thème peut être un peu différent que dans vos souvenirs.",
-                    "v2_imported": "Le fichier que vous avez importé vient d'un version antérieure. Nous essayons de maximizer la compatibilité mais il peu y avoir quelques incohérences.",
-                    "future_version_imported": "Le fichier importé viens d'une version postérieure de PleromaFE.",
-                    "older_version_imported": "Le fichier importé viens d'une version antérieure de PleromaFE.",
-                    "snapshot_source_mismatch": "Conflict de version : Probablement due à un retour arrière puis remise à jour de la version de PleromaFE, si vous avez charger le thème en utilisant une version antérieure vous voulez probablement utiliser la version antérieure, autrement utiliser la version postérieure.",
-                    "migration_napshot_gone": "Pour une raison inconnue l'instantané est manquant, des parties peuvent rendre différentes que dans vos souvenirs.",
-                    "migration_snapshot_ok": "Pour être sûr un instantanée du thème à été chargé. Vos pouvez essayer de charger ses données.",
-                    "fe_downgraded": "Retour en arrière de la version de PleromaFE.",
-                    "fe_upgraded": "Le moteur de thème PleromaFE à été mis à jour après un changement de version.",
-                    "snapshot_missing": "Aucun instantané du thème à été trouvé dans le fichier, il peut y avoir un rendu différent à la vision originelle."
-                },
-                "keep_as_is": "Garder tel-quel",
-                "use_source": "Nouvelle version"
-            },
-            "common": {
-                "color": "Couleur",
-                "opacity": "Transparence",
-                "contrast": {
-                    "hint": "Le ratio de contraste est {ratio}, il {level} {context}",
-                    "level": {
-                        "aa": "répond aux directives de niveau AA (minimum)",
-                        "aaa": "répond aux directives de niveau AAA (recommandé)",
-                        "bad": "ne réponds à aucune directive d'accessibilité"
-                    },
-                    "context": {
-                        "18pt": "pour texte large (19pt+)",
-                        "text": "pour texte"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Commun",
-                "main": "Couleurs communes",
-                "foreground_hint": "Voir l'onglet « Avancé » pour plus de contrôle détaillé",
-                "rgbo": "Icônes, accents, badges"
-            },
-            "advanced_colors": {
-                "_tab_label": "Avancé",
-                "alert": "Fond d'alerte",
-                "alert_error": "Erreur",
-                "badge": "Fond de badge",
-                "badge_notification": "Notification",
-                "panel_header": "Entête de panneau",
-                "top_bar": "Barre du haut",
-                "borders": "Bordures",
-                "buttons": "Boutons",
-                "inputs": "Champs de saisie",
-                "faint_text": "Texte en fondu",
-                "underlay": "sous-calque",
-                "pressed": "Appuyé",
-                "alert_warning": "Avertissement",
-                "alert_neutral": "Neutre",
-                "post": "Messages/Bios des comptes",
-                "poll": "Graphique de Sondage",
-                "icons": "Icônes",
-                "selectedPost": "Message sélectionné",
-                "selectedMenu": "Objet sélectionné du menu",
-                "disabled": "Désactivé",
-                "tabs": "Onglets",
-                "toggled": "(Dés)activé",
-                "highlight": "Éléments mis en valeur",
-                "popover": "Infobulles, menus"
-            },
-            "radii": {
-                "_tab_label": "Rondeur"
-            },
-            "shadows": {
-                "_tab_label": "Ombres et éclairage",
-                "component": "Composant",
-                "override": "Surcharger",
-                "shadow_id": "Ombre #{value}",
-                "blur": "Flou",
-                "spread": "Dispersion",
-                "inset": "Interne",
-                "hint": "Pour les ombres, vous pouvez aussi utiliser --variable comme valeur de couleur en CSS3. Veuillez noter que spécifier la transparence ne fonctionnera pas dans ce cas.",
-                "filter_hint": {
-                    "always_drop_shadow": "Attention, cette ombre utilise toujours {0} quand le navigateur le supporte.",
-                    "drop_shadow_syntax": "{0} ne supporte pas le paramètre {1} et mot-clé {2}.",
-                    "avatar_inset": "Veuillez noter que combiner a la fois les ombres internes et non-internes sur les avatars peut fournir des résultats innatendus avec la transparence des avatars.",
-                    "spread_zero": "Les ombres avec une dispersion > 0 apparaitrons comme si ils étaient à zéro",
-                    "inset_classic": "L'ombre interne utilisera toujours {0}"
-                },
-                "components": {
-                    "panel": "Panneau",
-                    "panelHeader": "En-tête de panneau",
-                    "topBar": "Barre du haut",
-                    "avatar": "Avatar utilisateur⋅ice (dans la vue de profil)",
-                    "avatarStatus": "Avatar utilisateur⋅ice (dans la vue de statuts)",
-                    "popup": "Popups et infobulles",
-                    "button": "Bouton",
-                    "buttonHover": "Bouton (survol)",
-                    "buttonPressed": "Bouton (cliqué)",
-                    "buttonPressedHover": "Bouton (cliqué+survol)",
-                    "input": "Champ de saisie"
-                },
-                "hintV3": "Pour les ombres vous pouvez aussi utiliser la notation {0} pour utiliser un autre emplacement de couleur."
-            },
-            "fonts": {
-                "_tab_label": "Polices",
-                "help": "Sélectionnez la police à utiliser pour les éléments de l'UI. Pour « personnalisé » vous avez à entrer le nom exact de la police comme il apparaît dans le système.",
-                "components": {
-                    "interface": "Interface",
-                    "input": "Champs de saisie",
-                    "post": "Post text",
-                    "postCode": "Texte à taille fixe dans un article (texte enrichi)"
-                },
-                "family": "Nom de la police",
-                "size": "Taille (en px)",
-                "weight": "Poid (gras)",
-                "custom": "Personnalisé"
-            },
-            "preview": {
-                "header": "Prévisualisation",
-                "content": "Contenu",
-                "error": "Exemple d'erreur",
-                "button": "Bouton",
-                "text": "Un certain nombre de {0} et {1}",
-                "mono": "contenu",
-                "input": "Je viens juste d’atterrir à L.A.",
-                "faint_link": "manuel utile",
-                "fine_print": "Lisez notre {0} pour n'apprendre rien d'utile !",
-                "header_faint": "Tout va bien",
-                "checkbox": "J'ai survolé les conditions d'utilisation",
-                "link": "un petit lien sympa"
-            }
-        },
-        "version": {
-            "title": "Version",
-            "backend_version": "Version du Backend",
-            "frontend_version": "Version du Frontend"
-        },
-        "change_email": "Changer de courriel",
-        "domain_mutes": "Domaines",
-        "pad_emoji": "Rajouter un espace autour de l'émoji après l’avoir choisit",
-        "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",
-        "fun": "Rigolo",
-        "greentext": "greentexting",
-        "allow_following_move": "Suivre automatiquement quand ce compte migre",
-        "change_email_error": "Il y a eu un problème pour charger votre courriel.",
-        "changed_email": "Courriel changé avec succès !",
-        "discoverable": "Permettre de découvrir ce compte dans les résultats de recherche web et autres services",
-        "emoji_reactions_on_timeline": "Montrer les émojis-réactions dans le flux",
-        "new_email": "Nouveau courriel",
-        "notification_visibility_moves": "Migrations de compte",
-        "user_mutes": "Comptes",
-        "useStreamingApi": "Recevoir les messages et notifications en temps réel",
-        "notification_setting_filters": "Filtres",
-        "notification_setting_privacy_option": "Masquer l'expéditeur et le contenu des notifications push",
-        "notification_setting_privacy": "Intimité",
-        "hide_followers_count_description": "Masquer le nombre d'abonnés",
-        "accent": "Accent"
-    },
-    "timeline": {
-        "collapse": "Fermer",
-        "conversation": "Conversation",
-        "error_fetching": "Erreur en cherchant les mises à jour",
-        "load_older": "Afficher plus",
-        "no_retweet_hint": "Le message est marqué en abonnés-seulement ou direct et ne peut pas être partagé",
-        "repeated": "a partagé",
-        "show_new": "Afficher plus",
-        "up_to_date": "À jour",
-        "no_more_statuses": "Pas plus de statuts",
-        "no_statuses": "Aucun statuts"
-    },
-    "status": {
-        "favorites": "Favoris",
-        "repeats": "Partages",
-        "delete": "Supprimer statuts",
-        "pin": "Agraffer sur le profil",
-        "unpin": "Dégraffer du profil",
-        "pinned": "Agraffé",
-        "delete_confirm": "Voulez-vous vraiment supprimer ce statuts ?",
-        "reply_to": "Réponse à",
-        "replies_list": "Réponses :",
-        "mute_conversation": "Masquer la conversation",
-        "unmute_conversation": "Démasquer la conversation",
-        "status_unavailable": "Status indisponible",
-        "copy_link": "Copier le lien au status"
-    },
-    "user_card": {
-        "approve": "Accepter",
-        "block": "Bloquer",
-        "blocked": "Bloqué !",
-        "deny": "Rejeter",
-        "favorites": "Favoris",
-        "follow": "Suivre",
-        "follow_sent": "Demande envoyée !",
-        "follow_progress": "Demande en cours…",
-        "follow_again": "Renvoyer la demande ?",
-        "follow_unfollow": "Désabonner",
-        "followees": "Suivis",
-        "followers": "Vous suivent",
-        "following": "Suivi !",
-        "follows_you": "Vous suit !",
-        "its_you": "C'est vous !",
-        "media": "Media",
-        "mute": "Masquer",
-        "muted": "Masqué",
-        "per_day": "par jour",
-        "remote_follow": "Suivre d'une autre instance",
-        "report": "Signalement",
-        "statuses": "Statuts",
-        "unblock": "Débloquer",
-        "unblock_progress": "Déblocage…",
-        "block_progress": "Blocage…",
-        "unmute": "Démasquer",
-        "unmute_progress": "Démasquage…",
-        "mute_progress": "Masquage…",
-        "admin_menu": {
-            "moderation": "Moderation",
-            "grant_admin": "Promouvoir Administrateur⋅ice",
-            "revoke_admin": "Dégrader Administrateur⋅ice",
-            "grant_moderator": "Promouvoir Modérateur⋅ice",
-            "revoke_moderator": "Dégrader Modérateur⋅ice",
-            "activate_account": "Activer le compte",
-            "deactivate_account": "Désactiver le compte",
-            "delete_account": "Supprimer le compte",
-            "force_nsfw": "Marquer tous les statuts comme NSFW",
-            "strip_media": "Supprimer les medias des statuts",
-            "force_unlisted": "Forcer les statuts à être délistés",
-            "sandbox": "Forcer les statuts à être visibles seuleument pour les abonné⋅e⋅s",
-            "disable_remote_subscription": "Interdir de s'abonner a l'utilisateur depuis l'instance distante",
-            "disable_any_subscription": "Interdir de s'abonner à l'utilisateur tout court",
-            "quarantine": "Interdir les statuts de l'utilisateur à fédérer",
-            "delete_user": "Supprimer l'utilisateur",
-            "delete_user_confirmation": "Êtes-vous absolument-sûr⋅e ? Cette action ne peut être annulée."
-        },
-        "mention": "Mention",
-        "hidden": "Caché",
-        "subscribe": "Abonner",
-        "unsubscribe": "Désabonner",
-        "hide_repeats": "Cacher les partages",
-        "show_repeats": "Montrer les partages"
-    },
-    "user_profile": {
-        "timeline_title": "Journal de l'utilisateur⋅ice",
-        "profile_does_not_exist": "Désolé, ce profil n'existe pas.",
-        "profile_loading_error": "Désolé, il y a eu une erreur au chargement du profil."
-    },
-    "user_reporting": {
-        "title": "Signaler {0}",
-        "add_comment_description": "Ce signalement sera envoyé aux modérateur⋅ice⋅s de votre instance. Vous pouvez fournir une explication de pourquoi vous signalez ce compte ci-dessous :",
-        "additional_comments": "Commentaires additionnels",
-        "forward_description": "Le compte vient d'un autre serveur. Envoyer une copie du signalement à celui-ci aussi ?",
-        "forward_to": "Transmettre à {0}",
-        "submit": "Envoyer",
-        "generic_error": "Une erreur est survenue lors du traitement de votre requête."
-    },
-    "who_to_follow": {
-        "more": "Plus",
-        "who_to_follow": "À qui s'abonner"
-    },
-    "tool_tip": {
-        "media_upload": "Envoyer un media",
-        "repeat": "Répéter",
-        "reply": "Répondre",
-        "favorite": "Favoriser",
-        "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"
-    },
-    "upload": {
-        "error": {
-            "base": "L'envoi a échoué.",
-            "file_too_big": "Fichier trop gros [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Réessayez plus tard"
-        },
-        "file_size_units": {
-            "B": "O",
-            "KiB": "KiO",
-            "MiB": "MiO",
-            "GiB": "GiO",
-            "TiB": "TiO"
-        }
-    },
-    "about": {
-        "mrf": {
-            "keyword": {
-                "reject": "Rejeté",
-                "replace": "Remplacer",
-                "keyword_policies": "Politiques par mot-clés",
-                "ftl_removal": "Suppression du flux \"Ensemble du réseau connu\"",
-                "is_replaced_by": "→"
-            },
-            "simple": {
-                "simple_policies": "Politiques par instances",
-                "accept": "Accepter",
-                "accept_desc": "Cette instance accepte des messages seulement depuis ces instances :",
-                "reject": "Rejeter",
-                "reject_desc": "Cette instance n'acceptera pas de message de ces instances :",
-                "quarantine": "Quarantaine",
-                "quarantine_desc": "Cette instance enverras seulement des messages publics à ces instances :",
-                "ftl_removal_desc": "Cette instance supprime ces instance du flux fédéré :",
-                "media_removal": "Suppression multimédia",
-                "media_removal_desc": "Cette instance supprime le contenu multimédia des instances suivantes :",
-                "media_nsfw": "Force le contenu multimédia comme sensible",
-                "ftl_removal": "Suppression du flux fédéré",
-                "media_nsfw_desc": "Cette instance force le contenu multimédia comme sensible pour les messages des instances suivantes :"
-            },
-            "federation": "Fédération",
-            "mrf_policies": "Politiques MRF activées",
-            "mrf_policies_desc": "Les politiques MRF modifient la fédération entre les instances. Les politiques suivantes sont activées :"
-        },
-        "staff": "Staff"
-    },
-    "domain_mute_card": {
-        "mute": "Muet",
-        "mute_progress": "Masquage…",
-        "unmute": "Démasquer",
-        "unmute_progress": "Démasquage…"
-    },
-    "polls": {
-        "add_poll": "Ajouter un Sondage",
-        "add_option": "Ajouter une option",
-        "option": "Option",
-        "votes": "votes",
-        "type": "Type de Sondage",
-        "single_choice": "Choix unique",
-        "multiple_choices": "Choix multiples",
-        "expiry": "Age du sondage",
-        "expires_in": "Fin du sondage dans {0}",
-        "not_enough_options": "Trop peu d'options unique au sondage",
-        "vote": "Voter",
-        "expired": "Sondage terminé il y a {0}"
-    },
-    "emoji": {
-        "emoji": "Émoji",
-        "search_emoji": "Rechercher un émoji",
-        "add_emoji": "Insérer un émoji",
-        "custom": "émoji personnalisé",
-        "unicode": "émoji unicode",
-        "load_all": "Charger tout les {emojiAmount} émojis",
-        "load_all_hint": "{saneAmount} émojis chargé, charger tout les émojis peuvent causer des problèmes de performances.",
-        "stickers": "Stickers",
-        "keep_open": "Garder le sélecteur ouvert"
-    },
-    "remote_user_resolver": {
-        "error": "Non trouvé.",
-        "searching_for": "Rechercher",
-        "remote_user_resolver": "Résolution de compte distant"
-    },
-    "time": {
-        "minutes_short": "{0}min",
-        "second_short": "{0}s",
-        "day": "{0} jour",
-        "days": "{0} jours",
-        "months": "{0} mois",
-        "month_short": "{0}m",
-        "months_short": "{0}m",
-        "now": "tout de suite",
-        "now_short": "maintenant",
-        "second": "{0} seconde",
-        "seconds": "{0} secondes",
-        "seconds_short": "{0}s",
-        "day_short": "{0}j",
-        "days_short": "{0}j",
-        "hour": "{0} heure",
-        "hours": "{0} heures",
-        "hour_short": "{0}h",
-        "hours_short": "{0}h",
-        "in_future": "dans {0}",
-        "in_past": "il y a {0}",
-        "minute": "{0} minute",
-        "minutes": "{0} minutes",
-        "minute_short": "{0}min",
-        "month": "{0} mois",
-        "week": "{0} semaine",
-        "weeks": "{0} semaines",
-        "week_short": "{0}s",
-        "weeks_short": "{0}s",
-        "year": "{0} année",
-        "years": "{0} années",
-        "year_short": "{0}a",
-        "years_short": "{0}a"
-    },
-    "search": {
-        "people": "Comptes",
-        "person_talking": "{count} personnes discutant",
-        "hashtags": "Mot-dièses",
-        "people_talking": "{count} personnes discutant",
-        "no_results": "Aucun résultats"
-    },
-    "password_reset": {
-        "forgot_password": "Mot de passe oublié ?",
-        "check_email": "Vérifiez vos courriels pour le lien permettant de changer votre mot de passe.",
-        "password_reset_disabled": "Le changement de mot de passe est désactivé. Veuillez contacter l'administration de votre instance.",
-        "password_reset_required_but_mailer_is_disabled": "Vous devez changer votre mot de passe mais sont changement est désactivé. Veuillez contacter l’administration de votre instance.",
-        "password_reset": "Nouveau mot de passe",
-        "instruction": "Entrer votre address de courriel ou votre nom utilisateur. Nous enverrons un lien pour changer votre mot de passe.",
-        "placeholder": "Votre email ou nom d'utilisateur",
-        "return_home": "Retourner à la page d'accueil",
-        "not_found": "Email ou nom d'utilisateur inconnu.",
-        "too_many_requests": "Vos avez atteint la limite d'essais, essayez plus tard.",
-        "password_reset_required": "Vous devez changer votre mot de passe pour vous authentifier."
+  "chat": {
+    "title": "Chat"
+  },
+  "exporter": {
+    "export": "Exporter",
+    "processing": "En cours de traitement, vous pourrez bientôt télécharger votre fichier"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Proxy média",
+    "scope_options": "Options de visibilité",
+    "text_limit": "Limite de texte",
+    "title": "Caractéristiques",
+    "who_to_follow": "Personnes à suivre"
+  },
+  "finder": {
+    "error_fetching_user": "Erreur lors de la recherche de l'utilisateur·ice",
+    "find_user": "Chercher un-e utilisateur·ice"
+  },
+  "general": {
+    "apply": "Appliquer",
+    "submit": "Envoyer",
+    "more": "Plus",
+    "generic_error": "Une erreur s'est produite",
+    "optional": "optionnel",
+    "show_more": "Montrer plus",
+    "show_less": "Montrer moins",
+    "cancel": "Annuler",
+    "disable": "Désactiver",
+    "enable": "Activer",
+    "confirm": "Confirmer",
+    "verify": "Vérifier",
+    "dismiss": "Rejeter"
+  },
+  "image_cropper": {
+    "crop_picture": "Rogner l'image",
+    "save": "Sauvegarder",
+    "save_without_cropping": "Sauvegarder sans rogner",
+    "cancel": "Annuler"
+  },
+  "importer": {
+    "submit": "Soumettre",
+    "success": "Importé avec succès.",
+    "error": "Une erreur est survenue pendant l'import de ce fichier."
+  },
+  "login": {
+    "login": "Connexion",
+    "description": "Connexion avec OAuth",
+    "logout": "Déconnexion",
+    "password": "Mot de passe",
+    "placeholder": "p.e. lain",
+    "register": "S'inscrire",
+    "username": "Identifiant",
+    "hint": "Connectez-vous pour rejoindre la discussion",
+    "authentication_code": "Code d'authentification",
+    "enter_recovery_code": "Entrez un code de récupération",
+    "enter_two_factor_code": "Entrez un code à double authentification",
+    "recovery_code": "Code de récupération",
+    "heading": {
+      "totp": "Authentification à double authentification",
+      "recovery": "Récuperation de la double authentification"
     }
+  },
+  "media_modal": {
+    "previous": "Précédent",
+    "next": "Suivant"
+  },
+  "nav": {
+    "about": "À propos",
+    "back": "Retour",
+    "chat": "Chat local",
+    "friend_requests": "Demandes de suivi",
+    "mentions": "Notifications",
+    "interactions": "Interactions",
+    "dms": "Messages directs",
+    "public_tl": "Fil d'actualité public",
+    "timeline": "Fil d'actualité",
+    "twkn": "Ensemble du réseau connu",
+    "user_search": "Recherche d'utilisateur·ice",
+    "who_to_follow": "Qui suivre",
+    "preferences": "Préférences",
+    "search": "Recherche",
+    "administration": "Administration"
+  },
+  "notifications": {
+    "broken_favorite": "Chargement d'un message inconnu…",
+    "favorited_you": "a aimé votre statut",
+    "followed_you": "a commencé à vous suivre",
+    "load_older": "Charger les notifications précédentes",
+    "notifications": "Notifications",
+    "read": "Lu !",
+    "repeated_you": "a partagé votre statut",
+    "no_more_notifications": "Aucune notification supplémentaire",
+    "migrated_to": "a migré à",
+    "reacted_with": "a réagi avec {0}",
+    "follow_request": "veut vous suivre"
+  },
+  "interactions": {
+    "favs_repeats": "Partages et favoris",
+    "follows": "Nouveaux suivis",
+    "load_older": "Chargez d'anciennes interactions",
+    "moves": "Migrations de comptes"
+  },
+  "post_status": {
+    "new_status": "Poster un nouveau statut",
+    "account_not_locked_warning": "Votre compte n'est pas {0}. N'importe qui peut vous suivre pour voir vos billets en Abonné·e·s uniquement.",
+    "account_not_locked_warning_link": "verrouillé",
+    "attachments_sensitive": "Marquer le média comme sensible",
+    "content_type": {
+      "text/plain": "Texte brut",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_warning": "Sujet (optionnel)",
+    "default": "Écrivez ici votre prochain statut.",
+    "direct_warning_to_all": "Ce message sera visible pour toutes les personnes mentionnées.",
+    "direct_warning_to_first_only": "Ce message sera visible uniquement pour personnes mentionnées au début du message.",
+    "posting": "Envoi en cours",
+    "scope_notice": {
+      "public": "Ce statut sera visible par tout le monde",
+      "private": "Ce statut sera visible par seulement vos abonné⋅e⋅s",
+      "unlisted": "Ce statut ne sera pas visible dans le Fil d'actualité public et l'Ensemble du réseau connu"
+    },
+    "scope": {
+      "direct": "Direct - N'envoyer qu'aux personnes mentionnées",
+      "private": "Abonné·e·s uniquement - Seul·e·s vos abonné·e·s verront vos billets",
+      "public": "Publique - Afficher dans les fils publics",
+      "unlisted": "Non-Listé - Ne pas afficher dans les fils publics"
+    }
+  },
+  "registration": {
+    "bio": "Biographie",
+    "email": "Adresse mail",
+    "fullname": "Pseudonyme",
+    "password_confirm": "Confirmation du mot de passe",
+    "registration": "Inscription",
+    "token": "Jeton d'invitation",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Cliquez sur l'image pour avoir un nouveau captcha",
+    "username_placeholder": "p.e. lain",
+    "fullname_placeholder": "p.e. Lain Iwakura",
+    "bio_placeholder": "p.e.\nSalut, je suis Lain\nJe suis une héroïne d'animé qui vit dans une banlieue japonaise. Vous me connaissez peut-être du Wired.",
+    "validations": {
+      "username_required": "ne peut pas être laissé vide",
+      "fullname_required": "ne peut pas être laissé vide",
+      "email_required": "ne peut pas être laissé vide",
+      "password_required": "ne peut pas être laissé vide",
+      "password_confirmation_required": "ne peut pas être laissé vide",
+      "password_confirmation_match": "doit être identique au mot de passe"
+    }
+  },
+  "selectable_list": {
+    "select_all": "Tout selectionner"
+  },
+  "settings": {
+    "app_name": "Nom de l'application",
+    "security": "Sécurité",
+    "enter_current_password_to_confirm": "Entrez votre mot de passe actuel pour confirmer votre identité",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "Configurer OTP",
+      "wait_pre_setup_otp": "préconfiguration OTP",
+      "confirm_and_enable": "Confirmer & activer OTP",
+      "title": "Double authentification",
+      "generate_new_recovery_codes": "Générer de nouveaux codes de récupération",
+      "warning_of_generate_new_codes": "Quand vous générez de nouveauc codes de récupération, vos anciens codes ne fonctionnerons plus.",
+      "recovery_codes": "Codes de récupération.",
+      "waiting_a_recovery_codes": "Réception des codes de récupération…",
+      "recovery_codes_warning": "Écrivez les codes ou sauvez les quelquepart sécurisé - sinon vous ne les verrez plus jamais. Si vous perdez l'accès à votre application de double authentification et codes de récupération vous serez vérouillé en dehors de votre compte.",
+      "authentication_methods": "Methodes d'authentification",
+      "scan": {
+        "title": "Scanner",
+        "desc": "En utilisant votre application de double authentification, scannez ce QR code ou entrez la clé textuelle :",
+        "secret_code": "Clé"
+      },
+      "verify": {
+        "desc": "Pour activer la double authentification, entrez le code depuis votre application :"
+      }
+    },
+    "attachmentRadius": "Pièces jointes",
+    "attachments": "Pièces jointes",
+    "autoload": "Charger la suite automatiquement une fois le bas de la page atteint",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatars (Notifications)",
+    "avatarRadius": "Avatars",
+    "background": "Arrière-plan",
+    "bio": "Biographie",
+    "block_export": "Export des comptes bloqués",
+    "block_export_button": "Export des comptes bloqués vers un fichier csv",
+    "block_import": "Import des comptes bloqués",
+    "block_import_error": "Erreur lors de l'import des comptes bloqués",
+    "blocks_imported": "Blocks importés ! Le traitement va prendre un moment.",
+    "blocks_tab": "Bloqué·e·s",
+    "btnRadius": "Boutons",
+    "cBlue": "Bleu (répondre, suivre)",
+    "cGreen": "Vert (partager)",
+    "cOrange": "Orange (aimer)",
+    "cRed": "Rouge (annuler)",
+    "change_password": "Changez votre mot de passe",
+    "change_password_error": "Il y a eu un problème pour changer votre mot de passe.",
+    "changed_password": "Mot de passe modifié avec succès !",
+    "collapse_subject": "Réduire les messages avec des sujets",
+    "composing": "Composition",
+    "confirm_new_password": "Confirmation du nouveau mot de passe",
+    "current_avatar": "Avatar actuel",
+    "current_password": "Mot de passe actuel",
+    "current_profile_banner": "Bannière de profil actuelle",
+    "data_import_export_tab": "Import / Export des Données",
+    "default_vis": "Visibilité par défaut",
+    "delete_account": "Supprimer le compte",
+    "delete_account_description": "Supprimer définitivement vos données et désactiver votre compte.",
+    "delete_account_error": "Il y a eu un problème lors de la tentative de suppression de votre compte. Si le problème persiste, contactez l'administrateur⋅ice de cette instance.",
+    "delete_account_instructions": "Indiquez votre mot de passe ci-dessous pour confirmer la suppression de votre compte.",
+    "avatar_size_instruction": "La taille minimale recommandée pour l'image de l'avatar est de 150x150 pixels.",
+    "export_theme": "Enregistrer le thème",
+    "filtering": "Filtre",
+    "filtering_explanation": "Tous les statuts contenant ces mots seront masqués. Un mot par ligne",
+    "follow_export": "Exporter les abonnements",
+    "follow_export_button": "Exporter les abonnements en csv",
+    "follow_import": "Importer des abonnements",
+    "follow_import_error": "Erreur lors de l'importation des abonnements",
+    "follows_imported": "Abonnements importés ! Le traitement peut prendre un moment.",
+    "foreground": "Premier plan",
+    "general": "Général",
+    "hide_attachments_in_convo": "Masquer les pièces jointes dans les conversations",
+    "hide_attachments_in_tl": "Masquer les pièces jointes dans le journal",
+    "hide_muted_posts": "Masquer les statuts des utilisateurs masqués",
+    "max_thumbnails": "Nombre maximum de miniatures par statuts",
+    "hide_isp": "Masquer le panneau spécifique a l'instance",
+    "preload_images": "Précharger les images",
+    "use_one_click_nsfw": "Ouvrir les pièces-jointes NSFW avec un seul clic",
+    "hide_post_stats": "Masquer les statistiques de publication (le nombre de favoris)",
+    "hide_user_stats": "Masquer les statistiques de profil (le nombre d'amis)",
+    "hide_filtered_statuses": "Masquer les statuts filtrés",
+    "import_blocks_from_a_csv_file": "Importer les blocages depuis un fichier csv",
+    "import_followers_from_a_csv_file": "Importer des abonnements depuis un fichier csv",
+    "import_theme": "Charger le thème",
+    "inputRadius": "Champs de texte",
+    "checkboxRadius": "Cases à cocher",
+    "instance_default": "(default : {value})",
+    "instance_default_simple": "(default)",
+    "interface": "Interface",
+    "interfaceLanguage": "Langue de l'interface",
+    "invalid_theme_imported": "Le fichier sélectionné n'est pas un thème Pleroma pris en charge. Aucun changement n'a été apporté à votre thème.",
+    "limited_availability": "Non disponible dans votre navigateur",
+    "links": "Liens",
+    "lock_account_description": "Limitez votre compte aux abonnés acceptés uniquement",
+    "loop_video": "Vidéos en boucle",
+    "loop_video_silent_only": "Boucle uniquement les vidéos sans le son (les « gifs » de Mastodon)",
+    "mutes_tab": "Comptes silenciés",
+    "play_videos_in_modal": "Jouer les vidéos directement dans le visionneur de médias",
+    "use_contain_fit": "Ne pas rogner les miniatures des pièces-jointes",
+    "name": "Nom",
+    "name_bio": "Nom & Bio",
+    "new_password": "Nouveau mot de passe",
+    "notification_visibility": "Types de notifications à afficher",
+    "notification_visibility_follows": "Abonnements",
+    "notification_visibility_likes": "J'aime",
+    "notification_visibility_mentions": "Mentionnés",
+    "notification_visibility_repeats": "Partages",
+    "no_rich_text_description": "Ne formatez pas le texte",
+    "no_blocks": "Aucun bloqués",
+    "no_mutes": "Aucun masqués",
+    "hide_follows_description": "Ne pas afficher à qui je suis abonné",
+    "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",
+    "oauth_tokens": "Jetons OAuth",
+    "token": "Jeton",
+    "refresh_token": "Rafraichir le jeton",
+    "valid_until": "Valable jusque",
+    "revoke_token": "Révoquer",
+    "panelRadius": "Fenêtres",
+    "pause_on_unfocused": "Suspendre le streaming lorsque l'onglet n'est pas actif",
+    "presets": "Thèmes prédéfinis",
+    "profile_background": "Image de fond",
+    "profile_banner": "Bannière de profil",
+    "profile_tab": "Profil",
+    "radii_help": "Vous pouvez ici choisir le niveau d'arrondi des angles de l'interface (en pixels)",
+    "replies_in_timeline": "Réponses au journal",
+    "reply_link_preview": "Afficher un aperçu lors du survol de liens vers une réponse",
+    "reply_visibility_all": "Montrer toutes les réponses",
+    "reply_visibility_following": "Afficher uniquement les réponses adressées à moi ou aux personnes que je suis",
+    "reply_visibility_self": "Afficher uniquement les réponses adressées à moi",
+    "autohide_floating_post_button": "Automatiquement cacher le bouton de Nouveau Statut (sur mobile)",
+    "saving_err": "Erreur lors de l'enregistrement des paramètres",
+    "saving_ok": "Paramètres enregistrés",
+    "search_user_to_block": "Rechercher qui vous voulez bloquer",
+    "search_user_to_mute": "Rechercher qui vous voulez masquer",
+    "security_tab": "Sécurité",
+    "scope_copy": "Garder la même visibilité en répondant (les DMs restent toujours des DMs)",
+    "minimal_scopes_mode": "Rétrécir les options de séléction de la portée",
+    "set_new_avatar": "Changer d'avatar",
+    "set_new_profile_background": "Changer d'image de fond",
+    "set_new_profile_banner": "Changer de bannière",
+    "settings": "Paramètres",
+    "subject_input_always_show": "Toujours copier le champ de sujet",
+    "subject_line_behavior": "Copier le sujet en répondant",
+    "subject_line_email": "Similaire au courriel : « re : sujet »",
+    "subject_line_mastodon": "Comme mastodon : copier tel quel",
+    "subject_line_noop": "Ne pas copier",
+    "post_status_content_type": "Type de contenu du statuts",
+    "stop_gifs": "N'animer les GIFS que lors du survol du curseur de la souris",
+    "streaming": "Charger automatiquement les nouveaux statuts lorsque vous êtes au haut de la page",
+    "text": "Texte",
+    "theme": "Thème",
+    "theme_help": "Spécifiez des codes couleur hexadécimaux (#rrvvbb) pour personnaliser les couleurs du thème.",
+    "theme_help_v2_1": "Vous pouvez aussi surcharger certaines couleurs de composants et transparence via la case à cocher, utilisez le bouton « Vider tout » pour effacer toutes les surcharges.",
+    "theme_help_v2_2": "Les icônes sous certaines des entrées ont un indicateur de contraste du fond/texte, survolez les pour plus d'informations détailles. Veuillez garder a l'esprit que lors de l'utilisation de transparence l'indicateur de contraste indique le pire des cas.",
+    "tooltipRadius": "Info-bulles/alertes",
+    "upload_a_photo": "Envoyer une photo",
+    "user_settings": "Paramètres utilisateur",
+    "values": {
+      "false": "non",
+      "true": "oui"
+    },
+    "notifications": "Notifications",
+    "notification_setting": "Reçevoir les notifications de :",
+    "notification_setting_follows": "Utilisateurs que vous suivez",
+    "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
+    "notification_setting_followers": "Utilisateurs qui vous suivent",
+    "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas",
+    "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.",
+    "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.",
+    "enable_web_push_notifications": "Activer les notifications de push web",
+    "style": {
+      "switcher": {
+        "keep_color": "Garder les couleurs",
+        "keep_shadows": "Garder les ombres",
+        "keep_opacity": "Garder la transparence",
+        "keep_roundness": "Garder la rondeur",
+        "keep_fonts": "Garder les polices",
+        "save_load_hint": "L'option « Garder » préserve les options activés en cours lors de la séléction ou chargement des thèmes, il sauve aussi les dites options lors de l'export d'un thème. Quand toutes les cases sont décochés, exporter un thème sauvera tout.",
+        "reset": "Remise à zéro",
+        "clear_all": "Tout vider",
+        "clear_opacity": "Vider la transparence",
+        "load_theme": "Charger le thème",
+        "use_snapshot": "Ancienne version",
+        "help": {
+          "upgraded_from_v2": "PleromaFE à été mis à jour, le thème peut être un peu différent que dans vos souvenirs.",
+          "v2_imported": "Le fichier que vous avez importé vient d'un version antérieure. Nous essayons de maximizer la compatibilité mais il peu y avoir quelques incohérences.",
+          "future_version_imported": "Le fichier importé viens d'une version postérieure de PleromaFE.",
+          "older_version_imported": "Le fichier importé viens d'une version antérieure de PleromaFE.",
+          "snapshot_source_mismatch": "Conflict de version : Probablement due à un retour arrière puis remise à jour de la version de PleromaFE, si vous avez charger le thème en utilisant une version antérieure vous voulez probablement utiliser la version antérieure, autrement utiliser la version postérieure.",
+          "migration_napshot_gone": "Pour une raison inconnue l'instantané est manquant, des parties peuvent rendre différentes que dans vos souvenirs.",
+          "migration_snapshot_ok": "Pour être sûr un instantanée du thème à été chargé. Vos pouvez essayer de charger ses données.",
+          "fe_downgraded": "Retour en arrière de la version de PleromaFE.",
+          "fe_upgraded": "Le moteur de thème PleromaFE à été mis à jour après un changement de version.",
+          "snapshot_missing": "Aucun instantané du thème à été trouvé dans le fichier, il peut y avoir un rendu différent à la vision originelle."
+        },
+        "keep_as_is": "Garder tel-quel",
+        "use_source": "Nouvelle version"
+      },
+      "common": {
+        "color": "Couleur",
+        "opacity": "Transparence",
+        "contrast": {
+          "hint": "Le ratio de contraste est {ratio}, il {level} {context}",
+          "level": {
+            "aa": "répond aux directives de niveau AA (minimum)",
+            "aaa": "répond aux directives de niveau AAA (recommandé)",
+            "bad": "ne réponds à aucune directive d'accessibilité"
+          },
+          "context": {
+            "18pt": "pour texte large (19pt+)",
+            "text": "pour texte"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Commun",
+        "main": "Couleurs communes",
+        "foreground_hint": "Voir l'onglet « Avancé » pour plus de contrôle détaillé",
+        "rgbo": "Icônes, accents, badges"
+      },
+      "advanced_colors": {
+        "_tab_label": "Avancé",
+        "alert": "Fond d'alerte",
+        "alert_error": "Erreur",
+        "badge": "Fond de badge",
+        "badge_notification": "Notification",
+        "panel_header": "Entête de panneau",
+        "top_bar": "Barre du haut",
+        "borders": "Bordures",
+        "buttons": "Boutons",
+        "inputs": "Champs de saisie",
+        "faint_text": "Texte en fondu",
+        "underlay": "sous-calque",
+        "pressed": "Appuyé",
+        "alert_warning": "Avertissement",
+        "alert_neutral": "Neutre",
+        "post": "Messages/Bios des comptes",
+        "poll": "Graphique de Sondage",
+        "icons": "Icônes",
+        "selectedPost": "Message sélectionné",
+        "selectedMenu": "Objet sélectionné du menu",
+        "disabled": "Désactivé",
+        "tabs": "Onglets",
+        "toggled": "(Dés)activé",
+        "highlight": "Éléments mis en valeur",
+        "popover": "Infobulles, menus"
+      },
+      "radii": {
+        "_tab_label": "Rondeur"
+      },
+      "shadows": {
+        "_tab_label": "Ombres et éclairage",
+        "component": "Composant",
+        "override": "Surcharger",
+        "shadow_id": "Ombre #{value}",
+        "blur": "Flou",
+        "spread": "Dispersion",
+        "inset": "Interne",
+        "hint": "Pour les ombres, vous pouvez aussi utiliser --variable comme valeur de couleur en CSS3. Veuillez noter que spécifier la transparence ne fonctionnera pas dans ce cas.",
+        "filter_hint": {
+          "always_drop_shadow": "Attention, cette ombre utilise toujours {0} quand le navigateur le supporte.",
+          "drop_shadow_syntax": "{0} ne supporte pas le paramètre {1} et mot-clé {2}.",
+          "avatar_inset": "Veuillez noter que combiner a la fois les ombres internes et non-internes sur les avatars peut fournir des résultats innatendus avec la transparence des avatars.",
+          "spread_zero": "Les ombres avec une dispersion > 0 apparaitrons comme si ils étaient à zéro",
+          "inset_classic": "L'ombre interne utilisera toujours {0}"
+        },
+        "components": {
+          "panel": "Panneau",
+          "panelHeader": "En-tête de panneau",
+          "topBar": "Barre du haut",
+          "avatar": "Avatar utilisateur⋅ice (dans la vue de profil)",
+          "avatarStatus": "Avatar utilisateur⋅ice (dans la vue de statuts)",
+          "popup": "Popups et infobulles",
+          "button": "Bouton",
+          "buttonHover": "Bouton (survol)",
+          "buttonPressed": "Bouton (cliqué)",
+          "buttonPressedHover": "Bouton (cliqué+survol)",
+          "input": "Champ de saisie"
+        },
+        "hintV3": "Pour les ombres vous pouvez aussi utiliser la notation {0} pour utiliser un autre emplacement de couleur."
+      },
+      "fonts": {
+        "_tab_label": "Polices",
+        "help": "Sélectionnez la police à utiliser pour les éléments de l'UI. Pour « personnalisé » vous avez à entrer le nom exact de la police comme il apparaît dans le système.",
+        "components": {
+          "interface": "Interface",
+          "input": "Champs de saisie",
+          "post": "Post text",
+          "postCode": "Texte à taille fixe dans un article (texte enrichi)"
+        },
+        "family": "Nom de la police",
+        "size": "Taille (en px)",
+        "weight": "Poid (gras)",
+        "custom": "Personnalisé"
+      },
+      "preview": {
+        "header": "Prévisualisation",
+        "content": "Contenu",
+        "error": "Exemple d'erreur",
+        "button": "Bouton",
+        "text": "Un certain nombre de {0} et {1}",
+        "mono": "contenu",
+        "input": "Je viens juste d’atterrir à L.A.",
+        "faint_link": "manuel utile",
+        "fine_print": "Lisez notre {0} pour n'apprendre rien d'utile !",
+        "header_faint": "Tout va bien",
+        "checkbox": "J'ai survolé les conditions d'utilisation",
+        "link": "un petit lien sympa"
+      }
+    },
+    "version": {
+      "title": "Version",
+      "backend_version": "Version du Backend",
+      "frontend_version": "Version du Frontend"
+    },
+    "change_email": "Changer de courriel",
+    "domain_mutes": "Domaines",
+    "pad_emoji": "Rajouter un espace autour de l'émoji après l’avoir choisit",
+    "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",
+    "fun": "Rigolo",
+    "greentext": "greentexting",
+    "allow_following_move": "Suivre automatiquement quand ce compte migre",
+    "change_email_error": "Il y a eu un problème pour charger votre courriel.",
+    "changed_email": "Courriel changé avec succès !",
+    "discoverable": "Permettre de découvrir ce compte dans les résultats de recherche web et autres services",
+    "emoji_reactions_on_timeline": "Montrer les émojis-réactions dans le flux",
+    "new_email": "Nouveau courriel",
+    "notification_visibility_moves": "Migrations de compte",
+    "user_mutes": "Comptes",
+    "useStreamingApi": "Recevoir les messages et notifications en temps réel",
+    "notification_setting_filters": "Filtres",
+    "notification_setting_privacy_option": "Masquer l'expéditeur et le contenu des notifications push",
+    "notification_setting_privacy": "Intimité",
+    "hide_followers_count_description": "Masquer le nombre d'abonnés",
+    "accent": "Accent"
+  },
+  "timeline": {
+    "collapse": "Fermer",
+    "conversation": "Conversation",
+    "error_fetching": "Erreur en cherchant les mises à jour",
+    "load_older": "Afficher plus",
+    "no_retweet_hint": "Le message est marqué en abonnés-seulement ou direct et ne peut pas être partagé",
+    "repeated": "a partagé",
+    "show_new": "Afficher plus",
+    "up_to_date": "À jour",
+    "no_more_statuses": "Pas plus de statuts",
+    "no_statuses": "Aucun statuts"
+  },
+  "status": {
+    "favorites": "Favoris",
+    "repeats": "Partages",
+    "delete": "Supprimer statuts",
+    "pin": "Agraffer sur le profil",
+    "unpin": "Dégraffer du profil",
+    "pinned": "Agraffé",
+    "delete_confirm": "Voulez-vous vraiment supprimer ce statuts ?",
+    "reply_to": "Réponse à",
+    "replies_list": "Réponses :",
+    "mute_conversation": "Masquer la conversation",
+    "unmute_conversation": "Démasquer la conversation",
+    "status_unavailable": "Status indisponible",
+    "copy_link": "Copier le lien au status"
+  },
+  "user_card": {
+    "approve": "Accepter",
+    "block": "Bloquer",
+    "blocked": "Bloqué !",
+    "deny": "Rejeter",
+    "favorites": "Favoris",
+    "follow": "Suivre",
+    "follow_sent": "Demande envoyée !",
+    "follow_progress": "Demande en cours…",
+    "follow_again": "Renvoyer la demande ?",
+    "follow_unfollow": "Désabonner",
+    "followees": "Suivis",
+    "followers": "Vous suivent",
+    "following": "Suivi !",
+    "follows_you": "Vous suit !",
+    "its_you": "C'est vous !",
+    "media": "Media",
+    "mute": "Masquer",
+    "muted": "Masqué",
+    "per_day": "par jour",
+    "remote_follow": "Suivre d'une autre instance",
+    "report": "Signalement",
+    "statuses": "Statuts",
+    "unblock": "Débloquer",
+    "unblock_progress": "Déblocage…",
+    "block_progress": "Blocage…",
+    "unmute": "Démasquer",
+    "unmute_progress": "Démasquage…",
+    "mute_progress": "Masquage…",
+    "admin_menu": {
+      "moderation": "Moderation",
+      "grant_admin": "Promouvoir Administrateur⋅ice",
+      "revoke_admin": "Dégrader Administrateur⋅ice",
+      "grant_moderator": "Promouvoir Modérateur⋅ice",
+      "revoke_moderator": "Dégrader Modérateur⋅ice",
+      "activate_account": "Activer le compte",
+      "deactivate_account": "Désactiver le compte",
+      "delete_account": "Supprimer le compte",
+      "force_nsfw": "Marquer tous les statuts comme NSFW",
+      "strip_media": "Supprimer les medias des statuts",
+      "force_unlisted": "Forcer les statuts à être délistés",
+      "sandbox": "Forcer les statuts à être visibles seuleument pour les abonné⋅e⋅s",
+      "disable_remote_subscription": "Interdir de s'abonner a l'utilisateur depuis l'instance distante",
+      "disable_any_subscription": "Interdir de s'abonner à l'utilisateur tout court",
+      "quarantine": "Interdir les statuts de l'utilisateur à fédérer",
+      "delete_user": "Supprimer l'utilisateur",
+      "delete_user_confirmation": "Êtes-vous absolument-sûr⋅e ? Cette action ne peut être annulée."
+    },
+    "mention": "Mention",
+    "hidden": "Caché",
+    "subscribe": "Abonner",
+    "unsubscribe": "Désabonner",
+    "hide_repeats": "Cacher les partages",
+    "show_repeats": "Montrer les partages"
+  },
+  "user_profile": {
+    "timeline_title": "Journal de l'utilisateur⋅ice",
+    "profile_does_not_exist": "Désolé, ce profil n'existe pas.",
+    "profile_loading_error": "Désolé, il y a eu une erreur au chargement du profil."
+  },
+  "user_reporting": {
+    "title": "Signaler {0}",
+    "add_comment_description": "Ce signalement sera envoyé aux modérateur⋅ice⋅s de votre instance. Vous pouvez fournir une explication de pourquoi vous signalez ce compte ci-dessous :",
+    "additional_comments": "Commentaires additionnels",
+    "forward_description": "Le compte vient d'un autre serveur. Envoyer une copie du signalement à celui-ci aussi ?",
+    "forward_to": "Transmettre à {0}",
+    "submit": "Envoyer",
+    "generic_error": "Une erreur est survenue lors du traitement de votre requête."
+  },
+  "who_to_follow": {
+    "more": "Plus",
+    "who_to_follow": "À qui s'abonner"
+  },
+  "tool_tip": {
+    "media_upload": "Envoyer un media",
+    "repeat": "Répéter",
+    "reply": "Répondre",
+    "favorite": "Favoriser",
+    "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"
+  },
+  "upload": {
+    "error": {
+      "base": "L'envoi a échoué.",
+      "file_too_big": "Fichier trop gros [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Réessayez plus tard"
+    },
+    "file_size_units": {
+      "B": "O",
+      "KiB": "KiO",
+      "MiB": "MiO",
+      "GiB": "GiO",
+      "TiB": "TiO"
+    }
+  },
+  "about": {
+    "mrf": {
+      "keyword": {
+        "reject": "Rejeté",
+        "replace": "Remplacer",
+        "keyword_policies": "Politiques par mot-clés",
+        "ftl_removal": "Suppression du flux \"Ensemble du réseau connu\"",
+        "is_replaced_by": "→"
+      },
+      "simple": {
+        "simple_policies": "Politiques par instances",
+        "accept": "Accepter",
+        "accept_desc": "Cette instance accepte des messages seulement depuis ces instances :",
+        "reject": "Rejeter",
+        "reject_desc": "Cette instance n'acceptera pas de message de ces instances :",
+        "quarantine": "Quarantaine",
+        "quarantine_desc": "Cette instance enverras seulement des messages publics à ces instances :",
+        "ftl_removal_desc": "Cette instance supprime ces instance du flux fédéré :",
+        "media_removal": "Suppression multimédia",
+        "media_removal_desc": "Cette instance supprime le contenu multimédia des instances suivantes :",
+        "media_nsfw": "Force le contenu multimédia comme sensible",
+        "ftl_removal": "Suppression du flux fédéré",
+        "media_nsfw_desc": "Cette instance force le contenu multimédia comme sensible pour les messages des instances suivantes :"
+      },
+      "federation": "Fédération",
+      "mrf_policies": "Politiques MRF activées",
+      "mrf_policies_desc": "Les politiques MRF modifient la fédération entre les instances. Les politiques suivantes sont activées :"
+    },
+    "staff": "Staff"
+  },
+  "domain_mute_card": {
+    "mute": "Muet",
+    "mute_progress": "Masquage…",
+    "unmute": "Démasquer",
+    "unmute_progress": "Démasquage…"
+  },
+  "polls": {
+    "add_poll": "Ajouter un Sondage",
+    "add_option": "Ajouter une option",
+    "option": "Option",
+    "votes": "votes",
+    "type": "Type de Sondage",
+    "single_choice": "Choix unique",
+    "multiple_choices": "Choix multiples",
+    "expiry": "Age du sondage",
+    "expires_in": "Fin du sondage dans {0}",
+    "not_enough_options": "Trop peu d'options unique au sondage",
+    "vote": "Voter",
+    "expired": "Sondage terminé il y a {0}"
+  },
+  "emoji": {
+    "emoji": "Émoji",
+    "search_emoji": "Rechercher un émoji",
+    "add_emoji": "Insérer un émoji",
+    "custom": "émoji personnalisé",
+    "unicode": "émoji unicode",
+    "load_all": "Charger tout les {emojiAmount} émojis",
+    "load_all_hint": "{saneAmount} émojis chargé, charger tout les émojis peuvent causer des problèmes de performances.",
+    "stickers": "Stickers",
+    "keep_open": "Garder le sélecteur ouvert"
+  },
+  "remote_user_resolver": {
+    "error": "Non trouvé.",
+    "searching_for": "Rechercher",
+    "remote_user_resolver": "Résolution de compte distant"
+  },
+  "time": {
+    "minutes_short": "{0}min",
+    "second_short": "{0}s",
+    "day": "{0} jour",
+    "days": "{0} jours",
+    "months": "{0} mois",
+    "month_short": "{0}m",
+    "months_short": "{0}m",
+    "now": "tout de suite",
+    "now_short": "maintenant",
+    "second": "{0} seconde",
+    "seconds": "{0} secondes",
+    "seconds_short": "{0}s",
+    "day_short": "{0}j",
+    "days_short": "{0}j",
+    "hour": "{0} heure",
+    "hours": "{0} heures",
+    "hour_short": "{0}h",
+    "hours_short": "{0}h",
+    "in_future": "dans {0}",
+    "in_past": "il y a {0}",
+    "minute": "{0} minute",
+    "minutes": "{0} minutes",
+    "minute_short": "{0}min",
+    "month": "{0} mois",
+    "week": "{0} semaine",
+    "weeks": "{0} semaines",
+    "week_short": "{0}s",
+    "weeks_short": "{0}s",
+    "year": "{0} année",
+    "years": "{0} années",
+    "year_short": "{0}a",
+    "years_short": "{0}a"
+  },
+  "search": {
+    "people": "Comptes",
+    "person_talking": "{count} personnes discutant",
+    "hashtags": "Mot-dièses",
+    "people_talking": "{count} personnes discutant",
+    "no_results": "Aucun résultats"
+  },
+  "password_reset": {
+    "forgot_password": "Mot de passe oublié ?",
+    "check_email": "Vérifiez vos courriels pour le lien permettant de changer votre mot de passe.",
+    "password_reset_disabled": "Le changement de mot de passe est désactivé. Veuillez contacter l'administration de votre instance.",
+    "password_reset_required_but_mailer_is_disabled": "Vous devez changer votre mot de passe mais sont changement est désactivé. Veuillez contacter l’administration de votre instance.",
+    "password_reset": "Nouveau mot de passe",
+    "instruction": "Entrer votre address de courriel ou votre nom utilisateur. Nous enverrons un lien pour changer votre mot de passe.",
+    "placeholder": "Votre email ou nom d'utilisateur",
+    "return_home": "Retourner à la page d'accueil",
+    "not_found": "Email ou nom d'utilisateur inconnu.",
+    "too_many_requests": "Vos avez atteint la limite d'essais, essayez plus tard.",
+    "password_reset_required": "Vous devez changer votre mot de passe pour vous authentifier."
+  }
 }
diff --git a/src/i18n/it.json b/src/i18n/it.json
index cddcb489..360c72aa 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -1,489 +1,489 @@
 {
-    "general": {
-        "submit": "Invia",
-        "apply": "Applica",
-        "more": "Altro",
-        "generic_error": "Errore",
-        "optional": "facoltativo",
-        "show_more": "Mostra tutto",
-        "show_less": "Ripiega",
-        "dismiss": "Chiudi",
-        "cancel": "Annulla",
-        "disable": "Disabilita",
-        "enable": "Abilita",
-        "confirm": "Conferma",
-        "verify": "Verifica"
+  "general": {
+    "submit": "Invia",
+    "apply": "Applica",
+    "more": "Altro",
+    "generic_error": "Errore",
+    "optional": "facoltativo",
+    "show_more": "Mostra tutto",
+    "show_less": "Ripiega",
+    "dismiss": "Chiudi",
+    "cancel": "Annulla",
+    "disable": "Disabilita",
+    "enable": "Abilita",
+    "confirm": "Conferma",
+    "verify": "Verifica"
+  },
+  "nav": {
+    "mentions": "Menzioni",
+    "public_tl": "Sequenza pubblica",
+    "timeline": "Sequenza personale",
+    "twkn": "Sequenza globale",
+    "chat": "Chat della stanza",
+    "friend_requests": "Vogliono seguirti",
+    "about": "Informazioni",
+    "administration": "Amministrazione",
+    "back": "Indietro",
+    "interactions": "Interazioni",
+    "dms": "Messaggi diretti",
+    "user_search": "Ricerca utenti",
+    "search": "Ricerca",
+    "who_to_follow": "Chi seguire",
+    "preferences": "Preferenze"
+  },
+  "notifications": {
+    "followed_you": "ti segue",
+    "notifications": "Notifiche",
+    "read": "Letto!",
+    "broken_favorite": "Stato sconosciuto, lo sto cercando…",
+    "favorited_you": "ha gradito il tuo messaggio",
+    "load_older": "Carica notifiche precedenti",
+    "repeated_you": "ha condiviso il tuo messaggio",
+    "follow_request": "vuole seguirti",
+    "no_more_notifications": "Fine delle notifiche",
+    "migrated_to": "è migrato verso",
+    "reacted_with": "ha reagito con {0}"
+  },
+  "settings": {
+    "attachments": "Allegati",
+    "autoload": "Abilita caricamento automatico quando raggiungi il fondo pagina",
+    "avatar": "Icona utente",
+    "bio": "Introduzione",
+    "current_avatar": "La tua icona attuale",
+    "current_profile_banner": "Il tuo stendardo attuale",
+    "filtering": "Filtri",
+    "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, una per riga",
+    "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
+    "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
+    "name": "Nome",
+    "name_bio": "Nome ed introduzione",
+    "nsfw_clickthrough": "Fai click per visualizzare gli allegati offuscati",
+    "profile_background": "Sfondo della tua pagina",
+    "profile_banner": "Stendardo del tuo profilo",
+    "reply_link_preview": "Visualizza le risposte al passaggio del cursore",
+    "set_new_avatar": "Scegli una nuova icona",
+    "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
+    "set_new_profile_banner": "Scegli un nuovo stendardo per il tuo profilo",
+    "settings": "Impostazioni",
+    "theme": "Tema",
+    "user_settings": "Impostazioni Utente",
+    "attachmentRadius": "Allegati",
+    "avatarAltRadius": "Icone utente (Notifiche)",
+    "avatarRadius": "Icone utente",
+    "background": "Sfondo",
+    "btnRadius": "Pulsanti",
+    "cBlue": "Blu (risposte, seguire)",
+    "cGreen": "Verde (ripeti)",
+    "cOrange": "Arancione (gradire)",
+    "cRed": "Rosso (annulla)",
+    "change_password": "Cambia password",
+    "change_password_error": "C'è stato un problema durante il cambiamento della password.",
+    "changed_password": "Password cambiata correttamente!",
+    "collapse_subject": "Ripiega messaggi con Oggetto",
+    "confirm_new_password": "Conferma la nuova password",
+    "current_password": "La tua password attuale",
+    "data_import_export_tab": "Importa o esporta dati",
+    "default_vis": "Visibilità predefinita dei messaggi",
+    "delete_account": "Elimina profilo",
+    "delete_account_description": "Elimina definitivamente i tuoi dati e disattiva il tuo profilo.",
+    "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo profilo. Se il problema persiste contatta l'amministratore della tua stanza.",
+    "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione del tuo profilo.",
+    "export_theme": "Salva impostazioni",
+    "follow_export": "Esporta la lista di chi segui",
+    "follow_export_button": "Esporta la lista di chi segui in un file CSV",
+    "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
+    "follow_import": "Importa la lista di chi segui",
+    "follow_import_error": "Errore nell'importazione della lista di chi segui",
+    "follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.",
+    "foreground": "Primo piano",
+    "general": "Generale",
+    "hide_post_stats": "Nascondi statistiche dei messaggi (es. il numero di preferenze)",
+    "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero dei tuoi seguaci)",
+    "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file CSV",
+    "import_theme": "Carica impostazioni",
+    "inputRadius": "Campi di testo",
+    "instance_default": "(predefinito: {value})",
+    "interfaceLanguage": "Lingua dell'interfaccia",
+    "invalid_theme_imported": "Il file selezionato non è un tema supportato da Pleroma. Il tuo tema non è stato modificato.",
+    "limited_availability": "Non disponibile nel tuo browser",
+    "links": "Collegamenti",
+    "lock_account_description": "Limita il tuo account solo a seguaci approvati",
+    "loop_video": "Riproduci video in ciclo continuo",
+    "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le \"gif\" di Mastodon)",
+    "new_password": "Nuova password",
+    "notification_visibility": "Tipi di notifiche da mostrare",
+    "notification_visibility_follows": "Nuove persone ti seguono",
+    "notification_visibility_likes": "Preferiti",
+    "notification_visibility_mentions": "Menzioni",
+    "notification_visibility_repeats": "Condivisioni",
+    "no_rich_text_description": "Togli la formattazione del testo da tutti i messaggi",
+    "oauth_tokens": "Token OAuth",
+    "token": "Token",
+    "refresh_token": "Aggiorna token",
+    "valid_until": "Valido fino a",
+    "revoke_token": "Revoca",
+    "panelRadius": "Pannelli",
+    "pause_on_unfocused": "Interrompi l'aggiornamento continuo mentre la scheda è in secondo piano",
+    "presets": "Valori predefiniti",
+    "profile_tab": "Profilo",
+    "radii_help": "Imposta il raggio degli angoli (in pixel)",
+    "replies_in_timeline": "Risposte nella sequenza personale",
+    "reply_visibility_all": "Mostra tutte le risposte",
+    "reply_visibility_following": "Mostra solo le risposte rivolte a me o agli utenti che seguo",
+    "reply_visibility_self": "Mostra solo risposte rivolte a me",
+    "saving_err": "Errore nel salvataggio delle impostazioni",
+    "saving_ok": "Impostazioni salvate",
+    "security_tab": "Sicurezza",
+    "stop_gifs": "Riproduci GIF al passaggio del cursore",
+    "streaming": "Mostra automaticamente i nuovi messaggi quando sei in cima alla pagina",
+    "text": "Testo",
+    "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
+    "tooltipRadius": "Suggerimenti/avvisi",
+    "values": {
+      "false": "no",
+      "true": "sì"
     },
-    "nav": {
-        "mentions": "Menzioni",
-        "public_tl": "Sequenza pubblica",
-        "timeline": "Sequenza personale",
-        "twkn": "Sequenza globale",
-        "chat": "Chat della stanza",
-        "friend_requests": "Vogliono seguirti",
-        "about": "Informazioni",
-        "administration": "Amministrazione",
-        "back": "Indietro",
-        "interactions": "Interazioni",
-        "dms": "Messaggi diretti",
-        "user_search": "Ricerca utenti",
-        "search": "Ricerca",
-        "who_to_follow": "Chi seguire",
-        "preferences": "Preferenze"
+    "avatar_size_instruction": "La taglia minima per l'icona personale è 150x150 pixel.",
+    "domain_mutes": "Domini",
+    "discoverable": "Permetti la scoperta di questo profilo da servizi di ricerca ed altro",
+    "composing": "Composizione",
+    "changed_email": "Email cambiata con successo!",
+    "change_email_error": "C'è stato un problema nel cambiare la tua email.",
+    "change_email": "Cambia email",
+    "blocks_tab": "Bloccati",
+    "blocks_imported": "Blocchi importati! Saranno elaborati a breve.",
+    "block_import_error": "Errore nell'importazione",
+    "block_import": "Importa blocchi",
+    "block_export_button": "Esporta i tuoi blocchi in un file CSV",
+    "block_export": "Esporta blocchi",
+    "allow_following_move": "Consenti",
+    "mfa": {
+      "verify": {
+        "desc": "Per abilitare l'autenticazione bifattoriale, inserisci il codice fornito dalla tua applicazione:"
+      },
+      "scan": {
+        "secret_code": "Codice",
+        "desc": "Con la tua applicazione bifattoriale, acquisisci questo QR o inserisci il codice manualmente:",
+        "title": "Acquisisci"
+      },
+      "authentication_methods": "Metodi di accesso",
+      "recovery_codes_warning": "Appuntati i codici o salvali in un posto sicuro, altrimenti rischi di non rivederli mai più. Se perderai l'accesso sia alla tua applicazione bifattoriale che ai codici di recupero non potrai più accedere al tuo profilo.",
+      "waiting_a_recovery_codes": "Ricevo codici di recupero…",
+      "recovery_codes": "Codici di recupero.",
+      "warning_of_generate_new_codes": "Alla generazione di nuovi codici di recupero, quelli vecchi saranno disattivati.",
+      "generate_new_recovery_codes": "Genera nuovi codici di recupero",
+      "title": "Accesso bifattoriale",
+      "confirm_and_enable": "Conferma ed abilita OTP",
+      "wait_pre_setup_otp": "preimposto OTP",
+      "setup_otp": "Imposta OTP",
+      "otp": "OTP"
     },
-    "notifications": {
-        "followed_you": "ti segue",
-        "notifications": "Notifiche",
-        "read": "Letto!",
-        "broken_favorite": "Stato sconosciuto, lo sto cercando…",
-        "favorited_you": "ha gradito il tuo messaggio",
-        "load_older": "Carica notifiche precedenti",
-        "repeated_you": "ha condiviso il tuo messaggio",
-        "follow_request": "vuole seguirti",
-        "no_more_notifications": "Fine delle notifiche",
-        "migrated_to": "è migrato verso",
-        "reacted_with": "ha reagito con {0}"
-    },
-    "settings": {
-        "attachments": "Allegati",
-        "autoload": "Abilita caricamento automatico quando raggiungi il fondo pagina",
-        "avatar": "Icona utente",
-        "bio": "Introduzione",
-        "current_avatar": "La tua icona attuale",
-        "current_profile_banner": "Il tuo stendardo attuale",
-        "filtering": "Filtri",
-        "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, una per riga",
-        "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
-        "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
-        "name": "Nome",
-        "name_bio": "Nome ed introduzione",
-        "nsfw_clickthrough": "Fai click per visualizzare gli allegati offuscati",
-        "profile_background": "Sfondo della tua pagina",
-        "profile_banner": "Stendardo del tuo profilo",
-        "reply_link_preview": "Visualizza le risposte al passaggio del cursore",
-        "set_new_avatar": "Scegli una nuova icona",
-        "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
-        "set_new_profile_banner": "Scegli un nuovo stendardo per il tuo profilo",
-        "settings": "Impostazioni",
-        "theme": "Tema",
-        "user_settings": "Impostazioni Utente",
-        "attachmentRadius": "Allegati",
-        "avatarAltRadius": "Icone utente (Notifiche)",
-        "avatarRadius": "Icone utente",
-        "background": "Sfondo",
-        "btnRadius": "Pulsanti",
-        "cBlue": "Blu (risposte, seguire)",
-        "cGreen": "Verde (ripeti)",
-        "cOrange": "Arancione (gradire)",
-        "cRed": "Rosso (annulla)",
-        "change_password": "Cambia password",
-        "change_password_error": "C'è stato un problema durante il cambiamento della password.",
-        "changed_password": "Password cambiata correttamente!",
-        "collapse_subject": "Ripiega messaggi con Oggetto",
-        "confirm_new_password": "Conferma la nuova password",
-        "current_password": "La tua password attuale",
-        "data_import_export_tab": "Importa o esporta dati",
-        "default_vis": "Visibilità predefinita dei messaggi",
-        "delete_account": "Elimina profilo",
-        "delete_account_description": "Elimina definitivamente i tuoi dati e disattiva il tuo profilo.",
-        "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo profilo. Se il problema persiste contatta l'amministratore della tua stanza.",
-        "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione del tuo profilo.",
-        "export_theme": "Salva impostazioni",
-        "follow_export": "Esporta la lista di chi segui",
-        "follow_export_button": "Esporta la lista di chi segui in un file CSV",
-        "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
-        "follow_import": "Importa la lista di chi segui",
-        "follow_import_error": "Errore nell'importazione della lista di chi segui",
-        "follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.",
-        "foreground": "Primo piano",
-        "general": "Generale",
-        "hide_post_stats": "Nascondi statistiche dei messaggi (es. il numero di preferenze)",
-        "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero dei tuoi seguaci)",
-        "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file CSV",
-        "import_theme": "Carica impostazioni",
-        "inputRadius": "Campi di testo",
-        "instance_default": "(predefinito: {value})",
-        "interfaceLanguage": "Lingua dell'interfaccia",
-        "invalid_theme_imported": "Il file selezionato non è un tema supportato da Pleroma. Il tuo tema non è stato modificato.",
-        "limited_availability": "Non disponibile nel tuo browser",
-        "links": "Collegamenti",
-        "lock_account_description": "Limita il tuo account solo a seguaci approvati",
-        "loop_video": "Riproduci video in ciclo continuo",
-        "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le \"gif\" di Mastodon)",
-        "new_password": "Nuova password",
-        "notification_visibility": "Tipi di notifiche da mostrare",
-        "notification_visibility_follows": "Nuove persone ti seguono",
-        "notification_visibility_likes": "Preferiti",
-        "notification_visibility_mentions": "Menzioni",
-        "notification_visibility_repeats": "Condivisioni",
-        "no_rich_text_description": "Togli la formattazione del testo da tutti i messaggi",
-        "oauth_tokens": "Token OAuth",
-        "token": "Token",
-        "refresh_token": "Aggiorna token",
-        "valid_until": "Valido fino a",
-        "revoke_token": "Revoca",
-        "panelRadius": "Pannelli",
-        "pause_on_unfocused": "Interrompi l'aggiornamento continuo mentre la scheda è in secondo piano",
-        "presets": "Valori predefiniti",
-        "profile_tab": "Profilo",
-        "radii_help": "Imposta il raggio degli angoli (in pixel)",
-        "replies_in_timeline": "Risposte nella sequenza personale",
-        "reply_visibility_all": "Mostra tutte le risposte",
-        "reply_visibility_following": "Mostra solo le risposte rivolte a me o agli utenti che seguo",
-        "reply_visibility_self": "Mostra solo risposte rivolte a me",
-        "saving_err": "Errore nel salvataggio delle impostazioni",
-        "saving_ok": "Impostazioni salvate",
-        "security_tab": "Sicurezza",
-        "stop_gifs": "Riproduci GIF al passaggio del cursore",
-        "streaming": "Mostra automaticamente i nuovi messaggi quando sei in cima alla pagina",
-        "text": "Testo",
-        "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
-        "tooltipRadius": "Suggerimenti/avvisi",
-        "values": {
-            "false": "no",
-            "true": "sì"
+    "enter_current_password_to_confirm": "Inserisci la tua password per identificarti",
+    "security": "Sicurezza",
+    "app_name": "Nome applicazione",
+    "style": {
+      "switcher": {
+        "help": {
+          "older_version_imported": "Il tema importato è stato creato per una versione precedente dell'interfaccia.",
+          "future_version_imported": "Il tema importato è stato creato per una versione più recente dell'interfaccia.",
+          "v2_imported": "Il tema importato è stato creato per una vecchia interfaccia. Non tutto potrebbe essere come prima.",
+          "upgraded_from_v2": "L'interfaccia è stata aggiornata, il tema potrebbe essere diverso da come lo intendevi.",
+          "migration_snapshot_ok": "Ho caricato l'anteprima del tema. Puoi provare a caricarne i contenuti.",
+          "fe_downgraded": "L'interfaccia è stata portata ad una versione precedente.",
+          "fe_upgraded": "Lo schema dei temi è stato aggiornato insieme all'interfaccia.",
+          "snapshot_missing": "Il tema non è provvisto di anteprima, quindi potrebbe essere diverso da come appare.",
+          "snapshot_present": "Tutti i valori sono sostituiti dall'anteprima del tema. Puoi invece caricare i suoi contenuti.",
+          "snapshot_source_mismatch": "Conflitto di versione: probabilmente l'interfaccia è stata portata ad una versione precedente e poi aggiornata di nuovo. Se hai modificato il tema con una versione precedente dell'interfaccia, usa la vecchia versione del tema, altrimenti puoi usare la nuova.",
+          "migration_napshot_gone": "Anteprima del tema non trovata, non tutto potrebbe essere come ricordi."
         },
-        "avatar_size_instruction": "La taglia minima per l'icona personale è 150x150 pixel.",
-        "domain_mutes": "Domini",
-        "discoverable": "Permetti la scoperta di questo profilo da servizi di ricerca ed altro",
-        "composing": "Composizione",
-        "changed_email": "Email cambiata con successo!",
-        "change_email_error": "C'è stato un problema nel cambiare la tua email.",
-        "change_email": "Cambia email",
-        "blocks_tab": "Bloccati",
-        "blocks_imported": "Blocchi importati! Saranno elaborati a breve.",
-        "block_import_error": "Errore nell'importazione",
-        "block_import": "Importa blocchi",
-        "block_export_button": "Esporta i tuoi blocchi in un file CSV",
-        "block_export": "Esporta blocchi",
-        "allow_following_move": "Consenti",
-        "mfa": {
-            "verify": {
-                "desc": "Per abilitare l'autenticazione bifattoriale, inserisci il codice fornito dalla tua applicazione:"
-            },
-            "scan": {
-                "secret_code": "Codice",
-                "desc": "Con la tua applicazione bifattoriale, acquisisci questo QR o inserisci il codice manualmente:",
-                "title": "Acquisisci"
-            },
-            "authentication_methods": "Metodi di accesso",
-            "recovery_codes_warning": "Appuntati i codici o salvali in un posto sicuro, altrimenti rischi di non rivederli mai più. Se perderai l'accesso sia alla tua applicazione bifattoriale che ai codici di recupero non potrai più accedere al tuo profilo.",
-            "waiting_a_recovery_codes": "Ricevo codici di recupero…",
-            "recovery_codes": "Codici di recupero.",
-            "warning_of_generate_new_codes": "Alla generazione di nuovi codici di recupero, quelli vecchi saranno disattivati.",
-            "generate_new_recovery_codes": "Genera nuovi codici di recupero",
-            "title": "Accesso bifattoriale",
-            "confirm_and_enable": "Conferma ed abilita OTP",
-            "wait_pre_setup_otp": "preimposto OTP",
-            "setup_otp": "Imposta OTP",
-            "otp": "OTP"
-        },
-        "enter_current_password_to_confirm": "Inserisci la tua password per identificarti",
-        "security": "Sicurezza",
-        "app_name": "Nome applicazione",
-        "style": {
-            "switcher": {
-                "help": {
-                    "older_version_imported": "Il tema importato è stato creato per una versione precedente dell'interfaccia.",
-                    "future_version_imported": "Il tema importato è stato creato per una versione più recente dell'interfaccia.",
-                    "v2_imported": "Il tema importato è stato creato per una vecchia interfaccia. Non tutto potrebbe essere come prima.",
-                    "upgraded_from_v2": "L'interfaccia è stata aggiornata, il tema potrebbe essere diverso da come lo intendevi.",
-                    "migration_snapshot_ok": "Ho caricato l'anteprima del tema. Puoi provare a caricarne i contenuti.",
-                    "fe_downgraded": "L'interfaccia è stata portata ad una versione precedente.",
-                    "fe_upgraded": "Lo schema dei temi è stato aggiornato insieme all'interfaccia.",
-                    "snapshot_missing": "Il tema non è provvisto di anteprima, quindi potrebbe essere diverso da come appare.",
-                    "snapshot_present": "Tutti i valori sono sostituiti dall'anteprima del tema. Puoi invece caricare i suoi contenuti.",
-                    "snapshot_source_mismatch": "Conflitto di versione: probabilmente l'interfaccia è stata portata ad una versione precedente e poi aggiornata di nuovo. Se hai modificato il tema con una versione precedente dell'interfaccia, usa la vecchia versione del tema, altrimenti puoi usare la nuova.",
-                    "migration_napshot_gone": "Anteprima del tema non trovata, non tutto potrebbe essere come ricordi."
-                },
-                "use_source": "Nuova versione",
-                "use_snapshot": "Versione precedente",
-                "keep_as_is": "Mantieni tal quale",
-                "load_theme": "Carica tema",
-                "clear_opacity": "Rimuovi opacità",
-                "clear_all": "Azzera tutto",
-                "reset": "Reimposta",
-                "save_load_hint": "Le opzioni \"mantieni\" conservano le impostazioni correnti quando selezioni o carichi un tema, e le salvano quando ne esporti uno. Quando nessuna casella è selezionata, tutte le impostazioni correnti saranno salvate nel tema.",
-                "keep_fonts": "Mantieni font",
-                "keep_roundness": "Mantieni vertici",
-                "keep_opacity": "Mantieni opacità",
-                "keep_shadows": "Mantieni ombre",
-                "keep_color": "Mantieni colori"
-            },
-            "common": {
-                "opacity": "Opacità",
-                "color": "Colore"
-            }
-        },
-        "enable_web_push_notifications": "Abilita notifiche web push",
-        "fun": "Divertimento",
-        "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.",
-        "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push",
-        "notification_setting_privacy": "Privacy",
-        "notification_setting_followers": "Utenti che ti seguono",
-        "notification_setting_non_followers": "Utenti che non ti seguono",
-        "notification_setting_non_follows": "Utenti che non segui",
-        "notification_setting_follows": "Utenti che segui",
-        "notification_setting": "Ricevi notifiche da:",
-        "notification_setting_filters": "Filtri",
-        "notifications": "Notifiche",
-        "greentext": "Frecce da meme",
-        "upload_a_photo": "Carica un'immagine",
-        "type_domains_to_mute": "Inserisci domini da zittire",
-        "theme_help_v2_2": "Le icone dietro alcuni elementi sono indicatori del contrasto fra testo e sfondo, passaci sopra col puntatore per ulteriori informazioni. Se si usano delle trasparenze, questi indicatori mostrano il peggior caso possibile.",
-        "theme_help_v2_1": "Puoi anche forzare colore ed opacità di alcuni elementi selezionando la casella. Usa il pulsante \"Azzera\" per azzerare tutte le forzature.",
-        "useStreamingApiWarning": "(Sconsigliato, sperimentale, può saltare messaggi)",
-        "useStreamingApi": "Ricevi messaggi e notifiche in tempo reale",
-        "user_mutes": "Utenti",
-        "post_status_content_type": "Tipo di contenuto dei messaggi",
-        "subject_line_noop": "Non copiare",
-        "subject_line_mastodon": "Come in Mastodon: copia tal quale",
-        "subject_line_email": "Come nelle email: \"re: oggetto\"",
-        "subject_line_behavior": "Copia oggetto quando rispondi",
-        "subject_input_always_show": "Mostra sempre il campo Oggetto",
-        "minimal_scopes_mode": "Riduci opzioni di visibilità",
-        "scope_copy": "Risposte ereditano la visibilità (messaggi privati lo fanno sempre)",
-        "search_user_to_mute": "Cerca utente da zittire",
-        "search_user_to_block": "Cerca utente da bloccare",
-        "autohide_floating_post_button": "Nascondi automaticamente il pulsante di composizione (mobile)",
-        "show_moderator_badge": "Mostra l'insegna di moderatore sulla mia pagina",
-        "show_admin_badge": "Mostra l'insegna di amministratore sulla mia pagina",
-        "hide_followers_count_description": "Non mostrare quanti seguaci ho",
-        "hide_follows_count_description": "Non mostrare quanti utenti seguo",
-        "hide_followers_description": "Non mostrare i miei seguaci",
-        "hide_follows_description": "Non mostrare chi seguo",
-        "no_mutes": "Nessun utente zittito",
-        "no_blocks": "Nessun utente bloccato",
-        "notification_visibility_emoji_reactions": "Reazioni",
-        "notification_visibility_moves": "Migrazioni utenti",
-        "new_email": "Nuova email",
-        "use_contain_fit": "Non ritagliare le anteprime degli allegati",
-        "play_videos_in_modal": "Riproduci video in un riquadro a sbalzo",
-        "mutes_tab": "Zittiti",
-        "interface": "Interfaccia",
-        "instance_default_simple": "(predefinito)",
-        "checkboxRadius": "Caselle di selezione",
-        "import_blocks_from_a_csv_file": "Importa blocchi da un file CSV",
-        "hide_filtered_statuses": "Nascondi messaggi filtrati",
-        "use_one_click_nsfw": "Apri media offuscati con un solo click",
-        "preload_images": "Precarica immagini",
-        "hide_isp": "Nascondi pannello della stanza",
-        "max_thumbnails": "Numero massimo di anteprime per messaggio",
-        "hide_muted_posts": "Nascondi messaggi degli utenti zittiti",
-        "accent": "Accento",
-        "emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
-        "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore",
-        "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più."
+        "use_source": "Nuova versione",
+        "use_snapshot": "Versione precedente",
+        "keep_as_is": "Mantieni tal quale",
+        "load_theme": "Carica tema",
+        "clear_opacity": "Rimuovi opacità",
+        "clear_all": "Azzera tutto",
+        "reset": "Reimposta",
+        "save_load_hint": "Le opzioni \"mantieni\" conservano le impostazioni correnti quando selezioni o carichi un tema, e le salvano quando ne esporti uno. Quando nessuna casella è selezionata, tutte le impostazioni correnti saranno salvate nel tema.",
+        "keep_fonts": "Mantieni font",
+        "keep_roundness": "Mantieni vertici",
+        "keep_opacity": "Mantieni opacità",
+        "keep_shadows": "Mantieni ombre",
+        "keep_color": "Mantieni colori"
+      },
+      "common": {
+        "opacity": "Opacità",
+        "color": "Colore"
+      }
     },
-    "timeline": {
-        "error_fetching": "Errore nell'aggiornamento",
-        "load_older": "Carica messaggi più vecchi",
-        "show_new": "Mostra nuovi",
-        "up_to_date": "Aggiornato",
-        "collapse": "Riduci",
-        "conversation": "Conversazione",
-        "no_retweet_hint": "Il messaggio è diretto o solo per seguaci e non può essere condiviso",
-        "repeated": "condiviso"
-    },
-    "user_card": {
-        "follow": "Segui",
-        "followees": "Chi stai seguendo",
-        "followers": "Seguaci",
-        "following": "Seguìto!",
-        "follows_you": "Ti segue!",
-        "mute": "Silenzia",
-        "muted": "Silenziato",
-        "per_day": "al giorno",
-        "statuses": "Messaggi",
-        "approve": "Approva",
-        "block": "Blocca",
-        "blocked": "Bloccato!",
-        "deny": "Nega",
-        "remote_follow": "Segui da remoto"
-    },
-    "chat": {
-        "title": "Chat"
-    },
-    "features_panel": {
-        "chat": "Chat",
-        "gopher": "Gopher",
-        "media_proxy": "Proxy multimedia",
-        "scope_options": "Opzioni visibilità",
-        "text_limit": "Lunghezza massima",
-        "title": "Caratteristiche",
-        "who_to_follow": "Chi seguire"
-    },
-    "finder": {
-        "error_fetching_user": "Errore nel recupero dell'utente",
-        "find_user": "Trova utente"
-    },
-    "login": {
-        "login": "Accedi",
-        "logout": "Disconnettiti",
-        "password": "Password",
-        "placeholder": "es. Lupo Lucio",
-        "register": "Registrati",
-        "username": "Nome utente",
-        "description": "Accedi con OAuth",
-        "hint": "Accedi per partecipare alla discussione",
-        "authentication_code": "Codice di autenticazione",
-        "enter_recovery_code": "Inserisci un codice di recupero",
-        "enter_two_factor_code": "Inserisci un codice two-factor",
-        "recovery_code": "Codice di recupero",
-        "heading": {
-            "totp": "Autenticazione two-factor",
-            "recovery": "Recupero two-factor"
-        }
-    },
-    "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_link": "protetto",
-        "attachments_sensitive": "Nascondi gli allegati",
-        "content_type": {
-            "text/plain": "Testo normale",
-            "text/bbcode": "BBCode",
-            "text/markdown": "Markdown",
-            "text/html": "HTML"
-        },
-        "content_warning": "Oggetto (facoltativo)",
-        "default": "Sono appena atterrato a Fiumicino.",
-        "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
-        "posting": "Sto pubblicando",
-        "scope": {
-            "direct": "Diretto - Visibile solo agli utenti menzionati",
-            "private": "Solo per seguaci - Visibile solo dai tuoi seguaci",
-            "public": "Pubblico - Visibile sulla sequenza pubblica",
-            "unlisted": "Non elencato - Non visibile sulla sequenza pubblica"
-        },
-        "scope_notice": {
-            "unlisted": "Questo messaggio non sarà visibile sulla sequenza locale né su quella pubblica",
-            "private": "Questo messaggio sarà visibile solo ai tuoi seguaci",
-            "public": "Questo messaggio sarà visibile a tutti"
-        },
-        "direct_warning_to_first_only": "Questo messaggio sarà visibile solo agli utenti menzionati all'inizio.",
-        "direct_warning_to_all": "Questo messaggio sarà visibile a tutti i menzionati.",
-        "new_status": "Nuovo messaggio"
-    },
-    "registration": {
-        "bio": "Introduzione",
-        "email": "Email",
-        "fullname": "Nome visualizzato",
-        "password_confirm": "Conferma password",
-        "registration": "Registrazione",
-        "token": "Codice d'invito",
-        "validations": {
-            "password_confirmation_match": "dovrebbe essere uguale alla password",
-            "password_confirmation_required": "non può essere vuoto",
-            "password_required": "non può essere vuoto",
-            "email_required": "non può essere vuoto",
-            "fullname_required": "non può essere vuoto",
-            "username_required": "non può essere vuoto"
-        },
-        "bio_placeholder": "es.\nCiao, sono Lupo Lucio.\nSono un lupo fantastico che vive nel Fantabosco. Forse mi hai visto alla Melevisione.",
-        "fullname_placeholder": "es. Lupo Lucio",
-        "username_placeholder": "es. mister_wolf",
-        "new_captcha": "Clicca l'immagine per avere un altro captcha",
-        "captcha": "CAPTCHA"
-    },
-    "user_profile": {
-        "timeline_title": "Sequenza dell'Utente"
-    },
-    "who_to_follow": {
-        "more": "Altro",
-        "who_to_follow": "Chi seguire"
-    },
-    "about": {
-        "mrf": {
-            "federation": "Federazione",
-            "keyword": {
-                "reject": "Rifiuta",
-                "replace": "Sostituisci",
-                "is_replaced_by": "→",
-                "keyword_policies": "Regole per parole chiave",
-                "ftl_removal": "Rimozione dalla sequenza globale"
-            },
-            "simple": {
-                "reject": "Rifiuta",
-                "accept": "Accetta",
-                "simple_policies": "Regole specifiche alla stanza",
-                "accept_desc": "Questa stanza accetta messaggi solo dalle seguenti stanze:",
-                "reject_desc": "Questa stanza non accetterà messaggi dalle stanze seguenti:",
-                "quarantine": "Quarantena",
-                "quarantine_desc": "Questa stanza inoltrerà solo messaggi pubblici alle seguenti stanze:",
-                "ftl_removal": "Rimozione dalla sequenza globale",
-                "ftl_removal_desc": "Questa stanza rimuove le seguenti stanze dalla sequenza globale:",
-                "media_removal": "Rimozione multimedia",
-                "media_removal_desc": "Questa istanza rimuove gli allegati dalle seguenti stanze:",
-                "media_nsfw": "Allegati oscurati forzatamente",
-                "media_nsfw_desc": "Questa stanza oscura gli allegati dei messaggi provenienti da queste stanze:"
-            },
-            "mrf_policies": "Regole RM abilitate",
-            "mrf_policies_desc": "Le regole RM cambiano il comportamento federativo della stanza. Vigono le seguenti regole:"
-        },
-        "staff": "Equipaggio"
-    },
-    "domain_mute_card": {
-        "mute": "Zittisci",
-        "mute_progress": "Zittisco…",
-        "unmute": "Ascolta",
-        "unmute_progress": "Procedo…"
-    },
-    "exporter": {
-        "export": "Esporta",
-        "processing": "In elaborazione, il tuo file sarà scaricabile a breve"
-    },
-    "image_cropper": {
-        "crop_picture": "Ritaglia immagine",
-        "save": "Salva",
-        "save_without_cropping": "Salva senza ritagliare",
-        "cancel": "Annulla"
-    },
-    "importer": {
-        "submit": "Invia",
-        "success": "Importato.",
-        "error": "L'importazione non è andata a buon fine."
-    },
-    "media_modal": {
-        "previous": "Precedente",
-        "next": "Prossimo"
-    },
-    "polls": {
-        "add_poll": "Sondaggio",
-        "add_option": "Alternativa",
-        "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",
-        "not_enough_options": "Aggiungi altre risposte"
-    },
-    "interactions": {
-        "favs_repeats": "Condivisi e preferiti",
-        "load_older": "Carica vecchie interazioni",
-        "moves": "Utenti migrati",
-        "follows": "Nuovi seguìti"
-    },
-    "emoji": {
-        "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",
-        "search_emoji": "Cerca un emoji",
-        "keep_open": "Tieni aperto il menù",
-        "emoji": "Emoji",
-        "stickers": "Adesivi"
-    },
-    "selectable_list": {
-        "select_all": "Seleziona tutto"
-    },
-    "remote_user_resolver": {
-        "error": "Non trovato.",
-        "searching_for": "Cerco",
-        "remote_user_resolver": "Cerca utenti remoti"
+    "enable_web_push_notifications": "Abilita notifiche web push",
+    "fun": "Divertimento",
+    "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.",
+    "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push",
+    "notification_setting_privacy": "Privacy",
+    "notification_setting_followers": "Utenti che ti seguono",
+    "notification_setting_non_followers": "Utenti che non ti seguono",
+    "notification_setting_non_follows": "Utenti che non segui",
+    "notification_setting_follows": "Utenti che segui",
+    "notification_setting": "Ricevi notifiche da:",
+    "notification_setting_filters": "Filtri",
+    "notifications": "Notifiche",
+    "greentext": "Frecce da meme",
+    "upload_a_photo": "Carica un'immagine",
+    "type_domains_to_mute": "Inserisci domini da zittire",
+    "theme_help_v2_2": "Le icone dietro alcuni elementi sono indicatori del contrasto fra testo e sfondo, passaci sopra col puntatore per ulteriori informazioni. Se si usano delle trasparenze, questi indicatori mostrano il peggior caso possibile.",
+    "theme_help_v2_1": "Puoi anche forzare colore ed opacità di alcuni elementi selezionando la casella. Usa il pulsante \"Azzera\" per azzerare tutte le forzature.",
+    "useStreamingApiWarning": "(Sconsigliato, sperimentale, può saltare messaggi)",
+    "useStreamingApi": "Ricevi messaggi e notifiche in tempo reale",
+    "user_mutes": "Utenti",
+    "post_status_content_type": "Tipo di contenuto dei messaggi",
+    "subject_line_noop": "Non copiare",
+    "subject_line_mastodon": "Come in Mastodon: copia tal quale",
+    "subject_line_email": "Come nelle email: \"re: oggetto\"",
+    "subject_line_behavior": "Copia oggetto quando rispondi",
+    "subject_input_always_show": "Mostra sempre il campo Oggetto",
+    "minimal_scopes_mode": "Riduci opzioni di visibilità",
+    "scope_copy": "Risposte ereditano la visibilità (messaggi privati lo fanno sempre)",
+    "search_user_to_mute": "Cerca utente da zittire",
+    "search_user_to_block": "Cerca utente da bloccare",
+    "autohide_floating_post_button": "Nascondi automaticamente il pulsante di composizione (mobile)",
+    "show_moderator_badge": "Mostra l'insegna di moderatore sulla mia pagina",
+    "show_admin_badge": "Mostra l'insegna di amministratore sulla mia pagina",
+    "hide_followers_count_description": "Non mostrare quanti seguaci ho",
+    "hide_follows_count_description": "Non mostrare quanti utenti seguo",
+    "hide_followers_description": "Non mostrare i miei seguaci",
+    "hide_follows_description": "Non mostrare chi seguo",
+    "no_mutes": "Nessun utente zittito",
+    "no_blocks": "Nessun utente bloccato",
+    "notification_visibility_emoji_reactions": "Reazioni",
+    "notification_visibility_moves": "Migrazioni utenti",
+    "new_email": "Nuova email",
+    "use_contain_fit": "Non ritagliare le anteprime degli allegati",
+    "play_videos_in_modal": "Riproduci video in un riquadro a sbalzo",
+    "mutes_tab": "Zittiti",
+    "interface": "Interfaccia",
+    "instance_default_simple": "(predefinito)",
+    "checkboxRadius": "Caselle di selezione",
+    "import_blocks_from_a_csv_file": "Importa blocchi da un file CSV",
+    "hide_filtered_statuses": "Nascondi messaggi filtrati",
+    "use_one_click_nsfw": "Apri media offuscati con un solo click",
+    "preload_images": "Precarica immagini",
+    "hide_isp": "Nascondi pannello della stanza",
+    "max_thumbnails": "Numero massimo di anteprime per messaggio",
+    "hide_muted_posts": "Nascondi messaggi degli utenti zittiti",
+    "accent": "Accento",
+    "emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
+    "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore",
+    "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più."
+  },
+  "timeline": {
+    "error_fetching": "Errore nell'aggiornamento",
+    "load_older": "Carica messaggi più vecchi",
+    "show_new": "Mostra nuovi",
+    "up_to_date": "Aggiornato",
+    "collapse": "Riduci",
+    "conversation": "Conversazione",
+    "no_retweet_hint": "Il messaggio è diretto o solo per seguaci e non può essere condiviso",
+    "repeated": "condiviso"
+  },
+  "user_card": {
+    "follow": "Segui",
+    "followees": "Chi stai seguendo",
+    "followers": "Seguaci",
+    "following": "Seguìto!",
+    "follows_you": "Ti segue!",
+    "mute": "Silenzia",
+    "muted": "Silenziato",
+    "per_day": "al giorno",
+    "statuses": "Messaggi",
+    "approve": "Approva",
+    "block": "Blocca",
+    "blocked": "Bloccato!",
+    "deny": "Nega",
+    "remote_follow": "Segui da remoto"
+  },
+  "chat": {
+    "title": "Chat"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Proxy multimedia",
+    "scope_options": "Opzioni visibilità",
+    "text_limit": "Lunghezza massima",
+    "title": "Caratteristiche",
+    "who_to_follow": "Chi seguire"
+  },
+  "finder": {
+    "error_fetching_user": "Errore nel recupero dell'utente",
+    "find_user": "Trova utente"
+  },
+  "login": {
+    "login": "Accedi",
+    "logout": "Disconnettiti",
+    "password": "Password",
+    "placeholder": "es. Lupo Lucio",
+    "register": "Registrati",
+    "username": "Nome utente",
+    "description": "Accedi con OAuth",
+    "hint": "Accedi per partecipare alla discussione",
+    "authentication_code": "Codice di autenticazione",
+    "enter_recovery_code": "Inserisci un codice di recupero",
+    "enter_two_factor_code": "Inserisci un codice two-factor",
+    "recovery_code": "Codice di recupero",
+    "heading": {
+      "totp": "Autenticazione two-factor",
+      "recovery": "Recupero two-factor"
     }
+  },
+  "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_link": "protetto",
+    "attachments_sensitive": "Nascondi gli allegati",
+    "content_type": {
+      "text/plain": "Testo normale",
+      "text/bbcode": "BBCode",
+      "text/markdown": "Markdown",
+      "text/html": "HTML"
+    },
+    "content_warning": "Oggetto (facoltativo)",
+    "default": "Sono appena atterrato a Fiumicino.",
+    "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
+    "posting": "Sto pubblicando",
+    "scope": {
+      "direct": "Diretto - Visibile solo agli utenti menzionati",
+      "private": "Solo per seguaci - Visibile solo dai tuoi seguaci",
+      "public": "Pubblico - Visibile sulla sequenza pubblica",
+      "unlisted": "Non elencato - Non visibile sulla sequenza pubblica"
+    },
+    "scope_notice": {
+      "unlisted": "Questo messaggio non sarà visibile sulla sequenza locale né su quella pubblica",
+      "private": "Questo messaggio sarà visibile solo ai tuoi seguaci",
+      "public": "Questo messaggio sarà visibile a tutti"
+    },
+    "direct_warning_to_first_only": "Questo messaggio sarà visibile solo agli utenti menzionati all'inizio.",
+    "direct_warning_to_all": "Questo messaggio sarà visibile a tutti i menzionati.",
+    "new_status": "Nuovo messaggio"
+  },
+  "registration": {
+    "bio": "Introduzione",
+    "email": "Email",
+    "fullname": "Nome visualizzato",
+    "password_confirm": "Conferma password",
+    "registration": "Registrazione",
+    "token": "Codice d'invito",
+    "validations": {
+      "password_confirmation_match": "dovrebbe essere uguale alla password",
+      "password_confirmation_required": "non può essere vuoto",
+      "password_required": "non può essere vuoto",
+      "email_required": "non può essere vuoto",
+      "fullname_required": "non può essere vuoto",
+      "username_required": "non può essere vuoto"
+    },
+    "bio_placeholder": "es.\nCiao, sono Lupo Lucio.\nSono un lupo fantastico che vive nel Fantabosco. Forse mi hai visto alla Melevisione.",
+    "fullname_placeholder": "es. Lupo Lucio",
+    "username_placeholder": "es. mister_wolf",
+    "new_captcha": "Clicca l'immagine per avere un altro captcha",
+    "captcha": "CAPTCHA"
+  },
+  "user_profile": {
+    "timeline_title": "Sequenza dell'Utente"
+  },
+  "who_to_follow": {
+    "more": "Altro",
+    "who_to_follow": "Chi seguire"
+  },
+  "about": {
+    "mrf": {
+      "federation": "Federazione",
+      "keyword": {
+        "reject": "Rifiuta",
+        "replace": "Sostituisci",
+        "is_replaced_by": "→",
+        "keyword_policies": "Regole per parole chiave",
+        "ftl_removal": "Rimozione dalla sequenza globale"
+      },
+      "simple": {
+        "reject": "Rifiuta",
+        "accept": "Accetta",
+        "simple_policies": "Regole specifiche alla stanza",
+        "accept_desc": "Questa stanza accetta messaggi solo dalle seguenti stanze:",
+        "reject_desc": "Questa stanza non accetterà messaggi dalle stanze seguenti:",
+        "quarantine": "Quarantena",
+        "quarantine_desc": "Questa stanza inoltrerà solo messaggi pubblici alle seguenti stanze:",
+        "ftl_removal": "Rimozione dalla sequenza globale",
+        "ftl_removal_desc": "Questa stanza rimuove le seguenti stanze dalla sequenza globale:",
+        "media_removal": "Rimozione multimedia",
+        "media_removal_desc": "Questa istanza rimuove gli allegati dalle seguenti stanze:",
+        "media_nsfw": "Allegati oscurati forzatamente",
+        "media_nsfw_desc": "Questa stanza oscura gli allegati dei messaggi provenienti da queste stanze:"
+      },
+      "mrf_policies": "Regole RM abilitate",
+      "mrf_policies_desc": "Le regole RM cambiano il comportamento federativo della stanza. Vigono le seguenti regole:"
+    },
+    "staff": "Equipaggio"
+  },
+  "domain_mute_card": {
+    "mute": "Zittisci",
+    "mute_progress": "Zittisco…",
+    "unmute": "Ascolta",
+    "unmute_progress": "Procedo…"
+  },
+  "exporter": {
+    "export": "Esporta",
+    "processing": "In elaborazione, il tuo file sarà scaricabile a breve"
+  },
+  "image_cropper": {
+    "crop_picture": "Ritaglia immagine",
+    "save": "Salva",
+    "save_without_cropping": "Salva senza ritagliare",
+    "cancel": "Annulla"
+  },
+  "importer": {
+    "submit": "Invia",
+    "success": "Importato.",
+    "error": "L'importazione non è andata a buon fine."
+  },
+  "media_modal": {
+    "previous": "Precedente",
+    "next": "Prossimo"
+  },
+  "polls": {
+    "add_poll": "Sondaggio",
+    "add_option": "Alternativa",
+    "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",
+    "not_enough_options": "Aggiungi altre risposte"
+  },
+  "interactions": {
+    "favs_repeats": "Condivisi e preferiti",
+    "load_older": "Carica vecchie interazioni",
+    "moves": "Utenti migrati",
+    "follows": "Nuovi seguìti"
+  },
+  "emoji": {
+    "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",
+    "search_emoji": "Cerca un emoji",
+    "keep_open": "Tieni aperto il menù",
+    "emoji": "Emoji",
+    "stickers": "Adesivi"
+  },
+  "selectable_list": {
+    "select_all": "Seleziona tutto"
+  },
+  "remote_user_resolver": {
+    "error": "Non trovato.",
+    "searching_for": "Cerco",
+    "remote_user_resolver": "Cerca utenti remoti"
+  }
 }
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 243e9ab9..af728b6e 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -1,747 +1,747 @@
 {
-    "chat": {
-        "title": "Chat"
-    },
-    "features_panel": {
-        "chat": "Chat",
-        "gopher": "Gopher",
-        "media_proxy": "Media proxy",
-        "scope_options": "Zichtbaarheidsopties",
-        "text_limit": "Tekst limiet",
-        "title": "Kenmerken",
-        "who_to_follow": "Wie te volgen"
-    },
-    "finder": {
-        "error_fetching_user": "Fout tijdens ophalen gebruiker",
-        "find_user": "Gebruiker zoeken"
-    },
-    "general": {
-        "apply": "Toepassen",
-        "submit": "Verzend",
-        "more": "Meer",
-        "optional": "optioneel",
-        "show_more": "Bekijk meer",
-        "show_less": "Bekijk minder",
-        "dismiss": "Opheffen",
-        "cancel": "Annuleren",
-        "disable": "Uitschakelen",
-        "enable": "Inschakelen",
-        "confirm": "Bevestigen",
-        "verify": "Verifiëren",
-        "generic_error": "Er is een fout opgetreden"
-    },
-    "login": {
-        "login": "Log in",
-        "description": "Log in met OAuth",
-        "logout": "Uitloggen",
-        "password": "Wachtwoord",
-        "placeholder": "bijv. lain",
-        "register": "Registreren",
-        "username": "Gebruikersnaam",
-        "hint": "Log in om deel te nemen aan de discussie",
-        "authentication_code": "Authenticatie code",
-        "enter_recovery_code": "Voer een herstelcode in",
-        "enter_two_factor_code": "Voer een twee-factor code in",
-        "recovery_code": "Herstelcode",
-        "heading": {
-            "totp": "Twee-factor authenticatie",
-            "recovery": "Twee-factor herstelling"
-        }
-    },
-    "nav": {
-        "about": "Over",
-        "back": "Terug",
-        "chat": "Lokale Chat",
-        "friend_requests": "Volgverzoeken",
-        "mentions": "Vermeldingen",
-        "dms": "Directe Berichten",
-        "public_tl": "Publieke Tijdlijn",
-        "timeline": "Tijdlijn",
-        "twkn": "Het Geheel Bekende Netwerk",
-        "user_search": "Gebruiker Zoeken",
-        "who_to_follow": "Wie te volgen",
-        "preferences": "Voorkeuren",
-        "administration": "Administratie",
-        "search": "Zoeken",
-        "interactions": "Interacties"
-    },
-    "notifications": {
-        "broken_favorite": "Onbekende status, aan het zoeken…",
-        "favorited_you": "vond je status leuk",
-        "followed_you": "volgt jou",
-        "load_older": "Laad oudere meldingen",
-        "notifications": "Meldingen",
-        "read": "Gelezen!",
-        "repeated_you": "Herhaalde je status",
-        "no_more_notifications": "Geen meldingen meer",
-        "migrated_to": "is gemigreerd naar",
-        "follow_request": "wil je volgen",
-        "reacted_with": "reageerde met {0}"
-    },
-    "post_status": {
-        "new_status": "Nieuwe status plaatsen",
-        "account_not_locked_warning": "Je account is niet {0}. Iedereen kan je volgen om je alleen-volgers berichten te lezen.",
-        "account_not_locked_warning_link": "gesloten",
-        "attachments_sensitive": "Markeer bijlagen als gevoelig",
-        "content_type": {
-            "text/plain": "Platte tekst",
-            "text/html": "HTML",
-            "text/markdown": "Markdown",
-            "text/bbcode": "BBCode"
-        },
-        "content_warning": "Onderwerp (optioneel)",
-        "default": "Zojuist geland in L.A.",
-        "direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
-        "posting": "Plaatsen",
-        "scope": {
-            "direct": "Direct - Post enkel naar vermelde gebruikers",
-            "private": "Enkel volgers - Post enkel naar volgers",
-            "public": "Publiek - Post op publieke tijdlijnen",
-            "unlisted": "Niet Vermelden - Niet tonen op publieke tijdlijnen"
-        },
-        "direct_warning_to_all": "Dit bericht zal zichtbaar zijn voor alle vermelde gebruikers.",
-        "direct_warning_to_first_only": "Dit bericht zal alleen zichtbaar zijn voor de vermelde gebruikers aan het begin van het bericht.",
-        "scope_notice": {
-            "public": "Dit bericht zal voor iedereen zichtbaar zijn",
-            "unlisted": "Dit bericht zal niet zichtbaar zijn in de Publieke Tijdlijn en Het Geheel Bekende Netwerk",
-            "private": "Dit bericht zal voor alleen je volgers zichtbaar zijn"
-        }
-    },
-    "registration": {
-        "bio": "Bio",
-        "email": "Email",
-        "fullname": "Weergave naam",
-        "password_confirm": "Wachtwoord bevestiging",
-        "registration": "Registratie",
-        "token": "Uitnodigings-token",
-        "captcha": "CAPTCHA",
-        "new_captcha": "Klik op de afbeelding voor een nieuwe captcha",
-        "validations": {
-            "username_required": "moet ingevuld zijn",
-            "fullname_required": "moet ingevuld zijn",
-            "email_required": "moet ingevuld zijn",
-            "password_required": "moet ingevuld zijn",
-            "password_confirmation_required": "moet ingevuld zijn",
-            "password_confirmation_match": "komt niet overeen met het wachtwoord"
-        },
-        "username_placeholder": "bijv. lain",
-        "fullname_placeholder": "bijv. Lain Iwakura",
-        "bio_placeholder": "bijv.\nHallo, ik ben Lain.\nIk ben een anime meisje woonachtig in een buitenwijk in Japan. Je kent me misschien van the Wired."
-    },
-    "settings": {
-        "attachmentRadius": "Bijlages",
-        "attachments": "Bijlages",
-        "autoload": "Automatisch laden inschakelen wanneer tot de bodem gescrold wordt",
-        "avatar": "Avatar",
-        "avatarAltRadius": "Avatars (Meldingen)",
-        "avatarRadius": "Avatars",
-        "background": "Achtergrond",
-        "bio": "Bio",
-        "btnRadius": "Knoppen",
-        "cBlue": "Blauw (Beantwoorden, volgen)",
-        "cGreen": "Groen (Herhalen)",
-        "cOrange": "Oranje (Favoriet)",
-        "cRed": "Rood (Annuleren)",
-        "change_password": "Wachtwoord Wijzigen",
-        "change_password_error": "Er is een fout opgetreden bij het wijzigen van je wachtwoord.",
-        "changed_password": "Wachtwoord succesvol gewijzigd!",
-        "collapse_subject": "Klap berichten met een onderwerp in",
-        "composing": "Opstellen",
-        "confirm_new_password": "Nieuw wachtwoord bevestigen",
-        "current_avatar": "Je huidige avatar",
-        "current_password": "Huidig wachtwoord",
-        "current_profile_banner": "Je huidige profiel banner",
-        "data_import_export_tab": "Data Import / Export",
-        "default_vis": "Standaard zichtbaarheidsbereik",
-        "delete_account": "Account Verwijderen",
-        "delete_account_description": "Permanent je gegevens verwijderen en account deactiveren.",
-        "delete_account_error": "Er is een fout opgetreden bij het verwijderen van je account. Indien dit probleem zich voor blijft doen, neem dan contact op met de beheerder van deze instantie.",
-        "delete_account_instructions": "Voer je wachtwoord in het onderstaande invoerveld in om het verwijderen van je account te bevestigen.",
-        "export_theme": "Preset opslaan",
-        "filtering": "Filtering",
-        "filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn",
-        "follow_export": "Volgers exporteren",
-        "follow_export_button": "Exporteer je volgers naar een csv bestand",
-        "follow_export_processing": "Aan het verwerken, binnen enkele ogenblikken wordt je gevraagd je bestand te downloaden",
-        "follow_import": "Volgers importeren",
-        "follow_import_error": "Fout bij importeren volgers",
-        "follows_imported": "Volgers geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
-        "foreground": "Voorgrond",
-        "general": "Algemeen",
-        "hide_attachments_in_convo": "Verberg bijlages in conversaties",
-        "hide_attachments_in_tl": "Verberg bijlages in de tijdlijn",
-        "hide_isp": "Verberg instantie-specifiek paneel",
-        "preload_images": "Afbeeldingen vooraf laden",
-        "hide_post_stats": "Verberg bericht statistieken (bijv. het aantal favorieten)",
-        "hide_user_stats": "Verberg bericht statistieken (bijv. het aantal volgers)",
-        "import_followers_from_a_csv_file": "Importeer volgers uit een csv bestand",
-        "import_theme": "Preset laden",
-        "inputRadius": "Invoervelden",
-        "checkboxRadius": "Checkboxen",
-        "instance_default": "(standaard: {value})",
-        "instance_default_simple": "(standaard)",
-        "interface": "Interface",
-        "interfaceLanguage": "Interface taal",
-        "invalid_theme_imported": "Het geselecteerde bestand is geen door Pleroma ondersteund thema. Er zijn geen aanpassingen gedaan.",
-        "limited_availability": "Niet beschikbaar in je browser",
-        "links": "Links",
-        "lock_account_description": "Laat volgers enkel toe na expliciete toestemming",
-        "loop_video": "Herhaal video's",
-        "loop_video_silent_only": "Herhaal enkel video's zonder geluid (bijv. Mastodon's \"gifs\")",
-        "name": "Naam",
-        "name_bio": "Naam & Bio",
-        "new_password": "Nieuw wachtwoord",
-        "notification_visibility": "Type meldingen die getoond worden",
-        "notification_visibility_follows": "Volgingen",
-        "notification_visibility_likes": "Vind-ik-leuks",
-        "notification_visibility_mentions": "Vermeldingen",
-        "notification_visibility_repeats": "Herhalingen",
-        "no_rich_text_description": "Verwijder rich text formattering van alle berichten",
-        "hide_network_description": "Toon niet wie mij volgt en wie ik volg.",
-        "nsfw_clickthrough": "Doorklikbaar verbergen van gevoelige bijlages inschakelen",
-        "oauth_tokens": "OAuth-tokens",
-        "token": "Token",
-        "refresh_token": "Token Vernieuwen",
-        "valid_until": "Geldig tot",
-        "revoke_token": "Intrekken",
-        "panelRadius": "Panelen",
-        "pause_on_unfocused": "Streamen pauzeren wanneer de tab niet in focus is",
-        "presets": "Presets",
-        "profile_background": "Profiel Achtergrond",
-        "profile_banner": "Profiel Banner",
-        "profile_tab": "Profiel",
-        "radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
-        "replies_in_timeline": "Antwoorden in tijdlijn",
-        "reply_link_preview": "Antwoord-link weergave inschakelen bij aanwijzen met muisaanwijzer",
-        "reply_visibility_all": "Alle antwoorden tonen",
-        "reply_visibility_following": "Enkel antwoorden tonen die aan mij of gevolgde gebruikers gericht zijn",
-        "reply_visibility_self": "Enkel antwoorden tonen die aan mij gericht zijn",
-        "saving_err": "Fout tijdens opslaan van instellingen",
-        "saving_ok": "Instellingen opgeslagen",
-        "security_tab": "Beveiliging",
-        "scope_copy": "Neem bereik over bij beantwoorden (Directe Berichten blijven altijd Direct)",
-        "set_new_avatar": "Nieuwe avatar instellen",
-        "set_new_profile_background": "Nieuwe profiel achtergrond instellen",
-        "set_new_profile_banner": "Nieuwe profiel banner instellen",
-        "settings": "Instellingen",
-        "subject_input_always_show": "Altijd onderwerpveld tonen",
-        "subject_line_behavior": "Onderwerp kopiëren bij antwoorden",
-        "subject_line_email": "Zoals email: \"re: onderwerp\"",
-        "subject_line_mastodon": "Zoals mastodon: kopieer zoals het is",
-        "subject_line_noop": "Niet kopiëren",
-        "stop_gifs": "GIFs afspelen bij zweven",
-        "streaming": "Automatisch streamen van nieuwe berichten inschakelen wanneer tot boven gescrold is",
-        "text": "Tekst",
-        "theme": "Thema",
-        "theme_help": "Gebruik hex color codes (#rrggbb) om je kleurschema te wijzigen.",
-        "theme_help_v2_1": "Je kan ook de kleur en transparantie van bepaalde componenten overschrijven door de checkbox aan te vinken, gebruik de \"Alles wissen\" knop om alle overschrijvingen te annuleren.",
-        "theme_help_v2_2": "Iconen onder sommige onderdelen zijn achtergrond/tekst contrast indicatoren, zweef er over voor gedetailleerde info. Hou er rekening mee dat bij doorzichtigheid de ergst mogelijke situatie wordt weer gegeven.",
-        "tooltipRadius": "Tooltips/alarmen",
-        "user_settings": "Gebruikersinstellingen",
-        "values": {
-            "false": "nee",
-            "true": "ja"
-        },
-        "notifications": "Meldingen",
-        "enable_web_push_notifications": "Web push meldingen inschakelen",
-        "style": {
-            "switcher": {
-                "keep_color": "Kleuren behouden",
-                "keep_shadows": "Schaduwen behouden",
-                "keep_opacity": "Transparantie behouden",
-                "keep_roundness": "Rondingen behouden",
-                "keep_fonts": "Lettertypes behouden",
-                "save_load_hint": "\"Behoud\" opties behouden de momenteel ingestelde opties bij het selecteren of laden van thema's, maar slaan ook de genoemde opties op bij het exporteren van een thema. Wanneer alle selectievakjes zijn uitgeschakeld, zal het exporteren van thema's alles opslaan.",
-                "reset": "Reset",
-                "clear_all": "Alles wissen",
-                "clear_opacity": "Transparantie wissen",
-                "keep_as_is": "Hou zoals het is",
-                "use_snapshot": "Oude versie",
-                "use_source": "Nieuwe versie",
-                "help": {
-                    "future_version_imported": "Het geïmporteerde bestand is gemaakt voor een nieuwere versie van FE.",
-                    "older_version_imported": "Het geïmporteerde bestand is gemaakt voor een oudere versie van FE.",
-                    "upgraded_from_v2": "PleromaFE is bijgewerkt, het thema kan iets anders uitzien dan dat je gewend bent.",
-                    "v2_imported": "Het geïmporteerde bestand is gemaakt voor een oudere FE. We proberen compatibiliteit te maximaliseren, maar het kan toch voorkomen dat er inconsistenties zijn.",
-                    "snapshot_source_mismatch": "Versie conflict: waarschijnlijk was FE terug gerold en opnieuw bijgewerkt, indien je het thema aangepast hebt met de oudere versie van FE wil je waarschijnlijk de oude versie gebruiken, gebruik anders de nieuwe versie.",
-                    "migration_napshot_gone": "Voor een onduidelijke reden mist de momentopname, dus sommige dingen kunnen anders uitzien dan je gewend bent.",
-                    "migration_snapshot_ok": "Voor de zekerheid is een momentopname van het thema geladen. Je kunt proberen om de thema gegevens te laden.",
-                    "fe_downgraded": "PleromaFE's versie is terug gerold.",
-                    "fe_upgraded": "De thema-engine van PleromaFE is bijgewerkt na de versie update.",
-                    "snapshot_missing": "Het bestand bevat geen thema momentopname, dus het thema kan anders uitzien dan je oorspronkelijk bedacht had.",
-                    "snapshot_present": "Thema momentopname is geladen, alle waarden zijn overschreven. Je kunt in plaats daarvan ook de daadwerkelijke data van het thema laden."
-                },
-                "load_theme": "Thema laden"
-            },
-            "common": {
-                "color": "Kleur",
-                "opacity": "Transparantie",
-                "contrast": {
-                    "hint": "Contrast verhouding is {ratio}, {level} {context}",
-                    "level": {
-                        "aa": "voldoet aan de richtlijn van niveau AA (minimum)",
-                        "aaa": "voldoet aan de richtlijn van niveau AAA (aangeraden)",
-                        "bad": "voldoet aan geen enkele toegankelijkheidsrichtlijn"
-                    },
-                    "context": {
-                        "18pt": "voor grote (18pt+) tekst",
-                        "text": "voor tekst"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Algemeen",
-                "main": "Algemene kleuren",
-                "foreground_hint": "Zie \"Geavanceerd\" tab voor meer gedetailleerde controle",
-                "rgbo": "Iconen, accenten, badges"
-            },
-            "advanced_colors": {
-                "_tab_label": "Geavanceerd",
-                "alert": "Alarm achtergrond",
-                "alert_error": "Fout",
-                "badge": "Badge achtergrond",
-                "badge_notification": "Meldingen",
-                "panel_header": "Paneel koptekst",
-                "top_bar": "Top balk",
-                "borders": "Randen",
-                "buttons": "Knoppen",
-                "inputs": "Invoervelden",
-                "faint_text": "Vervaagde tekst",
-                "tabs": "Tabbladen",
-                "toggled": "Geschakeld",
-                "disabled": "Uitgeschakeld",
-                "selectedMenu": "Geselecteerd menu item",
-                "selectedPost": "Geselecteerd bericht",
-                "pressed": "Ingedrukt",
-                "highlight": "Gemarkeerde elementen",
-                "icons": "Iconen",
-                "poll": "Poll grafiek",
-                "underlay": "Onderlaag",
-                "popover": "Tooltips, menu's, popovers",
-                "post": "Berichten / Gebruiker bios",
-                "alert_neutral": "Neutraal",
-                "alert_warning": "Waarschuwing"
-            },
-            "radii": {
-                "_tab_label": "Rondheid"
-            },
-            "shadows": {
-                "_tab_label": "Schaduw en belichting",
-                "component": "Onderdeel",
-                "override": "Overschrijven",
-                "shadow_id": "Schaduw #{value}",
-                "blur": "Vervagen",
-                "spread": "Spreiding",
-                "inset": "Inzet",
-                "hint": "Voor schaduw kan je ook --variable gebruiken als een kleur waarde om CSS3 variabelen te gebruiken. Houd er rekening mee dat het instellen van opaciteit in dit geval niet werkt.",
-                "filter_hint": {
-                    "always_drop_shadow": "Waarschuwing, deze schaduw gebruikt altijd {0} als de browser dit ondersteund.",
-                    "drop_shadow_syntax": "{0} ondersteund niet de {1} parameter en {2} sleutelwoord.",
-                    "avatar_inset": "Houdt er rekening mee dat het combineren van zowel inzet and niet-inzet schaduwen op transparante avatars onverwachte resultaten kan opleveren.",
-                    "spread_zero": "Schaduw met spreiding > 0 worden weergegeven alsof ze op nul staan",
-                    "inset_classic": "Inzet schaduw zal {0} gebruiken"
-                },
-                "components": {
-                    "panel": "Paneel",
-                    "panelHeader": "Paneel koptekst",
-                    "topBar": "Top balk",
-                    "avatar": "Gebruikers avatar (in profiel weergave)",
-                    "avatarStatus": "Gebruikers avatar (in bericht weergave)",
-                    "popup": "Popups en tooltips",
-                    "button": "Knop",
-                    "buttonHover": "Knop (zweven)",
-                    "buttonPressed": "Knop (ingedrukt)",
-                    "buttonPressedHover": "Knop (ingedrukt+zweven)",
-                    "input": "Invoerveld"
-                },
-                "hintV3": "Voor schaduwen kun je ook de {0} notatie gebruiken om de andere kleur invoer te gebruiken."
-            },
-            "fonts": {
-                "_tab_label": "Lettertypes",
-                "help": "Selecteer het lettertype om te gebruiken voor elementen van de UI. Voor \"aangepast\" dien je de exacte naam van het lettertype in te voeren zoals die in het systeem wordt weergegeven.",
-                "components": {
-                    "interface": "Interface",
-                    "input": "Invoervelden",
-                    "post": "Bericht tekst",
-                    "postCode": "Monospaced tekst in een bericht (rich text)"
-                },
-                "family": "Lettertype naam",
-                "size": "Grootte (in px)",
-                "weight": "Gewicht (dikgedruktheid)",
-                "custom": "Aangepast"
-            },
-            "preview": {
-                "header": "Voorvertoning",
-                "content": "Inhoud",
-                "error": "Voorbeeld fout",
-                "button": "Knop",
-                "text": "Nog een boel andere {0} en {1}",
-                "mono": "inhoud",
-                "input": "Zojuist geland in L.A.",
-                "faint_link": "handige gebruikershandleiding",
-                "fine_print": "Lees onze {0} om niets nuttig te leren!",
-                "header_faint": "Alles komt goed",
-                "checkbox": "Ik heb de gebruikersvoorwaarden gelezen",
-                "link": "een leuke kleine link"
-            }
-        },
-        "notification_setting_follows": "Gebruikers die je volgt",
-        "notification_setting_non_follows": "Gebruikers die je niet volgt",
-        "notification_setting_followers": "Gebruikers die je volgen",
-        "notification_setting_privacy": "Privacy",
-        "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
-        "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
-        "app_name": "App naam",
-        "security": "Beveiliging",
-        "enter_current_password_to_confirm": "Voer je huidige wachtwoord in om je identiteit te bevestigen",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "OTP instellen",
-            "wait_pre_setup_otp": "OTP voorinstellen",
-            "confirm_and_enable": "Bevestig en schakel OTP in",
-            "title": "Twee-factor Authenticatie",
-            "generate_new_recovery_codes": "Genereer nieuwe herstelcodes",
-            "recovery_codes": "Herstelcodes.",
-            "waiting_a_recovery_codes": "Backup codes ontvangen…",
-            "authentication_methods": "Authenticatie methodes",
-            "scan": {
-                "title": "Scannen",
-                "desc": "Scan de QR code of voer een sleutel in met je twee-factor applicatie:",
-                "secret_code": "Sleutel"
-            },
-            "verify": {
-                "desc": "Voer de code van je twee-factor applicatie in om twee-factor authenticatie in te schakelen:"
-            },
-            "warning_of_generate_new_codes": "Wanneer je nieuwe herstelcodes genereert, zullen je oude code niet langer werken.",
-            "recovery_codes_warning": "Schrijf de codes op of sla ze op een veilige locatie op - anders kun je ze niet meer inzien. Als je toegang tot je 2FA app en herstelcodes verliest, zal je buitengesloten zijn uit je account."
-        },
-        "allow_following_move": "Automatisch volgen toestaan wanneer een gevolgd account migreert",
-        "block_export": "Blokkades exporteren",
-        "block_import": "Blokkades importeren",
-        "blocks_imported": "Blokkades geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
-        "blocks_tab": "Blokkades",
-        "change_email": "Email wijzigen",
-        "change_email_error": "Er is een fout opgetreden tijdens het wijzigen van je email.",
-        "changed_email": "Email succesvol gewijzigd!",
-        "domain_mutes": "Domeinen",
-        "avatar_size_instruction": "De aangeraden minimale afmeting voor avatar afbeeldingen is 150x150 pixels.",
-        "pad_emoji": "Vul emoji aan met spaties wanneer deze met de picker ingevoegd worden",
-        "emoji_reactions_on_timeline": "Toon emoji reacties op de tijdlijn",
-        "accent": "Accent",
-        "hide_muted_posts": "Verberg berichten van genegeerde gebruikers",
-        "max_thumbnails": "Maximaal aantal miniaturen per bericht",
-        "use_one_click_nsfw": "Open gevoelige bijlagen met slechts één klik",
-        "hide_filtered_statuses": "Gefilterde statussen verbergen",
-        "import_blocks_from_a_csv_file": "Importeer blokkades van een csv bestand",
-        "mutes_tab": "Negeringen",
-        "play_videos_in_modal": "Speel video's af in een popup frame",
-        "new_email": "Nieuwe Email",
-        "notification_visibility_emoji_reactions": "Reacties",
-        "no_blocks": "Geen blokkades",
-        "no_mutes": "Geen negeringen",
-        "hide_followers_description": "Niet tonen wie mij volgt",
-        "hide_followers_count_description": "Niet mijn volgers aantal tonen",
-        "hide_follows_count_description": "Niet mijn gevolgde aantal tonen",
-        "show_admin_badge": "Beheerders badge tonen in mijn profiel",
-        "autohide_floating_post_button": "Nieuw Bericht knop automatisch verbergen (mobiel)",
-        "search_user_to_block": "Zoek wie je wilt blokkeren",
-        "search_user_to_mute": "Zoek wie je wilt negeren",
-        "minimal_scopes_mode": "Bericht bereik-opties minimaliseren",
-        "post_status_content_type": "Bericht status content type",
-        "user_mutes": "Gebruikers",
-        "useStreamingApi": "Berichten en meldingen in real-time ontvangen",
-        "useStreamingApiWarning": "(Afgeraden, experimenteel, kan berichten overslaan)",
-        "type_domains_to_mute": "Voer domeinen in om te negeren",
-        "upload_a_photo": "Upload een foto",
-        "fun": "Plezier",
-        "greentext": "Meme pijlen",
-        "notification_setting": "Ontvang meldingen van:",
-        "block_export_button": "Exporteer je geblokkeerde gebruikers naar een csv bestand",
-        "block_import_error": "Fout bij importeren blokkades",
-        "discoverable": "Sta toe dat dit account ontdekt kan worden in zoekresultaten en andere diensten",
-        "use_contain_fit": "Snij bijlage in miniaturen niet bij",
-        "notification_visibility_moves": "Gebruiker Migraties",
-        "hide_follows_description": "Niet tonen wie ik volg",
-        "show_moderator_badge": "Moderators badge tonen in mijn profiel",
-        "notification_setting_filters": "Filters",
-        "notification_setting_non_followers": "Gebruikers die je niet volgen",
-        "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
-        "version": {
-            "frontend_version": "Frontend Versie",
-            "backend_version": "Backend Versie",
-            "title": "Versie"
-        }
-    },
-    "timeline": {
-        "collapse": "Inklappen",
-        "conversation": "Conversatie",
-        "error_fetching": "Fout bij ophalen van updates",
-        "load_older": "Oudere statussen laden",
-        "no_retweet_hint": "Bericht is gemarkeerd als enkel volgers of direct en kan niet worden herhaald",
-        "repeated": "herhaalde",
-        "show_new": "Nieuwe tonen",
-        "up_to_date": "Up-to-date",
-        "no_statuses": "Geen statussen",
-        "no_more_statuses": "Geen statussen meer"
-    },
-    "user_card": {
-        "approve": "Goedkeuren",
-        "block": "Blokkeren",
-        "blocked": "Geblokkeerd!",
-        "deny": "Weigeren",
-        "favorites": "Favorieten",
-        "follow": "Volgen",
-        "follow_sent": "Aanvraag verzonden!",
-        "follow_progress": "Aanvragen…",
-        "follow_again": "Aanvraag opnieuw zenden?",
-        "follow_unfollow": "Stop volgen",
-        "followees": "Aan het volgen",
-        "followers": "Volgers",
-        "following": "Aan het volgen!",
-        "follows_you": "Volgt jou!",
-        "its_you": "'t is jij!",
-        "mute": "Negeren",
-        "muted": "Genegeerd",
-        "per_day": "per dag",
-        "remote_follow": "Volg vanop afstand",
-        "statuses": "Statussen",
-        "admin_menu": {
-            "delete_user_confirmation": "Weet je het heel zeker? Deze uitvoering kan niet ongedaan worden gemaakt.",
-            "delete_user": "Gebruiker verwijderen",
-            "quarantine": "Federeren van gebruikers berichten verbieden",
-            "disable_any_subscription": "Volgen van gebruiker in zijn geheel verbieden",
-            "disable_remote_subscription": "Volgen van gebruiker vanaf andere instanties verbieden",
-            "sandbox": "Berichten forceren om alleen voor volgers zichtbaar te zijn",
-            "force_unlisted": "Berichten forceren om niet publiekelijk getoond te worden",
-            "strip_media": "Media van berichten verwijderen",
-            "force_nsfw": "Alle berichten als gevoelig markeren",
-            "delete_account": "Account verwijderen",
-            "deactivate_account": "Account deactiveren",
-            "activate_account": "Account activeren",
-            "revoke_moderator": "Moderatorsrechten intrekken",
-            "grant_moderator": "Moderatorsrechten toekennen",
-            "revoke_admin": "Beheerdersrechten intrekken",
-            "grant_admin": "Beheerdersrechten toekennen",
-            "moderation": "Moderatie"
-        },
-        "show_repeats": "Herhalingen tonen",
-        "hide_repeats": "Herhalingen verbergen",
-        "mute_progress": "Negeren…",
-        "unmute_progress": "Negering opheffen…",
-        "unmute": "Negering opheffen",
-        "block_progress": "Blokkeren…",
-        "unblock_progress": "Blokkade opheffen…",
-        "unblock": "Blokkade opheffen",
-        "unsubscribe": "Abonnement opzeggen",
-        "subscribe": "Abonneren",
-        "report": "Aangeven",
-        "mention": "Vermelding",
-        "media": "Media",
-        "hidden": "Verborgen"
-    },
-    "user_profile": {
-        "timeline_title": "Gebruikers Tijdlijn",
-        "profile_loading_error": "Sorry, er is een fout opgetreden bij het laden van dit profiel.",
-        "profile_does_not_exist": "Sorry, dit profiel bestaat niet."
-    },
-    "who_to_follow": {
-        "more": "Meer",
-        "who_to_follow": "Wie te volgen"
-    },
-    "tool_tip": {
-        "media_upload": "Media Uploaden",
-        "repeat": "Herhalen",
-        "reply": "Beantwoorden",
-        "favorite": "Favoriet maken",
-        "user_settings": "Gebruikers Instellingen",
-        "reject_follow_request": "Volg-verzoek afwijzen",
-        "accept_follow_request": "Volg-aanvraag accepteren",
-        "add_reaction": "Reactie toevoegen"
-    },
-    "upload": {
-        "error": {
-            "base": "Upload mislukt.",
-            "file_too_big": "Bestand is te groot [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Probeer het later opnieuw"
-        },
-        "file_size_units": {
-            "B": "B",
-            "KiB": "KiB",
-            "MiB": "MiB",
-            "GiB": "GiB",
-            "TiB": "TiB"
-        }
-    },
-    "about": {
-        "mrf": {
-            "federation": "Federatie",
-            "keyword": {
-                "reject": "Afwijzen",
-                "replace": "Vervangen",
-                "is_replaced_by": "→",
-                "keyword_policies": "Zoekwoord Beleid",
-                "ftl_removal": "Verwijdering van \"Het Geheel Bekende Netwerk\" Tijdlijn"
-            },
-            "mrf_policies_desc": "MRF regels beïnvloeden het federatie gedrag van de instantie. De volgende regels zijn ingeschakeld:",
-            "mrf_policies": "Ingeschakelde MRF Regels",
-            "simple": {
-                "simple_policies": "Instantie-specifieke Regels",
-                "accept": "Accepteren",
-                "accept_desc": "Deze instantie accepteert alleen berichten van de volgende instanties:",
-                "reject": "Afwijzen",
-                "reject_desc": "Deze instantie zal geen berichten accepteren van de volgende instanties:",
-                "quarantine": "Quarantaine",
-                "quarantine_desc": "Deze instantie zal alleen publieke berichten sturen naar de volgende instanties:",
-                "ftl_removal_desc": "Deze instantie verwijdert de volgende instanties van \"Het Geheel Bekende Netwerk\" tijdlijn:",
-                "media_removal_desc": "Deze instantie verwijdert media van berichten van de volgende instanties:",
-                "media_nsfw_desc": "Deze instantie stelt media in als gevoelig in berichten van de volgende instanties:",
-                "ftl_removal": "Verwijderen van \"Het Geheel Bekende Netwerk\" Tijdlijn",
-                "media_removal": "Media Verwijdering",
-                "media_nsfw": "Forceer Media als Gevoelig"
-            }
-        },
-        "staff": "Personeel"
-    },
-    "domain_mute_card": {
-        "mute": "Negeren",
-        "mute_progress": "Negeren…",
-        "unmute": "Negering opheffen",
-        "unmute_progress": "Negering wordt opgeheven…"
-    },
-    "exporter": {
-        "export": "Exporteren",
-        "processing": "Verwerken, er wordt zo gevraagd om je bestand te downloaden"
-    },
-    "image_cropper": {
-        "save": "Opslaan",
-        "save_without_cropping": "Opslaan zonder bijsnijden",
-        "cancel": "Annuleren",
-        "crop_picture": "Afbeelding bijsnijden"
-    },
-    "importer": {
-        "submit": "Verzenden",
-        "success": "Succesvol geïmporteerd.",
-        "error": "Er is een fout opgetreden bij het importeren van dit bestand."
-    },
-    "media_modal": {
-        "previous": "Vorige",
-        "next": "Volgende"
-    },
-    "polls": {
-        "add_poll": "Poll Toevoegen",
-        "add_option": "Optie Toevoegen",
-        "option": "Optie",
-        "votes": "stemmen",
-        "vote": "Stem",
-        "single_choice": "Enkele keuze",
-        "multiple_choices": "Meerkeuze",
-        "expiry": "Poll leeftijd",
-        "expires_in": "Poll eindigt in {0}",
-        "expired": "Poll is {0} geleden beëindigd",
-        "not_enough_options": "Te weinig opties in poll",
-        "type": "Poll type"
-    },
-    "emoji": {
-        "emoji": "Emoji",
-        "keep_open": "Picker openhouden",
-        "search_emoji": "Zoek voor een emoji",
-        "add_emoji": "Emoji invoegen",
-        "unicode": "Unicode emoji",
-        "load_all": "Alle {emojiAmount} emoji worden geladen",
-        "stickers": "Stickers",
-        "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan problemen veroorzaken met prestaties.",
-        "custom": "Gepersonaliseerde emoji"
-    },
-    "interactions": {
-        "favs_repeats": "Herhalingen en Favorieten",
-        "follows": "Nieuwe volgingen",
-        "moves": "Gebruiker migreert",
-        "load_older": "Oudere interacties laden"
-    },
-    "remote_user_resolver": {
-        "searching_for": "Zoeken naar",
-        "error": "Niet gevonden.",
-        "remote_user_resolver": "Externe gebruikers zoeker"
-    },
-    "selectable_list": {
-        "select_all": "Alles selecteren"
-    },
-    "password_reset": {
-        "password_reset_required_but_mailer_is_disabled": "Je dient je wachtwoord opnieuw in te stellen, maar wachtwoord reset is uitgeschakeld. Neem contact op met de beheerder van deze instantie.",
-        "password_reset_required": "Je dient je wachtwoord opnieuw in te stellen om in te kunnen loggen.",
-        "password_reset_disabled": "Wachtwoord reset is uitgeschakeld. Neem contact op met de beheerder van deze instantie.",
-        "too_many_requests": "Je hebt het maximaal aantal pogingen bereikt, probeer het later opnieuw.",
-        "not_found": "We kunnen die email of gebruikersnaam niet vinden.",
-        "return_home": "Terugkeren naar de home pagina",
-        "check_email": "Controleer je email inbox voor een link om je wachtwoord opnieuw in te stellen.",
-        "placeholder": "Je email of gebruikersnaam",
-        "instruction": "Voer je email adres of gebruikersnaam in. We sturen je een link om je wachtwoord opnieuw in te stellen.",
-        "password_reset": "Wachtwoord opnieuw instellen",
-        "forgot_password": "Wachtwoord vergeten?"
-    },
-    "search": {
-        "no_results": "Geen resultaten",
-        "people_talking": "{count} personen aan het praten",
-        "person_talking": "{count} persoon aan het praten",
-        "hashtags": "Hashtags",
-        "people": "Personen"
-    },
-    "user_reporting": {
-        "generic_error": "Er is een fout opgetreden tijdens het verwerken van je verzoek.",
-        "submit": "Verzenden",
-        "forward_to": "Doorsturen naar {0}",
-        "forward_description": "Dit account hoort bij een andere server. Wil je een kopie van het rapport ook daarheen sturen?",
-        "additional_comments": "Aanvullende opmerkingen",
-        "add_comment_description": "Het rapport zal naar de moderators van de instantie worden verstuurd. Je kunt hieronder uitleg bijvoegen waarom je dit account wilt aangeven:",
-        "title": "{0} aangeven"
-    },
-    "status": {
-        "copy_link": "Link naar status kopiëren",
-        "status_unavailable": "Status niet beschikbaar",
-        "unmute_conversation": "Conversatie niet meer negeren",
-        "mute_conversation": "Conversatie negeren",
-        "replies_list": "Antwoorden:",
-        "reply_to": "Antwoorden aan",
-        "delete_confirm": "Wil je echt deze status verwijderen?",
-        "pin": "Aan profiel vastmaken",
-        "pinned": "Vastgezet",
-        "unpin": "Van profiel losmaken",
-        "delete": "Status verwijderen",
-        "repeats": "Herhalingen",
-        "favorites": "Favorieten"
-    },
-    "time": {
-        "years_short": "{0}j",
-        "year_short": "{0}j",
-        "years": "{0} jaren",
-        "year": "{0} jaar",
-        "weeks_short": "{0}w",
-        "week_short": "{0}w",
-        "weeks": "{0} weken",
-        "week": "{0} week",
-        "seconds_short": "{0}s",
-        "second_short": "{0}s",
-        "seconds": "{0} seconden",
-        "second": "{0} seconde",
-        "now_short": "nu",
-        "now": "zojuist",
-        "months_short": "{0}ma",
-        "month_short": "{0}ma",
-        "months": "{0} maanden",
-        "month": "{0} maand",
-        "minutes_short": "{0}min",
-        "minute_short": "{0}min",
-        "minutes": "{0} minuten",
-        "minute": "{0} minuut",
-        "in_past": "{0} geleden",
-        "in_future": "over {0}",
-        "hours_short": "{0}u",
-        "hour_short": "{0}u",
-        "hours": "{0} uren",
-        "hour": "{0} uur",
-        "days_short": "{0}d",
-        "day_short": "{0}d",
-        "days": "{0} dagen",
-        "day": "{0} dag"
+  "chat": {
+    "title": "Chat"
+  },
+  "features_panel": {
+    "chat": "Chat",
+    "gopher": "Gopher",
+    "media_proxy": "Media proxy",
+    "scope_options": "Zichtbaarheidsopties",
+    "text_limit": "Tekst limiet",
+    "title": "Kenmerken",
+    "who_to_follow": "Wie te volgen"
+  },
+  "finder": {
+    "error_fetching_user": "Fout tijdens ophalen gebruiker",
+    "find_user": "Gebruiker zoeken"
+  },
+  "general": {
+    "apply": "Toepassen",
+    "submit": "Verzend",
+    "more": "Meer",
+    "optional": "optioneel",
+    "show_more": "Bekijk meer",
+    "show_less": "Bekijk minder",
+    "dismiss": "Opheffen",
+    "cancel": "Annuleren",
+    "disable": "Uitschakelen",
+    "enable": "Inschakelen",
+    "confirm": "Bevestigen",
+    "verify": "Verifiëren",
+    "generic_error": "Er is een fout opgetreden"
+  },
+  "login": {
+    "login": "Log in",
+    "description": "Log in met OAuth",
+    "logout": "Uitloggen",
+    "password": "Wachtwoord",
+    "placeholder": "bijv. lain",
+    "register": "Registreren",
+    "username": "Gebruikersnaam",
+    "hint": "Log in om deel te nemen aan de discussie",
+    "authentication_code": "Authenticatie code",
+    "enter_recovery_code": "Voer een herstelcode in",
+    "enter_two_factor_code": "Voer een twee-factor code in",
+    "recovery_code": "Herstelcode",
+    "heading": {
+      "totp": "Twee-factor authenticatie",
+      "recovery": "Twee-factor herstelling"
     }
+  },
+  "nav": {
+    "about": "Over",
+    "back": "Terug",
+    "chat": "Lokale Chat",
+    "friend_requests": "Volgverzoeken",
+    "mentions": "Vermeldingen",
+    "dms": "Directe Berichten",
+    "public_tl": "Publieke Tijdlijn",
+    "timeline": "Tijdlijn",
+    "twkn": "Het Geheel Bekende Netwerk",
+    "user_search": "Gebruiker Zoeken",
+    "who_to_follow": "Wie te volgen",
+    "preferences": "Voorkeuren",
+    "administration": "Administratie",
+    "search": "Zoeken",
+    "interactions": "Interacties"
+  },
+  "notifications": {
+    "broken_favorite": "Onbekende status, aan het zoeken…",
+    "favorited_you": "vond je status leuk",
+    "followed_you": "volgt jou",
+    "load_older": "Laad oudere meldingen",
+    "notifications": "Meldingen",
+    "read": "Gelezen!",
+    "repeated_you": "Herhaalde je status",
+    "no_more_notifications": "Geen meldingen meer",
+    "migrated_to": "is gemigreerd naar",
+    "follow_request": "wil je volgen",
+    "reacted_with": "reageerde met {0}"
+  },
+  "post_status": {
+    "new_status": "Nieuwe status plaatsen",
+    "account_not_locked_warning": "Je account is niet {0}. Iedereen kan je volgen om je alleen-volgers berichten te lezen.",
+    "account_not_locked_warning_link": "gesloten",
+    "attachments_sensitive": "Markeer bijlagen als gevoelig",
+    "content_type": {
+      "text/plain": "Platte tekst",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_warning": "Onderwerp (optioneel)",
+    "default": "Zojuist geland in L.A.",
+    "direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
+    "posting": "Plaatsen",
+    "scope": {
+      "direct": "Direct - Post enkel naar vermelde gebruikers",
+      "private": "Enkel volgers - Post enkel naar volgers",
+      "public": "Publiek - Post op publieke tijdlijnen",
+      "unlisted": "Niet Vermelden - Niet tonen op publieke tijdlijnen"
+    },
+    "direct_warning_to_all": "Dit bericht zal zichtbaar zijn voor alle vermelde gebruikers.",
+    "direct_warning_to_first_only": "Dit bericht zal alleen zichtbaar zijn voor de vermelde gebruikers aan het begin van het bericht.",
+    "scope_notice": {
+      "public": "Dit bericht zal voor iedereen zichtbaar zijn",
+      "unlisted": "Dit bericht zal niet zichtbaar zijn in de Publieke Tijdlijn en Het Geheel Bekende Netwerk",
+      "private": "Dit bericht zal voor alleen je volgers zichtbaar zijn"
+    }
+  },
+  "registration": {
+    "bio": "Bio",
+    "email": "Email",
+    "fullname": "Weergave naam",
+    "password_confirm": "Wachtwoord bevestiging",
+    "registration": "Registratie",
+    "token": "Uitnodigings-token",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Klik op de afbeelding voor een nieuwe captcha",
+    "validations": {
+      "username_required": "moet ingevuld zijn",
+      "fullname_required": "moet ingevuld zijn",
+      "email_required": "moet ingevuld zijn",
+      "password_required": "moet ingevuld zijn",
+      "password_confirmation_required": "moet ingevuld zijn",
+      "password_confirmation_match": "komt niet overeen met het wachtwoord"
+    },
+    "username_placeholder": "bijv. lain",
+    "fullname_placeholder": "bijv. Lain Iwakura",
+    "bio_placeholder": "bijv.\nHallo, ik ben Lain.\nIk ben een anime meisje woonachtig in een buitenwijk in Japan. Je kent me misschien van the Wired."
+  },
+  "settings": {
+    "attachmentRadius": "Bijlages",
+    "attachments": "Bijlages",
+    "autoload": "Automatisch laden inschakelen wanneer tot de bodem gescrold wordt",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatars (Meldingen)",
+    "avatarRadius": "Avatars",
+    "background": "Achtergrond",
+    "bio": "Bio",
+    "btnRadius": "Knoppen",
+    "cBlue": "Blauw (Beantwoorden, volgen)",
+    "cGreen": "Groen (Herhalen)",
+    "cOrange": "Oranje (Favoriet)",
+    "cRed": "Rood (Annuleren)",
+    "change_password": "Wachtwoord Wijzigen",
+    "change_password_error": "Er is een fout opgetreden bij het wijzigen van je wachtwoord.",
+    "changed_password": "Wachtwoord succesvol gewijzigd!",
+    "collapse_subject": "Klap berichten met een onderwerp in",
+    "composing": "Opstellen",
+    "confirm_new_password": "Nieuw wachtwoord bevestigen",
+    "current_avatar": "Je huidige avatar",
+    "current_password": "Huidig wachtwoord",
+    "current_profile_banner": "Je huidige profiel banner",
+    "data_import_export_tab": "Data Import / Export",
+    "default_vis": "Standaard zichtbaarheidsbereik",
+    "delete_account": "Account Verwijderen",
+    "delete_account_description": "Permanent je gegevens verwijderen en account deactiveren.",
+    "delete_account_error": "Er is een fout opgetreden bij het verwijderen van je account. Indien dit probleem zich voor blijft doen, neem dan contact op met de beheerder van deze instantie.",
+    "delete_account_instructions": "Voer je wachtwoord in het onderstaande invoerveld in om het verwijderen van je account te bevestigen.",
+    "export_theme": "Preset opslaan",
+    "filtering": "Filtering",
+    "filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn",
+    "follow_export": "Volgers exporteren",
+    "follow_export_button": "Exporteer je volgers naar een csv bestand",
+    "follow_export_processing": "Aan het verwerken, binnen enkele ogenblikken wordt je gevraagd je bestand te downloaden",
+    "follow_import": "Volgers importeren",
+    "follow_import_error": "Fout bij importeren volgers",
+    "follows_imported": "Volgers geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
+    "foreground": "Voorgrond",
+    "general": "Algemeen",
+    "hide_attachments_in_convo": "Verberg bijlages in conversaties",
+    "hide_attachments_in_tl": "Verberg bijlages in de tijdlijn",
+    "hide_isp": "Verberg instantie-specifiek paneel",
+    "preload_images": "Afbeeldingen vooraf laden",
+    "hide_post_stats": "Verberg bericht statistieken (bijv. het aantal favorieten)",
+    "hide_user_stats": "Verberg bericht statistieken (bijv. het aantal volgers)",
+    "import_followers_from_a_csv_file": "Importeer volgers uit een csv bestand",
+    "import_theme": "Preset laden",
+    "inputRadius": "Invoervelden",
+    "checkboxRadius": "Checkboxen",
+    "instance_default": "(standaard: {value})",
+    "instance_default_simple": "(standaard)",
+    "interface": "Interface",
+    "interfaceLanguage": "Interface taal",
+    "invalid_theme_imported": "Het geselecteerde bestand is geen door Pleroma ondersteund thema. Er zijn geen aanpassingen gedaan.",
+    "limited_availability": "Niet beschikbaar in je browser",
+    "links": "Links",
+    "lock_account_description": "Laat volgers enkel toe na expliciete toestemming",
+    "loop_video": "Herhaal video's",
+    "loop_video_silent_only": "Herhaal enkel video's zonder geluid (bijv. Mastodon's \"gifs\")",
+    "name": "Naam",
+    "name_bio": "Naam & Bio",
+    "new_password": "Nieuw wachtwoord",
+    "notification_visibility": "Type meldingen die getoond worden",
+    "notification_visibility_follows": "Volgingen",
+    "notification_visibility_likes": "Vind-ik-leuks",
+    "notification_visibility_mentions": "Vermeldingen",
+    "notification_visibility_repeats": "Herhalingen",
+    "no_rich_text_description": "Verwijder rich text formattering van alle berichten",
+    "hide_network_description": "Toon niet wie mij volgt en wie ik volg.",
+    "nsfw_clickthrough": "Doorklikbaar verbergen van gevoelige bijlages inschakelen",
+    "oauth_tokens": "OAuth-tokens",
+    "token": "Token",
+    "refresh_token": "Token Vernieuwen",
+    "valid_until": "Geldig tot",
+    "revoke_token": "Intrekken",
+    "panelRadius": "Panelen",
+    "pause_on_unfocused": "Streamen pauzeren wanneer de tab niet in focus is",
+    "presets": "Presets",
+    "profile_background": "Profiel Achtergrond",
+    "profile_banner": "Profiel Banner",
+    "profile_tab": "Profiel",
+    "radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
+    "replies_in_timeline": "Antwoorden in tijdlijn",
+    "reply_link_preview": "Antwoord-link weergave inschakelen bij aanwijzen met muisaanwijzer",
+    "reply_visibility_all": "Alle antwoorden tonen",
+    "reply_visibility_following": "Enkel antwoorden tonen die aan mij of gevolgde gebruikers gericht zijn",
+    "reply_visibility_self": "Enkel antwoorden tonen die aan mij gericht zijn",
+    "saving_err": "Fout tijdens opslaan van instellingen",
+    "saving_ok": "Instellingen opgeslagen",
+    "security_tab": "Beveiliging",
+    "scope_copy": "Neem bereik over bij beantwoorden (Directe Berichten blijven altijd Direct)",
+    "set_new_avatar": "Nieuwe avatar instellen",
+    "set_new_profile_background": "Nieuwe profiel achtergrond instellen",
+    "set_new_profile_banner": "Nieuwe profiel banner instellen",
+    "settings": "Instellingen",
+    "subject_input_always_show": "Altijd onderwerpveld tonen",
+    "subject_line_behavior": "Onderwerp kopiëren bij antwoorden",
+    "subject_line_email": "Zoals email: \"re: onderwerp\"",
+    "subject_line_mastodon": "Zoals mastodon: kopieer zoals het is",
+    "subject_line_noop": "Niet kopiëren",
+    "stop_gifs": "GIFs afspelen bij zweven",
+    "streaming": "Automatisch streamen van nieuwe berichten inschakelen wanneer tot boven gescrold is",
+    "text": "Tekst",
+    "theme": "Thema",
+    "theme_help": "Gebruik hex color codes (#rrggbb) om je kleurschema te wijzigen.",
+    "theme_help_v2_1": "Je kan ook de kleur en transparantie van bepaalde componenten overschrijven door de checkbox aan te vinken, gebruik de \"Alles wissen\" knop om alle overschrijvingen te annuleren.",
+    "theme_help_v2_2": "Iconen onder sommige onderdelen zijn achtergrond/tekst contrast indicatoren, zweef er over voor gedetailleerde info. Hou er rekening mee dat bij doorzichtigheid de ergst mogelijke situatie wordt weer gegeven.",
+    "tooltipRadius": "Tooltips/alarmen",
+    "user_settings": "Gebruikersinstellingen",
+    "values": {
+      "false": "nee",
+      "true": "ja"
+    },
+    "notifications": "Meldingen",
+    "enable_web_push_notifications": "Web push meldingen inschakelen",
+    "style": {
+      "switcher": {
+        "keep_color": "Kleuren behouden",
+        "keep_shadows": "Schaduwen behouden",
+        "keep_opacity": "Transparantie behouden",
+        "keep_roundness": "Rondingen behouden",
+        "keep_fonts": "Lettertypes behouden",
+        "save_load_hint": "\"Behoud\" opties behouden de momenteel ingestelde opties bij het selecteren of laden van thema's, maar slaan ook de genoemde opties op bij het exporteren van een thema. Wanneer alle selectievakjes zijn uitgeschakeld, zal het exporteren van thema's alles opslaan.",
+        "reset": "Reset",
+        "clear_all": "Alles wissen",
+        "clear_opacity": "Transparantie wissen",
+        "keep_as_is": "Hou zoals het is",
+        "use_snapshot": "Oude versie",
+        "use_source": "Nieuwe versie",
+        "help": {
+          "future_version_imported": "Het geïmporteerde bestand is gemaakt voor een nieuwere versie van FE.",
+          "older_version_imported": "Het geïmporteerde bestand is gemaakt voor een oudere versie van FE.",
+          "upgraded_from_v2": "PleromaFE is bijgewerkt, het thema kan iets anders uitzien dan dat je gewend bent.",
+          "v2_imported": "Het geïmporteerde bestand is gemaakt voor een oudere FE. We proberen compatibiliteit te maximaliseren, maar het kan toch voorkomen dat er inconsistenties zijn.",
+          "snapshot_source_mismatch": "Versie conflict: waarschijnlijk was FE terug gerold en opnieuw bijgewerkt, indien je het thema aangepast hebt met de oudere versie van FE wil je waarschijnlijk de oude versie gebruiken, gebruik anders de nieuwe versie.",
+          "migration_napshot_gone": "Voor een onduidelijke reden mist de momentopname, dus sommige dingen kunnen anders uitzien dan je gewend bent.",
+          "migration_snapshot_ok": "Voor de zekerheid is een momentopname van het thema geladen. Je kunt proberen om de thema gegevens te laden.",
+          "fe_downgraded": "PleromaFE's versie is terug gerold.",
+          "fe_upgraded": "De thema-engine van PleromaFE is bijgewerkt na de versie update.",
+          "snapshot_missing": "Het bestand bevat geen thema momentopname, dus het thema kan anders uitzien dan je oorspronkelijk bedacht had.",
+          "snapshot_present": "Thema momentopname is geladen, alle waarden zijn overschreven. Je kunt in plaats daarvan ook de daadwerkelijke data van het thema laden."
+        },
+        "load_theme": "Thema laden"
+      },
+      "common": {
+        "color": "Kleur",
+        "opacity": "Transparantie",
+        "contrast": {
+          "hint": "Contrast verhouding is {ratio}, {level} {context}",
+          "level": {
+            "aa": "voldoet aan de richtlijn van niveau AA (minimum)",
+            "aaa": "voldoet aan de richtlijn van niveau AAA (aangeraden)",
+            "bad": "voldoet aan geen enkele toegankelijkheidsrichtlijn"
+          },
+          "context": {
+            "18pt": "voor grote (18pt+) tekst",
+            "text": "voor tekst"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Algemeen",
+        "main": "Algemene kleuren",
+        "foreground_hint": "Zie \"Geavanceerd\" tab voor meer gedetailleerde controle",
+        "rgbo": "Iconen, accenten, badges"
+      },
+      "advanced_colors": {
+        "_tab_label": "Geavanceerd",
+        "alert": "Alarm achtergrond",
+        "alert_error": "Fout",
+        "badge": "Badge achtergrond",
+        "badge_notification": "Meldingen",
+        "panel_header": "Paneel koptekst",
+        "top_bar": "Top balk",
+        "borders": "Randen",
+        "buttons": "Knoppen",
+        "inputs": "Invoervelden",
+        "faint_text": "Vervaagde tekst",
+        "tabs": "Tabbladen",
+        "toggled": "Geschakeld",
+        "disabled": "Uitgeschakeld",
+        "selectedMenu": "Geselecteerd menu item",
+        "selectedPost": "Geselecteerd bericht",
+        "pressed": "Ingedrukt",
+        "highlight": "Gemarkeerde elementen",
+        "icons": "Iconen",
+        "poll": "Poll grafiek",
+        "underlay": "Onderlaag",
+        "popover": "Tooltips, menu's, popovers",
+        "post": "Berichten / Gebruiker bios",
+        "alert_neutral": "Neutraal",
+        "alert_warning": "Waarschuwing"
+      },
+      "radii": {
+        "_tab_label": "Rondheid"
+      },
+      "shadows": {
+        "_tab_label": "Schaduw en belichting",
+        "component": "Onderdeel",
+        "override": "Overschrijven",
+        "shadow_id": "Schaduw #{value}",
+        "blur": "Vervagen",
+        "spread": "Spreiding",
+        "inset": "Inzet",
+        "hint": "Voor schaduw kan je ook --variable gebruiken als een kleur waarde om CSS3 variabelen te gebruiken. Houd er rekening mee dat het instellen van opaciteit in dit geval niet werkt.",
+        "filter_hint": {
+          "always_drop_shadow": "Waarschuwing, deze schaduw gebruikt altijd {0} als de browser dit ondersteund.",
+          "drop_shadow_syntax": "{0} ondersteund niet de {1} parameter en {2} sleutelwoord.",
+          "avatar_inset": "Houdt er rekening mee dat het combineren van zowel inzet and niet-inzet schaduwen op transparante avatars onverwachte resultaten kan opleveren.",
+          "spread_zero": "Schaduw met spreiding > 0 worden weergegeven alsof ze op nul staan",
+          "inset_classic": "Inzet schaduw zal {0} gebruiken"
+        },
+        "components": {
+          "panel": "Paneel",
+          "panelHeader": "Paneel koptekst",
+          "topBar": "Top balk",
+          "avatar": "Gebruikers avatar (in profiel weergave)",
+          "avatarStatus": "Gebruikers avatar (in bericht weergave)",
+          "popup": "Popups en tooltips",
+          "button": "Knop",
+          "buttonHover": "Knop (zweven)",
+          "buttonPressed": "Knop (ingedrukt)",
+          "buttonPressedHover": "Knop (ingedrukt+zweven)",
+          "input": "Invoerveld"
+        },
+        "hintV3": "Voor schaduwen kun je ook de {0} notatie gebruiken om de andere kleur invoer te gebruiken."
+      },
+      "fonts": {
+        "_tab_label": "Lettertypes",
+        "help": "Selecteer het lettertype om te gebruiken voor elementen van de UI. Voor \"aangepast\" dien je de exacte naam van het lettertype in te voeren zoals die in het systeem wordt weergegeven.",
+        "components": {
+          "interface": "Interface",
+          "input": "Invoervelden",
+          "post": "Bericht tekst",
+          "postCode": "Monospaced tekst in een bericht (rich text)"
+        },
+        "family": "Lettertype naam",
+        "size": "Grootte (in px)",
+        "weight": "Gewicht (dikgedruktheid)",
+        "custom": "Aangepast"
+      },
+      "preview": {
+        "header": "Voorvertoning",
+        "content": "Inhoud",
+        "error": "Voorbeeld fout",
+        "button": "Knop",
+        "text": "Nog een boel andere {0} en {1}",
+        "mono": "inhoud",
+        "input": "Zojuist geland in L.A.",
+        "faint_link": "handige gebruikershandleiding",
+        "fine_print": "Lees onze {0} om niets nuttig te leren!",
+        "header_faint": "Alles komt goed",
+        "checkbox": "Ik heb de gebruikersvoorwaarden gelezen",
+        "link": "een leuke kleine link"
+      }
+    },
+    "notification_setting_follows": "Gebruikers die je volgt",
+    "notification_setting_non_follows": "Gebruikers die je niet volgt",
+    "notification_setting_followers": "Gebruikers die je volgen",
+    "notification_setting_privacy": "Privacy",
+    "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
+    "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
+    "app_name": "App naam",
+    "security": "Beveiliging",
+    "enter_current_password_to_confirm": "Voer je huidige wachtwoord in om je identiteit te bevestigen",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "OTP instellen",
+      "wait_pre_setup_otp": "OTP voorinstellen",
+      "confirm_and_enable": "Bevestig en schakel OTP in",
+      "title": "Twee-factor Authenticatie",
+      "generate_new_recovery_codes": "Genereer nieuwe herstelcodes",
+      "recovery_codes": "Herstelcodes.",
+      "waiting_a_recovery_codes": "Backup codes ontvangen…",
+      "authentication_methods": "Authenticatie methodes",
+      "scan": {
+        "title": "Scannen",
+        "desc": "Scan de QR code of voer een sleutel in met je twee-factor applicatie:",
+        "secret_code": "Sleutel"
+      },
+      "verify": {
+        "desc": "Voer de code van je twee-factor applicatie in om twee-factor authenticatie in te schakelen:"
+      },
+      "warning_of_generate_new_codes": "Wanneer je nieuwe herstelcodes genereert, zullen je oude code niet langer werken.",
+      "recovery_codes_warning": "Schrijf de codes op of sla ze op een veilige locatie op - anders kun je ze niet meer inzien. Als je toegang tot je 2FA app en herstelcodes verliest, zal je buitengesloten zijn uit je account."
+    },
+    "allow_following_move": "Automatisch volgen toestaan wanneer een gevolgd account migreert",
+    "block_export": "Blokkades exporteren",
+    "block_import": "Blokkades importeren",
+    "blocks_imported": "Blokkades geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
+    "blocks_tab": "Blokkades",
+    "change_email": "Email wijzigen",
+    "change_email_error": "Er is een fout opgetreden tijdens het wijzigen van je email.",
+    "changed_email": "Email succesvol gewijzigd!",
+    "domain_mutes": "Domeinen",
+    "avatar_size_instruction": "De aangeraden minimale afmeting voor avatar afbeeldingen is 150x150 pixels.",
+    "pad_emoji": "Vul emoji aan met spaties wanneer deze met de picker ingevoegd worden",
+    "emoji_reactions_on_timeline": "Toon emoji reacties op de tijdlijn",
+    "accent": "Accent",
+    "hide_muted_posts": "Verberg berichten van genegeerde gebruikers",
+    "max_thumbnails": "Maximaal aantal miniaturen per bericht",
+    "use_one_click_nsfw": "Open gevoelige bijlagen met slechts één klik",
+    "hide_filtered_statuses": "Gefilterde statussen verbergen",
+    "import_blocks_from_a_csv_file": "Importeer blokkades van een csv bestand",
+    "mutes_tab": "Negeringen",
+    "play_videos_in_modal": "Speel video's af in een popup frame",
+    "new_email": "Nieuwe Email",
+    "notification_visibility_emoji_reactions": "Reacties",
+    "no_blocks": "Geen blokkades",
+    "no_mutes": "Geen negeringen",
+    "hide_followers_description": "Niet tonen wie mij volgt",
+    "hide_followers_count_description": "Niet mijn volgers aantal tonen",
+    "hide_follows_count_description": "Niet mijn gevolgde aantal tonen",
+    "show_admin_badge": "Beheerders badge tonen in mijn profiel",
+    "autohide_floating_post_button": "Nieuw Bericht knop automatisch verbergen (mobiel)",
+    "search_user_to_block": "Zoek wie je wilt blokkeren",
+    "search_user_to_mute": "Zoek wie je wilt negeren",
+    "minimal_scopes_mode": "Bericht bereik-opties minimaliseren",
+    "post_status_content_type": "Bericht status content type",
+    "user_mutes": "Gebruikers",
+    "useStreamingApi": "Berichten en meldingen in real-time ontvangen",
+    "useStreamingApiWarning": "(Afgeraden, experimenteel, kan berichten overslaan)",
+    "type_domains_to_mute": "Voer domeinen in om te negeren",
+    "upload_a_photo": "Upload een foto",
+    "fun": "Plezier",
+    "greentext": "Meme pijlen",
+    "notification_setting": "Ontvang meldingen van:",
+    "block_export_button": "Exporteer je geblokkeerde gebruikers naar een csv bestand",
+    "block_import_error": "Fout bij importeren blokkades",
+    "discoverable": "Sta toe dat dit account ontdekt kan worden in zoekresultaten en andere diensten",
+    "use_contain_fit": "Snij bijlage in miniaturen niet bij",
+    "notification_visibility_moves": "Gebruiker Migraties",
+    "hide_follows_description": "Niet tonen wie ik volg",
+    "show_moderator_badge": "Moderators badge tonen in mijn profiel",
+    "notification_setting_filters": "Filters",
+    "notification_setting_non_followers": "Gebruikers die je niet volgen",
+    "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
+    "version": {
+      "frontend_version": "Frontend Versie",
+      "backend_version": "Backend Versie",
+      "title": "Versie"
+    }
+  },
+  "timeline": {
+    "collapse": "Inklappen",
+    "conversation": "Conversatie",
+    "error_fetching": "Fout bij ophalen van updates",
+    "load_older": "Oudere statussen laden",
+    "no_retweet_hint": "Bericht is gemarkeerd als enkel volgers of direct en kan niet worden herhaald",
+    "repeated": "herhaalde",
+    "show_new": "Nieuwe tonen",
+    "up_to_date": "Up-to-date",
+    "no_statuses": "Geen statussen",
+    "no_more_statuses": "Geen statussen meer"
+  },
+  "user_card": {
+    "approve": "Goedkeuren",
+    "block": "Blokkeren",
+    "blocked": "Geblokkeerd!",
+    "deny": "Weigeren",
+    "favorites": "Favorieten",
+    "follow": "Volgen",
+    "follow_sent": "Aanvraag verzonden!",
+    "follow_progress": "Aanvragen…",
+    "follow_again": "Aanvraag opnieuw zenden?",
+    "follow_unfollow": "Stop volgen",
+    "followees": "Aan het volgen",
+    "followers": "Volgers",
+    "following": "Aan het volgen!",
+    "follows_you": "Volgt jou!",
+    "its_you": "'t is jij!",
+    "mute": "Negeren",
+    "muted": "Genegeerd",
+    "per_day": "per dag",
+    "remote_follow": "Volg vanop afstand",
+    "statuses": "Statussen",
+    "admin_menu": {
+      "delete_user_confirmation": "Weet je het heel zeker? Deze uitvoering kan niet ongedaan worden gemaakt.",
+      "delete_user": "Gebruiker verwijderen",
+      "quarantine": "Federeren van gebruikers berichten verbieden",
+      "disable_any_subscription": "Volgen van gebruiker in zijn geheel verbieden",
+      "disable_remote_subscription": "Volgen van gebruiker vanaf andere instanties verbieden",
+      "sandbox": "Berichten forceren om alleen voor volgers zichtbaar te zijn",
+      "force_unlisted": "Berichten forceren om niet publiekelijk getoond te worden",
+      "strip_media": "Media van berichten verwijderen",
+      "force_nsfw": "Alle berichten als gevoelig markeren",
+      "delete_account": "Account verwijderen",
+      "deactivate_account": "Account deactiveren",
+      "activate_account": "Account activeren",
+      "revoke_moderator": "Moderatorsrechten intrekken",
+      "grant_moderator": "Moderatorsrechten toekennen",
+      "revoke_admin": "Beheerdersrechten intrekken",
+      "grant_admin": "Beheerdersrechten toekennen",
+      "moderation": "Moderatie"
+    },
+    "show_repeats": "Herhalingen tonen",
+    "hide_repeats": "Herhalingen verbergen",
+    "mute_progress": "Negeren…",
+    "unmute_progress": "Negering opheffen…",
+    "unmute": "Negering opheffen",
+    "block_progress": "Blokkeren…",
+    "unblock_progress": "Blokkade opheffen…",
+    "unblock": "Blokkade opheffen",
+    "unsubscribe": "Abonnement opzeggen",
+    "subscribe": "Abonneren",
+    "report": "Aangeven",
+    "mention": "Vermelding",
+    "media": "Media",
+    "hidden": "Verborgen"
+  },
+  "user_profile": {
+    "timeline_title": "Gebruikers Tijdlijn",
+    "profile_loading_error": "Sorry, er is een fout opgetreden bij het laden van dit profiel.",
+    "profile_does_not_exist": "Sorry, dit profiel bestaat niet."
+  },
+  "who_to_follow": {
+    "more": "Meer",
+    "who_to_follow": "Wie te volgen"
+  },
+  "tool_tip": {
+    "media_upload": "Media Uploaden",
+    "repeat": "Herhalen",
+    "reply": "Beantwoorden",
+    "favorite": "Favoriet maken",
+    "user_settings": "Gebruikers Instellingen",
+    "reject_follow_request": "Volg-verzoek afwijzen",
+    "accept_follow_request": "Volg-aanvraag accepteren",
+    "add_reaction": "Reactie toevoegen"
+  },
+  "upload": {
+    "error": {
+      "base": "Upload mislukt.",
+      "file_too_big": "Bestand is te groot [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Probeer het later opnieuw"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "about": {
+    "mrf": {
+      "federation": "Federatie",
+      "keyword": {
+        "reject": "Afwijzen",
+        "replace": "Vervangen",
+        "is_replaced_by": "→",
+        "keyword_policies": "Zoekwoord Beleid",
+        "ftl_removal": "Verwijdering van \"Het Geheel Bekende Netwerk\" Tijdlijn"
+      },
+      "mrf_policies_desc": "MRF regels beïnvloeden het federatie gedrag van de instantie. De volgende regels zijn ingeschakeld:",
+      "mrf_policies": "Ingeschakelde MRF Regels",
+      "simple": {
+        "simple_policies": "Instantie-specifieke Regels",
+        "accept": "Accepteren",
+        "accept_desc": "Deze instantie accepteert alleen berichten van de volgende instanties:",
+        "reject": "Afwijzen",
+        "reject_desc": "Deze instantie zal geen berichten accepteren van de volgende instanties:",
+        "quarantine": "Quarantaine",
+        "quarantine_desc": "Deze instantie zal alleen publieke berichten sturen naar de volgende instanties:",
+        "ftl_removal_desc": "Deze instantie verwijdert de volgende instanties van \"Het Geheel Bekende Netwerk\" tijdlijn:",
+        "media_removal_desc": "Deze instantie verwijdert media van berichten van de volgende instanties:",
+        "media_nsfw_desc": "Deze instantie stelt media in als gevoelig in berichten van de volgende instanties:",
+        "ftl_removal": "Verwijderen van \"Het Geheel Bekende Netwerk\" Tijdlijn",
+        "media_removal": "Media Verwijdering",
+        "media_nsfw": "Forceer Media als Gevoelig"
+      }
+    },
+    "staff": "Personeel"
+  },
+  "domain_mute_card": {
+    "mute": "Negeren",
+    "mute_progress": "Negeren…",
+    "unmute": "Negering opheffen",
+    "unmute_progress": "Negering wordt opgeheven…"
+  },
+  "exporter": {
+    "export": "Exporteren",
+    "processing": "Verwerken, er wordt zo gevraagd om je bestand te downloaden"
+  },
+  "image_cropper": {
+    "save": "Opslaan",
+    "save_without_cropping": "Opslaan zonder bijsnijden",
+    "cancel": "Annuleren",
+    "crop_picture": "Afbeelding bijsnijden"
+  },
+  "importer": {
+    "submit": "Verzenden",
+    "success": "Succesvol geïmporteerd.",
+    "error": "Er is een fout opgetreden bij het importeren van dit bestand."
+  },
+  "media_modal": {
+    "previous": "Vorige",
+    "next": "Volgende"
+  },
+  "polls": {
+    "add_poll": "Poll Toevoegen",
+    "add_option": "Optie Toevoegen",
+    "option": "Optie",
+    "votes": "stemmen",
+    "vote": "Stem",
+    "single_choice": "Enkele keuze",
+    "multiple_choices": "Meerkeuze",
+    "expiry": "Poll leeftijd",
+    "expires_in": "Poll eindigt in {0}",
+    "expired": "Poll is {0} geleden beëindigd",
+    "not_enough_options": "Te weinig opties in poll",
+    "type": "Poll type"
+  },
+  "emoji": {
+    "emoji": "Emoji",
+    "keep_open": "Picker openhouden",
+    "search_emoji": "Zoek voor een emoji",
+    "add_emoji": "Emoji invoegen",
+    "unicode": "Unicode emoji",
+    "load_all": "Alle {emojiAmount} emoji worden geladen",
+    "stickers": "Stickers",
+    "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan problemen veroorzaken met prestaties.",
+    "custom": "Gepersonaliseerde emoji"
+  },
+  "interactions": {
+    "favs_repeats": "Herhalingen en Favorieten",
+    "follows": "Nieuwe volgingen",
+    "moves": "Gebruiker migreert",
+    "load_older": "Oudere interacties laden"
+  },
+  "remote_user_resolver": {
+    "searching_for": "Zoeken naar",
+    "error": "Niet gevonden.",
+    "remote_user_resolver": "Externe gebruikers zoeker"
+  },
+  "selectable_list": {
+    "select_all": "Alles selecteren"
+  },
+  "password_reset": {
+    "password_reset_required_but_mailer_is_disabled": "Je dient je wachtwoord opnieuw in te stellen, maar wachtwoord reset is uitgeschakeld. Neem contact op met de beheerder van deze instantie.",
+    "password_reset_required": "Je dient je wachtwoord opnieuw in te stellen om in te kunnen loggen.",
+    "password_reset_disabled": "Wachtwoord reset is uitgeschakeld. Neem contact op met de beheerder van deze instantie.",
+    "too_many_requests": "Je hebt het maximaal aantal pogingen bereikt, probeer het later opnieuw.",
+    "not_found": "We kunnen die email of gebruikersnaam niet vinden.",
+    "return_home": "Terugkeren naar de home pagina",
+    "check_email": "Controleer je email inbox voor een link om je wachtwoord opnieuw in te stellen.",
+    "placeholder": "Je email of gebruikersnaam",
+    "instruction": "Voer je email adres of gebruikersnaam in. We sturen je een link om je wachtwoord opnieuw in te stellen.",
+    "password_reset": "Wachtwoord opnieuw instellen",
+    "forgot_password": "Wachtwoord vergeten?"
+  },
+  "search": {
+    "no_results": "Geen resultaten",
+    "people_talking": "{count} personen aan het praten",
+    "person_talking": "{count} persoon aan het praten",
+    "hashtags": "Hashtags",
+    "people": "Personen"
+  },
+  "user_reporting": {
+    "generic_error": "Er is een fout opgetreden tijdens het verwerken van je verzoek.",
+    "submit": "Verzenden",
+    "forward_to": "Doorsturen naar {0}",
+    "forward_description": "Dit account hoort bij een andere server. Wil je een kopie van het rapport ook daarheen sturen?",
+    "additional_comments": "Aanvullende opmerkingen",
+    "add_comment_description": "Het rapport zal naar de moderators van de instantie worden verstuurd. Je kunt hieronder uitleg bijvoegen waarom je dit account wilt aangeven:",
+    "title": "{0} aangeven"
+  },
+  "status": {
+    "copy_link": "Link naar status kopiëren",
+    "status_unavailable": "Status niet beschikbaar",
+    "unmute_conversation": "Conversatie niet meer negeren",
+    "mute_conversation": "Conversatie negeren",
+    "replies_list": "Antwoorden:",
+    "reply_to": "Antwoorden aan",
+    "delete_confirm": "Wil je echt deze status verwijderen?",
+    "pin": "Aan profiel vastmaken",
+    "pinned": "Vastgezet",
+    "unpin": "Van profiel losmaken",
+    "delete": "Status verwijderen",
+    "repeats": "Herhalingen",
+    "favorites": "Favorieten"
+  },
+  "time": {
+    "years_short": "{0}j",
+    "year_short": "{0}j",
+    "years": "{0} jaren",
+    "year": "{0} jaar",
+    "weeks_short": "{0}w",
+    "week_short": "{0}w",
+    "weeks": "{0} weken",
+    "week": "{0} week",
+    "seconds_short": "{0}s",
+    "second_short": "{0}s",
+    "seconds": "{0} seconden",
+    "second": "{0} seconde",
+    "now_short": "nu",
+    "now": "zojuist",
+    "months_short": "{0}ma",
+    "month_short": "{0}ma",
+    "months": "{0} maanden",
+    "month": "{0} maand",
+    "minutes_short": "{0}min",
+    "minute_short": "{0}min",
+    "minutes": "{0} minuten",
+    "minute": "{0} minuut",
+    "in_past": "{0} geleden",
+    "in_future": "over {0}",
+    "hours_short": "{0}u",
+    "hour_short": "{0}u",
+    "hours": "{0} uren",
+    "hour": "{0} uur",
+    "days_short": "{0}d",
+    "day_short": "{0}d",
+    "days": "{0} dagen",
+    "day": "{0} dag"
+  }
 }
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 101e5d39..61e09318 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -1,743 +1,743 @@
 {
-    "about": {
-        "mrf": {
-            "federation": "Federacja",
-            "keyword": {
-                "keyword_policies": "Zasady słów kluczowych",
-                "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
-                "reject": "Odrzucanie",
-                "replace": "Zastąpienie",
-                "is_replaced_by": "→"
-            },
-            "mrf_policies": "Włączone zasady MRF",
-            "mrf_policies_desc": "Zasady MRF zmieniają zachowanie federowania instancji. Następujące zasady są włączone:",
-            "simple": {
-                "simple_policies": "Zasady specyficzne dla instancji",
-                "accept": "Akceptowanie",
-                "accept_desc": "Ta instancja akceptuje tylko posty z wymienionych instancji:",
-                "reject": "Odrzucanie",
-                "reject_desc": "Ta instancja odrzuca posty z wymienionych instancji:",
-                "quarantine": "Kwarantanna",
-                "quarantine_desc": "Ta instancja wysyła tylko publiczne posty do wymienionych instancji:",
-                "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
-                "ftl_removal_desc": "Ta instancja usuwa wymienionych instancje z \"Całej znanej sieci\":",
-                "media_removal": "Usuwanie multimediów",
-                "media_removal_desc": "Ta instancja usuwa multimedia z postów od wymienionych instancji:",
-                "media_nsfw": "Multimedia ustawione jako wrażliwe",
-                "media_nsfw_desc": "Ta instancja wymusza, by multimedia z wymienionych instancji były ustawione jako wrażliwe:"
-            }
-        },
-        "staff": "Administracja"
+  "about": {
+    "mrf": {
+      "federation": "Federacja",
+      "keyword": {
+        "keyword_policies": "Zasady słów kluczowych",
+        "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
+        "reject": "Odrzucanie",
+        "replace": "Zastąpienie",
+        "is_replaced_by": "→"
+      },
+      "mrf_policies": "Włączone zasady MRF",
+      "mrf_policies_desc": "Zasady MRF zmieniają zachowanie federowania instancji. Następujące zasady są włączone:",
+      "simple": {
+        "simple_policies": "Zasady specyficzne dla instancji",
+        "accept": "Akceptowanie",
+        "accept_desc": "Ta instancja akceptuje tylko posty z wymienionych instancji:",
+        "reject": "Odrzucanie",
+        "reject_desc": "Ta instancja odrzuca posty z wymienionych instancji:",
+        "quarantine": "Kwarantanna",
+        "quarantine_desc": "Ta instancja wysyła tylko publiczne posty do wymienionych instancji:",
+        "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
+        "ftl_removal_desc": "Ta instancja usuwa wymienionych instancje z \"Całej znanej sieci\":",
+        "media_removal": "Usuwanie multimediów",
+        "media_removal_desc": "Ta instancja usuwa multimedia z postów od wymienionych instancji:",
+        "media_nsfw": "Multimedia ustawione jako wrażliwe",
+        "media_nsfw_desc": "Ta instancja wymusza, by multimedia z wymienionych instancji były ustawione jako wrażliwe:"
+      }
     },
-    "chat": {
-        "title": "Czat"
-    },
-    "domain_mute_card": {
-        "mute": "Wycisz",
-        "mute_progress": "Wyciszam...",
-        "unmute": "Odcisz",
-        "unmute_progress": "Odciszam..."
-    },
-    "exporter": {
-        "export": "Eksportuj",
-        "processing": "Przetwarzam, za chwilę zostaniesz zapytany(-na) o ściągnięcie pliku"
-    },
-    "features_panel": {
-        "chat": "Czat",
-        "gopher": "Gopher",
-        "media_proxy": "Proxy mediów",
-        "scope_options": "Ustawienia zakresu",
-        "text_limit": "Limit tekstu",
-        "title": "Funkcje",
-        "who_to_follow": "Propozycje obserwacji"
-    },
-    "finder": {
-        "error_fetching_user": "Błąd przy pobieraniu profilu",
-        "find_user": "Znajdź użytkownika"
-    },
-    "general": {
-        "apply": "Zastosuj",
-        "submit": "Wyślij",
-        "more": "Więcej",
-        "generic_error": "Wystąpił błąd",
-        "optional": "nieobowiązkowe",
-        "show_more": "Pokaż więcej",
-        "show_less": "Pokaż mniej",
-        "dismiss": "Odrzuć",
-        "cancel": "Anuluj",
-        "disable": "Wyłącz",
-        "enable": "Włącz",
-        "confirm": "Potwierdź",
-        "verify": "Zweryfikuj"
-    },
-    "image_cropper": {
-        "crop_picture": "Przytnij obrazek",
-        "save": "Zapisz",
-        "save_without_cropping": "Zapisz bez przycinania",
-        "cancel": "Anuluj"
-    },
-    "importer": {
-        "submit": "Wyślij",
-        "success": "Zaimportowano pomyślnie.",
-        "error": "Wystąpił błąd podczas importowania pliku."
-    },
-    "login": {
-        "login": "Zaloguj",
-        "description": "Zaloguj używając OAuth",
-        "logout": "Wyloguj",
-        "password": "Hasło",
-        "placeholder": "n.p. lain",
-        "register": "Zarejestruj",
-        "username": "Użytkownik",
-        "hint": "Zaloguj się, aby dołączyć do dyskusji",
-        "authentication_code": "Kod weryfikacyjny",
-        "enter_recovery_code": "Wprowadź kod zapasowy",
-        "enter_two_factor_code": "Wprowadź kod weryfikacyjny",
-        "recovery_code": "Kod zapasowy",
-        "heading": {
-            "totp": "Weryfikacja dwuetapowa",
-            "recovery": "Zapasowa weryfikacja dwuetapowa"
-        }
-    },
-    "media_modal": {
-        "previous": "Poprzednie",
-        "next": "Następne"
-    },
-    "nav": {
-        "about": "O nas",
-        "administration": "Administracja",
-        "back": "Wróć",
-        "chat": "Lokalny czat",
-        "friend_requests": "Prośby o możliwość obserwacji",
-        "mentions": "Wzmianki",
-        "interactions": "Interakcje",
-        "dms": "Wiadomości prywatne",
-        "public_tl": "Publiczna oś czasu",
-        "timeline": "Oś czasu",
-        "twkn": "Cała znana sieć",
-        "user_search": "Wyszukiwanie użytkowników",
-        "search": "Wyszukiwanie",
-        "who_to_follow": "Sugestie obserwacji",
-        "preferences": "Preferencje"
-    },
-    "notifications": {
-        "broken_favorite": "Nieznany status, szukam go…",
-        "favorited_you": "dodał(-a) twój status do ulubionych",
-        "followed_you": "obserwuje cię",
-        "load_older": "Załaduj starsze powiadomienia",
-        "notifications": "Powiadomienia",
-        "read": "Przeczytane!",
-        "repeated_you": "powtórzył(-a) twój status",
-        "no_more_notifications": "Nie masz więcej powiadomień",
-        "migrated_to": "wyemigrował do",
-        "reacted_with": "zareagował z {0}",
-        "follow_request": "chce ciebie obserwować"
-    },
-    "polls": {
-        "add_poll": "Dodaj ankietę",
-        "add_option": "Dodaj opcję",
-        "option": "Opcja",
-        "votes": "głosów",
-        "vote": "Głosuj",
-        "type": "Typ ankiety",
-        "single_choice": "jednokrotnego wyboru",
-        "multiple_choices": "wielokrotnego wyboru",
-        "expiry": "Czas trwania ankiety",
-        "expires_in": "Ankieta kończy się za {0}",
-        "expired": "Ankieta skończyła się {0} temu",
-        "not_enough_options": "Zbyt mało unikalnych opcji w ankiecie"
-    },
-    "emoji": {
-        "stickers": "Naklejki",
-        "emoji": "Emoji",
-        "keep_open": "Zostaw selektor otwarty",
-        "search_emoji": "Wyszukaj emoji",
-        "add_emoji": "Wstaw emoji",
-        "custom": "Niestandardowe emoji",
-        "unicode": "Emoji unicode",
-        "load_all_hint": "Załadowano pierwsze {saneAmount} emoji, Załadowanie wszystkich emoji może spowodować problemy z wydajnością.",
-        "load_all": "Ładuję wszystkie {emojiAmount} emoji"
-    },
-    "interactions": {
-        "favs_repeats": "Powtórzenia i ulubione",
-        "follows": "Nowi obserwujący",
-        "moves": "Użytkownik migruje",
-        "load_older": "Załaduj starsze interakcje"
-    },
-    "post_status": {
-        "new_status": "Dodaj nowy status",
-        "account_not_locked_warning": "Twoje konto nie jest {0}. Każdy może cię zaobserwować aby zobaczyć wpisy tylko dla obserwujących.",
-        "account_not_locked_warning_link": "zablokowane",
-        "attachments_sensitive": "Oznacz załączniki jako wrażliwe",
-        "content_type": {
-            "text/plain": "Czysty tekst",
-            "text/html": "HTML",
-            "text/markdown": "Markdown",
-            "text/bbcode": "BBCode"
-        },
-        "content_warning": "Temat (nieobowiązkowy)",
-        "default": "Właśnie wróciłem z kościoła",
-        "direct_warning_to_all": "Ten wpis zobaczą wszystkie osoby, o których wspomniałeś(-aś).",
-        "direct_warning_to_first_only": "Ten wpis zobaczą tylko te osoby, o których wspomniałeś(-aś) na początku wiadomości.",
-        "posting": "Wysyłanie",
-        "scope_notice": {
-            "public": "Ten post będzie widoczny dla każdego",
-            "private": "Ten post będzie widoczny tylko dla twoich obserwujących",
-            "unlisted": "Ten post nie będzie widoczny na publicznej osi czasu i całej znanej sieci"
-        },
-        "scope": {
-            "direct": "Bezpośredni – Tylko dla wspomnianych użytkowników",
-            "private": "Tylko dla obserwujących – Umieść dla osób, które cię obserwują",
-            "public": "Publiczny – Umieść na publicznych osiach czasu",
-            "unlisted": "Niewidoczny – Nie umieszczaj na publicznych osiach czasu"
-        }
-    },
-    "registration": {
-        "bio": "Bio",
-        "email": "E-mail",
-        "fullname": "Wyświetlana nazwa profilu",
-        "password_confirm": "Potwierdzenie hasła",
-        "registration": "Rejestracja",
-        "token": "Token zaproszenia",
-        "captcha": "CAPTCHA",
-        "new_captcha": "Naciśnij na obrazek, aby dostać nowy kod captcha",
-        "username_placeholder": "np. lain",
-        "fullname_placeholder": "np. Lain Iwakura",
-        "bio_placeholder": "e.g.\nCześć, jestem Lain.\nJestem dziewczynką z anime żyjącą na peryferiach Japonii. Możesz znać mnie z Wired.",
-        "validations": {
-            "username_required": "nie może być pusta",
-            "fullname_required": "nie może być pusta",
-            "email_required": "nie może być pusty",
-            "password_required": "nie może być puste",
-            "password_confirmation_required": "nie może być puste",
-            "password_confirmation_match": "musi być takie jak hasło"
-        }
-    },
-    "remote_user_resolver": {
-        "remote_user_resolver": "Wyszukiwarka użytkowników nietutejszych",
-        "searching_for": "Szukam",
-        "error": "Nie znaleziono."
-    },
-    "selectable_list": {
-        "select_all": "Zaznacz wszystko"
-    },
-    "settings": {
-        "app_name": "Nazwa aplikacji",
-        "security": "Bezpieczeństwo",
-        "enter_current_password_to_confirm": "Wprowadź obecne hasło, by potwierdzić twoją tożsamość",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "Ustaw OTP",
-            "wait_pre_setup_otp": "początkowe ustawianie OTP",
-            "confirm_and_enable": "Potwierdź i włącz OTP",
-            "title": "Weryfikacja dwuetapowa",
-            "generate_new_recovery_codes": "Wygeneruj nowe kody zapasowe",
-            "warning_of_generate_new_codes": "Po tym gdy wygenerujesz nowe kody zapasowe, stare przestaną działać.",
-            "recovery_codes": "Kody zapasowe.",
-            "waiting_a_recovery_codes": "Otrzymuję kody zapasowe...",
-            "recovery_codes_warning": "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał(-a) dostępu do swojego konta.",
-            "authentication_methods": "Metody weryfikacji",
-            "scan": {
-                "title": "Skanuj",
-                "desc": "Zeskanuj ten kod QR używając twojej aplikacji 2FA albo wpisz ten klucz:",
-                "secret_code": "Klucz"
-            },
-            "verify": {
-                "desc": "By włączyć weryfikację dwuetapową, wpisz kod z twojej aplikacji 2FA:"
-            }
-        },
-        "allow_following_move": "Zezwalaj na automatyczną obserwację gdy obserwowane konto migruje",
-        "attachmentRadius": "Załączniki",
-        "attachments": "Załączniki",
-        "autoload": "Włącz automatyczne ładowanie po przewinięciu do końca strony",
-        "avatar": "Awatar",
-        "avatarAltRadius": "Awatary (powiadomienia)",
-        "avatarRadius": "Awatary",
-        "background": "Tło",
-        "bio": "Bio",
-        "block_export": "Eksport blokad",
-        "block_export_button": "Eksportuj twoje blokady do pliku .csv",
-        "block_import": "Import blokad",
-        "block_import_error": "Wystąpił błąd podczas importowania blokad",
-        "blocks_imported": "Zaimportowano blokady, przetwarzanie może zająć trochę czasu.",
-        "blocks_tab": "Bloki",
-        "btnRadius": "Przyciski",
-        "cBlue": "Niebieski (odpowiedz, obserwuj)",
-        "cGreen": "Zielony (powtórzenia)",
-        "cOrange": "Pomarańczowy (ulubione)",
-        "cRed": "Czerwony (anuluj)",
-        "change_email": "Zmień email",
-        "change_email_error": "Wystąpił problem podczas zmiany emaila.",
-        "changed_email": "Pomyślnie zmieniono email!",
-        "change_password": "Zmień hasło",
-        "change_password_error": "Podczas zmiany hasła wystąpił problem.",
-        "changed_password": "Pomyślnie zmieniono hasło!",
-        "collapse_subject": "Zwijaj posty z tematami",
-        "composing": "Pisanie",
-        "confirm_new_password": "Potwierdź nowe hasło",
-        "current_avatar": "Twój obecny awatar",
-        "current_password": "Obecne hasło",
-        "current_profile_banner": "Twój obecny banner profilu",
-        "data_import_export_tab": "Import/eksport danych",
-        "default_vis": "Domyślny zakres widoczności",
-        "delete_account": "Usuń konto",
-        "delete_account_description": "Trwale usuń dane i zdezaktywuj konto.",
-        "delete_account_error": "Wystąpił problem z usuwaniem twojego konta. Jeżeli problem powtarza się, poinformuj administratora swojej instancji.",
-        "delete_account_instructions": "Wprowadź swoje hasło w poniższe pole aby potwierdzić usunięcie konta.",
-        "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługach",
-        "domain_mutes": "Domeny",
-        "avatar_size_instruction": "Zalecany minimalny rozmiar awatarów to 150x150 pikseli.",
-        "pad_emoji": "Dodaj odstęp z obu stron emoji podczas dodawania selektorem",
-        "emoji_reactions_on_timeline": "Pokaż reakcje emoji na osi czasu",
-        "export_theme": "Zapisz motyw",
-        "filtering": "Filtrowanie",
-        "filtering_explanation": "Wszystkie statusy zawierające te słowa będą wyciszone. Jedno słowo na linijkę.",
-        "follow_export": "Eksport obserwowanych",
-        "follow_export_button": "Eksportuj swoją listę obserwowanych do pliku CSV",
-        "follow_import": "Import obserwowanych",
-        "follow_import_error": "Błąd przy importowaniu obserwowanych",
-        "follows_imported": "Obserwowani zaimportowani! Przetwarzanie może trochę potrwać.",
-        "accent": "Akcent",
-        "foreground": "Pierwszy plan",
-        "general": "Ogólne",
-        "hide_attachments_in_convo": "Ukrywaj załączniki w rozmowach",
-        "hide_attachments_in_tl": "Ukrywaj załączniki w osi czasu",
-        "hide_muted_posts": "Ukrywaj wpisy wyciszonych użytkowników",
-        "max_thumbnails": "Maksymalna liczba miniatur w poście",
-        "hide_isp": "Ukryj panel informacji o instancji",
-        "preload_images": "Ładuj wstępnie obrazy",
-        "use_one_click_nsfw": "Otwieraj załączniki NSFW jednym kliknięciem",
-        "hide_post_stats": "Ukrywaj statysyki postów (np. liczbę polubień)",
-        "hide_user_stats": "Ukrywaj statysyki użytkowników (np. liczbę obserwujących)",
-        "hide_filtered_statuses": "Ukrywaj filtrowane statusy",
-        "import_blocks_from_a_csv_file": "Importuj blokady z pliku CSV",
-        "import_followers_from_a_csv_file": "Importuj obserwowanych z pliku CSV",
-        "import_theme": "Załaduj motyw",
-        "inputRadius": "Pola tekstowe",
-        "checkboxRadius": "Pola wyboru",
-        "instance_default": "(domyślnie: {value})",
-        "instance_default_simple": "(domyślne)",
-        "interface": "Interfejs",
-        "interfaceLanguage": "Język interfejsu",
-        "invalid_theme_imported": "Wybrany plik nie jest obsługiwanym motywem Pleromy. Nie dokonano zmian w twoim motywie.",
-        "limited_availability": "Niedostępne w twojej przeglądarce",
-        "links": "Łącza",
-        "lock_account_description": "Spraw, by konto mogli wyświetlać tylko zatwierdzeni obserwujący",
-        "loop_video": "Zapętlaj filmy",
-        "loop_video_silent_only": "Zapętlaj tylko filmy bez dźwięku (np. mastodonowe „gify”)",
-        "mutes_tab": "Wyciszenia",
-        "play_videos_in_modal": "Odtwarzaj filmy bezpośrednio w przeglądarce mediów",
-        "use_contain_fit": "Nie przycinaj załączników na miniaturach",
-        "name": "Imię",
-        "name_bio": "Imię i bio",
-        "new_email": "Nowy email",
-        "new_password": "Nowe hasło",
-        "notification_visibility": "Rodzaje powiadomień do wyświetlania",
-        "notification_visibility_follows": "Obserwacje",
-        "notification_visibility_likes": "Ulubione",
-        "notification_visibility_mentions": "Wzmianki",
-        "notification_visibility_repeats": "Powtórzenia",
-        "notification_visibility_moves": "Użytkownik migruje",
-        "notification_visibility_emoji_reactions": "Reakcje",
-        "no_rich_text_description": "Usuwaj formatowanie ze wszystkich postów",
-        "no_blocks": "Bez blokad",
-        "no_mutes": "Bez wyciszeń",
-        "hide_follows_description": "Nie pokazuj kogo obserwuję",
-        "hide_followers_description": "Nie pokazuj kto mnie obserwuje",
-        "hide_follows_count_description": "Nie pokazuj licznika obserwowanych",
-        "hide_followers_count_description": "Nie pokazuj licznika obserwujących",
-        "show_admin_badge": "Pokazuj odznakę Administrator na moim profilu",
-        "show_moderator_badge": "Pokazuj odznakę Moderator na moim profilu",
-        "nsfw_clickthrough": "Włącz domyślne ukrywanie załączników o treści nieprzyzwoitej (NSFW)",
-        "oauth_tokens": "Tokeny OAuth",
-        "token": "Token",
-        "refresh_token": "Odśwież token",
-        "valid_until": "Ważne do",
-        "revoke_token": "Odwołać",
-        "panelRadius": "Panele",
-        "pause_on_unfocused": "Wstrzymuj strumieniowanie kiedy karta nie jest aktywna",
-        "presets": "Gotowe motywy",
-        "profile_background": "Tło profilu",
-        "profile_banner": "Banner profilu",
-        "profile_tab": "Profil",
-        "radii_help": "Ustaw zaokrąglenie krawędzi interfejsu (w pikselach)",
-        "replies_in_timeline": "Odpowiedzi na osi czasu",
-        "reply_link_preview": "Włącz dymek z podglądem postu po najechaniu na znak odpowiedzi",
-        "reply_visibility_all": "Pokazuj wszystkie odpowiedzi",
-        "reply_visibility_following": "Pokazuj tylko odpowiedzi skierowane do mnie i osób które obserwuję",
-        "reply_visibility_self": "Pokazuj tylko odpowiedzi skierowane do mnie",
-        "autohide_floating_post_button": "Ukryj automatycznie przycisk \"Nowy post\" (mobile)",
-        "saving_err": "Nie udało się zapisać ustawień",
-        "saving_ok": "Zapisano ustawienia",
-        "search_user_to_block": "Wyszukaj kogo chcesz zablokować",
-        "search_user_to_mute": "Wyszukaj kogo chcesz wyciszyć",
-        "security_tab": "Bezpieczeństwo",
-        "scope_copy": "Kopiuj zakres podczas odpowiadania (DM-y zawsze są kopiowane)",
-        "minimal_scopes_mode": "Zminimalizuj opcje wyboru zakresu postów",
-        "set_new_avatar": "Ustaw nowy awatar",
-        "set_new_profile_background": "Ustaw nowe tło profilu",
-        "set_new_profile_banner": "Ustaw nowy banner profilu",
-        "settings": "Ustawienia",
-        "subject_input_always_show": "Zawsze pokazuj pole tematu",
-        "subject_line_behavior": "Kopiuj temat podczas odpowiedzi",
-        "subject_line_email": "Jak w mailach – „re: temat”",
-        "subject_line_mastodon": "Jak na Mastodonie – po prostu kopiuj",
-        "subject_line_noop": "Nie kopiuj",
-        "post_status_content_type": "Post status content type",
-        "stop_gifs": "Odtwarzaj GIFy po najechaniu kursorem",
-        "streaming": "Włącz automatycznie strumieniowanie nowych postów gdy jesteś na początku strony",
-        "user_mutes": "Użytkownicy",
-        "useStreamingApi": "Otrzymuj posty i powiadomienia w czasie rzeczywistym",
-        "useStreamingApiWarning": "(Niezalecane, eksperymentalne, pomija posty)",
-        "text": "Tekst",
-        "theme": "Motyw",
-        "theme_help": "Użyj kolorów w notacji szesnastkowej (#rrggbb), by stworzyć swój motyw.",
-        "theme_help_v2_1": "Możesz też zastąpić kolory i widoczność poszczególnych komponentów przełączając pola wyboru, użyj „Wyczyść wszystko” aby usunąć wszystkie zastąpienia.",
-        "theme_help_v2_2": "Ikony pod niektórych wpisami są wskaźnikami kontrastu pomiędzy tłem a tekstem, po najechaniu na nie otrzymasz szczegółowe informacje. Zapamiętaj, że jeżeli używasz przezroczystości, wskaźniki pokazują najgorszy możliwy przypadek.",
-        "tooltipRadius": "Etykiety/alerty",
-        "type_domains_to_mute": "Wpisz domeny, które chcesz wyciszyć",
-        "upload_a_photo": "Wyślij zdjęcie",
-        "user_settings": "Ustawienia użytkownika",
-        "values": {
-            "false": "nie",
-            "true": "tak"
-        },
-        "fun": "Zabawa",
-        "greentext": "Memiczne strzałki",
-        "notifications": "Powiadomienia",
-        "notification_setting": "Otrzymuj powiadomienia od:",
-        "notification_setting_follows": "Ludzi których obserwujesz",
-        "notification_setting_non_follows": "Ludzi których nie obserwujesz",
-        "notification_setting_followers": "Ludzi którzy obserwują ciebie",
-        "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
-        "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
-        "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
-        "enable_web_push_notifications": "Włącz powiadomienia push",
-        "style": {
-            "switcher": {
-                "keep_color": "Zachowaj kolory",
-                "keep_shadows": "Zachowaj cienie",
-                "keep_opacity": "Zachowaj widoczność",
-                "keep_roundness": "Zachowaj zaokrąglenie",
-                "keep_fonts": "Zachowaj czcionki",
-                "save_load_hint": "Opcje „zachowaj” pozwalają na pozostanie przy obecnych opcjach po wybraniu lub załadowaniu motywu, jak i przechowywanie ich podczas eksportowania motywu. Jeżeli wszystkie opcje są odznaczone, eksportowanie motywu spowoduje zapisanie wszystkiego.",
-                "reset": "Wyzeruj",
-                "clear_all": "Wyczyść wszystko",
-                "clear_opacity": "Wyczyść widoczność",
-                "load_theme": "Załaduj motyw",
-                "keep_as_is": "Zostaw po staremu",
-                "use_snapshot": "Stara wersja",
-                "use_source": "Nowa wersja",
-                "help": {
-                    "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż zapamiętałeś(-aś).",
-                    "v2_imported": "Plik który zaimportowałeś(-aś) został stworzony dla starszego FE. Próbujemy zwiększyć kompatybilność, lecz wciąż mogą występować rozbieżności.",
-                    "future_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w nowszej wersji FE.",
-                    "older_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w starszej wersji FE.",
-                    "snapshot_present": "Migawka motywu jest załadowana, więc wszystkie wartości zostały nadpisane. Zamiast tego możesz załadować właściwe dane motywu.",
-                    "snapshot_missing": "Nie znaleziono migawki motywu w pliku, więc motyw może wyglądać inaczej niż pierwotnie zaplanowano.",
-                    "fe_upgraded": "Silnik motywów PleromaFE został zaaktualizowany.",
-                    "fe_downgraded": "Wersja PleromaFE została cofnięta.",
-                    "migration_snapshot_ok": "Żeby być bezpiecznym, migawka motywu została załadowana. Możesz spróbować załadować dane motywu.",
-                    "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż zapamiętałeś(-aś).",
-                    "snapshot_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaktualizowane ponownie, jeśli zmieniłeś(-aś) motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji."
-                }
-            },
-            "common": {
-                "color": "Kolor",
-                "opacity": "Widoczność",
-                "contrast": {
-                    "hint": "Współczynnik kontrastu wynosi {ratio}, {level} {context}",
-                    "level": {
-                        "aa": "spełnia wymogi poziomu AA (minimalne)",
-                        "aaa": "spełnia wymogi poziomu AAA (zalecane)",
-                        "bad": "nie spełnia żadnych wymogów dostępności"
-                    },
-                    "context": {
-                        "18pt": "dla dużego tekstu (18pt+)",
-                        "text": "dla tekstu"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Ogólne",
-                "main": "Ogólne kolory",
-                "foreground_hint": "Zajrzyj do karty „Zaawansowane”, aby uzyskać dokładniejszą kontrolę",
-                "rgbo": "Ikony, wyróżnienia, odznaki"
-            },
-            "advanced_colors": {
-                "_tab_label": "Zaawansowane",
-                "alert": "Tło alertu",
-                "alert_error": "Błąd",
-                "alert_warning": "Ostrzeżenie",
-                "alert_neutral": "Neutralne",
-                "post": "Posty/Bio użytkowników",
-                "badge": "Tło odznaki",
-                "popover": "Etykiety, menu, popovery",
-                "badge_notification": "Powiadomienie",
-                "panel_header": "Nagłówek panelu",
-                "top_bar": "Górny pasek",
-                "borders": "Granice",
-                "buttons": "Przyciski",
-                "inputs": "Pola wejścia",
-                "faint_text": "Zanikający tekst",
-                "underlay": "Podkład",
-                "poll": "Wykres ankiety",
-                "icons": "Ikony",
-                "highlight": "Podświetlone elementy",
-                "pressed": "Naciśnięte",
-                "selectedPost": "Wybrany post",
-                "selectedMenu": "Wybrany element menu",
-                "disabled": "Wyłączone",
-                "toggled": "Przełączone",
-                "tabs": "Karty"
-            },
-            "radii": {
-                "_tab_label": "Zaokrąglenie"
-            },
-            "shadows": {
-                "_tab_label": "Cień i podświetlenie",
-                "component": "Komponent",
-                "override": "Zastąp",
-                "shadow_id": "Cień #{value}",
-                "blur": "Rozmycie",
-                "spread": "Szerokość",
-                "inset": "Inset",
-                "hintV3": "Dla cieni możesz również użyć notacji {0} by użyć inny slot koloru.",
-                "filter_hint": {
-                    "always_drop_shadow": "Ostrzeżenie, ten cień zawsze używa {0} jeżeli to obsługiwane przez przeglądarkę.",
-                    "drop_shadow_syntax": "{0} nie obsługuje parametru {1} i słowa kluczowego {2}.",
-                    "avatar_inset": "Pamiętaj że użycie jednocześnie cieni inset i nie inset na awatarach może dać nieoczekiwane wyniki z przezroczystymi awatarami.",
-                    "spread_zero": "Cienie o ujemnej szerokości będą widoczne tak, jakby wynosiła ona zero",
-                    "inset_classic": "Cienie inset będą używały {0}"
-                },
-                "components": {
-                    "panel": "Panel",
-                    "panelHeader": "Nagłówek panelu",
-                    "topBar": "Górny pasek",
-                    "avatar": "Awatar użytkownika (w widoku profilu)",
-                    "avatarStatus": "Awatar użytkownika (w widoku wpisu)",
-                    "popup": "Wyskakujące okna i podpowiedzi",
-                    "button": "Przycisk",
-                    "buttonHover": "Przycisk (po najechaniu)",
-                    "buttonPressed": "Przycisk (naciśnięty)",
-                    "buttonPressedHover": "Przycisk(naciśnięty+najechany)",
-                    "input": "Pole wejścia"
-                }
-            },
-            "fonts": {
-                "_tab_label": "Czcionki",
-                "help": "Wybierz czcionkę używaną przez elementy UI. Jeżeli wybierzesz niestandardową, musisz wpisać dokładnie tę nazwę, pod którą pojawia się w systemie.",
-                "components": {
-                    "interface": "Interfejs",
-                    "input": "Pola wejścia",
-                    "post": "Tekst postu",
-                    "postCode": "Tekst o stałej szerokości znaków w sformatowanym poście"
-                },
-                "family": "Nazwa czcionki",
-                "size": "Rozmiar (w pikselach)",
-                "weight": "Grubość",
-                "custom": "Niestandardowa"
-            },
-            "preview": {
-                "header": "Podgląd",
-                "content": "Zawartość",
-                "error": "Przykładowy błąd",
-                "button": "Przycisk",
-                "text": "Trochę więcej {0} i {1}",
-                "mono": "treści",
-                "input": "Właśnie wróciłem z kościoła",
-                "faint_link": "pomocny podręcznik",
-                "fine_print": "Przeczytaj nasz {0}, aby nie nauczyć się niczego przydatnego!",
-                "header_faint": "W porządku",
-                "checkbox": "Przeleciałem(-am) przez zasady użytkowania",
-                "link": "i fajny mały odnośnik"
-            }
-        },
-        "version": {
-            "title": "Wersja",
-            "backend_version": "Wersja back-endu",
-            "frontend_version": "Wersja front-endu"
-        },
-        "notification_setting_privacy": "Prywatność",
-        "notification_setting_filters": "Filtry",
-        "notification_setting_privacy_option": "Ukryj nadawcę i zawartość powiadomień push"
-    },
-    "time": {
-        "day": "{0} dzień",
-        "days": "{0} dni",
-        "day_short": "{0} d",
-        "days_short": "{0} d",
-        "hour": "{0} godzina",
-        "hours": "{0} godzin",
-        "hour_short": "{0} godz.",
-        "hours_short": "{0} godz.",
-        "in_future": "za {0}",
-        "in_past": "{0} temu",
-        "minute": "{0} minuta",
-        "minutes": "{0} minut",
-        "minute_short": "{0} min",
-        "minutes_short": "{0} min",
-        "month": "{0} miesiąc",
-        "months": "{0} miesięcy",
-        "month_short": "{0} mies.",
-        "months_short": "{0} mies.",
-        "now": "teraz",
-        "now_short": "teraz",
-        "second": "{0} sekunda",
-        "seconds": "{0} sekund",
-        "second_short": "{0} s",
-        "seconds_short": "{0} s",
-        "week": "{0} tydzień",
-        "weeks": "{0} tygodni",
-        "week_short": "{0} tydz.",
-        "weeks_short": "{0} tyg.",
-        "year": "{0} rok",
-        "years": "{0} lata",
-        "year_short": "{0} r.",
-        "years_short": "{0} lata"
-    },
-    "timeline": {
-        "collapse": "Zwiń",
-        "conversation": "Rozmowa",
-        "error_fetching": "Błąd pobierania",
-        "load_older": "Załaduj starsze statusy",
-        "no_retweet_hint": "Wpis oznaczony jako tylko dla obserwujących lub bezpośredni nie może zostać powtórzony",
-        "repeated": "powtórzył(-a)",
-        "show_new": "Pokaż nowe",
-        "up_to_date": "Na bieżąco",
-        "no_more_statuses": "Brak kolejnych statusów",
-        "no_statuses": "Brak statusów"
-    },
-    "status": {
-        "favorites": "Ulubione",
-        "repeats": "Powtórzenia",
-        "delete": "Usuń status",
-        "pin": "Przypnij na profilu",
-        "unpin": "Odepnij z profilu",
-        "pinned": "Przypnięte",
-        "delete_confirm": "Czy naprawdę chcesz usunąć ten status?",
-        "reply_to": "Odpowiedź dla",
-        "replies_list": "Odpowiedzi:",
-        "mute_conversation": "Wycisz konwersację",
-        "unmute_conversation": "Odcisz konwersację",
-        "status_unavailable": "Status niedostępny",
-        "copy_link": "Kopiuj link do statusu"
-    },
-    "user_card": {
-        "approve": "Przyjmij",
-        "block": "Zablokuj",
-        "blocked": "Zablokowany!",
-        "deny": "Odrzuć",
-        "favorites": "Ulubione",
-        "follow": "Obserwuj",
-        "follow_sent": "Wysłano prośbę!",
-        "follow_progress": "Wysyłam prośbę…",
-        "follow_again": "Wysłać prośbę ponownie?",
-        "follow_unfollow": "Przestań obserwować",
-        "followees": "Obserwowani",
-        "followers": "Obserwujący",
-        "following": "Obserwowany!",
-        "follows_you": "Obserwuje cię!",
-        "hidden": "Ukryte",
-        "its_you": "To ty!",
-        "media": "Media",
-        "mention": "Wspomnienie",
-        "mute": "Wycisz",
-        "muted": "Wyciszony(-a)",
-        "per_day": "dziennie",
-        "remote_follow": "Zdalna obserwacja",
-        "report": "Zgłoś",
-        "statuses": "Statusy",
-        "subscribe": "Subskrybuj",
-        "unsubscribe": "Odsubskrybuj",
-        "unblock": "Odblokuj",
-        "unblock_progress": "Odblokowuję…",
-        "block_progress": "Blokuję…",
-        "unmute": "Cofnij wyciszenie",
-        "unmute_progress": "Cofam wyciszenie…",
-        "mute_progress": "Wyciszam…",
-        "hide_repeats": "Ukryj powtórzenia",
-        "show_repeats": "Pokaż powtórzenia",
-        "admin_menu": {
-            "moderation": "Moderacja",
-            "grant_admin": "Przyznaj admina",
-            "revoke_admin": "Odwołaj admina",
-            "grant_moderator": "Przyznaj moderatora",
-            "revoke_moderator": "Odwołaj moderatora",
-            "activate_account": "Aktywuj konto",
-            "deactivate_account": "Dezaktywuj konto",
-            "delete_account": "Usuń konto",
-            "force_nsfw": "Oznacz wszystkie posty jako NSFW",
-            "strip_media": "Usuń multimedia z postów",
-            "force_unlisted": "Wymuś posty na niepubliczne",
-            "sandbox": "Wymuś by posty były tylko dla obserwujących",
-            "disable_remote_subscription": "Zakaż obserwowania użytkownika ze zdalnych instancji",
-            "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika",
-            "quarantine": "Zakaż federowania postów od tego użytkownika",
-            "delete_user": "Usuń użytkownika",
-            "delete_user_confirmation": "Czy jesteś absolutnie pewny(-a)? Ta operacja nie może być cofnięta."
-        }
-    },
-    "user_profile": {
-        "timeline_title": "Oś czasu użytkownika",
-        "profile_does_not_exist": "Przepraszamy, ten profil nie istnieje.",
-        "profile_loading_error": "Przepraszamy, wystąpił błąd podczas ładowania tego profilu."
-    },
-    "user_reporting": {
-        "title": "Raportowanie {0}",
-        "add_comment_description": "Zgłoszenie zostanie wysłane do moderatorów instancji. Możesz dodać powód dlaczego zgłaszasz owe konto poniżej:",
-        "additional_comments": "Dodatkowe komentarze",
-        "forward_description": "To konto jest z innego serwera. Wysłać również tam kopię zgłoszenia?",
-        "forward_to": "Przekaż do {0}",
-        "submit": "Wyślij",
-        "generic_error": "Wystąpił błąd podczas przetwarzania twojej prośby."
-    },
-    "who_to_follow": {
-        "more": "Więcej",
-        "who_to_follow": "Propozycje obserwacji"
-    },
-    "tool_tip": {
-        "media_upload": "Wyślij media",
-        "repeat": "Powtórz",
-        "reply": "Odpowiedz",
-        "favorite": "Dodaj do ulubionych",
-        "add_reaction": "Dodaj reakcję",
-        "user_settings": "Ustawienia użytkownika",
-        "accept_follow_request": "Akceptuj prośbę o możliwość obserwacji",
-        "reject_follow_request": "Odrzuć prośbę o możliwość obserwacji"
-    },
-    "upload": {
-        "error": {
-            "base": "Wysyłanie nie powiodło się.",
-            "file_too_big": "Zbyt duży plik [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "Spróbuj ponownie później"
-        },
-        "file_size_units": {
-            "B": "B",
-            "KiB": "KiB",
-            "MiB": "MiB",
-            "GiB": "GiB",
-            "TiB": "TiB"
-        }
-    },
-    "search": {
-        "people": "Ludzie",
-        "hashtags": "Hasztagi",
-        "person_talking": "{count} osoba rozmawia o tym",
-        "people_talking": "{count} osób rozmawia o tym",
-        "no_results": "Brak wyników"
-    },
-    "password_reset": {
-        "forgot_password": "Zapomniałeś(-aś) hasła?",
-        "password_reset": "Reset hasła",
-        "instruction": "Wprowadź swój adres email lub nazwę użytkownika. Wyślemy ci link z którym możesz zresetować hasło.",
-        "placeholder": "Twój email lub nazwa użytkownika",
-        "check_email": "Sprawdź pocztę, aby uzyskać link do zresetowania hasła.",
-        "return_home": "Wróć do strony głównej",
-        "not_found": "Nie mogliśmy znaleźć tego emaila lub nazwy użytkownika.",
-        "too_many_requests": "Przekroczyłeś(-aś) limit prób, spróbuj ponownie później.",
-        "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
-        "password_reset_required": "Musisz zresetować hasło, by się zalogować.",
-        "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji."
+    "staff": "Administracja"
+  },
+  "chat": {
+    "title": "Czat"
+  },
+  "domain_mute_card": {
+    "mute": "Wycisz",
+    "mute_progress": "Wyciszam...",
+    "unmute": "Odcisz",
+    "unmute_progress": "Odciszam..."
+  },
+  "exporter": {
+    "export": "Eksportuj",
+    "processing": "Przetwarzam, za chwilę zostaniesz zapytany(-na) o ściągnięcie pliku"
+  },
+  "features_panel": {
+    "chat": "Czat",
+    "gopher": "Gopher",
+    "media_proxy": "Proxy mediów",
+    "scope_options": "Ustawienia zakresu",
+    "text_limit": "Limit tekstu",
+    "title": "Funkcje",
+    "who_to_follow": "Propozycje obserwacji"
+  },
+  "finder": {
+    "error_fetching_user": "Błąd przy pobieraniu profilu",
+    "find_user": "Znajdź użytkownika"
+  },
+  "general": {
+    "apply": "Zastosuj",
+    "submit": "Wyślij",
+    "more": "Więcej",
+    "generic_error": "Wystąpił błąd",
+    "optional": "nieobowiązkowe",
+    "show_more": "Pokaż więcej",
+    "show_less": "Pokaż mniej",
+    "dismiss": "Odrzuć",
+    "cancel": "Anuluj",
+    "disable": "Wyłącz",
+    "enable": "Włącz",
+    "confirm": "Potwierdź",
+    "verify": "Zweryfikuj"
+  },
+  "image_cropper": {
+    "crop_picture": "Przytnij obrazek",
+    "save": "Zapisz",
+    "save_without_cropping": "Zapisz bez przycinania",
+    "cancel": "Anuluj"
+  },
+  "importer": {
+    "submit": "Wyślij",
+    "success": "Zaimportowano pomyślnie.",
+    "error": "Wystąpił błąd podczas importowania pliku."
+  },
+  "login": {
+    "login": "Zaloguj",
+    "description": "Zaloguj używając OAuth",
+    "logout": "Wyloguj",
+    "password": "Hasło",
+    "placeholder": "n.p. lain",
+    "register": "Zarejestruj",
+    "username": "Użytkownik",
+    "hint": "Zaloguj się, aby dołączyć do dyskusji",
+    "authentication_code": "Kod weryfikacyjny",
+    "enter_recovery_code": "Wprowadź kod zapasowy",
+    "enter_two_factor_code": "Wprowadź kod weryfikacyjny",
+    "recovery_code": "Kod zapasowy",
+    "heading": {
+      "totp": "Weryfikacja dwuetapowa",
+      "recovery": "Zapasowa weryfikacja dwuetapowa"
     }
+  },
+  "media_modal": {
+    "previous": "Poprzednie",
+    "next": "Następne"
+  },
+  "nav": {
+    "about": "O nas",
+    "administration": "Administracja",
+    "back": "Wróć",
+    "chat": "Lokalny czat",
+    "friend_requests": "Prośby o możliwość obserwacji",
+    "mentions": "Wzmianki",
+    "interactions": "Interakcje",
+    "dms": "Wiadomości prywatne",
+    "public_tl": "Publiczna oś czasu",
+    "timeline": "Oś czasu",
+    "twkn": "Cała znana sieć",
+    "user_search": "Wyszukiwanie użytkowników",
+    "search": "Wyszukiwanie",
+    "who_to_follow": "Sugestie obserwacji",
+    "preferences": "Preferencje"
+  },
+  "notifications": {
+    "broken_favorite": "Nieznany status, szukam go…",
+    "favorited_you": "dodał(-a) twój status do ulubionych",
+    "followed_you": "obserwuje cię",
+    "load_older": "Załaduj starsze powiadomienia",
+    "notifications": "Powiadomienia",
+    "read": "Przeczytane!",
+    "repeated_you": "powtórzył(-a) twój status",
+    "no_more_notifications": "Nie masz więcej powiadomień",
+    "migrated_to": "wyemigrował do",
+    "reacted_with": "zareagował z {0}",
+    "follow_request": "chce ciebie obserwować"
+  },
+  "polls": {
+    "add_poll": "Dodaj ankietę",
+    "add_option": "Dodaj opcję",
+    "option": "Opcja",
+    "votes": "głosów",
+    "vote": "Głosuj",
+    "type": "Typ ankiety",
+    "single_choice": "jednokrotnego wyboru",
+    "multiple_choices": "wielokrotnego wyboru",
+    "expiry": "Czas trwania ankiety",
+    "expires_in": "Ankieta kończy się za {0}",
+    "expired": "Ankieta skończyła się {0} temu",
+    "not_enough_options": "Zbyt mało unikalnych opcji w ankiecie"
+  },
+  "emoji": {
+    "stickers": "Naklejki",
+    "emoji": "Emoji",
+    "keep_open": "Zostaw selektor otwarty",
+    "search_emoji": "Wyszukaj emoji",
+    "add_emoji": "Wstaw emoji",
+    "custom": "Niestandardowe emoji",
+    "unicode": "Emoji unicode",
+    "load_all_hint": "Załadowano pierwsze {saneAmount} emoji, Załadowanie wszystkich emoji może spowodować problemy z wydajnością.",
+    "load_all": "Ładuję wszystkie {emojiAmount} emoji"
+  },
+  "interactions": {
+    "favs_repeats": "Powtórzenia i ulubione",
+    "follows": "Nowi obserwujący",
+    "moves": "Użytkownik migruje",
+    "load_older": "Załaduj starsze interakcje"
+  },
+  "post_status": {
+    "new_status": "Dodaj nowy status",
+    "account_not_locked_warning": "Twoje konto nie jest {0}. Każdy może cię zaobserwować aby zobaczyć wpisy tylko dla obserwujących.",
+    "account_not_locked_warning_link": "zablokowane",
+    "attachments_sensitive": "Oznacz załączniki jako wrażliwe",
+    "content_type": {
+      "text/plain": "Czysty tekst",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_warning": "Temat (nieobowiązkowy)",
+    "default": "Właśnie wróciłem z kościoła",
+    "direct_warning_to_all": "Ten wpis zobaczą wszystkie osoby, o których wspomniałeś(-aś).",
+    "direct_warning_to_first_only": "Ten wpis zobaczą tylko te osoby, o których wspomniałeś(-aś) na początku wiadomości.",
+    "posting": "Wysyłanie",
+    "scope_notice": {
+      "public": "Ten post będzie widoczny dla każdego",
+      "private": "Ten post będzie widoczny tylko dla twoich obserwujących",
+      "unlisted": "Ten post nie będzie widoczny na publicznej osi czasu i całej znanej sieci"
+    },
+    "scope": {
+      "direct": "Bezpośredni – Tylko dla wspomnianych użytkowników",
+      "private": "Tylko dla obserwujących – Umieść dla osób, które cię obserwują",
+      "public": "Publiczny – Umieść na publicznych osiach czasu",
+      "unlisted": "Niewidoczny – Nie umieszczaj na publicznych osiach czasu"
+    }
+  },
+  "registration": {
+    "bio": "Bio",
+    "email": "E-mail",
+    "fullname": "Wyświetlana nazwa profilu",
+    "password_confirm": "Potwierdzenie hasła",
+    "registration": "Rejestracja",
+    "token": "Token zaproszenia",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Naciśnij na obrazek, aby dostać nowy kod captcha",
+    "username_placeholder": "np. lain",
+    "fullname_placeholder": "np. Lain Iwakura",
+    "bio_placeholder": "e.g.\nCześć, jestem Lain.\nJestem dziewczynką z anime żyjącą na peryferiach Japonii. Możesz znać mnie z Wired.",
+    "validations": {
+      "username_required": "nie może być pusta",
+      "fullname_required": "nie może być pusta",
+      "email_required": "nie może być pusty",
+      "password_required": "nie może być puste",
+      "password_confirmation_required": "nie może być puste",
+      "password_confirmation_match": "musi być takie jak hasło"
+    }
+  },
+  "remote_user_resolver": {
+    "remote_user_resolver": "Wyszukiwarka użytkowników nietutejszych",
+    "searching_for": "Szukam",
+    "error": "Nie znaleziono."
+  },
+  "selectable_list": {
+    "select_all": "Zaznacz wszystko"
+  },
+  "settings": {
+    "app_name": "Nazwa aplikacji",
+    "security": "Bezpieczeństwo",
+    "enter_current_password_to_confirm": "Wprowadź obecne hasło, by potwierdzić twoją tożsamość",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "Ustaw OTP",
+      "wait_pre_setup_otp": "początkowe ustawianie OTP",
+      "confirm_and_enable": "Potwierdź i włącz OTP",
+      "title": "Weryfikacja dwuetapowa",
+      "generate_new_recovery_codes": "Wygeneruj nowe kody zapasowe",
+      "warning_of_generate_new_codes": "Po tym gdy wygenerujesz nowe kody zapasowe, stare przestaną działać.",
+      "recovery_codes": "Kody zapasowe.",
+      "waiting_a_recovery_codes": "Otrzymuję kody zapasowe...",
+      "recovery_codes_warning": "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał(-a) dostępu do swojego konta.",
+      "authentication_methods": "Metody weryfikacji",
+      "scan": {
+        "title": "Skanuj",
+        "desc": "Zeskanuj ten kod QR używając twojej aplikacji 2FA albo wpisz ten klucz:",
+        "secret_code": "Klucz"
+      },
+      "verify": {
+        "desc": "By włączyć weryfikację dwuetapową, wpisz kod z twojej aplikacji 2FA:"
+      }
+    },
+    "allow_following_move": "Zezwalaj na automatyczną obserwację gdy obserwowane konto migruje",
+    "attachmentRadius": "Załączniki",
+    "attachments": "Załączniki",
+    "autoload": "Włącz automatyczne ładowanie po przewinięciu do końca strony",
+    "avatar": "Awatar",
+    "avatarAltRadius": "Awatary (powiadomienia)",
+    "avatarRadius": "Awatary",
+    "background": "Tło",
+    "bio": "Bio",
+    "block_export": "Eksport blokad",
+    "block_export_button": "Eksportuj twoje blokady do pliku .csv",
+    "block_import": "Import blokad",
+    "block_import_error": "Wystąpił błąd podczas importowania blokad",
+    "blocks_imported": "Zaimportowano blokady, przetwarzanie może zająć trochę czasu.",
+    "blocks_tab": "Bloki",
+    "btnRadius": "Przyciski",
+    "cBlue": "Niebieski (odpowiedz, obserwuj)",
+    "cGreen": "Zielony (powtórzenia)",
+    "cOrange": "Pomarańczowy (ulubione)",
+    "cRed": "Czerwony (anuluj)",
+    "change_email": "Zmień email",
+    "change_email_error": "Wystąpił problem podczas zmiany emaila.",
+    "changed_email": "Pomyślnie zmieniono email!",
+    "change_password": "Zmień hasło",
+    "change_password_error": "Podczas zmiany hasła wystąpił problem.",
+    "changed_password": "Pomyślnie zmieniono hasło!",
+    "collapse_subject": "Zwijaj posty z tematami",
+    "composing": "Pisanie",
+    "confirm_new_password": "Potwierdź nowe hasło",
+    "current_avatar": "Twój obecny awatar",
+    "current_password": "Obecne hasło",
+    "current_profile_banner": "Twój obecny banner profilu",
+    "data_import_export_tab": "Import/eksport danych",
+    "default_vis": "Domyślny zakres widoczności",
+    "delete_account": "Usuń konto",
+    "delete_account_description": "Trwale usuń dane i zdezaktywuj konto.",
+    "delete_account_error": "Wystąpił problem z usuwaniem twojego konta. Jeżeli problem powtarza się, poinformuj administratora swojej instancji.",
+    "delete_account_instructions": "Wprowadź swoje hasło w poniższe pole aby potwierdzić usunięcie konta.",
+    "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługach",
+    "domain_mutes": "Domeny",
+    "avatar_size_instruction": "Zalecany minimalny rozmiar awatarów to 150x150 pikseli.",
+    "pad_emoji": "Dodaj odstęp z obu stron emoji podczas dodawania selektorem",
+    "emoji_reactions_on_timeline": "Pokaż reakcje emoji na osi czasu",
+    "export_theme": "Zapisz motyw",
+    "filtering": "Filtrowanie",
+    "filtering_explanation": "Wszystkie statusy zawierające te słowa będą wyciszone. Jedno słowo na linijkę.",
+    "follow_export": "Eksport obserwowanych",
+    "follow_export_button": "Eksportuj swoją listę obserwowanych do pliku CSV",
+    "follow_import": "Import obserwowanych",
+    "follow_import_error": "Błąd przy importowaniu obserwowanych",
+    "follows_imported": "Obserwowani zaimportowani! Przetwarzanie może trochę potrwać.",
+    "accent": "Akcent",
+    "foreground": "Pierwszy plan",
+    "general": "Ogólne",
+    "hide_attachments_in_convo": "Ukrywaj załączniki w rozmowach",
+    "hide_attachments_in_tl": "Ukrywaj załączniki w osi czasu",
+    "hide_muted_posts": "Ukrywaj wpisy wyciszonych użytkowników",
+    "max_thumbnails": "Maksymalna liczba miniatur w poście",
+    "hide_isp": "Ukryj panel informacji o instancji",
+    "preload_images": "Ładuj wstępnie obrazy",
+    "use_one_click_nsfw": "Otwieraj załączniki NSFW jednym kliknięciem",
+    "hide_post_stats": "Ukrywaj statysyki postów (np. liczbę polubień)",
+    "hide_user_stats": "Ukrywaj statysyki użytkowników (np. liczbę obserwujących)",
+    "hide_filtered_statuses": "Ukrywaj filtrowane statusy",
+    "import_blocks_from_a_csv_file": "Importuj blokady z pliku CSV",
+    "import_followers_from_a_csv_file": "Importuj obserwowanych z pliku CSV",
+    "import_theme": "Załaduj motyw",
+    "inputRadius": "Pola tekstowe",
+    "checkboxRadius": "Pola wyboru",
+    "instance_default": "(domyślnie: {value})",
+    "instance_default_simple": "(domyślne)",
+    "interface": "Interfejs",
+    "interfaceLanguage": "Język interfejsu",
+    "invalid_theme_imported": "Wybrany plik nie jest obsługiwanym motywem Pleromy. Nie dokonano zmian w twoim motywie.",
+    "limited_availability": "Niedostępne w twojej przeglądarce",
+    "links": "Łącza",
+    "lock_account_description": "Spraw, by konto mogli wyświetlać tylko zatwierdzeni obserwujący",
+    "loop_video": "Zapętlaj filmy",
+    "loop_video_silent_only": "Zapętlaj tylko filmy bez dźwięku (np. mastodonowe „gify”)",
+    "mutes_tab": "Wyciszenia",
+    "play_videos_in_modal": "Odtwarzaj filmy bezpośrednio w przeglądarce mediów",
+    "use_contain_fit": "Nie przycinaj załączników na miniaturach",
+    "name": "Imię",
+    "name_bio": "Imię i bio",
+    "new_email": "Nowy email",
+    "new_password": "Nowe hasło",
+    "notification_visibility": "Rodzaje powiadomień do wyświetlania",
+    "notification_visibility_follows": "Obserwacje",
+    "notification_visibility_likes": "Ulubione",
+    "notification_visibility_mentions": "Wzmianki",
+    "notification_visibility_repeats": "Powtórzenia",
+    "notification_visibility_moves": "Użytkownik migruje",
+    "notification_visibility_emoji_reactions": "Reakcje",
+    "no_rich_text_description": "Usuwaj formatowanie ze wszystkich postów",
+    "no_blocks": "Bez blokad",
+    "no_mutes": "Bez wyciszeń",
+    "hide_follows_description": "Nie pokazuj kogo obserwuję",
+    "hide_followers_description": "Nie pokazuj kto mnie obserwuje",
+    "hide_follows_count_description": "Nie pokazuj licznika obserwowanych",
+    "hide_followers_count_description": "Nie pokazuj licznika obserwujących",
+    "show_admin_badge": "Pokazuj odznakę Administrator na moim profilu",
+    "show_moderator_badge": "Pokazuj odznakę Moderator na moim profilu",
+    "nsfw_clickthrough": "Włącz domyślne ukrywanie załączników o treści nieprzyzwoitej (NSFW)",
+    "oauth_tokens": "Tokeny OAuth",
+    "token": "Token",
+    "refresh_token": "Odśwież token",
+    "valid_until": "Ważne do",
+    "revoke_token": "Odwołać",
+    "panelRadius": "Panele",
+    "pause_on_unfocused": "Wstrzymuj strumieniowanie kiedy karta nie jest aktywna",
+    "presets": "Gotowe motywy",
+    "profile_background": "Tło profilu",
+    "profile_banner": "Banner profilu",
+    "profile_tab": "Profil",
+    "radii_help": "Ustaw zaokrąglenie krawędzi interfejsu (w pikselach)",
+    "replies_in_timeline": "Odpowiedzi na osi czasu",
+    "reply_link_preview": "Włącz dymek z podglądem postu po najechaniu na znak odpowiedzi",
+    "reply_visibility_all": "Pokazuj wszystkie odpowiedzi",
+    "reply_visibility_following": "Pokazuj tylko odpowiedzi skierowane do mnie i osób które obserwuję",
+    "reply_visibility_self": "Pokazuj tylko odpowiedzi skierowane do mnie",
+    "autohide_floating_post_button": "Ukryj automatycznie przycisk \"Nowy post\" (mobile)",
+    "saving_err": "Nie udało się zapisać ustawień",
+    "saving_ok": "Zapisano ustawienia",
+    "search_user_to_block": "Wyszukaj kogo chcesz zablokować",
+    "search_user_to_mute": "Wyszukaj kogo chcesz wyciszyć",
+    "security_tab": "Bezpieczeństwo",
+    "scope_copy": "Kopiuj zakres podczas odpowiadania (DM-y zawsze są kopiowane)",
+    "minimal_scopes_mode": "Zminimalizuj opcje wyboru zakresu postów",
+    "set_new_avatar": "Ustaw nowy awatar",
+    "set_new_profile_background": "Ustaw nowe tło profilu",
+    "set_new_profile_banner": "Ustaw nowy banner profilu",
+    "settings": "Ustawienia",
+    "subject_input_always_show": "Zawsze pokazuj pole tematu",
+    "subject_line_behavior": "Kopiuj temat podczas odpowiedzi",
+    "subject_line_email": "Jak w mailach – „re: temat”",
+    "subject_line_mastodon": "Jak na Mastodonie – po prostu kopiuj",
+    "subject_line_noop": "Nie kopiuj",
+    "post_status_content_type": "Post status content type",
+    "stop_gifs": "Odtwarzaj GIFy po najechaniu kursorem",
+    "streaming": "Włącz automatycznie strumieniowanie nowych postów gdy jesteś na początku strony",
+    "user_mutes": "Użytkownicy",
+    "useStreamingApi": "Otrzymuj posty i powiadomienia w czasie rzeczywistym",
+    "useStreamingApiWarning": "(Niezalecane, eksperymentalne, pomija posty)",
+    "text": "Tekst",
+    "theme": "Motyw",
+    "theme_help": "Użyj kolorów w notacji szesnastkowej (#rrggbb), by stworzyć swój motyw.",
+    "theme_help_v2_1": "Możesz też zastąpić kolory i widoczność poszczególnych komponentów przełączając pola wyboru, użyj „Wyczyść wszystko” aby usunąć wszystkie zastąpienia.",
+    "theme_help_v2_2": "Ikony pod niektórych wpisami są wskaźnikami kontrastu pomiędzy tłem a tekstem, po najechaniu na nie otrzymasz szczegółowe informacje. Zapamiętaj, że jeżeli używasz przezroczystości, wskaźniki pokazują najgorszy możliwy przypadek.",
+    "tooltipRadius": "Etykiety/alerty",
+    "type_domains_to_mute": "Wpisz domeny, które chcesz wyciszyć",
+    "upload_a_photo": "Wyślij zdjęcie",
+    "user_settings": "Ustawienia użytkownika",
+    "values": {
+      "false": "nie",
+      "true": "tak"
+    },
+    "fun": "Zabawa",
+    "greentext": "Memiczne strzałki",
+    "notifications": "Powiadomienia",
+    "notification_setting": "Otrzymuj powiadomienia od:",
+    "notification_setting_follows": "Ludzi których obserwujesz",
+    "notification_setting_non_follows": "Ludzi których nie obserwujesz",
+    "notification_setting_followers": "Ludzi którzy obserwują ciebie",
+    "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
+    "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
+    "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
+    "enable_web_push_notifications": "Włącz powiadomienia push",
+    "style": {
+      "switcher": {
+        "keep_color": "Zachowaj kolory",
+        "keep_shadows": "Zachowaj cienie",
+        "keep_opacity": "Zachowaj widoczność",
+        "keep_roundness": "Zachowaj zaokrąglenie",
+        "keep_fonts": "Zachowaj czcionki",
+        "save_load_hint": "Opcje „zachowaj” pozwalają na pozostanie przy obecnych opcjach po wybraniu lub załadowaniu motywu, jak i przechowywanie ich podczas eksportowania motywu. Jeżeli wszystkie opcje są odznaczone, eksportowanie motywu spowoduje zapisanie wszystkiego.",
+        "reset": "Wyzeruj",
+        "clear_all": "Wyczyść wszystko",
+        "clear_opacity": "Wyczyść widoczność",
+        "load_theme": "Załaduj motyw",
+        "keep_as_is": "Zostaw po staremu",
+        "use_snapshot": "Stara wersja",
+        "use_source": "Nowa wersja",
+        "help": {
+          "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż zapamiętałeś(-aś).",
+          "v2_imported": "Plik który zaimportowałeś(-aś) został stworzony dla starszego FE. Próbujemy zwiększyć kompatybilność, lecz wciąż mogą występować rozbieżności.",
+          "future_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w nowszej wersji FE.",
+          "older_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w starszej wersji FE.",
+          "snapshot_present": "Migawka motywu jest załadowana, więc wszystkie wartości zostały nadpisane. Zamiast tego możesz załadować właściwe dane motywu.",
+          "snapshot_missing": "Nie znaleziono migawki motywu w pliku, więc motyw może wyglądać inaczej niż pierwotnie zaplanowano.",
+          "fe_upgraded": "Silnik motywów PleromaFE został zaaktualizowany.",
+          "fe_downgraded": "Wersja PleromaFE została cofnięta.",
+          "migration_snapshot_ok": "Żeby być bezpiecznym, migawka motywu została załadowana. Możesz spróbować załadować dane motywu.",
+          "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż zapamiętałeś(-aś).",
+          "snapshot_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaktualizowane ponownie, jeśli zmieniłeś(-aś) motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji."
+        }
+      },
+      "common": {
+        "color": "Kolor",
+        "opacity": "Widoczność",
+        "contrast": {
+          "hint": "Współczynnik kontrastu wynosi {ratio}, {level} {context}",
+          "level": {
+            "aa": "spełnia wymogi poziomu AA (minimalne)",
+            "aaa": "spełnia wymogi poziomu AAA (zalecane)",
+            "bad": "nie spełnia żadnych wymogów dostępności"
+          },
+          "context": {
+            "18pt": "dla dużego tekstu (18pt+)",
+            "text": "dla tekstu"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Ogólne",
+        "main": "Ogólne kolory",
+        "foreground_hint": "Zajrzyj do karty „Zaawansowane”, aby uzyskać dokładniejszą kontrolę",
+        "rgbo": "Ikony, wyróżnienia, odznaki"
+      },
+      "advanced_colors": {
+        "_tab_label": "Zaawansowane",
+        "alert": "Tło alertu",
+        "alert_error": "Błąd",
+        "alert_warning": "Ostrzeżenie",
+        "alert_neutral": "Neutralne",
+        "post": "Posty/Bio użytkowników",
+        "badge": "Tło odznaki",
+        "popover": "Etykiety, menu, popovery",
+        "badge_notification": "Powiadomienie",
+        "panel_header": "Nagłówek panelu",
+        "top_bar": "Górny pasek",
+        "borders": "Granice",
+        "buttons": "Przyciski",
+        "inputs": "Pola wejścia",
+        "faint_text": "Zanikający tekst",
+        "underlay": "Podkład",
+        "poll": "Wykres ankiety",
+        "icons": "Ikony",
+        "highlight": "Podświetlone elementy",
+        "pressed": "Naciśnięte",
+        "selectedPost": "Wybrany post",
+        "selectedMenu": "Wybrany element menu",
+        "disabled": "Wyłączone",
+        "toggled": "Przełączone",
+        "tabs": "Karty"
+      },
+      "radii": {
+        "_tab_label": "Zaokrąglenie"
+      },
+      "shadows": {
+        "_tab_label": "Cień i podświetlenie",
+        "component": "Komponent",
+        "override": "Zastąp",
+        "shadow_id": "Cień #{value}",
+        "blur": "Rozmycie",
+        "spread": "Szerokość",
+        "inset": "Inset",
+        "hintV3": "Dla cieni możesz również użyć notacji {0} by użyć inny slot koloru.",
+        "filter_hint": {
+          "always_drop_shadow": "Ostrzeżenie, ten cień zawsze używa {0} jeżeli to obsługiwane przez przeglądarkę.",
+          "drop_shadow_syntax": "{0} nie obsługuje parametru {1} i słowa kluczowego {2}.",
+          "avatar_inset": "Pamiętaj że użycie jednocześnie cieni inset i nie inset na awatarach może dać nieoczekiwane wyniki z przezroczystymi awatarami.",
+          "spread_zero": "Cienie o ujemnej szerokości będą widoczne tak, jakby wynosiła ona zero",
+          "inset_classic": "Cienie inset będą używały {0}"
+        },
+        "components": {
+          "panel": "Panel",
+          "panelHeader": "Nagłówek panelu",
+          "topBar": "Górny pasek",
+          "avatar": "Awatar użytkownika (w widoku profilu)",
+          "avatarStatus": "Awatar użytkownika (w widoku wpisu)",
+          "popup": "Wyskakujące okna i podpowiedzi",
+          "button": "Przycisk",
+          "buttonHover": "Przycisk (po najechaniu)",
+          "buttonPressed": "Przycisk (naciśnięty)",
+          "buttonPressedHover": "Przycisk(naciśnięty+najechany)",
+          "input": "Pole wejścia"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Czcionki",
+        "help": "Wybierz czcionkę używaną przez elementy UI. Jeżeli wybierzesz niestandardową, musisz wpisać dokładnie tę nazwę, pod którą pojawia się w systemie.",
+        "components": {
+          "interface": "Interfejs",
+          "input": "Pola wejścia",
+          "post": "Tekst postu",
+          "postCode": "Tekst o stałej szerokości znaków w sformatowanym poście"
+        },
+        "family": "Nazwa czcionki",
+        "size": "Rozmiar (w pikselach)",
+        "weight": "Grubość",
+        "custom": "Niestandardowa"
+      },
+      "preview": {
+        "header": "Podgląd",
+        "content": "Zawartość",
+        "error": "Przykładowy błąd",
+        "button": "Przycisk",
+        "text": "Trochę więcej {0} i {1}",
+        "mono": "treści",
+        "input": "Właśnie wróciłem z kościoła",
+        "faint_link": "pomocny podręcznik",
+        "fine_print": "Przeczytaj nasz {0}, aby nie nauczyć się niczego przydatnego!",
+        "header_faint": "W porządku",
+        "checkbox": "Przeleciałem(-am) przez zasady użytkowania",
+        "link": "i fajny mały odnośnik"
+      }
+    },
+    "version": {
+      "title": "Wersja",
+      "backend_version": "Wersja back-endu",
+      "frontend_version": "Wersja front-endu"
+    },
+    "notification_setting_privacy": "Prywatność",
+    "notification_setting_filters": "Filtry",
+    "notification_setting_privacy_option": "Ukryj nadawcę i zawartość powiadomień push"
+  },
+  "time": {
+    "day": "{0} dzień",
+    "days": "{0} dni",
+    "day_short": "{0} d",
+    "days_short": "{0} d",
+    "hour": "{0} godzina",
+    "hours": "{0} godzin",
+    "hour_short": "{0} godz.",
+    "hours_short": "{0} godz.",
+    "in_future": "za {0}",
+    "in_past": "{0} temu",
+    "minute": "{0} minuta",
+    "minutes": "{0} minut",
+    "minute_short": "{0} min",
+    "minutes_short": "{0} min",
+    "month": "{0} miesiąc",
+    "months": "{0} miesięcy",
+    "month_short": "{0} mies.",
+    "months_short": "{0} mies.",
+    "now": "teraz",
+    "now_short": "teraz",
+    "second": "{0} sekunda",
+    "seconds": "{0} sekund",
+    "second_short": "{0} s",
+    "seconds_short": "{0} s",
+    "week": "{0} tydzień",
+    "weeks": "{0} tygodni",
+    "week_short": "{0} tydz.",
+    "weeks_short": "{0} tyg.",
+    "year": "{0} rok",
+    "years": "{0} lata",
+    "year_short": "{0} r.",
+    "years_short": "{0} lata"
+  },
+  "timeline": {
+    "collapse": "Zwiń",
+    "conversation": "Rozmowa",
+    "error_fetching": "Błąd pobierania",
+    "load_older": "Załaduj starsze statusy",
+    "no_retweet_hint": "Wpis oznaczony jako tylko dla obserwujących lub bezpośredni nie może zostać powtórzony",
+    "repeated": "powtórzył(-a)",
+    "show_new": "Pokaż nowe",
+    "up_to_date": "Na bieżąco",
+    "no_more_statuses": "Brak kolejnych statusów",
+    "no_statuses": "Brak statusów"
+  },
+  "status": {
+    "favorites": "Ulubione",
+    "repeats": "Powtórzenia",
+    "delete": "Usuń status",
+    "pin": "Przypnij na profilu",
+    "unpin": "Odepnij z profilu",
+    "pinned": "Przypnięte",
+    "delete_confirm": "Czy naprawdę chcesz usunąć ten status?",
+    "reply_to": "Odpowiedź dla",
+    "replies_list": "Odpowiedzi:",
+    "mute_conversation": "Wycisz konwersację",
+    "unmute_conversation": "Odcisz konwersację",
+    "status_unavailable": "Status niedostępny",
+    "copy_link": "Kopiuj link do statusu"
+  },
+  "user_card": {
+    "approve": "Przyjmij",
+    "block": "Zablokuj",
+    "blocked": "Zablokowany!",
+    "deny": "Odrzuć",
+    "favorites": "Ulubione",
+    "follow": "Obserwuj",
+    "follow_sent": "Wysłano prośbę!",
+    "follow_progress": "Wysyłam prośbę…",
+    "follow_again": "Wysłać prośbę ponownie?",
+    "follow_unfollow": "Przestań obserwować",
+    "followees": "Obserwowani",
+    "followers": "Obserwujący",
+    "following": "Obserwowany!",
+    "follows_you": "Obserwuje cię!",
+    "hidden": "Ukryte",
+    "its_you": "To ty!",
+    "media": "Media",
+    "mention": "Wspomnienie",
+    "mute": "Wycisz",
+    "muted": "Wyciszony(-a)",
+    "per_day": "dziennie",
+    "remote_follow": "Zdalna obserwacja",
+    "report": "Zgłoś",
+    "statuses": "Statusy",
+    "subscribe": "Subskrybuj",
+    "unsubscribe": "Odsubskrybuj",
+    "unblock": "Odblokuj",
+    "unblock_progress": "Odblokowuję…",
+    "block_progress": "Blokuję…",
+    "unmute": "Cofnij wyciszenie",
+    "unmute_progress": "Cofam wyciszenie…",
+    "mute_progress": "Wyciszam…",
+    "hide_repeats": "Ukryj powtórzenia",
+    "show_repeats": "Pokaż powtórzenia",
+    "admin_menu": {
+      "moderation": "Moderacja",
+      "grant_admin": "Przyznaj admina",
+      "revoke_admin": "Odwołaj admina",
+      "grant_moderator": "Przyznaj moderatora",
+      "revoke_moderator": "Odwołaj moderatora",
+      "activate_account": "Aktywuj konto",
+      "deactivate_account": "Dezaktywuj konto",
+      "delete_account": "Usuń konto",
+      "force_nsfw": "Oznacz wszystkie posty jako NSFW",
+      "strip_media": "Usuń multimedia z postów",
+      "force_unlisted": "Wymuś posty na niepubliczne",
+      "sandbox": "Wymuś by posty były tylko dla obserwujących",
+      "disable_remote_subscription": "Zakaż obserwowania użytkownika ze zdalnych instancji",
+      "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika",
+      "quarantine": "Zakaż federowania postów od tego użytkownika",
+      "delete_user": "Usuń użytkownika",
+      "delete_user_confirmation": "Czy jesteś absolutnie pewny(-a)? Ta operacja nie może być cofnięta."
+    }
+  },
+  "user_profile": {
+    "timeline_title": "Oś czasu użytkownika",
+    "profile_does_not_exist": "Przepraszamy, ten profil nie istnieje.",
+    "profile_loading_error": "Przepraszamy, wystąpił błąd podczas ładowania tego profilu."
+  },
+  "user_reporting": {
+    "title": "Raportowanie {0}",
+    "add_comment_description": "Zgłoszenie zostanie wysłane do moderatorów instancji. Możesz dodać powód dlaczego zgłaszasz owe konto poniżej:",
+    "additional_comments": "Dodatkowe komentarze",
+    "forward_description": "To konto jest z innego serwera. Wysłać również tam kopię zgłoszenia?",
+    "forward_to": "Przekaż do {0}",
+    "submit": "Wyślij",
+    "generic_error": "Wystąpił błąd podczas przetwarzania twojej prośby."
+  },
+  "who_to_follow": {
+    "more": "Więcej",
+    "who_to_follow": "Propozycje obserwacji"
+  },
+  "tool_tip": {
+    "media_upload": "Wyślij media",
+    "repeat": "Powtórz",
+    "reply": "Odpowiedz",
+    "favorite": "Dodaj do ulubionych",
+    "add_reaction": "Dodaj reakcję",
+    "user_settings": "Ustawienia użytkownika",
+    "accept_follow_request": "Akceptuj prośbę o możliwość obserwacji",
+    "reject_follow_request": "Odrzuć prośbę o możliwość obserwacji"
+  },
+  "upload": {
+    "error": {
+      "base": "Wysyłanie nie powiodło się.",
+      "file_too_big": "Zbyt duży plik [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Spróbuj ponownie później"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "Ludzie",
+    "hashtags": "Hasztagi",
+    "person_talking": "{count} osoba rozmawia o tym",
+    "people_talking": "{count} osób rozmawia o tym",
+    "no_results": "Brak wyników"
+  },
+  "password_reset": {
+    "forgot_password": "Zapomniałeś(-aś) hasła?",
+    "password_reset": "Reset hasła",
+    "instruction": "Wprowadź swój adres email lub nazwę użytkownika. Wyślemy ci link z którym możesz zresetować hasło.",
+    "placeholder": "Twój email lub nazwa użytkownika",
+    "check_email": "Sprawdź pocztę, aby uzyskać link do zresetowania hasła.",
+    "return_home": "Wróć do strony głównej",
+    "not_found": "Nie mogliśmy znaleźć tego emaila lub nazwy użytkownika.",
+    "too_many_requests": "Przekroczyłeś(-aś) limit prób, spróbuj ponownie później.",
+    "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
+    "password_reset_required": "Musisz zresetować hasło, by się zalogować.",
+    "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji."
+  }
 }
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 357d97a8..69b22618 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -1,478 +1,478 @@
 {
-    "chat": {
-        "title": "Чат"
-    },
-    "finder": {
-        "error_fetching_user": "Пользователь не найден",
-        "find_user": "Найти пользователя"
-    },
-    "general": {
-        "apply": "Применить",
-        "submit": "Отправить",
-        "cancel": "Отмена",
-        "disable": "Оключить",
-        "enable": "Включить",
-        "confirm": "Подтвердить",
-        "verify": "Проверить",
-        "more": "Больше",
-        "generic_error": "Произошла ошибка",
-        "optional": "не обязательно",
-        "show_less": "Показать меньше",
-        "show_more": "Показать больше"
-    },
-    "login": {
-        "login": "Войти",
-        "logout": "Выйти",
-        "password": "Пароль",
-        "placeholder": "e.c. lain",
-        "register": "Зарегистрироваться",
-        "username": "Имя пользователя",
-        "authentication_code": "Код аутентификации",
-        "enter_recovery_code": "Ввести код восстановления",
-        "enter_two_factor_code": "Ввести код аутентификации",
-        "recovery_code": "Код восстановления",
-        "heading": {
-            "TotpForm": "Двухфакторная аутентификация",
-            "RecoveryForm": "Two-factor recovery"
-        }
-    },
-    "nav": {
-        "back": "Назад",
-        "chat": "Локальный чат",
-        "mentions": "Упоминания",
-        "interactions": "Взаимодействия",
-        "public_tl": "Публичная лента",
-        "timeline": "Лента",
-        "twkn": "Федеративная лента",
-        "search": "Поиск",
-        "friend_requests": "Запросы на чтение"
-    },
-    "notifications": {
-        "broken_favorite": "Неизвестный статус, ищем...",
-        "favorited_you": "нравится ваш статус",
-        "followed_you": "начал(а) читать вас",
-        "load_older": "Загрузить старые уведомления",
-        "notifications": "Уведомления",
-        "read": "Прочесть",
-        "repeated_you": "повторил(а) ваш статус",
-        "follow_request": "хочет читать вас"
-    },
-    "interactions": {
-        "favs_repeats": "Повторы и фавориты",
-        "follows": "Новые подписки",
-        "load_older": "Загрузить старые взаимодействия"
-    },
-    "post_status": {
-        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может начать читать вас чтобы видеть посты только для подписчиков.",
-        "account_not_locked_warning_link": "залочен",
-        "attachments_sensitive": "Вложения содержат чувствительный контент",
-        "content_warning": "Тема (не обязательно)",
-        "default": "Что нового?",
-        "direct_warning": "Этот пост будет виден только упомянутым пользователям",
-        "posting": "Отправляется",
-        "scope_notice": {
-            "public": "Этот пост будет виден всем",
-            "private": "Этот пост будет виден только вашим подписчикам",
-            "unlisted": "Этот пост не будет виден в публичной и федеративной ленте"
-        },
-        "scope": {
-            "direct": "Личное - этот пост видят только те кто в нём упомянут",
-            "private": "Для подписчиков - этот пост видят только подписчики",
-            "public": "Публичный - этот пост виден всем",
-            "unlisted": "Непубличный - этот пост не виден на публичных лентах"
-        }
-    },
-    "registration": {
-        "bio": "Описание",
-        "email": "Email",
-        "fullname": "Отображаемое имя",
-        "password_confirm": "Подтверждение пароля",
-        "registration": "Регистрация",
-        "token": "Код приглашения",
-        "validations": {
-            "username_required": "не должно быть пустым",
-            "fullname_required": "не должно быть пустым",
-            "email_required": "не должен быть пустым",
-            "password_required": "не должен быть пустым",
-            "password_confirmation_required": "не должно быть пустым",
-            "password_confirmation_match": "должно совпадать с паролем"
-        }
-    },
-    "settings": {
-        "enter_current_password_to_confirm": "Введите свой текущий пароль",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "Настройка OTP",
-            "wait_pre_setup_otp": "предварительная настройка OTP",
-            "confirm_and_enable": "Подтвердить и включить OTP",
-            "title": "Двухфакторная аутентификация",
-            "generate_new_recovery_codes": "Получить новые коды востановления",
-            "warning_of_generate_new_codes": "После получения новых кодов восстановления, старые больше не будут работать.",
-            "recovery_codes": "Коды восстановления.",
-            "waiting_a_recovery_codes": "Получение кодов восстановления ...",
-            "recovery_codes_warning": "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
-            "authentication_methods": "Методы аутентификации",
-            "scan": {
-                "title": "Сканирование",
-                "desc": "Используйте приложение для двухэтапной аутентификации для сканирования этого QR-код или введите текстовый ключ:",
-                "secret_code": "Ключ"
-            },
-            "verify": {
-                "desc": "Чтобы включить двухэтапную аутентификации, введите код из вашего приложение для двухэтапной аутентификации:"
-            }
-        },
-        "attachmentRadius": "Прикреплённые файлы",
-        "attachments": "Вложения",
-        "autoload": "Включить автоматическую загрузку при прокрутке вниз",
-        "avatar": "Аватар",
-        "avatarAltRadius": "Аватары в уведомлениях",
-        "avatarRadius": "Аватары",
-        "background": "Фон",
-        "bio": "Описание",
-        "btnRadius": "Кнопки",
-        "cBlue": "Ответить, читать",
-        "cGreen": "Повторить",
-        "cOrange": "Нравится",
-        "cRed": "Отменить",
-        "change_email": "Сменить email",
-        "change_email_error": "Произошла ошибка при попытке изменить email.",
-        "changed_email": "Email изменён успешно!",
-        "change_password": "Сменить пароль",
-        "change_password_error": "Произошла ошибка при попытке изменить пароль.",
-        "changed_password": "Пароль изменён успешно!",
-        "collapse_subject": "Сворачивать посты с темой",
-        "confirm_new_password": "Подтверждение нового пароля",
-        "current_avatar": "Текущий аватар",
-        "current_password": "Текущий пароль",
-        "current_profile_banner": "Текущий баннер профиля",
-        "data_import_export_tab": "Импорт / Экспорт данных",
-        "delete_account": "Удалить аккаунт",
-        "delete_account_description": "Удалить ваш аккаунт и все ваши сообщения.",
-        "delete_account_error": "Возникла ошибка в процессе удаления вашего аккаунта. Если это повторяется, свяжитесь с администратором вашего сервера.",
-        "delete_account_instructions": "Введите ваш пароль в поле ниже для подтверждения удаления.",
-        "export_theme": "Сохранить Тему",
-        "filtering": "Фильтрация",
-        "filtering_explanation": "Все статусы, содержащие данные слова, будут игнорироваться, по одному в строке",
-        "follow_export": "Экспортировать читаемых",
-        "follow_export_button": "Экспортировать читаемых в файл .csv",
-        "follow_export_processing": "Ведётся обработка, скоро вам будет предложено загрузить файл",
-        "follow_import": "Импортировать читаемых",
-        "follow_import_error": "Ошибка при импортировании читаемых",
-        "follows_imported": "Список читаемых импортирован. Обработка займёт некоторое время..",
-        "foreground": "Передний план",
-        "general": "Общие",
-        "hide_attachments_in_convo": "Прятать вложения в разговорах",
-        "hide_attachments_in_tl": "Прятать вложения в ленте",
-        "hide_isp": "Скрыть серверную панель",
-        "import_followers_from_a_csv_file": "Импортировать читаемых из файла .csv",
-        "import_theme": "Загрузить Тему",
-        "inputRadius": "Поля ввода",
-        "checkboxRadius": "Чекбоксы",
-        "instance_default": "(по умолчанию: {value})",
-        "instance_default_simple": "(по умолчанию)",
-        "interface": "Интерфейс",
-        "interfaceLanguage": "Язык интерфейса",
-        "limited_availability": "Не доступно в вашем браузере",
-        "links": "Ссылки",
-        "lock_account_description": "Аккаунт доступен только подтверждённым подписчикам",
-        "loop_video": "Зациливать видео",
-        "loop_video_silent_only": "Зацикливать только беззвучные видео (т.е. \"гифки\" с Mastodon)",
-        "name": "Имя",
-        "name_bio": "Имя и описание",
-        "new_email": "Новый email",
-        "new_password": "Новый пароль",
-        "fun": "Потешное",
-        "greentext": "Мемные стрелочки",
-        "notification_visibility": "Показывать уведомления",
-        "notification_visibility_follows": "Подписки",
-        "notification_visibility_likes": "Лайки",
-        "notification_visibility_mentions": "Упоминания",
-        "notification_visibility_repeats": "Повторы",
-        "no_rich_text_description": "Убрать форматирование из всех постов",
-        "hide_follows_description": "Не показывать кого я читаю",
-        "hide_followers_description": "Не показывать кто читает меня",
-        "hide_follows_count_description": "Не показывать число читаемых пользователей",
-        "hide_followers_count_description": "Не показывать число моих подписчиков",
-        "show_admin_badge": "Показывать значок администратора в моем профиле",
-        "show_moderator_badge": "Показывать значок модератора в моем профиле",
-        "nsfw_clickthrough": "Включить скрытие NSFW вложений",
-        "oauth_tokens": "OAuth токены",
-        "token": "Токен",
-        "refresh_token": "Рефреш токен",
-        "valid_until": "Годен до",
-        "revoke_token": "Удалить",
-        "panelRadius": "Панели",
-        "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
-        "presets": "Пресеты",
-        "profile_background": "Фон профиля",
-        "profile_banner": "Баннер профиля",
-        "profile_tab": "Профиль",
-        "radii_help": "Скругление углов элементов интерфейса (в пикселях)",
-        "replies_in_timeline": "Ответы в ленте",
-        "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
-        "reply_visibility_all": "Показывать все ответы",
-        "reply_visibility_following": "Показывать только ответы мне или тех на кого я подписан",
-        "reply_visibility_self": "Показывать только ответы мне",
-        "autohide_floating_post_button": "Автоматически скрывать кнопку постинга (в мобильной версии)",
-        "saving_err": "Не удалось сохранить настройки",
-        "saving_ok": "Сохранено",
-        "security_tab": "Безопасность",
-        "scope_copy": "Копировать видимость поста при ответе (всегда включено для Личных Сообщений)",
-        "minimal_scopes_mode": "Минимизировать набор опций видимости поста",
-        "set_new_avatar": "Загрузить новый аватар",
-        "set_new_profile_background": "Загрузить новый фон профиля",
-        "set_new_profile_banner": "Загрузить новый баннер профиля",
-        "settings": "Настройки",
-        "subject_input_always_show": "Всегда показывать поле ввода темы",
-        "stop_gifs": "Проигрывать GIF анимации только при наведении",
-        "streaming": "Включить автоматическую загрузку новых сообщений при прокрутке вверх",
-        "useStreamingApi": "Получать сообщения и уведомления в реальном времени",
-        "useStreamingApiWarning": "(Не рекомендуется, экспериментально, сообщения могут пропадать)",
-        "text": "Текст",
-        "theme": "Тема",
-        "theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",
-        "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения.",
-        "theme_help_v2_2": "Под некоторыми полями ввода это идикаторы контрастности, наведите на них мышью чтобы узнать больше. Приспользовании прозрачности контраст расчитывается для наихудшего варианта.",
-        "tooltipRadius": "Всплывающие подсказки/уведомления",
-        "user_settings": "Настройки пользователя",
-        "values": {
-            "false": "нет",
-            "true": "да"
-        },
-        "style": {
-            "switcher": {
-                "keep_color": "Оставить цвета",
-                "keep_shadows": "Оставить тени",
-                "keep_opacity": "Оставить прозрачность",
-                "keep_roundness": "Оставить скругление",
-                "keep_fonts": "Оставить шрифты",
-                "save_load_hint": "Опции \"оставить...\" позволяют сохранить текущие настройки при выборе другой темы или импорта её из файла. Так же они влияют на то какие компоненты будут сохранены при экспорте темы. Когда все галочки сняты все компоненты будут экспортированы.",
-                "reset": "Сбросить",
-                "clear_all": "Очистить всё",
-                "clear_opacity": "Очистить прозрачность"
-            },
-            "common": {
-                "color": "Цвет",
-                "opacity": "Прозрачность",
-                "contrast": {
-                    "hint": "Уровень контраста: {ratio}, что {level} {context}",
-                    "level": {
-                        "aa": "соответствует гайдлайну Level AA (минимальный)",
-                        "aaa": "соответствует гайдлайну Level AAA (рекомендуемый)",
-                        "bad": "не соответствует каким либо гайдлайнам"
-                    },
-                    "context": {
-                        "18pt": "для крупного (18pt+) текста",
-                        "text": "для текста"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "Общие",
-                "main": "Общие цвета",
-                "foreground_hint": "См. вкладку \"Дополнительно\" для более детального контроля",
-                "rgbo": "Иконки, акценты, ярылки"
-            },
-            "advanced_colors": {
-                "_tab_label": "Дополнительно",
-                "alert": "Фон уведомлений",
-                "alert_error": "Ошибки",
-                "badge": "Фон значков",
-                "badge_notification": "Уведомления",
-                "panel_header": "Заголовок панели",
-                "top_bar": "Верняя полоска",
-                "borders": "Границы",
-                "buttons": "Кнопки",
-                "inputs": "Поля ввода",
-                "faint_text": "Маловажный текст"
-            },
-            "radii": {
-                "_tab_label": "Скругление"
-            },
-            "shadows": {
-                "_tab_label": "Светотень",
-                "component": "Компонент",
-                "override": "Переопределить",
-                "shadow_id": "Тень №{value}",
-                "blur": "Размытие",
-                "spread": "Разброс",
-                "inset": "Внутренняя",
-                "hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
-                "filter_hint": {
-                    "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это.",
-                    "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}.",
-                    "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете.",
-                    "spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
-                    "inset_classic": "Внутренние тени будут использовать {0}"
-                },
-                "components": {
-                    "panel": "Панель",
-                    "panelHeader": "Заголовок панели",
-                    "topBar": "Верхняя полоска",
-                    "avatar": "Аватарка (профиль)",
-                    "avatarStatus": "Аватарка (в ленте)",
-                    "popup": "Всплывающие подсказки",
-                    "button": "Кнопки",
-                    "buttonHover": "Кнопки (наведен курсор)",
-                    "buttonPressed": "Кнопки (нажата)",
-                    "buttonPressedHover": "Кнопки (нажата+наведен курсор)",
-                    "input": "Поля ввода"
-                }
-            },
-            "fonts": {
-                "_tab_label": "Шрифты",
-                "help": "Выберите тип шрифта для использования в интерфейсе. При выборе варианта \"другой\" надо ввести название шрифта в точности как он называется в системе.",
-                "components": {
-                    "interface": "Интерфейс",
-                    "input": "Поля ввода",
-                    "post": "Текст постов",
-                    "postCode": "Моноширинный текст в посте (форматирование)"
-                },
-                "family": "Шрифт",
-                "size": "Размер (в пикселях)",
-                "weight": "Ширина",
-                "custom": "Другой"
-            },
-            "preview": {
-                "header": "Пример",
-                "content": "Контент",
-                "error": "Ошибка стоп 000",
-                "button": "Кнопка",
-                "text": "Еще немного {0} и масенькая {1}",
-                "mono": "контента",
-                "input": "Что нового?",
-                "faint_link": "Его придется убрать",
-                "fine_print": "Если проблемы остались — ваш гуртовщик мыши плохо стоит. {0}.",
-                "header_faint": "Все идет по плану",
-                "checkbox": "Я подтверждаю что не было ни единого разрыва",
-                "link": "ссылка"
-            }
-        },
-        "notification_setting_non_followers": "Не читающие вас",
-        "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
-        "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
-        "notification_setting_followers": "Читающие вас",
-        "notification_setting_follows": "Читаемые вами",
-        "notification_setting_non_follows": "Не читаемые вами"
-    },
-    "timeline": {
-        "collapse": "Свернуть",
-        "conversation": "Разговор",
-        "error_fetching": "Ошибка при обновлении",
-        "load_older": "Загрузить старые статусы",
-        "no_retweet_hint": "Пост помечен как \"только для подписчиков\" или \"личное\" и поэтому не может быть повторён",
-        "repeated": "повторил(а)",
-        "show_new": "Показать новые",
-        "up_to_date": "Обновлено"
-    },
-    "user_card": {
-        "block": "Заблокировать",
-        "blocked": "Заблокирован",
-        "favorites": "Понравившиеся",
-        "follow": "Читать",
-        "follow_sent": "Запрос отправлен!",
-        "follow_progress": "Запрашиваем…",
-        "follow_again": "Запросить еще раз?",
-        "follow_unfollow": "Перестать читать",
-        "followees": "Читаемые",
-        "followers": "Читатели",
-        "following": "Читаю!",
-        "follows_you": "Читает вас!",
-        "mute": "Игнорировать",
-        "muted": "Игнорирую",
-        "per_day": "в день",
-        "remote_follow": "Читать удалённо",
-        "statuses": "Статусы",
-        "admin_menu": {
-            "moderation": "Опции модератора",
-            "grant_admin": "Сделать администратором",
-            "revoke_admin": "Забрать права администратора",
-            "grant_moderator": "Сделать модератором",
-            "revoke_moderator": "Забрать права модератора",
-            "activate_account": "Активировать аккаунт",
-            "deactivate_account": "Деактивировать аккаунт",
-            "delete_account": "Удалить аккаунт",
-            "force_nsfw": "Отмечать посты пользователя как NSFW",
-            "strip_media": "Убирать вложения из постов пользователя",
-            "force_unlisted": "Не добавлять посты в публичные ленты",
-            "sandbox": "Принудить видимость постов только читателям",
-            "disable_remote_subscription": "Запретить читать с удаленных серверов",
-            "disable_any_subscription": "Запретить читать пользователя",
-            "quarantine": "Не федерировать посты пользователя",
-            "delete_user": "Удалить пользователя",
-            "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
-        }
-    },
-    "user_profile": {
-        "timeline_title": "Лента пользователя"
-    },
-    "search": {
-        "people": "Люди",
-        "hashtags": "Хэштэги",
-        "person_talking": "Популярно у {count} человека",
-        "people_talking": "Популярно у {count} человек",
-        "no_results": "Ничего не найдено"
-    },
-    "password_reset": {
-        "forgot_password": "Забыли пароль?",
-        "password_reset": "Сброс пароля",
-        "instruction": "Введите ваш email или имя пользователя, и мы отправим вам ссылку для сброса пароля.",
-        "placeholder": "Ваш email или имя пользователя",
-        "check_email": "Проверьте ваш email и перейдите по ссылке для сброса пароля.",
-        "return_home": "Вернуться на главную страницу",
-        "not_found": "Мы не смогли найти аккаунт с таким email-ом или именем пользователя.",
-        "too_many_requests": "Вы исчерпали допустимое количество попыток, попробуйте позже.",
-        "password_reset_disabled": "Сброс пароля отключен. Cвяжитесь с администратором вашего сервера."
-    },
-    "about": {
-        "mrf": {
-            "federation": "Федерация",
-            "simple": {
-                "accept_desc": "Данный сервер принимает сообщения только со следующих серверов:",
-                "ftl_removal_desc": "Данный сервер скрывает следующие сервера с федеративной ленты:",
-                "media_nsfw_desc": "Данный сервер принужденно помечает вложения со следущих серверов как NSFW:",
-                "simple_policies": "Правила для определенных серверов",
-                "accept": "Принимаемые сообщения",
-                "reject": "Отклоняемые сообщения",
-                "reject_desc": "Данный сервер не принимает сообщения со следующих серверов:",
-                "quarantine": "Зона карантина",
-                "quarantine_desc": "Данный сервер отправляет только публичные посты следующим серверам:",
-                "ftl_removal": "Скрытие с федеративной ленты",
-                "media_removal": "Удаление вложений",
-                "media_removal_desc": "Данный сервер удаляет вложения со следующих серверов:",
-                "media_nsfw": "Принужденно помеченно как NSFW"
-            },
-            "keyword": {
-                "ftl_removal": "Убрать из федеративной ленты",
-                "reject": "Отклонить",
-                "keyword_policies": "Действия на ключевые слова",
-                "replace": "Заменить",
-                "is_replaced_by": "→"
-            },
-            "mrf_policies": "Активные правила MRF (модуль переписывания сообщений)",
-            "mrf_policies_desc": "Правила MRF (модуль переписывания сообщений) влияют на федерацию данного сервера. Следующие правила активны:"
-        },
-        "staff": "Администрация"
-    },
-    "domain_mute_card": {
-        "mute": "Игнорировать",
-        "mute_progress": "В процессе...",
-        "unmute": "Прекратить игнорирование",
-        "unmute_progress": "В процессе..."
-    },
-    "exporter": {
-        "export": "Экспорт",
-        "processing": "Запрос в обработке, вам скоро будет предложено загрузить файл"
-    },
-    "features_panel": {
-        "chat": "Чат",
-        "media_proxy": "Прокси для внешних вложений",
-        "text_limit": "Лимит символов",
-        "title": "Особенности",
-        "gopher": "Gopher"
-    },
-    "tool_tip": {
-        "accept_follow_request": "Принять запрос на чтение",
-        "reject_follow_request": "Отклонить запрос на чтение"
+  "chat": {
+    "title": "Чат"
+  },
+  "finder": {
+    "error_fetching_user": "Пользователь не найден",
+    "find_user": "Найти пользователя"
+  },
+  "general": {
+    "apply": "Применить",
+    "submit": "Отправить",
+    "cancel": "Отмена",
+    "disable": "Оключить",
+    "enable": "Включить",
+    "confirm": "Подтвердить",
+    "verify": "Проверить",
+    "more": "Больше",
+    "generic_error": "Произошла ошибка",
+    "optional": "не обязательно",
+    "show_less": "Показать меньше",
+    "show_more": "Показать больше"
+  },
+  "login": {
+    "login": "Войти",
+    "logout": "Выйти",
+    "password": "Пароль",
+    "placeholder": "e.c. lain",
+    "register": "Зарегистрироваться",
+    "username": "Имя пользователя",
+    "authentication_code": "Код аутентификации",
+    "enter_recovery_code": "Ввести код восстановления",
+    "enter_two_factor_code": "Ввести код аутентификации",
+    "recovery_code": "Код восстановления",
+    "heading": {
+      "TotpForm": "Двухфакторная аутентификация",
+      "RecoveryForm": "Two-factor recovery"
     }
+  },
+  "nav": {
+    "back": "Назад",
+    "chat": "Локальный чат",
+    "mentions": "Упоминания",
+    "interactions": "Взаимодействия",
+    "public_tl": "Публичная лента",
+    "timeline": "Лента",
+    "twkn": "Федеративная лента",
+    "search": "Поиск",
+    "friend_requests": "Запросы на чтение"
+  },
+  "notifications": {
+    "broken_favorite": "Неизвестный статус, ищем...",
+    "favorited_you": "нравится ваш статус",
+    "followed_you": "начал(а) читать вас",
+    "load_older": "Загрузить старые уведомления",
+    "notifications": "Уведомления",
+    "read": "Прочесть",
+    "repeated_you": "повторил(а) ваш статус",
+    "follow_request": "хочет читать вас"
+  },
+  "interactions": {
+    "favs_repeats": "Повторы и фавориты",
+    "follows": "Новые подписки",
+    "load_older": "Загрузить старые взаимодействия"
+  },
+  "post_status": {
+    "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может начать читать вас чтобы видеть посты только для подписчиков.",
+    "account_not_locked_warning_link": "залочен",
+    "attachments_sensitive": "Вложения содержат чувствительный контент",
+    "content_warning": "Тема (не обязательно)",
+    "default": "Что нового?",
+    "direct_warning": "Этот пост будет виден только упомянутым пользователям",
+    "posting": "Отправляется",
+    "scope_notice": {
+      "public": "Этот пост будет виден всем",
+      "private": "Этот пост будет виден только вашим подписчикам",
+      "unlisted": "Этот пост не будет виден в публичной и федеративной ленте"
+    },
+    "scope": {
+      "direct": "Личное - этот пост видят только те кто в нём упомянут",
+      "private": "Для подписчиков - этот пост видят только подписчики",
+      "public": "Публичный - этот пост виден всем",
+      "unlisted": "Непубличный - этот пост не виден на публичных лентах"
+    }
+  },
+  "registration": {
+    "bio": "Описание",
+    "email": "Email",
+    "fullname": "Отображаемое имя",
+    "password_confirm": "Подтверждение пароля",
+    "registration": "Регистрация",
+    "token": "Код приглашения",
+    "validations": {
+      "username_required": "не должно быть пустым",
+      "fullname_required": "не должно быть пустым",
+      "email_required": "не должен быть пустым",
+      "password_required": "не должен быть пустым",
+      "password_confirmation_required": "не должно быть пустым",
+      "password_confirmation_match": "должно совпадать с паролем"
+    }
+  },
+  "settings": {
+    "enter_current_password_to_confirm": "Введите свой текущий пароль",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "Настройка OTP",
+      "wait_pre_setup_otp": "предварительная настройка OTP",
+      "confirm_and_enable": "Подтвердить и включить OTP",
+      "title": "Двухфакторная аутентификация",
+      "generate_new_recovery_codes": "Получить новые коды востановления",
+      "warning_of_generate_new_codes": "После получения новых кодов восстановления, старые больше не будут работать.",
+      "recovery_codes": "Коды восстановления.",
+      "waiting_a_recovery_codes": "Получение кодов восстановления ...",
+      "recovery_codes_warning": "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
+      "authentication_methods": "Методы аутентификации",
+      "scan": {
+        "title": "Сканирование",
+        "desc": "Используйте приложение для двухэтапной аутентификации для сканирования этого QR-код или введите текстовый ключ:",
+        "secret_code": "Ключ"
+      },
+      "verify": {
+        "desc": "Чтобы включить двухэтапную аутентификации, введите код из вашего приложение для двухэтапной аутентификации:"
+      }
+    },
+    "attachmentRadius": "Прикреплённые файлы",
+    "attachments": "Вложения",
+    "autoload": "Включить автоматическую загрузку при прокрутке вниз",
+    "avatar": "Аватар",
+    "avatarAltRadius": "Аватары в уведомлениях",
+    "avatarRadius": "Аватары",
+    "background": "Фон",
+    "bio": "Описание",
+    "btnRadius": "Кнопки",
+    "cBlue": "Ответить, читать",
+    "cGreen": "Повторить",
+    "cOrange": "Нравится",
+    "cRed": "Отменить",
+    "change_email": "Сменить email",
+    "change_email_error": "Произошла ошибка при попытке изменить email.",
+    "changed_email": "Email изменён успешно!",
+    "change_password": "Сменить пароль",
+    "change_password_error": "Произошла ошибка при попытке изменить пароль.",
+    "changed_password": "Пароль изменён успешно!",
+    "collapse_subject": "Сворачивать посты с темой",
+    "confirm_new_password": "Подтверждение нового пароля",
+    "current_avatar": "Текущий аватар",
+    "current_password": "Текущий пароль",
+    "current_profile_banner": "Текущий баннер профиля",
+    "data_import_export_tab": "Импорт / Экспорт данных",
+    "delete_account": "Удалить аккаунт",
+    "delete_account_description": "Удалить ваш аккаунт и все ваши сообщения.",
+    "delete_account_error": "Возникла ошибка в процессе удаления вашего аккаунта. Если это повторяется, свяжитесь с администратором вашего сервера.",
+    "delete_account_instructions": "Введите ваш пароль в поле ниже для подтверждения удаления.",
+    "export_theme": "Сохранить Тему",
+    "filtering": "Фильтрация",
+    "filtering_explanation": "Все статусы, содержащие данные слова, будут игнорироваться, по одному в строке",
+    "follow_export": "Экспортировать читаемых",
+    "follow_export_button": "Экспортировать читаемых в файл .csv",
+    "follow_export_processing": "Ведётся обработка, скоро вам будет предложено загрузить файл",
+    "follow_import": "Импортировать читаемых",
+    "follow_import_error": "Ошибка при импортировании читаемых",
+    "follows_imported": "Список читаемых импортирован. Обработка займёт некоторое время..",
+    "foreground": "Передний план",
+    "general": "Общие",
+    "hide_attachments_in_convo": "Прятать вложения в разговорах",
+    "hide_attachments_in_tl": "Прятать вложения в ленте",
+    "hide_isp": "Скрыть серверную панель",
+    "import_followers_from_a_csv_file": "Импортировать читаемых из файла .csv",
+    "import_theme": "Загрузить Тему",
+    "inputRadius": "Поля ввода",
+    "checkboxRadius": "Чекбоксы",
+    "instance_default": "(по умолчанию: {value})",
+    "instance_default_simple": "(по умолчанию)",
+    "interface": "Интерфейс",
+    "interfaceLanguage": "Язык интерфейса",
+    "limited_availability": "Не доступно в вашем браузере",
+    "links": "Ссылки",
+    "lock_account_description": "Аккаунт доступен только подтверждённым подписчикам",
+    "loop_video": "Зациливать видео",
+    "loop_video_silent_only": "Зацикливать только беззвучные видео (т.е. \"гифки\" с Mastodon)",
+    "name": "Имя",
+    "name_bio": "Имя и описание",
+    "new_email": "Новый email",
+    "new_password": "Новый пароль",
+    "fun": "Потешное",
+    "greentext": "Мемные стрелочки",
+    "notification_visibility": "Показывать уведомления",
+    "notification_visibility_follows": "Подписки",
+    "notification_visibility_likes": "Лайки",
+    "notification_visibility_mentions": "Упоминания",
+    "notification_visibility_repeats": "Повторы",
+    "no_rich_text_description": "Убрать форматирование из всех постов",
+    "hide_follows_description": "Не показывать кого я читаю",
+    "hide_followers_description": "Не показывать кто читает меня",
+    "hide_follows_count_description": "Не показывать число читаемых пользователей",
+    "hide_followers_count_description": "Не показывать число моих подписчиков",
+    "show_admin_badge": "Показывать значок администратора в моем профиле",
+    "show_moderator_badge": "Показывать значок модератора в моем профиле",
+    "nsfw_clickthrough": "Включить скрытие NSFW вложений",
+    "oauth_tokens": "OAuth токены",
+    "token": "Токен",
+    "refresh_token": "Рефреш токен",
+    "valid_until": "Годен до",
+    "revoke_token": "Удалить",
+    "panelRadius": "Панели",
+    "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
+    "presets": "Пресеты",
+    "profile_background": "Фон профиля",
+    "profile_banner": "Баннер профиля",
+    "profile_tab": "Профиль",
+    "radii_help": "Скругление углов элементов интерфейса (в пикселях)",
+    "replies_in_timeline": "Ответы в ленте",
+    "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
+    "reply_visibility_all": "Показывать все ответы",
+    "reply_visibility_following": "Показывать только ответы мне или тех на кого я подписан",
+    "reply_visibility_self": "Показывать только ответы мне",
+    "autohide_floating_post_button": "Автоматически скрывать кнопку постинга (в мобильной версии)",
+    "saving_err": "Не удалось сохранить настройки",
+    "saving_ok": "Сохранено",
+    "security_tab": "Безопасность",
+    "scope_copy": "Копировать видимость поста при ответе (всегда включено для Личных Сообщений)",
+    "minimal_scopes_mode": "Минимизировать набор опций видимости поста",
+    "set_new_avatar": "Загрузить новый аватар",
+    "set_new_profile_background": "Загрузить новый фон профиля",
+    "set_new_profile_banner": "Загрузить новый баннер профиля",
+    "settings": "Настройки",
+    "subject_input_always_show": "Всегда показывать поле ввода темы",
+    "stop_gifs": "Проигрывать GIF анимации только при наведении",
+    "streaming": "Включить автоматическую загрузку новых сообщений при прокрутке вверх",
+    "useStreamingApi": "Получать сообщения и уведомления в реальном времени",
+    "useStreamingApiWarning": "(Не рекомендуется, экспериментально, сообщения могут пропадать)",
+    "text": "Текст",
+    "theme": "Тема",
+    "theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",
+    "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения.",
+    "theme_help_v2_2": "Под некоторыми полями ввода это идикаторы контрастности, наведите на них мышью чтобы узнать больше. Приспользовании прозрачности контраст расчитывается для наихудшего варианта.",
+    "tooltipRadius": "Всплывающие подсказки/уведомления",
+    "user_settings": "Настройки пользователя",
+    "values": {
+      "false": "нет",
+      "true": "да"
+    },
+    "style": {
+      "switcher": {
+        "keep_color": "Оставить цвета",
+        "keep_shadows": "Оставить тени",
+        "keep_opacity": "Оставить прозрачность",
+        "keep_roundness": "Оставить скругление",
+        "keep_fonts": "Оставить шрифты",
+        "save_load_hint": "Опции \"оставить...\" позволяют сохранить текущие настройки при выборе другой темы или импорта её из файла. Так же они влияют на то какие компоненты будут сохранены при экспорте темы. Когда все галочки сняты все компоненты будут экспортированы.",
+        "reset": "Сбросить",
+        "clear_all": "Очистить всё",
+        "clear_opacity": "Очистить прозрачность"
+      },
+      "common": {
+        "color": "Цвет",
+        "opacity": "Прозрачность",
+        "contrast": {
+          "hint": "Уровень контраста: {ratio}, что {level} {context}",
+          "level": {
+            "aa": "соответствует гайдлайну Level AA (минимальный)",
+            "aaa": "соответствует гайдлайну Level AAA (рекомендуемый)",
+            "bad": "не соответствует каким либо гайдлайнам"
+          },
+          "context": {
+            "18pt": "для крупного (18pt+) текста",
+            "text": "для текста"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Общие",
+        "main": "Общие цвета",
+        "foreground_hint": "См. вкладку \"Дополнительно\" для более детального контроля",
+        "rgbo": "Иконки, акценты, ярылки"
+      },
+      "advanced_colors": {
+        "_tab_label": "Дополнительно",
+        "alert": "Фон уведомлений",
+        "alert_error": "Ошибки",
+        "badge": "Фон значков",
+        "badge_notification": "Уведомления",
+        "panel_header": "Заголовок панели",
+        "top_bar": "Верняя полоска",
+        "borders": "Границы",
+        "buttons": "Кнопки",
+        "inputs": "Поля ввода",
+        "faint_text": "Маловажный текст"
+      },
+      "radii": {
+        "_tab_label": "Скругление"
+      },
+      "shadows": {
+        "_tab_label": "Светотень",
+        "component": "Компонент",
+        "override": "Переопределить",
+        "shadow_id": "Тень №{value}",
+        "blur": "Размытие",
+        "spread": "Разброс",
+        "inset": "Внутренняя",
+        "hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
+        "filter_hint": {
+          "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это.",
+          "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}.",
+          "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете.",
+          "spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
+          "inset_classic": "Внутренние тени будут использовать {0}"
+        },
+        "components": {
+          "panel": "Панель",
+          "panelHeader": "Заголовок панели",
+          "topBar": "Верхняя полоска",
+          "avatar": "Аватарка (профиль)",
+          "avatarStatus": "Аватарка (в ленте)",
+          "popup": "Всплывающие подсказки",
+          "button": "Кнопки",
+          "buttonHover": "Кнопки (наведен курсор)",
+          "buttonPressed": "Кнопки (нажата)",
+          "buttonPressedHover": "Кнопки (нажата+наведен курсор)",
+          "input": "Поля ввода"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Шрифты",
+        "help": "Выберите тип шрифта для использования в интерфейсе. При выборе варианта \"другой\" надо ввести название шрифта в точности как он называется в системе.",
+        "components": {
+          "interface": "Интерфейс",
+          "input": "Поля ввода",
+          "post": "Текст постов",
+          "postCode": "Моноширинный текст в посте (форматирование)"
+        },
+        "family": "Шрифт",
+        "size": "Размер (в пикселях)",
+        "weight": "Ширина",
+        "custom": "Другой"
+      },
+      "preview": {
+        "header": "Пример",
+        "content": "Контент",
+        "error": "Ошибка стоп 000",
+        "button": "Кнопка",
+        "text": "Еще немного {0} и масенькая {1}",
+        "mono": "контента",
+        "input": "Что нового?",
+        "faint_link": "Его придется убрать",
+        "fine_print": "Если проблемы остались — ваш гуртовщик мыши плохо стоит. {0}.",
+        "header_faint": "Все идет по плану",
+        "checkbox": "Я подтверждаю что не было ни единого разрыва",
+        "link": "ссылка"
+      }
+    },
+    "notification_setting_non_followers": "Не читающие вас",
+    "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
+    "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
+    "notification_setting_followers": "Читающие вас",
+    "notification_setting_follows": "Читаемые вами",
+    "notification_setting_non_follows": "Не читаемые вами"
+  },
+  "timeline": {
+    "collapse": "Свернуть",
+    "conversation": "Разговор",
+    "error_fetching": "Ошибка при обновлении",
+    "load_older": "Загрузить старые статусы",
+    "no_retweet_hint": "Пост помечен как \"только для подписчиков\" или \"личное\" и поэтому не может быть повторён",
+    "repeated": "повторил(а)",
+    "show_new": "Показать новые",
+    "up_to_date": "Обновлено"
+  },
+  "user_card": {
+    "block": "Заблокировать",
+    "blocked": "Заблокирован",
+    "favorites": "Понравившиеся",
+    "follow": "Читать",
+    "follow_sent": "Запрос отправлен!",
+    "follow_progress": "Запрашиваем…",
+    "follow_again": "Запросить еще раз?",
+    "follow_unfollow": "Перестать читать",
+    "followees": "Читаемые",
+    "followers": "Читатели",
+    "following": "Читаю!",
+    "follows_you": "Читает вас!",
+    "mute": "Игнорировать",
+    "muted": "Игнорирую",
+    "per_day": "в день",
+    "remote_follow": "Читать удалённо",
+    "statuses": "Статусы",
+    "admin_menu": {
+      "moderation": "Опции модератора",
+      "grant_admin": "Сделать администратором",
+      "revoke_admin": "Забрать права администратора",
+      "grant_moderator": "Сделать модератором",
+      "revoke_moderator": "Забрать права модератора",
+      "activate_account": "Активировать аккаунт",
+      "deactivate_account": "Деактивировать аккаунт",
+      "delete_account": "Удалить аккаунт",
+      "force_nsfw": "Отмечать посты пользователя как NSFW",
+      "strip_media": "Убирать вложения из постов пользователя",
+      "force_unlisted": "Не добавлять посты в публичные ленты",
+      "sandbox": "Принудить видимость постов только читателям",
+      "disable_remote_subscription": "Запретить читать с удаленных серверов",
+      "disable_any_subscription": "Запретить читать пользователя",
+      "quarantine": "Не федерировать посты пользователя",
+      "delete_user": "Удалить пользователя",
+      "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
+    }
+  },
+  "user_profile": {
+    "timeline_title": "Лента пользователя"
+  },
+  "search": {
+    "people": "Люди",
+    "hashtags": "Хэштэги",
+    "person_talking": "Популярно у {count} человека",
+    "people_talking": "Популярно у {count} человек",
+    "no_results": "Ничего не найдено"
+  },
+  "password_reset": {
+    "forgot_password": "Забыли пароль?",
+    "password_reset": "Сброс пароля",
+    "instruction": "Введите ваш email или имя пользователя, и мы отправим вам ссылку для сброса пароля.",
+    "placeholder": "Ваш email или имя пользователя",
+    "check_email": "Проверьте ваш email и перейдите по ссылке для сброса пароля.",
+    "return_home": "Вернуться на главную страницу",
+    "not_found": "Мы не смогли найти аккаунт с таким email-ом или именем пользователя.",
+    "too_many_requests": "Вы исчерпали допустимое количество попыток, попробуйте позже.",
+    "password_reset_disabled": "Сброс пароля отключен. Cвяжитесь с администратором вашего сервера."
+  },
+  "about": {
+    "mrf": {
+      "federation": "Федерация",
+      "simple": {
+        "accept_desc": "Данный сервер принимает сообщения только со следующих серверов:",
+        "ftl_removal_desc": "Данный сервер скрывает следующие сервера с федеративной ленты:",
+        "media_nsfw_desc": "Данный сервер принужденно помечает вложения со следущих серверов как NSFW:",
+        "simple_policies": "Правила для определенных серверов",
+        "accept": "Принимаемые сообщения",
+        "reject": "Отклоняемые сообщения",
+        "reject_desc": "Данный сервер не принимает сообщения со следующих серверов:",
+        "quarantine": "Зона карантина",
+        "quarantine_desc": "Данный сервер отправляет только публичные посты следующим серверам:",
+        "ftl_removal": "Скрытие с федеративной ленты",
+        "media_removal": "Удаление вложений",
+        "media_removal_desc": "Данный сервер удаляет вложения со следующих серверов:",
+        "media_nsfw": "Принужденно помеченно как NSFW"
+      },
+      "keyword": {
+        "ftl_removal": "Убрать из федеративной ленты",
+        "reject": "Отклонить",
+        "keyword_policies": "Действия на ключевые слова",
+        "replace": "Заменить",
+        "is_replaced_by": "→"
+      },
+      "mrf_policies": "Активные правила MRF (модуль переписывания сообщений)",
+      "mrf_policies_desc": "Правила MRF (модуль переписывания сообщений) влияют на федерацию данного сервера. Следующие правила активны:"
+    },
+    "staff": "Администрация"
+  },
+  "domain_mute_card": {
+    "mute": "Игнорировать",
+    "mute_progress": "В процессе...",
+    "unmute": "Прекратить игнорирование",
+    "unmute_progress": "В процессе..."
+  },
+  "exporter": {
+    "export": "Экспорт",
+    "processing": "Запрос в обработке, вам скоро будет предложено загрузить файл"
+  },
+  "features_panel": {
+    "chat": "Чат",
+    "media_proxy": "Прокси для внешних вложений",
+    "text_limit": "Лимит символов",
+    "title": "Особенности",
+    "gopher": "Gopher"
+  },
+  "tool_tip": {
+    "accept_follow_request": "Принять запрос на чтение",
+    "reject_follow_request": "Отклонить запрос на чтение"
+  }
 }
diff --git a/src/i18n/te.json b/src/i18n/te.json
index f0953d97..6022349d 100644
--- a/src/i18n/te.json
+++ b/src/i18n/te.json
@@ -1,352 +1,352 @@
 {
-    "chat.title": "చాట్",
-    "features_panel.chat": "చాట్",
-    "features_panel.gopher": "గోఫర్",
-    "features_panel.media_proxy": "మీడియా ప్రాక్సీ",
-    "features_panel.scope_options": "స్కోప్ ఎంపికలు",
-    "features_panel.text_limit": "వచన పరిమితి",
-    "features_panel.title": "లక్షణాలు",
-    "features_panel.who_to_follow": "ఎవరిని అనుసరించాలి",
-    "finder.error_fetching_user": "వినియోగదారుని పొందడంలో లోపం",
-    "finder.find_user": "వినియోగదారుని కనుగొనండి",
-    "general.apply": "వర్తించు",
-    "general.submit": "సమర్పించు",
-    "general.more": "మరిన్ని",
-    "general.generic_error": "ఒక తప్పిదం సంభవించినది",
-    "general.optional": "ఐచ్చికం",
-    "image_cropper.crop_picture": "చిత్రాన్ని కత్తిరించండి",
-    "image_cropper.save": "దాచు",
-    "image_cropper.save_without_cropping": "కత్తిరించకుండా సేవ్ చేయి",
-    "image_cropper.cancel": "రద్దుచేయి",
-    "login.login": "లాగిన్",
-    "login.description": "OAuth తో లాగిన్ అవ్వండి",
-    "login.logout": "లాగౌట్",
-    "login.password": "సంకేతపదము",
-    "login.placeholder": "ఉదా. lain",
-    "login.register": "నమోదు చేసుకోండి",
-    "login.username": "వాడుకరి పేరు",
-    "login.hint": "చర్చలో చేరడానికి లాగిన్ అవ్వండి",
-    "media_modal.previous": "ముందరి పుట",
-    "media_modal.next": "తరువాత",
-    "nav.about": "గురించి",
-    "nav.back": "వెనక్కి",
-    "nav.chat": "స్థానిక చాట్",
-    "nav.friend_requests": "అనుసరించడానికి అభ్యర్థనలు",
-    "nav.mentions": "ప్రస్తావనలు",
-    "nav.dms": "నేరుగా పంపిన సందేశాలు",
-    "nav.public_tl": "ప్రజా కాలక్రమం",
-    "nav.timeline": "కాలక్రమం",
-    "nav.twkn": "మొత్తం తెలిసిన నెట్వర్క్",
-    "nav.user_search": "వాడుకరి శోధన",
-    "nav.who_to_follow": "ఎవరిని అనుసరించాలి",
-    "nav.preferences": "ప్రాధాన్యతలు",
-    "notifications.broken_favorite": "తెలియని స్థితి, దాని కోసం శోధిస్తోంది...",
-    "notifications.favorited_you": "మీ స్థితిని ఇష్టపడ్డారు",
-    "notifications.followed_you": "మిమ్మల్ని అనుసరించారు",
-    "notifications.load_older": "పాత నోటిఫికేషన్లను లోడ్ చేయండి",
-    "notifications.notifications": "ప్రకటనలు",
-    "notifications.read": "చదివాను!",
-    "notifications.repeated_you": "మీ స్థితిని పునరావృతం చేసారు",
-    "notifications.no_more_notifications": "ఇక నోటిఫికేషన్లు లేవు",
-    "post_status.new_status": "క్రొత్త స్థితిని పోస్ట్ చేయండి",
-    "post_status.account_not_locked_warning": "మీ ఖాతా {౦} కాదు. ఎవరైనా మిమ్మల్ని అనుసరించి అనుచరులకు మాత్రమే ఉద్దేశించిన పోస్టులను చూడవచ్చు.",
-    "post_status.account_not_locked_warning_link": "తాళం వేయబడినది",
-    "post_status.attachments_sensitive": "జోడింపులను సున్నితమైనవిగా గుర్తించండి",
-    "post_status.content_type.text/plain": "సాధారణ అక్షరాలు",
-    "post_status.content_type.text/html": "హెచ్‌టిఎమ్ఎల్",
-    "post_status.content_type.text/markdown": "మార్క్డౌన్",
-    "post_status.content_warning": "విషయం (ఐచ్ఛికం)",
-    "post_status.default": "ఇప్పుడే విజయవాడలో దిగాను.",
-    "post_status.direct_warning": "ఈ పోస్ట్ మాత్రమే పేర్కొన్న వినియోగదారులకు మాత్రమే కనిపిస్తుంది.",
-    "post_status.posting": "పోస్ట్ చేస్తున్నా",
-    "post_status.scope.direct": "ప్రత్యక్ష - పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయబడుతుంది",
-    "post_status.scope.private": "అనుచరులకు మాత్రమే - అనుచరులకు మాత్రమే పోస్ట్ చేయబడుతుంది",
-    "post_status.scope.public": "పబ్లిక్ - ప్రజా కాలక్రమాలకు పోస్ట్ చేయబడుతుంది",
-    "post_status.scope.unlisted": "జాబితా చేయబడనిది - ప్రజా కాలక్రమాలకు పోస్ట్ చేయవద్దు",
-    "registration.bio": "బయో",
-    "registration.email": "ఈ మెయిల్",
-    "registration.fullname": "ప్రదర్శన పేరు",
-    "registration.password_confirm": "పాస్వర్డ్ నిర్ధారణ",
-    "registration.registration": "నమోదు",
-    "registration.token": "ఆహ్వాన టోకెన్",
-    "registration.captcha": "కాప్చా",
-    "registration.new_captcha": "కొత్త కాప్చా పొందుటకు చిత్రం మీద క్లిక్ చేయండి",
-    "registration.username_placeholder": "ఉదా. lain",
-    "registration.fullname_placeholder": "ఉదా. Lain Iwakura",
-    "registration.bio_placeholder": "e.g.\nHi, I'm Lain.\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
-    "registration.validations.username_required": "ఖాళీగా విడిచిపెట్టరాదు",
-    "registration.validations.fullname_required": "ఖాళీగా విడిచిపెట్టరాదు",
-    "registration.validations.email_required": "ఖాళీగా విడిచిపెట్టరాదు",
-    "registration.validations.password_required": "ఖాళీగా విడిచిపెట్టరాదు",
-    "registration.validations.password_confirmation_required": "ఖాళీగా విడిచిపెట్టరాదు",
-    "registration.validations.password_confirmation_match": "సంకేతపదం వలె ఉండాలి",
-    "settings.app_name": "అనువర్తన పేరు",
-    "settings.attachmentRadius": "జోడింపులు",
-    "settings.attachments": "జోడింపులు",
-    "settings.autoload": "క్రిందికి స్క్రోల్ చేయబడినప్పుడు స్వయంచాలక లోడింగ్ని ప్రారంభించు",
-    "settings.avatar": "అవతారం",
-    "settings.avatarAltRadius": "అవతారాలు (ప్రకటనలు)",
-    "settings.avatarRadius": "అవతారాలు",
-    "settings.background": "బ్యాక్‌గ్రౌండు",
-    "settings.bio": "బయో",
-    "settings.blocks_tab": "బ్లాక్‌లు",
-    "settings.btnRadius": "బటన్లు",
-    "settings.cBlue": "నీలం (ప్రత్యుత్తరం, అనుసరించండి)",
-    "settings.cGreen": "Green (Retweet)",
-    "settings.cOrange": "ఆరెంజ్ (ఇష్టపడు)",
-    "settings.cRed": "Red (Cancel)",
-    "settings.change_password": "పాస్‌వర్డ్ మార్చండి",
-    "settings.change_password_error": "మీ పాస్వర్డ్ను మార్చడంలో సమస్య ఉంది.",
-    "settings.changed_password": "పాస్వర్డ్ విజయవంతంగా మార్చబడింది!",
-    "settings.collapse_subject": "Collapse posts with subjects",
-    "settings.composing": "Composing",
-    "settings.confirm_new_password": "కొత్త పాస్వర్డ్ను నిర్ధారించండి",
-    "settings.current_avatar": "మీ ప్రస్తుత అవతారం",
-    "settings.current_password": "ప్రస్తుత పాస్వర్డ్",
-    "settings.current_profile_banner": "మీ ప్రస్తుత ప్రొఫైల్ బ్యానర్",
-    "settings.data_import_export_tab": "Data Import / Export",
-    "settings.default_vis": "Default visibility scope",
-    "settings.delete_account": "Delete Account",
-    "settings.delete_account_description": "మీ ఖాతా మరియు మీ అన్ని సందేశాలను శాశ్వతంగా తొలగించండి.",
-    "settings.delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
-    "settings.delete_account_instructions": "ఖాతా తొలగింపును నిర్ధారించడానికి దిగువ ఇన్పుట్లో మీ పాస్వర్డ్ను టైప్ చేయండి.",
-    "settings.avatar_size_instruction": "అవతార్ చిత్రాలకు సిఫార్సు చేసిన కనీస పరిమాణం 150x150 పిక్సెల్స్.",
-    "settings.export_theme": "Save preset",
-    "settings.filtering": "వడపోత",
-    "settings.filtering_explanation": "All statuses containing these words will be muted, one per line",
-    "settings.follow_export": "Follow export",
-    "settings.follow_export_button": "Export your follows to a csv file",
-    "settings.follow_export_processing": "Processing, you'll soon be asked to download your file",
-    "settings.follow_import": "Follow import",
-    "settings.follow_import_error": "అనుచరులను దిగుమతి చేయడంలో లోపం",
-    "settings.follows_imported": "Follows imported! Processing them will take a while.",
-    "settings.foreground": "Foreground",
-    "settings.general": "General",
-    "settings.hide_attachments_in_convo": "సంభాషణలలో జోడింపులను దాచు",
-    "settings.hide_attachments_in_tl": "కాలక్రమంలో జోడింపులను దాచు",
-    "settings.hide_muted_posts": "మ్యూట్ చేసిన వినియోగదారుల యొక్క పోస్ట్లను దాచిపెట్టు",
-    "settings.max_thumbnails": "Maximum amount of thumbnails per post",
-    "settings.hide_isp": "Hide instance-specific panel",
-    "settings.preload_images": "Preload images",
-    "settings.use_one_click_nsfw": "కేవలం ఒక క్లిక్ తో NSFW జోడింపులను తెరవండి",
-    "settings.hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
-    "settings.hide_user_stats": "Hide user statistics (e.g. the number of followers)",
-    "settings.hide_filtered_statuses": "Hide filtered statuses",
-    "settings.import_followers_from_a_csv_file": "Import follows from a csv file",
-    "settings.import_theme": "Load preset",
-    "settings.inputRadius": "Input fields",
-    "settings.checkboxRadius": "Checkboxes",
-    "settings.instance_default": "(default: {value})",
-    "settings.instance_default_simple": "(default)",
-    "settings.interface": "Interface",
-    "settings.interfaceLanguage": "Interface language",
-    "settings.invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
-    "settings.limited_availability": "మీ బ్రౌజర్లో అందుబాటులో లేదు",
-    "settings.links": "Links",
-    "settings.lock_account_description": "మీ ఖాతాను ఆమోదించిన అనుచరులకు మాత్రమే పరిమితం చేయండి",
-    "settings.loop_video": "Loop videos",
-    "settings.loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
-    "settings.mutes_tab": "మ్యూట్ చేయబడినవి",
-    "settings.play_videos_in_modal": "మీడియా వీక్షికలో నేరుగా వీడియోలను ప్లే చేయి",
-    "settings.use_contain_fit": "అటాచ్మెంట్ సూక్ష్మచిత్రాలను కత్తిరించవద్దు",
-    "settings.name": "Name",
-    "settings.name_bio": "పేరు & బయో",
-    "settings.new_password": "కొత్త సంకేతపదం",
-    "settings.notification_visibility": "చూపించవలసిన నోటిఫికేషన్ రకాలు",
-    "settings.notification_visibility_follows": "Follows",
-    "settings.notification_visibility_likes": "ఇష్టాలు",
-    "settings.notification_visibility_mentions": "ప్రస్తావనలు",
-    "settings.notification_visibility_repeats": "పునఃప్రసారాలు",
-    "settings.no_rich_text_description": "అన్ని పోస్ట్ల నుండి రిచ్ టెక్స్ట్ ఫార్మాటింగ్ను స్ట్రిప్ చేయండి",
-    "settings.no_blocks": "బ్లాక్స్ లేవు",
-    "settings.no_mutes": "మ్యూట్లు లేవు",
-    "settings.hide_follows_description": "నేను ఎవరిని అనుసరిస్తున్నానో చూపించవద్దు",
-    "settings.hide_followers_description": "నన్ను ఎవరు అనుసరిస్తున్నారో చూపవద్దు",
-    "settings.show_admin_badge": "నా ప్రొఫైల్ లో అడ్మిన్ బ్యాడ్జ్ చూపించు",
-    "settings.show_moderator_badge": "నా ప్రొఫైల్లో మోడరేటర్ బ్యాడ్జ్ని చూపించు",
-    "settings.nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
-    "settings.oauth_tokens": "OAuth tokens",
-    "settings.token": "Token",
-    "settings.refresh_token": "Refresh Token",
-    "settings.valid_until": "Valid Until",
-    "settings.revoke_token": "Revoke",
-    "settings.panelRadius": "Panels",
-    "settings.pause_on_unfocused": "Pause streaming when tab is not focused",
-    "settings.presets": "Presets",
-    "settings.profile_background": "Profile Background",
-    "settings.profile_banner": "Profile Banner",
-    "settings.profile_tab": "Profile",
-    "settings.radii_help": "Set up interface edge rounding (in pixels)",
-    "settings.replies_in_timeline": "Replies in timeline",
-    "settings.reply_link_preview": "Enable reply-link preview on mouse hover",
-    "settings.reply_visibility_all": "Show all replies",
-    "settings.reply_visibility_following": "Only show replies directed at me or users I'm following",
-    "settings.reply_visibility_self": "Only show replies directed at me",
-    "settings.saving_err": "Error saving settings",
-    "settings.saving_ok": "Settings saved",
-    "settings.security_tab": "Security",
-    "settings.scope_copy": "Copy scope when replying (DMs are always copied)",
-    "settings.set_new_avatar": "Set new avatar",
-    "settings.set_new_profile_background": "Set new profile background",
-    "settings.set_new_profile_banner": "Set new profile banner",
-    "settings.settings": "Settings",
-    "settings.subject_input_always_show": "Always show subject field",
-    "settings.subject_line_behavior": "Copy subject when replying",
-    "settings.subject_line_email": "Like email: \"re: subject\"",
-    "settings.subject_line_mastodon": "Like mastodon: copy as is",
-    "settings.subject_line_noop": "Do not copy",
-    "settings.post_status_content_type": "Post status content type",
-    "settings.stop_gifs": "Play-on-hover GIFs",
-    "settings.streaming": "Enable automatic streaming of new posts when scrolled to the top",
-    "settings.text": "Text",
-    "settings.theme": "Theme",
-    "settings.theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
-    "settings.theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
-    "settings.theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
-    "settings.tooltipRadius": "Tooltips/alerts",
-    "settings.upload_a_photo": "Upload a photo",
-    "settings.user_settings": "User Settings",
-    "settings.values.false": "no",
-    "settings.values.true": "yes",
-    "settings.notifications": "Notifications",
-    "settings.enable_web_push_notifications": "Enable web push notifications",
-    "settings.style.switcher.keep_color": "Keep colors",
-    "settings.style.switcher.keep_shadows": "Keep shadows",
-    "settings.style.switcher.keep_opacity": "Keep opacity",
-    "settings.style.switcher.keep_roundness": "Keep roundness",
-    "settings.style.switcher.keep_fonts": "Keep fonts",
-    "settings.style.switcher.save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
-    "settings.style.switcher.reset": "Reset",
-    "settings.style.switcher.clear_all": "Clear all",
-    "settings.style.switcher.clear_opacity": "Clear opacity",
-    "settings.style.common.color": "Color",
-    "settings.style.common.opacity": "Opacity",
-    "settings.style.common.contrast.hint": "Contrast ratio is {ratio}, it {level} {context}",
-    "settings.style.common.contrast.level.aa": "meets Level AA guideline (minimal)",
-    "settings.style.common.contrast.level.aaa": "meets Level AAA guideline (recommended)",
-    "settings.style.common.contrast.level.bad": "doesn't meet any accessibility guidelines",
-    "settings.style.common.contrast.context.18pt": "for large (18pt+) text",
-    "settings.style.common.contrast.context.text": "for text",
-    "settings.style.common_colors._tab_label": "Common",
-    "settings.style.common_colors.main": "Common colors",
-    "settings.style.common_colors.foreground_hint": "See \"Advanced\" tab for more detailed control",
-    "settings.style.common_colors.rgbo": "Icons, accents, badges",
-    "settings.style.advanced_colors._tab_label": "Advanced",
-    "settings.style.advanced_colors.alert": "Alert background",
-    "settings.style.advanced_colors.alert_error": "Error",
-    "settings.style.advanced_colors.badge": "Badge background",
-    "settings.style.advanced_colors.badge_notification": "Notification",
-    "settings.style.advanced_colors.panel_header": "Panel header",
-    "settings.style.advanced_colors.top_bar": "Top bar",
-    "settings.style.advanced_colors.borders": "Borders",
-    "settings.style.advanced_colors.buttons": "Buttons",
-    "settings.style.advanced_colors.inputs": "Input fields",
-    "settings.style.advanced_colors.faint_text": "Faded text",
-    "settings.style.radii._tab_label": "Roundness",
-    "settings.style.shadows._tab_label": "Shadow and lighting",
-    "settings.style.shadows.component": "Component",
-    "settings.style.shadows.override": "Override",
-    "settings.style.shadows.shadow_id": "Shadow #{value}",
-    "settings.style.shadows.blur": "Blur",
-    "settings.style.shadows.spread": "Spread",
-    "settings.style.shadows.inset": "Inset",
-    "settings.style.shadows.hint": "For shadows you can also use --variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case.",
-    "settings.style.shadows.filter_hint.always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
-    "settings.style.shadows.filter_hint.drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
-    "settings.style.shadows.filter_hint.avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
-    "settings.style.shadows.filter_hint.spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
-    "settings.style.shadows.filter_hint.inset_classic": "Inset shadows will be using {0}",
-    "settings.style.shadows.components.panel": "Panel",
-    "settings.style.shadows.components.panelHeader": "Panel header",
-    "settings.style.shadows.components.topBar": "Top bar",
-    "settings.style.shadows.components.avatar": "User avatar (in profile view)",
-    "settings.style.shadows.components.avatarStatus": "User avatar (in post display)",
-    "settings.style.shadows.components.popup": "Popups and tooltips",
-    "settings.style.shadows.components.button": "Button",
-    "settings.style.shadows.components.buttonHover": "Button (hover)",
-    "settings.style.shadows.components.buttonPressed": "Button (pressed)",
-    "settings.style.shadows.components.buttonPressedHover": "Button (pressed+hover)",
-    "settings.style.shadows.components.input": "Input field",
-    "settings.style.fonts._tab_label": "Fonts",
-    "settings.style.fonts.help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
-    "settings.style.fonts.components.interface": "Interface",
-    "settings.style.fonts.components.input": "Input fields",
-    "settings.style.fonts.components.post": "Post text",
-    "settings.style.fonts.components.postCode": "Monospaced text in a post (rich text)",
-    "settings.style.fonts.family": "Font name",
-    "settings.style.fonts.size": "Size (in px)",
-    "settings.style.fonts.weight": "Weight (boldness)",
-    "settings.style.fonts.custom": "Custom",
-    "settings.style.preview.header": "Preview",
-    "settings.style.preview.content": "Content",
-    "settings.style.preview.error": "Example error",
-    "settings.style.preview.button": "Button",
-    "settings.style.preview.text": "A bunch of more {0} and {1}",
-    "settings.style.preview.mono": "content",
-    "settings.style.preview.input": "Just landed in L.A.",
-    "settings.style.preview.faint_link": "helpful manual",
-    "settings.style.preview.fine_print": "Read our {0} to learn nothing useful!",
-    "settings.style.preview.header_faint": "This is fine",
-    "settings.style.preview.checkbox": "I have skimmed over terms and conditions",
-    "settings.style.preview.link": "a nice lil' link",
-    "settings.version.title": "Version",
-    "settings.version.backend_version": "Backend Version",
-    "settings.version.frontend_version": "Frontend Version",
-    "timeline.collapse": "Collapse",
-    "timeline.conversation": "Conversation",
-    "timeline.error_fetching": "Error fetching updates",
-    "timeline.load_older": "Load older statuses",
-    "timeline.no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
-    "timeline.repeated": "repeated",
-    "timeline.show_new": "Show new",
-    "timeline.up_to_date": "Up-to-date",
-    "timeline.no_more_statuses": "No more statuses",
-    "timeline.no_statuses": "No statuses",
-    "status.reply_to": "Reply to",
-    "status.replies_list": "Replies:",
-    "user_card.approve": "Approve",
-    "user_card.block": "Block",
-    "user_card.blocked": "Blocked!",
-    "user_card.deny": "Deny",
-    "user_card.favorites": "Favorites",
-    "user_card.follow": "Follow",
-    "user_card.follow_sent": "Request sent!",
-    "user_card.follow_progress": "Requesting…",
-    "user_card.follow_again": "Send request again?",
-    "user_card.follow_unfollow": "Unfollow",
-    "user_card.followees": "Following",
-    "user_card.followers": "Followers",
-    "user_card.following": "Following!",
-    "user_card.follows_you": "Follows you!",
-    "user_card.its_you": "It's you!",
-    "user_card.media": "Media",
-    "user_card.mute": "Mute",
-    "user_card.muted": "Muted",
-    "user_card.per_day": "per day",
-    "user_card.remote_follow": "Remote follow",
-    "user_card.statuses": "Statuses",
-    "user_card.unblock": "Unblock",
-    "user_card.unblock_progress": "Unblocking...",
-    "user_card.block_progress": "Blocking...",
-    "user_card.unmute": "Unmute",
-    "user_card.unmute_progress": "Unmuting...",
-    "user_card.mute_progress": "Muting...",
-    "user_profile.timeline_title": "User Timeline",
-    "user_profile.profile_does_not_exist": "Sorry, this profile does not exist.",
-    "user_profile.profile_loading_error": "Sorry, there was an error loading this profile.",
-    "who_to_follow.more": "More",
-    "who_to_follow.who_to_follow": "Who to follow",
-    "tool_tip.media_upload": "Upload Media",
-    "tool_tip.repeat": "Repeat",
-    "tool_tip.reply": "Reply",
-    "tool_tip.favorite": "Favorite",
-    "tool_tip.user_settings": "User Settings",
-    "upload.error.base": "Upload failed.",
-    "upload.error.file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-    "upload.error.default": "Try again later",
-    "upload.file_size_units.B": "B",
-    "upload.file_size_units.KiB": "KiB",
-    "upload.file_size_units.MiB": "MiB",
-    "upload.file_size_units.GiB": "GiB",
-    "upload.file_size_units.TiB": "TiB"
+  "chat.title": "చాట్",
+  "features_panel.chat": "చాట్",
+  "features_panel.gopher": "గోఫర్",
+  "features_panel.media_proxy": "మీడియా ప్రాక్సీ",
+  "features_panel.scope_options": "స్కోప్ ఎంపికలు",
+  "features_panel.text_limit": "వచన పరిమితి",
+  "features_panel.title": "లక్షణాలు",
+  "features_panel.who_to_follow": "ఎవరిని అనుసరించాలి",
+  "finder.error_fetching_user": "వినియోగదారుని పొందడంలో లోపం",
+  "finder.find_user": "వినియోగదారుని కనుగొనండి",
+  "general.apply": "వర్తించు",
+  "general.submit": "సమర్పించు",
+  "general.more": "మరిన్ని",
+  "general.generic_error": "ఒక తప్పిదం సంభవించినది",
+  "general.optional": "ఐచ్చికం",
+  "image_cropper.crop_picture": "చిత్రాన్ని కత్తిరించండి",
+  "image_cropper.save": "దాచు",
+  "image_cropper.save_without_cropping": "కత్తిరించకుండా సేవ్ చేయి",
+  "image_cropper.cancel": "రద్దుచేయి",
+  "login.login": "లాగిన్",
+  "login.description": "OAuth తో లాగిన్ అవ్వండి",
+  "login.logout": "లాగౌట్",
+  "login.password": "సంకేతపదము",
+  "login.placeholder": "ఉదా. lain",
+  "login.register": "నమోదు చేసుకోండి",
+  "login.username": "వాడుకరి పేరు",
+  "login.hint": "చర్చలో చేరడానికి లాగిన్ అవ్వండి",
+  "media_modal.previous": "ముందరి పుట",
+  "media_modal.next": "తరువాత",
+  "nav.about": "గురించి",
+  "nav.back": "వెనక్కి",
+  "nav.chat": "స్థానిక చాట్",
+  "nav.friend_requests": "అనుసరించడానికి అభ్యర్థనలు",
+  "nav.mentions": "ప్రస్తావనలు",
+  "nav.dms": "నేరుగా పంపిన సందేశాలు",
+  "nav.public_tl": "ప్రజా కాలక్రమం",
+  "nav.timeline": "కాలక్రమం",
+  "nav.twkn": "మొత్తం తెలిసిన నెట్వర్క్",
+  "nav.user_search": "వాడుకరి శోధన",
+  "nav.who_to_follow": "ఎవరిని అనుసరించాలి",
+  "nav.preferences": "ప్రాధాన్యతలు",
+  "notifications.broken_favorite": "తెలియని స్థితి, దాని కోసం శోధిస్తోంది...",
+  "notifications.favorited_you": "మీ స్థితిని ఇష్టపడ్డారు",
+  "notifications.followed_you": "మిమ్మల్ని అనుసరించారు",
+  "notifications.load_older": "పాత నోటిఫికేషన్లను లోడ్ చేయండి",
+  "notifications.notifications": "ప్రకటనలు",
+  "notifications.read": "చదివాను!",
+  "notifications.repeated_you": "మీ స్థితిని పునరావృతం చేసారు",
+  "notifications.no_more_notifications": "ఇక నోటిఫికేషన్లు లేవు",
+  "post_status.new_status": "క్రొత్త స్థితిని పోస్ట్ చేయండి",
+  "post_status.account_not_locked_warning": "మీ ఖాతా {౦} కాదు. ఎవరైనా మిమ్మల్ని అనుసరించి అనుచరులకు మాత్రమే ఉద్దేశించిన పోస్టులను చూడవచ్చు.",
+  "post_status.account_not_locked_warning_link": "తాళం వేయబడినది",
+  "post_status.attachments_sensitive": "జోడింపులను సున్నితమైనవిగా గుర్తించండి",
+  "post_status.content_type.text/plain": "సాధారణ అక్షరాలు",
+  "post_status.content_type.text/html": "హెచ్‌టిఎమ్ఎల్",
+  "post_status.content_type.text/markdown": "మార్క్డౌన్",
+  "post_status.content_warning": "విషయం (ఐచ్ఛికం)",
+  "post_status.default": "ఇప్పుడే విజయవాడలో దిగాను.",
+  "post_status.direct_warning": "ఈ పోస్ట్ మాత్రమే పేర్కొన్న వినియోగదారులకు మాత్రమే కనిపిస్తుంది.",
+  "post_status.posting": "పోస్ట్ చేస్తున్నా",
+  "post_status.scope.direct": "ప్రత్యక్ష - పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయబడుతుంది",
+  "post_status.scope.private": "అనుచరులకు మాత్రమే - అనుచరులకు మాత్రమే పోస్ట్ చేయబడుతుంది",
+  "post_status.scope.public": "పబ్లిక్ - ప్రజా కాలక్రమాలకు పోస్ట్ చేయబడుతుంది",
+  "post_status.scope.unlisted": "జాబితా చేయబడనిది - ప్రజా కాలక్రమాలకు పోస్ట్ చేయవద్దు",
+  "registration.bio": "బయో",
+  "registration.email": "ఈ మెయిల్",
+  "registration.fullname": "ప్రదర్శన పేరు",
+  "registration.password_confirm": "పాస్వర్డ్ నిర్ధారణ",
+  "registration.registration": "నమోదు",
+  "registration.token": "ఆహ్వాన టోకెన్",
+  "registration.captcha": "కాప్చా",
+  "registration.new_captcha": "కొత్త కాప్చా పొందుటకు చిత్రం మీద క్లిక్ చేయండి",
+  "registration.username_placeholder": "ఉదా. lain",
+  "registration.fullname_placeholder": "ఉదా. Lain Iwakura",
+  "registration.bio_placeholder": "e.g.\nHi, I'm Lain.\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
+  "registration.validations.username_required": "ఖాళీగా విడిచిపెట్టరాదు",
+  "registration.validations.fullname_required": "ఖాళీగా విడిచిపెట్టరాదు",
+  "registration.validations.email_required": "ఖాళీగా విడిచిపెట్టరాదు",
+  "registration.validations.password_required": "ఖాళీగా విడిచిపెట్టరాదు",
+  "registration.validations.password_confirmation_required": "ఖాళీగా విడిచిపెట్టరాదు",
+  "registration.validations.password_confirmation_match": "సంకేతపదం వలె ఉండాలి",
+  "settings.app_name": "అనువర్తన పేరు",
+  "settings.attachmentRadius": "జోడింపులు",
+  "settings.attachments": "జోడింపులు",
+  "settings.autoload": "క్రిందికి స్క్రోల్ చేయబడినప్పుడు స్వయంచాలక లోడింగ్ని ప్రారంభించు",
+  "settings.avatar": "అవతారం",
+  "settings.avatarAltRadius": "అవతారాలు (ప్రకటనలు)",
+  "settings.avatarRadius": "అవతారాలు",
+  "settings.background": "బ్యాక్‌గ్రౌండు",
+  "settings.bio": "బయో",
+  "settings.blocks_tab": "బ్లాక్‌లు",
+  "settings.btnRadius": "బటన్లు",
+  "settings.cBlue": "నీలం (ప్రత్యుత్తరం, అనుసరించండి)",
+  "settings.cGreen": "Green (Retweet)",
+  "settings.cOrange": "ఆరెంజ్ (ఇష్టపడు)",
+  "settings.cRed": "Red (Cancel)",
+  "settings.change_password": "పాస్‌వర్డ్ మార్చండి",
+  "settings.change_password_error": "మీ పాస్వర్డ్ను మార్చడంలో సమస్య ఉంది.",
+  "settings.changed_password": "పాస్వర్డ్ విజయవంతంగా మార్చబడింది!",
+  "settings.collapse_subject": "Collapse posts with subjects",
+  "settings.composing": "Composing",
+  "settings.confirm_new_password": "కొత్త పాస్వర్డ్ను నిర్ధారించండి",
+  "settings.current_avatar": "మీ ప్రస్తుత అవతారం",
+  "settings.current_password": "ప్రస్తుత పాస్వర్డ్",
+  "settings.current_profile_banner": "మీ ప్రస్తుత ప్రొఫైల్ బ్యానర్",
+  "settings.data_import_export_tab": "Data Import / Export",
+  "settings.default_vis": "Default visibility scope",
+  "settings.delete_account": "Delete Account",
+  "settings.delete_account_description": "మీ ఖాతా మరియు మీ అన్ని సందేశాలను శాశ్వతంగా తొలగించండి.",
+  "settings.delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
+  "settings.delete_account_instructions": "ఖాతా తొలగింపును నిర్ధారించడానికి దిగువ ఇన్పుట్లో మీ పాస్వర్డ్ను టైప్ చేయండి.",
+  "settings.avatar_size_instruction": "అవతార్ చిత్రాలకు సిఫార్సు చేసిన కనీస పరిమాణం 150x150 పిక్సెల్స్.",
+  "settings.export_theme": "Save preset",
+  "settings.filtering": "వడపోత",
+  "settings.filtering_explanation": "All statuses containing these words will be muted, one per line",
+  "settings.follow_export": "Follow export",
+  "settings.follow_export_button": "Export your follows to a csv file",
+  "settings.follow_export_processing": "Processing, you'll soon be asked to download your file",
+  "settings.follow_import": "Follow import",
+  "settings.follow_import_error": "అనుచరులను దిగుమతి చేయడంలో లోపం",
+  "settings.follows_imported": "Follows imported! Processing them will take a while.",
+  "settings.foreground": "Foreground",
+  "settings.general": "General",
+  "settings.hide_attachments_in_convo": "సంభాషణలలో జోడింపులను దాచు",
+  "settings.hide_attachments_in_tl": "కాలక్రమంలో జోడింపులను దాచు",
+  "settings.hide_muted_posts": "మ్యూట్ చేసిన వినియోగదారుల యొక్క పోస్ట్లను దాచిపెట్టు",
+  "settings.max_thumbnails": "Maximum amount of thumbnails per post",
+  "settings.hide_isp": "Hide instance-specific panel",
+  "settings.preload_images": "Preload images",
+  "settings.use_one_click_nsfw": "కేవలం ఒక క్లిక్ తో NSFW జోడింపులను తెరవండి",
+  "settings.hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
+  "settings.hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+  "settings.hide_filtered_statuses": "Hide filtered statuses",
+  "settings.import_followers_from_a_csv_file": "Import follows from a csv file",
+  "settings.import_theme": "Load preset",
+  "settings.inputRadius": "Input fields",
+  "settings.checkboxRadius": "Checkboxes",
+  "settings.instance_default": "(default: {value})",
+  "settings.instance_default_simple": "(default)",
+  "settings.interface": "Interface",
+  "settings.interfaceLanguage": "Interface language",
+  "settings.invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
+  "settings.limited_availability": "మీ బ్రౌజర్లో అందుబాటులో లేదు",
+  "settings.links": "Links",
+  "settings.lock_account_description": "మీ ఖాతాను ఆమోదించిన అనుచరులకు మాత్రమే పరిమితం చేయండి",
+  "settings.loop_video": "Loop videos",
+  "settings.loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
+  "settings.mutes_tab": "మ్యూట్ చేయబడినవి",
+  "settings.play_videos_in_modal": "మీడియా వీక్షికలో నేరుగా వీడియోలను ప్లే చేయి",
+  "settings.use_contain_fit": "అటాచ్మెంట్ సూక్ష్మచిత్రాలను కత్తిరించవద్దు",
+  "settings.name": "Name",
+  "settings.name_bio": "పేరు & బయో",
+  "settings.new_password": "కొత్త సంకేతపదం",
+  "settings.notification_visibility": "చూపించవలసిన నోటిఫికేషన్ రకాలు",
+  "settings.notification_visibility_follows": "Follows",
+  "settings.notification_visibility_likes": "ఇష్టాలు",
+  "settings.notification_visibility_mentions": "ప్రస్తావనలు",
+  "settings.notification_visibility_repeats": "పునఃప్రసారాలు",
+  "settings.no_rich_text_description": "అన్ని పోస్ట్ల నుండి రిచ్ టెక్స్ట్ ఫార్మాటింగ్ను స్ట్రిప్ చేయండి",
+  "settings.no_blocks": "బ్లాక్స్ లేవు",
+  "settings.no_mutes": "మ్యూట్లు లేవు",
+  "settings.hide_follows_description": "నేను ఎవరిని అనుసరిస్తున్నానో చూపించవద్దు",
+  "settings.hide_followers_description": "నన్ను ఎవరు అనుసరిస్తున్నారో చూపవద్దు",
+  "settings.show_admin_badge": "నా ప్రొఫైల్ లో అడ్మిన్ బ్యాడ్జ్ చూపించు",
+  "settings.show_moderator_badge": "నా ప్రొఫైల్లో మోడరేటర్ బ్యాడ్జ్ని చూపించు",
+  "settings.nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
+  "settings.oauth_tokens": "OAuth tokens",
+  "settings.token": "Token",
+  "settings.refresh_token": "Refresh Token",
+  "settings.valid_until": "Valid Until",
+  "settings.revoke_token": "Revoke",
+  "settings.panelRadius": "Panels",
+  "settings.pause_on_unfocused": "Pause streaming when tab is not focused",
+  "settings.presets": "Presets",
+  "settings.profile_background": "Profile Background",
+  "settings.profile_banner": "Profile Banner",
+  "settings.profile_tab": "Profile",
+  "settings.radii_help": "Set up interface edge rounding (in pixels)",
+  "settings.replies_in_timeline": "Replies in timeline",
+  "settings.reply_link_preview": "Enable reply-link preview on mouse hover",
+  "settings.reply_visibility_all": "Show all replies",
+  "settings.reply_visibility_following": "Only show replies directed at me or users I'm following",
+  "settings.reply_visibility_self": "Only show replies directed at me",
+  "settings.saving_err": "Error saving settings",
+  "settings.saving_ok": "Settings saved",
+  "settings.security_tab": "Security",
+  "settings.scope_copy": "Copy scope when replying (DMs are always copied)",
+  "settings.set_new_avatar": "Set new avatar",
+  "settings.set_new_profile_background": "Set new profile background",
+  "settings.set_new_profile_banner": "Set new profile banner",
+  "settings.settings": "Settings",
+  "settings.subject_input_always_show": "Always show subject field",
+  "settings.subject_line_behavior": "Copy subject when replying",
+  "settings.subject_line_email": "Like email: \"re: subject\"",
+  "settings.subject_line_mastodon": "Like mastodon: copy as is",
+  "settings.subject_line_noop": "Do not copy",
+  "settings.post_status_content_type": "Post status content type",
+  "settings.stop_gifs": "Play-on-hover GIFs",
+  "settings.streaming": "Enable automatic streaming of new posts when scrolled to the top",
+  "settings.text": "Text",
+  "settings.theme": "Theme",
+  "settings.theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
+  "settings.theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
+  "settings.theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
+  "settings.tooltipRadius": "Tooltips/alerts",
+  "settings.upload_a_photo": "Upload a photo",
+  "settings.user_settings": "User Settings",
+  "settings.values.false": "no",
+  "settings.values.true": "yes",
+  "settings.notifications": "Notifications",
+  "settings.enable_web_push_notifications": "Enable web push notifications",
+  "settings.style.switcher.keep_color": "Keep colors",
+  "settings.style.switcher.keep_shadows": "Keep shadows",
+  "settings.style.switcher.keep_opacity": "Keep opacity",
+  "settings.style.switcher.keep_roundness": "Keep roundness",
+  "settings.style.switcher.keep_fonts": "Keep fonts",
+  "settings.style.switcher.save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
+  "settings.style.switcher.reset": "Reset",
+  "settings.style.switcher.clear_all": "Clear all",
+  "settings.style.switcher.clear_opacity": "Clear opacity",
+  "settings.style.common.color": "Color",
+  "settings.style.common.opacity": "Opacity",
+  "settings.style.common.contrast.hint": "Contrast ratio is {ratio}, it {level} {context}",
+  "settings.style.common.contrast.level.aa": "meets Level AA guideline (minimal)",
+  "settings.style.common.contrast.level.aaa": "meets Level AAA guideline (recommended)",
+  "settings.style.common.contrast.level.bad": "doesn't meet any accessibility guidelines",
+  "settings.style.common.contrast.context.18pt": "for large (18pt+) text",
+  "settings.style.common.contrast.context.text": "for text",
+  "settings.style.common_colors._tab_label": "Common",
+  "settings.style.common_colors.main": "Common colors",
+  "settings.style.common_colors.foreground_hint": "See \"Advanced\" tab for more detailed control",
+  "settings.style.common_colors.rgbo": "Icons, accents, badges",
+  "settings.style.advanced_colors._tab_label": "Advanced",
+  "settings.style.advanced_colors.alert": "Alert background",
+  "settings.style.advanced_colors.alert_error": "Error",
+  "settings.style.advanced_colors.badge": "Badge background",
+  "settings.style.advanced_colors.badge_notification": "Notification",
+  "settings.style.advanced_colors.panel_header": "Panel header",
+  "settings.style.advanced_colors.top_bar": "Top bar",
+  "settings.style.advanced_colors.borders": "Borders",
+  "settings.style.advanced_colors.buttons": "Buttons",
+  "settings.style.advanced_colors.inputs": "Input fields",
+  "settings.style.advanced_colors.faint_text": "Faded text",
+  "settings.style.radii._tab_label": "Roundness",
+  "settings.style.shadows._tab_label": "Shadow and lighting",
+  "settings.style.shadows.component": "Component",
+  "settings.style.shadows.override": "Override",
+  "settings.style.shadows.shadow_id": "Shadow #{value}",
+  "settings.style.shadows.blur": "Blur",
+  "settings.style.shadows.spread": "Spread",
+  "settings.style.shadows.inset": "Inset",
+  "settings.style.shadows.hint": "For shadows you can also use --variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case.",
+  "settings.style.shadows.filter_hint.always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
+  "settings.style.shadows.filter_hint.drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
+  "settings.style.shadows.filter_hint.avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
+  "settings.style.shadows.filter_hint.spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
+  "settings.style.shadows.filter_hint.inset_classic": "Inset shadows will be using {0}",
+  "settings.style.shadows.components.panel": "Panel",
+  "settings.style.shadows.components.panelHeader": "Panel header",
+  "settings.style.shadows.components.topBar": "Top bar",
+  "settings.style.shadows.components.avatar": "User avatar (in profile view)",
+  "settings.style.shadows.components.avatarStatus": "User avatar (in post display)",
+  "settings.style.shadows.components.popup": "Popups and tooltips",
+  "settings.style.shadows.components.button": "Button",
+  "settings.style.shadows.components.buttonHover": "Button (hover)",
+  "settings.style.shadows.components.buttonPressed": "Button (pressed)",
+  "settings.style.shadows.components.buttonPressedHover": "Button (pressed+hover)",
+  "settings.style.shadows.components.input": "Input field",
+  "settings.style.fonts._tab_label": "Fonts",
+  "settings.style.fonts.help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
+  "settings.style.fonts.components.interface": "Interface",
+  "settings.style.fonts.components.input": "Input fields",
+  "settings.style.fonts.components.post": "Post text",
+  "settings.style.fonts.components.postCode": "Monospaced text in a post (rich text)",
+  "settings.style.fonts.family": "Font name",
+  "settings.style.fonts.size": "Size (in px)",
+  "settings.style.fonts.weight": "Weight (boldness)",
+  "settings.style.fonts.custom": "Custom",
+  "settings.style.preview.header": "Preview",
+  "settings.style.preview.content": "Content",
+  "settings.style.preview.error": "Example error",
+  "settings.style.preview.button": "Button",
+  "settings.style.preview.text": "A bunch of more {0} and {1}",
+  "settings.style.preview.mono": "content",
+  "settings.style.preview.input": "Just landed in L.A.",
+  "settings.style.preview.faint_link": "helpful manual",
+  "settings.style.preview.fine_print": "Read our {0} to learn nothing useful!",
+  "settings.style.preview.header_faint": "This is fine",
+  "settings.style.preview.checkbox": "I have skimmed over terms and conditions",
+  "settings.style.preview.link": "a nice lil' link",
+  "settings.version.title": "Version",
+  "settings.version.backend_version": "Backend Version",
+  "settings.version.frontend_version": "Frontend Version",
+  "timeline.collapse": "Collapse",
+  "timeline.conversation": "Conversation",
+  "timeline.error_fetching": "Error fetching updates",
+  "timeline.load_older": "Load older statuses",
+  "timeline.no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
+  "timeline.repeated": "repeated",
+  "timeline.show_new": "Show new",
+  "timeline.up_to_date": "Up-to-date",
+  "timeline.no_more_statuses": "No more statuses",
+  "timeline.no_statuses": "No statuses",
+  "status.reply_to": "Reply to",
+  "status.replies_list": "Replies:",
+  "user_card.approve": "Approve",
+  "user_card.block": "Block",
+  "user_card.blocked": "Blocked!",
+  "user_card.deny": "Deny",
+  "user_card.favorites": "Favorites",
+  "user_card.follow": "Follow",
+  "user_card.follow_sent": "Request sent!",
+  "user_card.follow_progress": "Requesting…",
+  "user_card.follow_again": "Send request again?",
+  "user_card.follow_unfollow": "Unfollow",
+  "user_card.followees": "Following",
+  "user_card.followers": "Followers",
+  "user_card.following": "Following!",
+  "user_card.follows_you": "Follows you!",
+  "user_card.its_you": "It's you!",
+  "user_card.media": "Media",
+  "user_card.mute": "Mute",
+  "user_card.muted": "Muted",
+  "user_card.per_day": "per day",
+  "user_card.remote_follow": "Remote follow",
+  "user_card.statuses": "Statuses",
+  "user_card.unblock": "Unblock",
+  "user_card.unblock_progress": "Unblocking...",
+  "user_card.block_progress": "Blocking...",
+  "user_card.unmute": "Unmute",
+  "user_card.unmute_progress": "Unmuting...",
+  "user_card.mute_progress": "Muting...",
+  "user_profile.timeline_title": "User Timeline",
+  "user_profile.profile_does_not_exist": "Sorry, this profile does not exist.",
+  "user_profile.profile_loading_error": "Sorry, there was an error loading this profile.",
+  "who_to_follow.more": "More",
+  "who_to_follow.who_to_follow": "Who to follow",
+  "tool_tip.media_upload": "Upload Media",
+  "tool_tip.repeat": "Repeat",
+  "tool_tip.reply": "Reply",
+  "tool_tip.favorite": "Favorite",
+  "tool_tip.user_settings": "User Settings",
+  "upload.error.base": "Upload failed.",
+  "upload.error.file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+  "upload.error.default": "Try again later",
+  "upload.file_size_units.B": "B",
+  "upload.file_size_units.KiB": "KiB",
+  "upload.file_size_units.MiB": "MiB",
+  "upload.file_size_units.GiB": "GiB",
+  "upload.file_size_units.TiB": "TiB"
 }
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 095db754..f95dc498 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -1,698 +1,698 @@
 {
-    "chat": {
-        "title": "聊天"
-    },
-    "exporter": {
-        "export": "导出",
-        "processing": "正在处理，稍后会提示您下载文件"
-    },
-    "features_panel": {
-        "chat": "聊天",
-        "gopher": "Gopher",
-        "media_proxy": "媒体代理",
-        "scope_options": "可见范围设置",
-        "text_limit": "文本长度限制",
-        "title": "功能",
-        "who_to_follow": "推荐关注"
-    },
-    "finder": {
-        "error_fetching_user": "获取用户时发生错误",
-        "find_user": "寻找用户"
-    },
-    "general": {
-        "apply": "应用",
-        "submit": "提交",
-        "more": "更多",
-        "generic_error": "发生一个错误",
-        "optional": "可选项",
-        "show_more": "展开",
-        "show_less": "收起",
-        "cancel": "取消",
-        "disable": "禁用",
-        "enable": "启用",
-        "confirm": "确认",
-        "verify": "验证",
-        "dismiss": "忽略"
-    },
-    "image_cropper": {
-        "crop_picture": "裁剪图片",
-        "save": "保存",
-        "save_without_cropping": "保存未经裁剪的图片",
-        "cancel": "取消"
-    },
-    "importer": {
-        "submit": "提交",
-        "success": "导入成功。",
-        "error": "导入此文件时出现一个错误。"
-    },
-    "login": {
-        "login": "登录",
-        "description": "用 OAuth 登录",
-        "logout": "登出",
-        "password": "密码",
-        "placeholder": "例如：lain",
-        "register": "注册",
-        "username": "用户名",
-        "hint": "登录后加入讨论",
-        "authentication_code": "验证码",
-        "enter_recovery_code": "输入一个恢复码",
-        "enter_two_factor_code": "输入一个双重因素验证码",
-        "recovery_code": "恢复码",
-        "heading": {
-            "totp": "双重因素验证",
-            "recovery": "双重因素恢复"
-        }
-    },
-    "media_modal": {
-        "previous": "往前",
-        "next": "往后"
-    },
-    "nav": {
-        "about": "关于",
-        "back": "后退",
-        "chat": "本站聊天",
-        "friend_requests": "关注请求",
-        "mentions": "提及",
-        "interactions": "互动",
-        "dms": "私信",
-        "public_tl": "公共时间线",
-        "timeline": "时间线",
-        "twkn": "所有已知网络",
-        "user_search": "用户搜索",
-        "search": "搜索",
-        "who_to_follow": "推荐关注",
-        "preferences": "偏好设置",
-        "administration": "管理员"
-    },
-    "notifications": {
-        "broken_favorite": "未知的状态，正在搜索中...",
-        "favorited_you": "收藏了你的状态",
-        "followed_you": "关注了你",
-        "load_older": "加载更早的通知",
-        "notifications": "通知",
-        "read": "阅读！",
-        "repeated_you": "转发了你的状态",
-        "no_more_notifications": "没有更多的通知",
-        "reacted_with": "和 {0} 互动过",
-        "migrated_to": "迁移到",
-        "follow_request": "想要关注你"
-    },
-    "polls": {
-        "add_poll": "增加问卷调查",
-        "add_option": "增加选项",
-        "option": "选项",
-        "votes": "投票",
-        "vote": "投票",
-        "type": "问卷类型",
-        "single_choice": "单选项",
-        "multiple_choices": "多选项",
-        "expiry": "问卷的时间",
-        "expires_in": "投票于 {0} 内结束",
-        "expired": "投票 {0} 前已结束",
-        "not_enough_options": "投票的选项太少"
-    },
-    "stickers": {
-        "add_sticker": "添加贴纸"
-    },
-    "interactions": {
-        "favs_repeats": "转发和收藏",
-        "follows": "新的关注者",
-        "load_older": "加载更早的互动",
-        "moves": "用户迁移"
-    },
-    "post_status": {
-        "new_status": "发布新状态",
-        "account_not_locked_warning": "你的帐号没有 {0}。任何人都可以关注你并浏览你的上锁内容。",
-        "account_not_locked_warning_link": "上锁",
-        "attachments_sensitive": "标记附件为敏感内容",
-        "content_type": {
-            "text/plain": "纯文本",
-            "text/html": "HTML",
-            "text/markdown": "Markdown",
-            "text/bbcode": "BBCode"
-        },
-        "content_warning": "主题（可选）",
-        "default": "刚刚抵达上海",
-        "direct_warning_to_all": "本条内容只有被提及的用户能够看到。",
-        "direct_warning_to_first_only": "本条内容只有被在消息开始处提及的用户能够看到。",
-        "posting": "发送",
-        "scope_notice": {
-            "public": "本条内容可以被所有人看到",
-            "private": "关注你的人才能看到本条内容",
-            "unlisted": "本条内容既不在公共时间线，也不会在所有已知网络上可见"
-        },
-        "scope": {
-            "direct": "私信 - 只发送给被提及的用户",
-            "private": "仅关注者 - 只有关注了你的人能看到",
-            "public": "公共 - 发送到公共时间轴",
-            "unlisted": "不公开 - 不会发送到公共时间轴"
-        }
-    },
-    "registration": {
-        "bio": "简介",
-        "email": "电子邮箱",
-        "fullname": "全名",
-        "password_confirm": "确认密码",
-        "registration": "注册",
-        "token": "邀请码",
-        "captcha": "CAPTCHA",
-        "new_captcha": "点击图片获取新的验证码",
-        "username_placeholder": "例如：lain",
-        "fullname_placeholder": "例如：岩仓玲音",
-        "bio_placeholder": "例如：\n你好，我是玲音。\n我是一个住在日本郊区的动画少女。你可能在 Wired 见过我。",
-        "validations": {
-            "username_required": "不能留空",
-            "fullname_required": "不能留空",
-            "email_required": "不能留空",
-            "password_required": "不能留空",
-            "password_confirmation_required": "不能留空",
-            "password_confirmation_match": "密码不一致"
-        }
-    },
-    "selectable_list": {
-        "select_all": "选择全部"
-    },
-    "settings": {
-        "app_name": "App 名称",
-        "security": "安全",
-        "enter_current_password_to_confirm": "输入你当前密码来确认你的身份",
-        "mfa": {
-            "otp": "OTP",
-            "setup_otp": "设置 OTP",
-            "wait_pre_setup_otp": "预设 OTP",
-            "confirm_and_enable": "确认并启用 OTP",
-            "title": "双因素验证",
-            "generate_new_recovery_codes": "生成新的恢复码",
-            "warning_of_generate_new_codes": "当你生成新的恢复码时，你的旧恢复码就失效了。",
-            "recovery_codes": "恢复码。",
-            "waiting_a_recovery_codes": "正在接收备份码……",
-            "recovery_codes_warning": "抄写这些号码，或者保存在安全的地方。这些号码不会再次显示。如果你无法访问你的 2FA app，也丢失了你的恢复码，你的账号就再也无法登录了。",
-            "authentication_methods": "身份验证方法",
-            "scan": {
-                "title": "扫一下",
-                "desc": "使用你的双因素验证 app，扫描这个二维码，或者输入这些文字密钥：",
-                "secret_code": "密钥"
-            },
-            "verify": {
-                "desc": "要启用双因素验证，请把你的双因素验证 app 里的数字输入："
-            }
-        },
-        "attachmentRadius": "附件",
-        "attachments": "附件",
-        "autoload": "启用滚动到底部时的自动加载",
-        "avatar": "头像",
-        "avatarAltRadius": "头像（通知）",
-        "avatarRadius": "头像",
-        "background": "背景",
-        "bio": "简介",
-        "block_export": "拉黑名单导出",
-        "block_export_button": "导出你的拉黑名单到一个 csv 文件",
-        "block_import": "拉黑名单导入",
-        "block_import_error": "导入拉黑名单出错",
-        "blocks_imported": "拉黑名单导入成功！需要一点时间来处理。",
-        "blocks_tab": "块",
-        "btnRadius": "按钮",
-        "cBlue": "蓝色（回复，关注）",
-        "cGreen": "绿色（转发）",
-        "cOrange": "橙色（收藏）",
-        "cRed": "红色（取消）",
-        "change_password": "修改密码",
-        "change_password_error": "修改密码的时候出了点问题。",
-        "changed_password": "成功修改了密码！",
-        "collapse_subject": "折叠带主题的内容",
-        "composing": "正在书写",
-        "confirm_new_password": "确认新密码",
-        "current_avatar": "当前头像",
-        "current_password": "当前密码",
-        "current_profile_banner": "您当前的横幅图片",
-        "data_import_export_tab": "数据导入/导出",
-        "default_vis": "默认可见范围",
-        "delete_account": "删除账户",
-        "delete_account_description": "永久删除你的帐号和所有数据。",
-        "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。",
-        "delete_account_instructions": "在下面输入你的密码来确认删除账户",
-        "avatar_size_instruction": "推荐的头像图片最小的尺寸是 150x150 像素。",
-        "export_theme": "导出预置主题",
-        "filtering": "过滤器",
-        "filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个",
-        "follow_export": "导出关注",
-        "follow_export_button": "将关注导出成 csv 文件",
-        "follow_import": "导入关注",
-        "follow_import_error": "导入关注时错误",
-        "follows_imported": "关注已导入！尚需要一些时间来处理。",
-        "foreground": "前景",
-        "general": "通用",
-        "hide_attachments_in_convo": "在对话中隐藏附件",
-        "hide_attachments_in_tl": "在时间线上隐藏附件",
-        "hide_muted_posts": "不显示被隐藏的用户的帖子",
-        "max_thumbnails": "最多再每个帖子所能显示的缩略图数量",
-        "hide_isp": "隐藏指定实例的面板H",
-        "preload_images": "预载图片",
-        "use_one_click_nsfw": "点击一次以打开工作场所不适宜的附件",
-        "hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)",
-        "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）",
-        "hide_filtered_statuses": "隐藏过滤的状态",
-        "import_blocks_from_a_csv_file": "从 csv 文件中导入拉黑名单",
-        "import_followers_from_a_csv_file": "从 csv 文件中导入关注",
-        "import_theme": "导入预置主题",
-        "inputRadius": "输入框",
-        "checkboxRadius": "复选框",
-        "instance_default": "(默认：{value})",
-        "instance_default_simple": "(默认)",
-        "interface": "界面",
-        "interfaceLanguage": "界面语言",
-        "invalid_theme_imported": "您所选择的主题文件不被 Pleroma 支持，因此主题未被修改。",
-        "limited_availability": "在您的浏览器中无法使用",
-        "links": "链接",
-        "lock_account_description": "你需要手动审核关注请求",
-        "loop_video": "循环视频",
-        "loop_video_silent_only": "只循环没有声音的视频（例如：Mastodon 里的“GIF”）",
-        "mutes_tab": "隐藏",
-        "play_videos_in_modal": "在弹出框内播放视频",
-        "use_contain_fit": "生成缩略图时不要裁剪附件",
-        "name": "名字",
-        "name_bio": "名字及简介",
-        "new_password": "新密码",
-        "notification_visibility": "要显示的通知类型",
-        "notification_visibility_follows": "关注",
-        "notification_visibility_likes": "点赞",
-        "notification_visibility_mentions": "提及",
-        "notification_visibility_repeats": "转发",
-        "no_rich_text_description": "不显示富文本格式",
-        "no_blocks": "没有拉黑的",
-        "no_mutes": "没有隐藏",
-        "hide_follows_description": "不要显示我所关注的人",
-        "hide_followers_description": "不要显示关注我的人",
-        "show_admin_badge": "显示管理徽章",
-        "show_moderator_badge": "显示版主徽章",
-        "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
-        "oauth_tokens": "OAuth令牌",
-        "token": "令牌",
-        "refresh_token": "刷新令牌",
-        "valid_until": "有效期至",
-        "revoke_token": "撤消",
-        "panelRadius": "面板",
-        "pause_on_unfocused": "在离开页面时暂停时间线推送",
-        "presets": "预置",
-        "profile_background": "个人资料背景图",
-        "profile_banner": "横幅图片",
-        "profile_tab": "个人资料",
-        "radii_help": "设置界面边缘的圆角 (单位：像素)",
-        "replies_in_timeline": "时间线中的回复",
-        "reply_link_preview": "启用鼠标悬停时预览回复链接",
-        "reply_visibility_all": "显示所有回复",
-        "reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
-        "reply_visibility_self": "只显示发送给我的回复",
-        "autohide_floating_post_button": "自动隐藏新帖子的按钮（移动设备）",
-        "saving_err": "保存设置时发生错误",
-        "saving_ok": "设置已保存",
-        "search_user_to_block": "搜索你想屏蔽的用户",
-        "search_user_to_mute": "搜索你想要隐藏的用户",
-        "security_tab": "安全",
-        "scope_copy": "回复时的复制范围（私信是总是复制的）",
-        "minimal_scopes_mode": "最小发文范围",
-        "set_new_avatar": "设置新头像",
-        "set_new_profile_background": "设置新的个人资料背景",
-        "set_new_profile_banner": "设置新的横幅图片",
-        "settings": "设置",
-        "subject_input_always_show": "总是显示主题框",
-        "subject_line_behavior": "回复时复制主题",
-        "subject_line_email": "比如电邮： \"re: 主题\"",
-        "subject_line_mastodon": "比如 mastodon: copy as is",
-        "subject_line_noop": "不要复制",
-        "post_status_content_type": "发文状态内容类型",
-        "stop_gifs": "鼠标悬停时播放GIF",
-        "streaming": "开启滚动到顶部时的自动推送",
-        "text": "文本",
-        "theme": "主题",
-        "theme_help": "使用十六进制代码（#rrggbb）来设置主题颜色。",
-        "theme_help_v2_1": "你也可以通过切换复选框来覆盖某些组件的颜色和透明。使用“清除所有”来清楚所有覆盖设置。",
-        "theme_help_v2_2": "某些条目下的图标是背景或文本对比指示器，鼠标悬停可以获取详细信息。请记住，使用透明度来显示最差的情况。",
-        "tooltipRadius": "提醒",
-        "upload_a_photo": "上传照片",
-        "user_settings": "用户设置",
-        "values": {
-            "false": "否",
-            "true": "是"
-        },
-        "notifications": "通知",
-        "notification_setting": "通知来源：",
-        "notification_setting_follows": "你所关注的用户",
-        "notification_setting_non_follows": "你没有关注的用户",
-        "notification_setting_followers": "关注你的用户",
-        "notification_setting_non_followers": "没有关注你的用户",
-        "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
-        "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
-        "enable_web_push_notifications": "启用 web 推送通知",
-        "style": {
-            "switcher": {
-                "keep_color": "保留颜色",
-                "keep_shadows": "保留阴影",
-                "keep_opacity": "保留透明度",
-                "keep_roundness": "保留圆角",
-                "keep_fonts": "保留字体",
-                "save_load_hint": "\"保留\" 选项在选择或加载主题时保留当前设置的选项，在导出主题时还会存储上述选项。当所有复选框未设置时，导出主题将保存所有内容。",
-                "reset": "重置",
-                "clear_all": "清除全部",
-                "clear_opacity": "清除透明度",
-                "load_theme": "加载主题",
-                "help": {
-                    "upgraded_from_v2": "PleromaFE 已升级，主题会和你记忆中的不太一样。"
-                },
-                "use_source": "新版本",
-                "use_snapshot": "老版本",
-                "keep_as_is": "保持原状"
-            },
-            "common": {
-                "color": "颜色",
-                "opacity": "透明度",
-                "contrast": {
-                    "hint": "对比度是 {ratio}， 它 {level} {context}",
-                    "level": {
-                        "aa": "符合 AA 等级准则（最低）",
-                        "aaa": "符合 AAA 等级准则（推荐）",
-                        "bad": "不符合任何辅助功能指南"
-                    },
-                    "context": {
-                        "18pt": "大字文本 (18pt+)",
-                        "text": "文本"
-                    }
-                }
-            },
-            "common_colors": {
-                "_tab_label": "常规",
-                "main": "常用颜色",
-                "foreground_hint": "点击”高级“ 标签进行细致的控制",
-                "rgbo": "图标，口音，徽章"
-            },
-            "advanced_colors": {
-                "_tab_label": "高级",
-                "alert": "提醒或警告背景色",
-                "alert_error": "错误",
-                "badge": "徽章背景",
-                "badge_notification": "通知",
-                "panel_header": "面板标题",
-                "top_bar": "顶栏",
-                "borders": "边框",
-                "buttons": "按钮",
-                "inputs": "输入框",
-                "faint_text": "灰度文字"
-            },
-            "radii": {
-                "_tab_label": "圆角"
-            },
-            "shadows": {
-                "_tab_label": "阴影和照明",
-                "component": "组件",
-                "override": "覆盖",
-                "shadow_id": "阴影 #{value}",
-                "blur": "模糊",
-                "spread": "扩散",
-                "inset": "插入内部",
-                "hint": "对于阴影你还可以使用 --variable 作为颜色值来使用 CSS3 变量。请注意，这种情况下，透明设置将不起作用。",
-                "filter_hint": {
-                    "always_drop_shadow": "警告，此阴影设置会总是使用 {0} ，如果浏览器支持的话。",
-                    "drop_shadow_syntax": "{0} 不支持参数 {1} 和关键词 {2} 。",
-                    "avatar_inset": "请注意组合两个内部和非内部的阴影到头像上，在透明头像上可能会有意料之外的效果。",
-                    "spread_zero": "阴影的扩散 > 0 会同设置成零一样",
-                    "inset_classic": "插入内部的阴影会使用 {0}"
-                },
-                "components": {
-                    "panel": "面板",
-                    "panelHeader": "面板标题",
-                    "topBar": "顶栏",
-                    "avatar": "用户头像（在个人资料栏）",
-                    "avatarStatus": "用户头像（在帖子显示栏）",
-                    "popup": "弹窗和工具提示",
-                    "button": "按钮",
-                    "buttonHover": "按钮（悬停）",
-                    "buttonPressed": "按钮（按下）",
-                    "buttonPressedHover": "按钮（按下和悬停）",
-                    "input": "输入框"
-                }
-            },
-            "fonts": {
-                "_tab_label": "字体",
-                "help": "给用户界面的元素选择字体。选择 “自选”的你必须输入确切的字体名称。",
-                "components": {
-                    "interface": "界面",
-                    "input": "输入框",
-                    "post": "发帖文字",
-                    "postCode": "帖子中使用等间距文字（富文本）"
-                },
-                "family": "字体名称",
-                "size": "大小 (in px)",
-                "weight": "字重 （粗体）)",
-                "custom": "自选"
-            },
-            "preview": {
-                "header": "预览",
-                "content": "内容",
-                "error": "例子错误",
-                "button": "按钮",
-                "text": "有堆 {0} 和 {1}",
-                "mono": "内容",
-                "input": "刚刚抵达上海",
-                "faint_link": "帮助菜单",
-                "fine_print": "阅读我们的 {0} ，然而什么也学不到！",
-                "header_faint": "这很正常",
-                "checkbox": "我已经浏览了 TOC",
-                "link": "一个很棒的摇滚链接"
-            }
-        },
-        "version": {
-            "title": "版本",
-            "backend_version": "后端版本",
-            "frontend_version": "前端版本"
-        },
-        "notification_setting_filters": "过滤器",
-        "domain_mutes": "域名",
-        "changed_email": "邮箱修改成功！",
-        "change_email_error": "修改你的电子邮箱时发生错误",
-        "change_email": "修改电子邮箱",
-        "allow_following_move": "正在关注的账号迁移时自动重新关注",
-        "notification_setting_privacy_option": "在通知推送中隐藏发送者和内容",
-        "notification_setting_privacy": "隐私",
-        "hide_follows_count_description": "不显示关注数",
-        "notification_visibility_emoji_reactions": "互动",
-        "notification_visibility_moves": "用户迁移",
-        "new_email": "新邮箱",
-        "emoji_reactions_on_timeline": "在时间线上显示表情符号互动"
-    },
-    "time": {
-        "day": "{0} 天",
-        "days": "{0} 天",
-        "day_short": "{0}d",
-        "days_short": "{0}d",
-        "hour": "{0} 小时",
-        "hours": "{0} 小时",
-        "hour_short": "{0}h",
-        "hours_short": "{0}h",
-        "in_future": "还有 {0}",
-        "in_past": "{0} 之前",
-        "minute": "{0} 分钟",
-        "minutes": "{0} 分钟",
-        "minute_short": "{0}min",
-        "minutes_short": "{0}min",
-        "month": "{0} 月",
-        "months": "{0} 月",
-        "month_short": "{0}mo",
-        "months_short": "{0}mo",
-        "now": "刚刚",
-        "now_short": "刚刚",
-        "second": "{0} 秒",
-        "seconds": "{0} 秒",
-        "second_short": "{0}s",
-        "seconds_short": "{0}s",
-        "week": "{0} 周",
-        "weeks": "{0} 周",
-        "week_short": "{0}w",
-        "weeks_short": "{0}w",
-        "year": "{0} 年",
-        "years": "{0} 年",
-        "year_short": "{0}y",
-        "years_short": "{0}y"
-    },
-    "timeline": {
-        "collapse": "折叠",
-        "conversation": "对话",
-        "error_fetching": "获取更新时发生错误",
-        "load_older": "加载更早的状态",
-        "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发。",
-        "repeated": "已转发",
-        "show_new": "显示新内容",
-        "up_to_date": "已是最新",
-        "no_more_statuses": "没有更多的状态",
-        "no_statuses": "没有状态更新"
-    },
-    "status": {
-        "favorites": "收藏",
-        "repeats": "转发",
-        "delete": "删除状态",
-        "pin": "在个人资料置顶",
-        "unpin": "取消在个人资料置顶",
-        "pinned": "置顶",
-        "delete_confirm": "你真的想要删除这条状态吗？",
-        "reply_to": "回复",
-        "replies_list": "回复：",
-        "mute_conversation": "隐藏对话",
-        "unmute_conversation": "对话取消隐藏"
-    },
-    "user_card": {
-        "approve": "允许",
-        "block": "屏蔽",
-        "blocked": "已屏蔽！",
-        "deny": "拒绝",
-        "favorites": "收藏",
-        "follow": "关注",
-        "follow_sent": "请求已发送！",
-        "follow_progress": "请求中",
-        "follow_again": "再次发送请求？",
-        "follow_unfollow": "取消关注",
-        "followees": "正在关注",
-        "followers": "关注者",
-        "following": "正在关注！",
-        "follows_you": "关注了你！",
-        "its_you": "就是你！!",
-        "media": "媒体",
-        "mute": "隐藏",
-        "muted": "已隐藏",
-        "per_day": "每天",
-        "remote_follow": "跨站关注",
-        "report": "报告",
-        "statuses": "状态",
-        "subscribe": "订阅",
-        "unsubscribe": "退订",
-        "unblock": "取消拉黑",
-        "unblock_progress": "取消拉黑中...",
-        "block_progress": "拉黑中...",
-        "unmute": "取消隐藏",
-        "unmute_progress": "取消隐藏中...",
-        "mute_progress": "隐藏中...",
-        "admin_menu": {
-            "moderation": "权限",
-            "grant_admin": "赋予管理权限",
-            "revoke_admin": "撤销管理权限",
-            "grant_moderator": "赋予版主权限",
-            "revoke_moderator": "撤销版主权限",
-            "activate_account": "激活账号",
-            "deactivate_account": "关闭账号",
-            "delete_account": "删除账号",
-            "force_nsfw": "标记所有的帖子都是 - 工作场合不适",
-            "strip_media": "从帖子里删除媒体文件",
-            "force_unlisted": "强制帖子为不公开",
-            "sandbox": "强制帖子为只有关注者可看",
-            "disable_remote_subscription": "禁止从远程实例关注用户",
-            "disable_any_subscription": "完全禁止关注用户",
-            "quarantine": "从联合实例中禁止用户帖子",
-            "delete_user": "删除用户",
-            "delete_user_confirmation": "你确认吗？此操作无法撤销。"
-        },
-        "hidden": "已隐藏",
-        "show_repeats": "显示转发",
-        "hide_repeats": "隐藏转发"
-    },
-    "user_profile": {
-        "timeline_title": "用户时间线",
-        "profile_does_not_exist": "抱歉，此个人资料不存在。",
-        "profile_loading_error": "抱歉，载入个人资料时出错。"
-    },
-    "user_reporting": {
-        "title": "报告 {0}",
-        "add_comment_description": "此报告会发送给你的实例管理员。你可以在下面提供更多详细信息解释报告的缘由：",
-        "additional_comments": "其它信息",
-        "forward_description": "这个账号是从另外一个服务器。同时发送一个副本到那里？",
-        "forward_to": "转发 {0}",
-        "submit": "提交",
-        "generic_error": "当处理你的请求时，发生了一个错误。"
-    },
-    "who_to_follow": {
-        "more": "更多",
-        "who_to_follow": "推荐关注"
-    },
-    "tool_tip": {
-        "media_upload": "上传多媒体",
-        "repeat": "转发",
-        "reply": "回复",
-        "favorite": "收藏",
-        "user_settings": "用户设置",
-        "reject_follow_request": "拒绝关注请求",
-        "add_reaction": "添加互动"
-    },
-    "upload": {
-        "error": {
-            "base": "上传不成功。",
-            "file_too_big": "文件太大了 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-            "default": "迟些再试"
-        },
-        "file_size_units": {
-            "B": "B",
-            "KiB": "KiB",
-            "MiB": "MiB",
-            "GiB": "GiB",
-            "TiB": "TiB"
-        }
-    },
-    "search": {
-        "people": "人",
-        "hashtags": "Hashtags",
-        "person_talking": "{count} 人正在讨论",
-        "people_talking": "{count} 人正在讨论",
-        "no_results": "没有搜索结果"
-    },
-    "password_reset": {
-        "forgot_password": "忘记密码了？",
-        "password_reset": "重置密码",
-        "instruction": "输入你的电邮地址或者用户名，我们将发送一个链接到你的邮箱，用于重置密码。",
-        "placeholder": "你的电邮地址或者用户名",
-        "check_email": "检查你的邮箱，会有一个链接用于重置密码。",
-        "return_home": "回到首页",
-        "not_found": "我们无法找到匹配的邮箱地址或者用户名。",
-        "too_many_requests": "你触发了尝试的限制，请稍后再试。",
-        "password_reset_disabled": "密码重置已经被禁用。请联系你的实例管理员。"
-    },
-    "remote_user_resolver": {
-        "error": "未找到。",
-        "searching_for": "搜索",
-        "remote_user_resolver": "远程用户解析器"
-    },
-    "emoji": {
-        "keep_open": "选择器保持打开",
-        "stickers": "贴图",
-        "unicode": "Unicode 表情符号",
-        "custom": "自定义表情符号",
-        "add_emoji": "插入表情符号",
-        "search_emoji": "搜索表情符号",
-        "emoji": "表情符号"
-    },
-    "about": {
-        "mrf": {
-            "simple": {
-                "quarantine_desc": "本实例只会把公开状态发送非下列实例：",
-                "quarantine": "隔离",
-                "reject_desc": "本实例不会接收来自下列实例的消息：",
-                "reject": "拒绝",
-                "accept_desc": "本实例只接收来自下列实例的消息：",
-                "simple_policies": "站规",
-                "accept": "接受",
-                "media_removal": "移除媒体"
-            },
-            "mrf_policies_desc": "MRF 策略会影响本实例的互通行为。以下策略已启用：",
-            "mrf_policies": "已启动 MRF 策略",
-            "keyword": {
-                "ftl_removal": "从“全部已知网络”时间线上移除",
-                "keyword_policies": "关键词策略",
-                "is_replaced_by": "→",
-                "replace": "替换",
-                "reject": "拒绝"
-            },
-            "federation": "联邦"
-        }
-    },
-    "domain_mute_card": {
-        "unmute_progress": "正在取消隐藏……",
-        "unmute": "取消隐藏",
-        "mute_progress": "隐藏中……",
-        "mute": "隐藏"
+  "chat": {
+    "title": "聊天"
+  },
+  "exporter": {
+    "export": "导出",
+    "processing": "正在处理，稍后会提示您下载文件"
+  },
+  "features_panel": {
+    "chat": "聊天",
+    "gopher": "Gopher",
+    "media_proxy": "媒体代理",
+    "scope_options": "可见范围设置",
+    "text_limit": "文本长度限制",
+    "title": "功能",
+    "who_to_follow": "推荐关注"
+  },
+  "finder": {
+    "error_fetching_user": "获取用户时发生错误",
+    "find_user": "寻找用户"
+  },
+  "general": {
+    "apply": "应用",
+    "submit": "提交",
+    "more": "更多",
+    "generic_error": "发生一个错误",
+    "optional": "可选项",
+    "show_more": "展开",
+    "show_less": "收起",
+    "cancel": "取消",
+    "disable": "禁用",
+    "enable": "启用",
+    "confirm": "确认",
+    "verify": "验证",
+    "dismiss": "忽略"
+  },
+  "image_cropper": {
+    "crop_picture": "裁剪图片",
+    "save": "保存",
+    "save_without_cropping": "保存未经裁剪的图片",
+    "cancel": "取消"
+  },
+  "importer": {
+    "submit": "提交",
+    "success": "导入成功。",
+    "error": "导入此文件时出现一个错误。"
+  },
+  "login": {
+    "login": "登录",
+    "description": "用 OAuth 登录",
+    "logout": "登出",
+    "password": "密码",
+    "placeholder": "例如：lain",
+    "register": "注册",
+    "username": "用户名",
+    "hint": "登录后加入讨论",
+    "authentication_code": "验证码",
+    "enter_recovery_code": "输入一个恢复码",
+    "enter_two_factor_code": "输入一个双重因素验证码",
+    "recovery_code": "恢复码",
+    "heading": {
+      "totp": "双重因素验证",
+      "recovery": "双重因素恢复"
     }
+  },
+  "media_modal": {
+    "previous": "往前",
+    "next": "往后"
+  },
+  "nav": {
+    "about": "关于",
+    "back": "后退",
+    "chat": "本站聊天",
+    "friend_requests": "关注请求",
+    "mentions": "提及",
+    "interactions": "互动",
+    "dms": "私信",
+    "public_tl": "公共时间线",
+    "timeline": "时间线",
+    "twkn": "所有已知网络",
+    "user_search": "用户搜索",
+    "search": "搜索",
+    "who_to_follow": "推荐关注",
+    "preferences": "偏好设置",
+    "administration": "管理员"
+  },
+  "notifications": {
+    "broken_favorite": "未知的状态，正在搜索中...",
+    "favorited_you": "收藏了你的状态",
+    "followed_you": "关注了你",
+    "load_older": "加载更早的通知",
+    "notifications": "通知",
+    "read": "阅读！",
+    "repeated_you": "转发了你的状态",
+    "no_more_notifications": "没有更多的通知",
+    "reacted_with": "和 {0} 互动过",
+    "migrated_to": "迁移到",
+    "follow_request": "想要关注你"
+  },
+  "polls": {
+    "add_poll": "增加问卷调查",
+    "add_option": "增加选项",
+    "option": "选项",
+    "votes": "投票",
+    "vote": "投票",
+    "type": "问卷类型",
+    "single_choice": "单选项",
+    "multiple_choices": "多选项",
+    "expiry": "问卷的时间",
+    "expires_in": "投票于 {0} 内结束",
+    "expired": "投票 {0} 前已结束",
+    "not_enough_options": "投票的选项太少"
+  },
+  "stickers": {
+    "add_sticker": "添加贴纸"
+  },
+  "interactions": {
+    "favs_repeats": "转发和收藏",
+    "follows": "新的关注者",
+    "load_older": "加载更早的互动",
+    "moves": "用户迁移"
+  },
+  "post_status": {
+    "new_status": "发布新状态",
+    "account_not_locked_warning": "你的帐号没有 {0}。任何人都可以关注你并浏览你的上锁内容。",
+    "account_not_locked_warning_link": "上锁",
+    "attachments_sensitive": "标记附件为敏感内容",
+    "content_type": {
+      "text/plain": "纯文本",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_warning": "主题（可选）",
+    "default": "刚刚抵达上海",
+    "direct_warning_to_all": "本条内容只有被提及的用户能够看到。",
+    "direct_warning_to_first_only": "本条内容只有被在消息开始处提及的用户能够看到。",
+    "posting": "发送",
+    "scope_notice": {
+      "public": "本条内容可以被所有人看到",
+      "private": "关注你的人才能看到本条内容",
+      "unlisted": "本条内容既不在公共时间线，也不会在所有已知网络上可见"
+    },
+    "scope": {
+      "direct": "私信 - 只发送给被提及的用户",
+      "private": "仅关注者 - 只有关注了你的人能看到",
+      "public": "公共 - 发送到公共时间轴",
+      "unlisted": "不公开 - 不会发送到公共时间轴"
+    }
+  },
+  "registration": {
+    "bio": "简介",
+    "email": "电子邮箱",
+    "fullname": "全名",
+    "password_confirm": "确认密码",
+    "registration": "注册",
+    "token": "邀请码",
+    "captcha": "CAPTCHA",
+    "new_captcha": "点击图片获取新的验证码",
+    "username_placeholder": "例如：lain",
+    "fullname_placeholder": "例如：岩仓玲音",
+    "bio_placeholder": "例如：\n你好，我是玲音。\n我是一个住在日本郊区的动画少女。你可能在 Wired 见过我。",
+    "validations": {
+      "username_required": "不能留空",
+      "fullname_required": "不能留空",
+      "email_required": "不能留空",
+      "password_required": "不能留空",
+      "password_confirmation_required": "不能留空",
+      "password_confirmation_match": "密码不一致"
+    }
+  },
+  "selectable_list": {
+    "select_all": "选择全部"
+  },
+  "settings": {
+    "app_name": "App 名称",
+    "security": "安全",
+    "enter_current_password_to_confirm": "输入你当前密码来确认你的身份",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "设置 OTP",
+      "wait_pre_setup_otp": "预设 OTP",
+      "confirm_and_enable": "确认并启用 OTP",
+      "title": "双因素验证",
+      "generate_new_recovery_codes": "生成新的恢复码",
+      "warning_of_generate_new_codes": "当你生成新的恢复码时，你的旧恢复码就失效了。",
+      "recovery_codes": "恢复码。",
+      "waiting_a_recovery_codes": "正在接收备份码……",
+      "recovery_codes_warning": "抄写这些号码，或者保存在安全的地方。这些号码不会再次显示。如果你无法访问你的 2FA app，也丢失了你的恢复码，你的账号就再也无法登录了。",
+      "authentication_methods": "身份验证方法",
+      "scan": {
+        "title": "扫一下",
+        "desc": "使用你的双因素验证 app，扫描这个二维码，或者输入这些文字密钥：",
+        "secret_code": "密钥"
+      },
+      "verify": {
+        "desc": "要启用双因素验证，请把你的双因素验证 app 里的数字输入："
+      }
+    },
+    "attachmentRadius": "附件",
+    "attachments": "附件",
+    "autoload": "启用滚动到底部时的自动加载",
+    "avatar": "头像",
+    "avatarAltRadius": "头像（通知）",
+    "avatarRadius": "头像",
+    "background": "背景",
+    "bio": "简介",
+    "block_export": "拉黑名单导出",
+    "block_export_button": "导出你的拉黑名单到一个 csv 文件",
+    "block_import": "拉黑名单导入",
+    "block_import_error": "导入拉黑名单出错",
+    "blocks_imported": "拉黑名单导入成功！需要一点时间来处理。",
+    "blocks_tab": "块",
+    "btnRadius": "按钮",
+    "cBlue": "蓝色（回复，关注）",
+    "cGreen": "绿色（转发）",
+    "cOrange": "橙色（收藏）",
+    "cRed": "红色（取消）",
+    "change_password": "修改密码",
+    "change_password_error": "修改密码的时候出了点问题。",
+    "changed_password": "成功修改了密码！",
+    "collapse_subject": "折叠带主题的内容",
+    "composing": "正在书写",
+    "confirm_new_password": "确认新密码",
+    "current_avatar": "当前头像",
+    "current_password": "当前密码",
+    "current_profile_banner": "您当前的横幅图片",
+    "data_import_export_tab": "数据导入/导出",
+    "default_vis": "默认可见范围",
+    "delete_account": "删除账户",
+    "delete_account_description": "永久删除你的帐号和所有数据。",
+    "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。",
+    "delete_account_instructions": "在下面输入你的密码来确认删除账户",
+    "avatar_size_instruction": "推荐的头像图片最小的尺寸是 150x150 像素。",
+    "export_theme": "导出预置主题",
+    "filtering": "过滤器",
+    "filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个",
+    "follow_export": "导出关注",
+    "follow_export_button": "将关注导出成 csv 文件",
+    "follow_import": "导入关注",
+    "follow_import_error": "导入关注时错误",
+    "follows_imported": "关注已导入！尚需要一些时间来处理。",
+    "foreground": "前景",
+    "general": "通用",
+    "hide_attachments_in_convo": "在对话中隐藏附件",
+    "hide_attachments_in_tl": "在时间线上隐藏附件",
+    "hide_muted_posts": "不显示被隐藏的用户的帖子",
+    "max_thumbnails": "最多再每个帖子所能显示的缩略图数量",
+    "hide_isp": "隐藏指定实例的面板H",
+    "preload_images": "预载图片",
+    "use_one_click_nsfw": "点击一次以打开工作场所不适宜的附件",
+    "hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)",
+    "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）",
+    "hide_filtered_statuses": "隐藏过滤的状态",
+    "import_blocks_from_a_csv_file": "从 csv 文件中导入拉黑名单",
+    "import_followers_from_a_csv_file": "从 csv 文件中导入关注",
+    "import_theme": "导入预置主题",
+    "inputRadius": "输入框",
+    "checkboxRadius": "复选框",
+    "instance_default": "(默认：{value})",
+    "instance_default_simple": "(默认)",
+    "interface": "界面",
+    "interfaceLanguage": "界面语言",
+    "invalid_theme_imported": "您所选择的主题文件不被 Pleroma 支持，因此主题未被修改。",
+    "limited_availability": "在您的浏览器中无法使用",
+    "links": "链接",
+    "lock_account_description": "你需要手动审核关注请求",
+    "loop_video": "循环视频",
+    "loop_video_silent_only": "只循环没有声音的视频（例如：Mastodon 里的“GIF”）",
+    "mutes_tab": "隐藏",
+    "play_videos_in_modal": "在弹出框内播放视频",
+    "use_contain_fit": "生成缩略图时不要裁剪附件",
+    "name": "名字",
+    "name_bio": "名字及简介",
+    "new_password": "新密码",
+    "notification_visibility": "要显示的通知类型",
+    "notification_visibility_follows": "关注",
+    "notification_visibility_likes": "点赞",
+    "notification_visibility_mentions": "提及",
+    "notification_visibility_repeats": "转发",
+    "no_rich_text_description": "不显示富文本格式",
+    "no_blocks": "没有拉黑的",
+    "no_mutes": "没有隐藏",
+    "hide_follows_description": "不要显示我所关注的人",
+    "hide_followers_description": "不要显示关注我的人",
+    "show_admin_badge": "显示管理徽章",
+    "show_moderator_badge": "显示版主徽章",
+    "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开",
+    "oauth_tokens": "OAuth令牌",
+    "token": "令牌",
+    "refresh_token": "刷新令牌",
+    "valid_until": "有效期至",
+    "revoke_token": "撤消",
+    "panelRadius": "面板",
+    "pause_on_unfocused": "在离开页面时暂停时间线推送",
+    "presets": "预置",
+    "profile_background": "个人资料背景图",
+    "profile_banner": "横幅图片",
+    "profile_tab": "个人资料",
+    "radii_help": "设置界面边缘的圆角 (单位：像素)",
+    "replies_in_timeline": "时间线中的回复",
+    "reply_link_preview": "启用鼠标悬停时预览回复链接",
+    "reply_visibility_all": "显示所有回复",
+    "reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
+    "reply_visibility_self": "只显示发送给我的回复",
+    "autohide_floating_post_button": "自动隐藏新帖子的按钮（移动设备）",
+    "saving_err": "保存设置时发生错误",
+    "saving_ok": "设置已保存",
+    "search_user_to_block": "搜索你想屏蔽的用户",
+    "search_user_to_mute": "搜索你想要隐藏的用户",
+    "security_tab": "安全",
+    "scope_copy": "回复时的复制范围（私信是总是复制的）",
+    "minimal_scopes_mode": "最小发文范围",
+    "set_new_avatar": "设置新头像",
+    "set_new_profile_background": "设置新的个人资料背景",
+    "set_new_profile_banner": "设置新的横幅图片",
+    "settings": "设置",
+    "subject_input_always_show": "总是显示主题框",
+    "subject_line_behavior": "回复时复制主题",
+    "subject_line_email": "比如电邮： \"re: 主题\"",
+    "subject_line_mastodon": "比如 mastodon: copy as is",
+    "subject_line_noop": "不要复制",
+    "post_status_content_type": "发文状态内容类型",
+    "stop_gifs": "鼠标悬停时播放GIF",
+    "streaming": "开启滚动到顶部时的自动推送",
+    "text": "文本",
+    "theme": "主题",
+    "theme_help": "使用十六进制代码（#rrggbb）来设置主题颜色。",
+    "theme_help_v2_1": "你也可以通过切换复选框来覆盖某些组件的颜色和透明。使用“清除所有”来清楚所有覆盖设置。",
+    "theme_help_v2_2": "某些条目下的图标是背景或文本对比指示器，鼠标悬停可以获取详细信息。请记住，使用透明度来显示最差的情况。",
+    "tooltipRadius": "提醒",
+    "upload_a_photo": "上传照片",
+    "user_settings": "用户设置",
+    "values": {
+      "false": "否",
+      "true": "是"
+    },
+    "notifications": "通知",
+    "notification_setting": "通知来源：",
+    "notification_setting_follows": "你所关注的用户",
+    "notification_setting_non_follows": "你没有关注的用户",
+    "notification_setting_followers": "关注你的用户",
+    "notification_setting_non_followers": "没有关注你的用户",
+    "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
+    "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
+    "enable_web_push_notifications": "启用 web 推送通知",
+    "style": {
+      "switcher": {
+        "keep_color": "保留颜色",
+        "keep_shadows": "保留阴影",
+        "keep_opacity": "保留透明度",
+        "keep_roundness": "保留圆角",
+        "keep_fonts": "保留字体",
+        "save_load_hint": "\"保留\" 选项在选择或加载主题时保留当前设置的选项，在导出主题时还会存储上述选项。当所有复选框未设置时，导出主题将保存所有内容。",
+        "reset": "重置",
+        "clear_all": "清除全部",
+        "clear_opacity": "清除透明度",
+        "load_theme": "加载主题",
+        "help": {
+          "upgraded_from_v2": "PleromaFE 已升级，主题会和你记忆中的不太一样。"
+        },
+        "use_source": "新版本",
+        "use_snapshot": "老版本",
+        "keep_as_is": "保持原状"
+      },
+      "common": {
+        "color": "颜色",
+        "opacity": "透明度",
+        "contrast": {
+          "hint": "对比度是 {ratio}， 它 {level} {context}",
+          "level": {
+            "aa": "符合 AA 等级准则（最低）",
+            "aaa": "符合 AAA 等级准则（推荐）",
+            "bad": "不符合任何辅助功能指南"
+          },
+          "context": {
+            "18pt": "大字文本 (18pt+)",
+            "text": "文本"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "常规",
+        "main": "常用颜色",
+        "foreground_hint": "点击”高级“ 标签进行细致的控制",
+        "rgbo": "图标，口音，徽章"
+      },
+      "advanced_colors": {
+        "_tab_label": "高级",
+        "alert": "提醒或警告背景色",
+        "alert_error": "错误",
+        "badge": "徽章背景",
+        "badge_notification": "通知",
+        "panel_header": "面板标题",
+        "top_bar": "顶栏",
+        "borders": "边框",
+        "buttons": "按钮",
+        "inputs": "输入框",
+        "faint_text": "灰度文字"
+      },
+      "radii": {
+        "_tab_label": "圆角"
+      },
+      "shadows": {
+        "_tab_label": "阴影和照明",
+        "component": "组件",
+        "override": "覆盖",
+        "shadow_id": "阴影 #{value}",
+        "blur": "模糊",
+        "spread": "扩散",
+        "inset": "插入内部",
+        "hint": "对于阴影你还可以使用 --variable 作为颜色值来使用 CSS3 变量。请注意，这种情况下，透明设置将不起作用。",
+        "filter_hint": {
+          "always_drop_shadow": "警告，此阴影设置会总是使用 {0} ，如果浏览器支持的话。",
+          "drop_shadow_syntax": "{0} 不支持参数 {1} 和关键词 {2} 。",
+          "avatar_inset": "请注意组合两个内部和非内部的阴影到头像上，在透明头像上可能会有意料之外的效果。",
+          "spread_zero": "阴影的扩散 > 0 会同设置成零一样",
+          "inset_classic": "插入内部的阴影会使用 {0}"
+        },
+        "components": {
+          "panel": "面板",
+          "panelHeader": "面板标题",
+          "topBar": "顶栏",
+          "avatar": "用户头像（在个人资料栏）",
+          "avatarStatus": "用户头像（在帖子显示栏）",
+          "popup": "弹窗和工具提示",
+          "button": "按钮",
+          "buttonHover": "按钮（悬停）",
+          "buttonPressed": "按钮（按下）",
+          "buttonPressedHover": "按钮（按下和悬停）",
+          "input": "输入框"
+        }
+      },
+      "fonts": {
+        "_tab_label": "字体",
+        "help": "给用户界面的元素选择字体。选择 “自选”的你必须输入确切的字体名称。",
+        "components": {
+          "interface": "界面",
+          "input": "输入框",
+          "post": "发帖文字",
+          "postCode": "帖子中使用等间距文字（富文本）"
+        },
+        "family": "字体名称",
+        "size": "大小 (in px)",
+        "weight": "字重 （粗体）)",
+        "custom": "自选"
+      },
+      "preview": {
+        "header": "预览",
+        "content": "内容",
+        "error": "例子错误",
+        "button": "按钮",
+        "text": "有堆 {0} 和 {1}",
+        "mono": "内容",
+        "input": "刚刚抵达上海",
+        "faint_link": "帮助菜单",
+        "fine_print": "阅读我们的 {0} ，然而什么也学不到！",
+        "header_faint": "这很正常",
+        "checkbox": "我已经浏览了 TOC",
+        "link": "一个很棒的摇滚链接"
+      }
+    },
+    "version": {
+      "title": "版本",
+      "backend_version": "后端版本",
+      "frontend_version": "前端版本"
+    },
+    "notification_setting_filters": "过滤器",
+    "domain_mutes": "域名",
+    "changed_email": "邮箱修改成功！",
+    "change_email_error": "修改你的电子邮箱时发生错误",
+    "change_email": "修改电子邮箱",
+    "allow_following_move": "正在关注的账号迁移时自动重新关注",
+    "notification_setting_privacy_option": "在通知推送中隐藏发送者和内容",
+    "notification_setting_privacy": "隐私",
+    "hide_follows_count_description": "不显示关注数",
+    "notification_visibility_emoji_reactions": "互动",
+    "notification_visibility_moves": "用户迁移",
+    "new_email": "新邮箱",
+    "emoji_reactions_on_timeline": "在时间线上显示表情符号互动"
+  },
+  "time": {
+    "day": "{0} 天",
+    "days": "{0} 天",
+    "day_short": "{0}d",
+    "days_short": "{0}d",
+    "hour": "{0} 小时",
+    "hours": "{0} 小时",
+    "hour_short": "{0}h",
+    "hours_short": "{0}h",
+    "in_future": "还有 {0}",
+    "in_past": "{0} 之前",
+    "minute": "{0} 分钟",
+    "minutes": "{0} 分钟",
+    "minute_short": "{0}min",
+    "minutes_short": "{0}min",
+    "month": "{0} 月",
+    "months": "{0} 月",
+    "month_short": "{0}mo",
+    "months_short": "{0}mo",
+    "now": "刚刚",
+    "now_short": "刚刚",
+    "second": "{0} 秒",
+    "seconds": "{0} 秒",
+    "second_short": "{0}s",
+    "seconds_short": "{0}s",
+    "week": "{0} 周",
+    "weeks": "{0} 周",
+    "week_short": "{0}w",
+    "weeks_short": "{0}w",
+    "year": "{0} 年",
+    "years": "{0} 年",
+    "year_short": "{0}y",
+    "years_short": "{0}y"
+  },
+  "timeline": {
+    "collapse": "折叠",
+    "conversation": "对话",
+    "error_fetching": "获取更新时发生错误",
+    "load_older": "加载更早的状态",
+    "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发。",
+    "repeated": "已转发",
+    "show_new": "显示新内容",
+    "up_to_date": "已是最新",
+    "no_more_statuses": "没有更多的状态",
+    "no_statuses": "没有状态更新"
+  },
+  "status": {
+    "favorites": "收藏",
+    "repeats": "转发",
+    "delete": "删除状态",
+    "pin": "在个人资料置顶",
+    "unpin": "取消在个人资料置顶",
+    "pinned": "置顶",
+    "delete_confirm": "你真的想要删除这条状态吗？",
+    "reply_to": "回复",
+    "replies_list": "回复：",
+    "mute_conversation": "隐藏对话",
+    "unmute_conversation": "对话取消隐藏"
+  },
+  "user_card": {
+    "approve": "允许",
+    "block": "屏蔽",
+    "blocked": "已屏蔽！",
+    "deny": "拒绝",
+    "favorites": "收藏",
+    "follow": "关注",
+    "follow_sent": "请求已发送！",
+    "follow_progress": "请求中",
+    "follow_again": "再次发送请求？",
+    "follow_unfollow": "取消关注",
+    "followees": "正在关注",
+    "followers": "关注者",
+    "following": "正在关注！",
+    "follows_you": "关注了你！",
+    "its_you": "就是你！!",
+    "media": "媒体",
+    "mute": "隐藏",
+    "muted": "已隐藏",
+    "per_day": "每天",
+    "remote_follow": "跨站关注",
+    "report": "报告",
+    "statuses": "状态",
+    "subscribe": "订阅",
+    "unsubscribe": "退订",
+    "unblock": "取消拉黑",
+    "unblock_progress": "取消拉黑中...",
+    "block_progress": "拉黑中...",
+    "unmute": "取消隐藏",
+    "unmute_progress": "取消隐藏中...",
+    "mute_progress": "隐藏中...",
+    "admin_menu": {
+      "moderation": "权限",
+      "grant_admin": "赋予管理权限",
+      "revoke_admin": "撤销管理权限",
+      "grant_moderator": "赋予版主权限",
+      "revoke_moderator": "撤销版主权限",
+      "activate_account": "激活账号",
+      "deactivate_account": "关闭账号",
+      "delete_account": "删除账号",
+      "force_nsfw": "标记所有的帖子都是 - 工作场合不适",
+      "strip_media": "从帖子里删除媒体文件",
+      "force_unlisted": "强制帖子为不公开",
+      "sandbox": "强制帖子为只有关注者可看",
+      "disable_remote_subscription": "禁止从远程实例关注用户",
+      "disable_any_subscription": "完全禁止关注用户",
+      "quarantine": "从联合实例中禁止用户帖子",
+      "delete_user": "删除用户",
+      "delete_user_confirmation": "你确认吗？此操作无法撤销。"
+    },
+    "hidden": "已隐藏",
+    "show_repeats": "显示转发",
+    "hide_repeats": "隐藏转发"
+  },
+  "user_profile": {
+    "timeline_title": "用户时间线",
+    "profile_does_not_exist": "抱歉，此个人资料不存在。",
+    "profile_loading_error": "抱歉，载入个人资料时出错。"
+  },
+  "user_reporting": {
+    "title": "报告 {0}",
+    "add_comment_description": "此报告会发送给你的实例管理员。你可以在下面提供更多详细信息解释报告的缘由：",
+    "additional_comments": "其它信息",
+    "forward_description": "这个账号是从另外一个服务器。同时发送一个副本到那里？",
+    "forward_to": "转发 {0}",
+    "submit": "提交",
+    "generic_error": "当处理你的请求时，发生了一个错误。"
+  },
+  "who_to_follow": {
+    "more": "更多",
+    "who_to_follow": "推荐关注"
+  },
+  "tool_tip": {
+    "media_upload": "上传多媒体",
+    "repeat": "转发",
+    "reply": "回复",
+    "favorite": "收藏",
+    "user_settings": "用户设置",
+    "reject_follow_request": "拒绝关注请求",
+    "add_reaction": "添加互动"
+  },
+  "upload": {
+    "error": {
+      "base": "上传不成功。",
+      "file_too_big": "文件太大了 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "迟些再试"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "人",
+    "hashtags": "Hashtags",
+    "person_talking": "{count} 人正在讨论",
+    "people_talking": "{count} 人正在讨论",
+    "no_results": "没有搜索结果"
+  },
+  "password_reset": {
+    "forgot_password": "忘记密码了？",
+    "password_reset": "重置密码",
+    "instruction": "输入你的电邮地址或者用户名，我们将发送一个链接到你的邮箱，用于重置密码。",
+    "placeholder": "你的电邮地址或者用户名",
+    "check_email": "检查你的邮箱，会有一个链接用于重置密码。",
+    "return_home": "回到首页",
+    "not_found": "我们无法找到匹配的邮箱地址或者用户名。",
+    "too_many_requests": "你触发了尝试的限制，请稍后再试。",
+    "password_reset_disabled": "密码重置已经被禁用。请联系你的实例管理员。"
+  },
+  "remote_user_resolver": {
+    "error": "未找到。",
+    "searching_for": "搜索",
+    "remote_user_resolver": "远程用户解析器"
+  },
+  "emoji": {
+    "keep_open": "选择器保持打开",
+    "stickers": "贴图",
+    "unicode": "Unicode 表情符号",
+    "custom": "自定义表情符号",
+    "add_emoji": "插入表情符号",
+    "search_emoji": "搜索表情符号",
+    "emoji": "表情符号"
+  },
+  "about": {
+    "mrf": {
+      "simple": {
+        "quarantine_desc": "本实例只会把公开状态发送非下列实例：",
+        "quarantine": "隔离",
+        "reject_desc": "本实例不会接收来自下列实例的消息：",
+        "reject": "拒绝",
+        "accept_desc": "本实例只接收来自下列实例的消息：",
+        "simple_policies": "站规",
+        "accept": "接受",
+        "media_removal": "移除媒体"
+      },
+      "mrf_policies_desc": "MRF 策略会影响本实例的互通行为。以下策略已启用：",
+      "mrf_policies": "已启动 MRF 策略",
+      "keyword": {
+        "ftl_removal": "从“全部已知网络”时间线上移除",
+        "keyword_policies": "关键词策略",
+        "is_replaced_by": "→",
+        "replace": "替换",
+        "reject": "拒绝"
+      },
+      "federation": "联邦"
+    }
+  },
+  "domain_mute_card": {
+    "unmute_progress": "正在取消隐藏……",
+    "unmute": "取消隐藏",
+    "mute_progress": "隐藏中……",
+    "mute": "隐藏"
+  }
 }

From 10070394780ac79e9ee1e8548500586a1f78f65b Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Sun, 10 May 2020 12:54:55 +0200
Subject: [PATCH 154/415] Autocomplete domain mutes from list of known
 instances

---
 CHANGELOG.md                                  |  1 +
 .../domain_mute_card/domain_mute_card.js      | 11 ++++++++
 .../domain_mute_card/domain_mute_card.vue     | 15 ++++++++++
 .../tabs/mutes_and_blocks_tab.js              | 28 +++++++++++++------
 .../tabs/mutes_and_blocks_tab.vue             | 21 ++++++--------
 src/i18n/en.json                              |  2 +-
 src/modules/instance.js                       | 17 +++++++++++
 src/services/api/api.service.js               |  6 ++++
 8 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e467bc9..11f539da 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/).
 ### Add
 - Added private notifications option for push notifications
 - 'Copy link' button for statuses (in the ellipsis menu)
+- Autocomplete domains from list of known instances
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it
diff --git a/src/components/domain_mute_card/domain_mute_card.js b/src/components/domain_mute_card/domain_mute_card.js
index c8e838ba..f234dcb0 100644
--- a/src/components/domain_mute_card/domain_mute_card.js
+++ b/src/components/domain_mute_card/domain_mute_card.js
@@ -5,9 +5,20 @@ const DomainMuteCard = {
   components: {
     ProgressButton
   },
+  computed: {
+    user () {
+      return this.$store.state.users.currentUser
+    },
+    muted () {
+      return this.user.domainMutes.includes(this.domain)
+    }
+  },
   methods: {
     unmuteDomain () {
       return this.$store.dispatch('unmuteDomain', this.domain)
+    },
+    muteDomain () {
+      return this.$store.dispatch('muteDomain', this.domain)
     }
   }
 }
diff --git a/src/components/domain_mute_card/domain_mute_card.vue b/src/components/domain_mute_card/domain_mute_card.vue
index 567d81c5..97aee243 100644
--- a/src/components/domain_mute_card/domain_mute_card.vue
+++ b/src/components/domain_mute_card/domain_mute_card.vue
@@ -4,6 +4,7 @@
       {{ domain }}
     </div>
     <ProgressButton
+      v-if="muted"
       :click="unmuteDomain"
       class="btn btn-default"
     >
@@ -12,6 +13,16 @@
         {{ $t('domain_mute_card.unmute_progress') }}
       </template>
     </ProgressButton>
+    <ProgressButton
+      v-else
+      :click="muteDomain"
+      class="btn btn-default"
+    >
+      {{ $t('domain_mute_card.mute') }}
+      <template slot="progress">
+        {{ $t('domain_mute_card.mute_progress') }}
+      </template>
+    </ProgressButton>
   </div>
 </template>
 
@@ -34,5 +45,9 @@
   button {
     width: 10em;
   }
+
+  .autosuggest-results & {
+    padding-left: 1em;
+  }
 }
 </style>
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index b0043dbb..40a87b81 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -32,12 +32,12 @@ const DomainMuteList = withSubscription({
 const MutesAndBlocks = {
   data () {
     return {
-      activeTab: 'profile',
-      newDomainToMute: ''
+      activeTab: 'profile'
     }
   },
   created () {
     this.$store.dispatch('fetchTokens')
+    this.$store.dispatch('getKnownDomains')
   },
   components: {
     TabSwitcher,
@@ -51,6 +51,14 @@ const MutesAndBlocks = {
     Autosuggest,
     Checkbox
   },
+  computed: {
+    knownDomains () {
+      return this.$store.state.instance.knownDomains
+    },
+    user () {
+      return this.$store.state.users.currentUser
+    }
+  },
   methods: {
     importFollows (file) {
       return this.$store.state.api.backendInteractor.importFollows({ file })
@@ -86,13 +94,13 @@ const MutesAndBlocks = {
     filterUnblockedUsers (userIds) {
       return reject(userIds, (userId) => {
         const relationship = this.$store.getters.relationship(this.userId)
-        return relationship.blocking || userId === this.$store.state.users.currentUser.id
+        return relationship.blocking || userId === this.user.id
       })
     },
     filterUnMutedUsers (userIds) {
       return reject(userIds, (userId) => {
         const relationship = this.$store.getters.relationship(this.userId)
-        return relationship.muting || userId === this.$store.state.users.currentUser.id
+        return relationship.muting || userId === this.user.id
       })
     },
     queryUserIds (query) {
@@ -111,12 +119,16 @@ const MutesAndBlocks = {
     unmuteUsers (ids) {
       return this.$store.dispatch('unmuteUsers', ids)
     },
+    filterUnMutedDomains (urls) {
+      return urls.filter(url => !this.user.domainMutes.includes(url))
+    },
+    queryKnownDomains (query) {
+      return new Promise((resolve, reject) => {
+        resolve(this.knownDomains.filter(url => url.toLowerCase().includes(query)))
+      })
+    },
     unmuteDomains (domains) {
       return this.$store.dispatch('unmuteDomains', domains)
-    },
-    muteDomain () {
-      return this.$store.dispatch('muteDomain', this.newDomainToMute)
-        .then(() => { this.newDomainToMute = '' })
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
index 6884b7be..5a1cf2c0 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@@ -119,21 +119,16 @@
 
         <div :label="$t('settings.domain_mutes')">
           <div class="domain-mute-form">
-            <input
-              v-model="newDomainToMute"
+            <Autosuggest
+              :filter="filterUnMutedDomains"
+              :query="queryKnownDomains"
               :placeholder="$t('settings.type_domains_to_mute')"
-              type="text"
-              @keyup.enter="muteDomain"
             >
-            <ProgressButton
-              class="btn btn-default domain-mute-button"
-              :click="muteDomain"
-            >
-              {{ $t('domain_mute_card.mute') }}
-              <template slot="progress">
-                {{ $t('domain_mute_card.mute_progress') }}
-              </template>
-            </ProgressButton>
+              <DomainMuteCard
+                slot-scope="row"
+                :domain="row.item"
+              />
+            </Autosuggest>
           </div>
           <DomainMuteList
             :refresh="true"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index c322e538..eefe10e5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -401,7 +401,7 @@
     "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
     "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
     "tooltipRadius": "Tooltips/alerts",
-    "type_domains_to_mute": "Type in domains to mute",
+    "type_domains_to_mute": "Search domains to mute",
     "upload_a_photo": "Upload a photo",
     "user_settings": "User Settings",
     "values": {
diff --git a/src/modules/instance.js b/src/modules/instance.js
index da82eb01..ec5f4e54 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -1,6 +1,7 @@
 import { set } from 'vue'
 import { getPreset, applyTheme } from '../services/style_setter/style_setter.js'
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
+import apiService from '../services/api/api.service.js'
 import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
@@ -48,6 +49,7 @@ const defaultState = {
   postFormats: [],
   restrictedNicknames: [],
   safeDM: true,
+  knownDomains: [],
 
   // Feature-set, apparently, not everything here is reported...
   chatAvailable: false,
@@ -80,6 +82,9 @@ const instance = {
       if (typeof value !== 'undefined') {
         set(state, name, value)
       }
+    },
+    setKnownDomains (state, domains) {
+      state.knownDomains = domains
     }
   },
   getters: {
@@ -182,6 +187,18 @@ const instance = {
         state.emojiFetched = true
         dispatch('getStaticEmoji')
       }
+    },
+
+    async getKnownDomains ({ commit, rootState }) {
+      try {
+        const result = await apiService.fetchKnownDomains({
+          credentials: rootState.users.currentUser.credentials
+        })
+        commit('setKnownDomains', result)
+      } catch (e) {
+        console.warn("Can't load known domains")
+        console.warn(e)
+      }
     }
   }
 }
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 9c7530a2..b3082bc5 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -75,6 +75,7 @@ const MASTODON_SEARCH_2 = `/api/v2/search`
 const MASTODON_USER_SEARCH_URL = '/api/v1/accounts/search'
 const MASTODON_DOMAIN_BLOCKS_URL = '/api/v1/domain_blocks'
 const MASTODON_STREAMING = '/api/v1/streaming'
+const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
 const PLEROMA_EMOJI_REACTIONS_URL = id => `/api/v1/pleroma/statuses/${id}/reactions`
 const PLEROMA_EMOJI_REACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
 const PLEROMA_EMOJI_UNREACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
@@ -995,6 +996,10 @@ const search2 = ({ credentials, q, resolve, limit, offset, following }) => {
     })
 }
 
+const fetchKnownDomains = ({ credentials }) => {
+  return promisedRequest({ url: MASTODON_KNOWN_DOMAIN_LIST_URL, credentials })
+}
+
 const fetchDomainMutes = ({ credentials }) => {
   return promisedRequest({ url: MASTODON_DOMAIN_BLOCKS_URL, credentials })
 }
@@ -1193,6 +1198,7 @@ const apiService = {
   updateNotificationSettings,
   search2,
   searchUsers,
+  fetchKnownDomains,
   fetchDomainMutes,
   muteDomain,
   unmuteDomain

From e6a27bcaca57c4c6351f7c41c2892c4e5222829e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 8 Jun 2020 13:30:16 +0200
Subject: [PATCH 155/415] MediaUpload: Allow drag-and-drop of multiple files at
 once

---
 src/components/media_upload/media_upload.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index f457d022..4568224b 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -37,7 +37,9 @@ const mediaUpload = {
     fileDrop (e) {
       if (e.dataTransfer.files.length > 0) {
         e.preventDefault() // allow dropping text like before
-        this.uploadFile(e.dataTransfer.files[0])
+        for (const file of e.dataTransfer.files) {
+          this.uploadFile(file)
+        }
       }
     },
     fileDrag (e) {

From 99eaec85478f384ddb0ea45a9d9c95c4dce646f5 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 8 Jun 2020 17:22:07 +0200
Subject: [PATCH 156/415] Messages: Load languages asynchronously.

Reduces the size of the initial app bundle by about half.
---
 src/App.js                                    |  3 +-
 .../interface_language_switcher.vue           |  3 +-
 src/i18n/messages.js                          | 95 +++++++++++++------
 src/main.js                                   |  6 +-
 src/modules/config.js                         |  5 +
 5 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/src/App.js b/src/App.js
index 6445335a..040138c9 100644
--- a/src/App.js
+++ b/src/App.js
@@ -47,7 +47,8 @@ export default {
   }),
   created () {
     // Load the locale from the storage
-    this.$i18n.locale = this.$store.getters.mergedConfig.interfaceLanguage
+    const val = this.$store.getters.mergedConfig.interfaceLanguage
+    this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
     window.addEventListener('resize', this.updateMobileState)
   },
   destroyed () {
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index f5ace0cc..dd6800a3 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -32,7 +32,7 @@ import _ from 'lodash'
 export default {
   computed: {
     languageCodes () {
-      return Object.keys(languagesObject)
+      return languagesObject.languages
     },
 
     languageNames () {
@@ -43,7 +43,6 @@ export default {
       get: function () { return this.$store.getters.mergedConfig.interfaceLanguage },
       set: function (val) {
         this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
-        this.$i18n.locale = val
       }
     }
   },
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index c56ae205..a257486f 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -7,34 +7,75 @@
 // sed -i -e "s/'//gm" -e 's/"/\\"/gm' -re 's/^( +)(.+?): ((.+?))?(,?)(\{?)$/\1"\2": "\4"/gm' -e 's/\"\{\"/{/g' -e 's/,"$/",/g' file.json
 // There's only problem that apostrophe character ' gets replaced by \\ so you have to fix it manually, sorry.
 
+const loaders = {
+  ar: () => import('./ar.json'),
+  ca: () => import('./ca.json'),
+  cs: () => import('./cs.json'),
+  de: () => import('./de.json'),
+  eo: () => import('./eo.json'),
+  es: () => import('./es.json'),
+  et: () => import('./et.json'),
+  eu: () => import('./eu.json'),
+  fi: () => import('./fi.json'),
+  fr: () => import('./fr.json'),
+  ga: () => import('./ga.json'),
+  he: () => import('./he.json'),
+  hu: () => import('./hu.json'),
+  it: () => import('./it.json'),
+  ja: () => import('./ja_pedantic.json'),
+  ja_easy: () => import('./ja_easy.json'),
+  ko: () => import('./ko.json'),
+  nb: () => import('./nb.json'),
+  nl: () => import('./nl.json'),
+  oc: () => import('./oc.json'),
+  pl: () => import('./pl.json'),
+  pt: () => import('./pt.json'),
+  ro: () => import('./ro.json'),
+  ru: () => import('./ru.json'),
+  te: () => import('./te.json'),
+  zh: () => import('./zh.json')
+}
+
 const messages = {
-  ar: require('./ar.json'),
-  ca: require('./ca.json'),
-  cs: require('./cs.json'),
-  de: require('./de.json'),
-  en: require('./en.json'),
-  eo: require('./eo.json'),
-  es: require('./es.json'),
-  et: require('./et.json'),
-  eu: require('./eu.json'),
-  fi: require('./fi.json'),
-  fr: require('./fr.json'),
-  ga: require('./ga.json'),
-  he: require('./he.json'),
-  hu: require('./hu.json'),
-  it: require('./it.json'),
-  ja: require('./ja_pedantic.json'),
-  ja_easy: require('./ja_easy.json'),
-  ko: require('./ko.json'),
-  nb: require('./nb.json'),
-  nl: require('./nl.json'),
-  oc: require('./oc.json'),
-  pl: require('./pl.json'),
-  pt: require('./pt.json'),
-  ro: require('./ro.json'),
-  ru: require('./ru.json'),
-  te: require('./te.json'),
-  zh: require('./zh.json')
+  languages: [
+    'ar',
+    'ca',
+    'cs',
+    'de',
+    'en',
+    'eo',
+    'es',
+    'et',
+    'eu',
+    'fi',
+    'fr',
+    'ga',
+    'he',
+    'hu',
+    'it',
+    'ja',
+    'ja_easy',
+    'ko',
+    'nb',
+    'nl',
+    'oc',
+    'pl',
+    'pt',
+    'ro',
+    'ru',
+    'te',
+    'zh'
+  ],
+  default: {
+    en: require('./en.json')
+  },
+  setLanguage: async (i18n, language) => {
+    if (loaders[language]) {
+      let messages = await loaders[language]()
+      i18n.setLocaleMessage(language, messages)
+    }
+    i18n.locale = language
+  }
 }
 
 export default messages
diff --git a/src/main.js b/src/main.js
index be4213fa..9a201e4f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,11 +46,13 @@ Vue.use(VBodyScrollLock)
 
 const i18n = new VueI18n({
   // By default, use the browser locale, we will update it if neccessary
-  locale: currentLocale,
+  locale: 'en',
   fallbackLocale: 'en',
-  messages
+  messages: messages.default
 })
 
+messages.setLanguage(i18n, currentLocale)
+
 const persistedStateOptions = {
   paths: [
     'config',
diff --git a/src/modules/config.js b/src/modules/config.js
index b6b1b241..47b24d77 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -1,5 +1,6 @@
 import { set, delete as del } from 'vue'
 import { setPreset, applyTheme } from '../services/style_setter/style_setter.js'
+import messages from '../i18n/messages'
 
 const browserLocale = (window.navigator.language || 'en').split('-')[0]
 
@@ -115,6 +116,10 @@ const config = {
         case 'customTheme':
         case 'customThemeSource':
           applyTheme(value)
+          break
+        case 'interfaceLanguage':
+          messages.setLanguage(this.getters.i18n, value)
+          break
       }
     }
   }

From e45f7fe8772f538c6824718ec26067849bde34c6 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 8 Jun 2020 18:22:17 +0200
Subject: [PATCH 157/415] MediaUpload: Correctly handle multiple uploads.

---
 src/components/media_upload/media_upload.js   | 33 ++++++++++++-------
 .../post_status_form/post_status_form.js      |  2 --
 .../post_status_form/post_status_form.vue     |  1 +
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 4568224b..16e47ef7 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -5,10 +5,15 @@ import fileSizeFormatService from '../../services/file_size_format/file_size_for
 const mediaUpload = {
   data () {
     return {
-      uploading: false,
+      uploadCount: 0,
       uploadReady: true
     }
   },
+  computed: {
+    uploading () {
+      return this.uploadCount > 0
+    }
+  },
   methods: {
     uploadFile (file) {
       const self = this
@@ -23,23 +28,27 @@ const mediaUpload = {
       formData.append('file', file)
 
       self.$emit('uploading')
-      self.uploading = true
+      self.uploadCount++
 
       statusPosterService.uploadMedia({ store, formData })
         .then((fileData) => {
           self.$emit('uploaded', fileData)
-          self.uploading = false
+          self.decreaseUploadCount()
         }, (error) => { // eslint-disable-line handle-callback-err
           self.$emit('upload-failed', 'default')
-          self.uploading = false
+          self.decreaseUploadCount()
         })
     },
+    decreaseUploadCount() {
+      this.uploadCount--
+      if (this.uploadCount === 0) {
+        this.$emit('all-uploaded')
+      }
+    },
     fileDrop (e) {
       if (e.dataTransfer.files.length > 0) {
         e.preventDefault() // allow dropping text like before
-        for (const file of e.dataTransfer.files) {
-          this.uploadFile(file)
-        }
+        this.multiUpload(e.dataTransfer.files)
       }
     },
     fileDrag (e) {
@@ -56,11 +65,13 @@ const mediaUpload = {
         this.uploadReady = true
       })
     },
-    change ({ target }) {
-      for (var i = 0; i < target.files.length; i++) {
-        let file = target.files[i]
+    multiUpload (files) {
+      for (const file of files) {
         this.uploadFile(file)
       }
+    },
+    change ({ target }) {
+      this.multiUpload(target.files)
     }
   },
   props: [
@@ -69,7 +80,7 @@ const mediaUpload = {
   watch: {
     'dropFiles': function (fileInfos) {
       if (!this.uploading) {
-        this.uploadFile(fileInfos[0])
+        this.multiUpload(fileInfos)
       }
     }
   }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index a98e1e31..6164caa0 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -218,7 +218,6 @@ const PostStatusForm = {
     },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
-      this.enableSubmit()
     },
     removeMediaFile (fileInfo) {
       let index = this.newStatus.files.indexOf(fileInfo)
@@ -227,7 +226,6 @@ const PostStatusForm = {
     uploadFailed (errString, templateArgs) {
       templateArgs = templateArgs || {}
       this.error = this.$t('upload.error.base') + ' ' + this.$t('upload.error.' + errString, templateArgs)
-      this.enableSubmit()
     },
     disableSubmit () {
       this.submitDisabled = true
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 9789a481..5629ceac 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -172,6 +172,7 @@
             @uploading="disableSubmit"
             @uploaded="addMediaFile"
             @upload-failed="uploadFailed"
+            @all-uploaded="enableSubmit"
           />
           <div
             class="emoji-icon"

From fbc4889ece185bbe6386493562b89c83d6a89916 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 8 Jun 2020 18:26:16 +0200
Subject: [PATCH 158/415] Linting.

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

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 16e47ef7..5849b065 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -39,7 +39,7 @@ const mediaUpload = {
           self.decreaseUploadCount()
         })
     },
-    decreaseUploadCount() {
+    decreaseUploadCount () {
       this.uploadCount--
       if (this.uploadCount === 0) {
         this.$emit('all-uploaded')

From d5ec269d884ab13b641acb816a951ab3db3ec428 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 8 Jun 2020 19:14:13 +0200
Subject: [PATCH 159/415] Update changelog.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e467bc9..85e03095 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Cropped images look correct in Chrome
 - Newlines in the muted words settings work again
 - Clicking on non-latin hashtags won't open a new window
+- Uploading and drag-dropping files works correctly now.
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From d8211392c425564598328a760a659f46a47147fd Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 8 Jun 2020 17:24:08 +0000
Subject: [PATCH 160/415] Apply suggestion to CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85e03095..1467f133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Cropped images look correct in Chrome
 - Newlines in the muted words settings work again
 - Clicking on non-latin hashtags won't open a new window
-- Uploading and drag-dropping files works correctly now.
+- Uploading and drag-dropping multiple files works correctly now.
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From 44db3af0db55454c537a26bf9ea3fc8e121c7e43 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 9 Jun 2020 09:26:46 +0200
Subject: [PATCH 161/415] Messages: DRY things up a bit.

---
 src/i18n/messages.js | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index a257486f..c3195f10 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -37,35 +37,7 @@ const loaders = {
 }
 
 const messages = {
-  languages: [
-    'ar',
-    'ca',
-    'cs',
-    'de',
-    'en',
-    'eo',
-    'es',
-    'et',
-    'eu',
-    'fi',
-    'fr',
-    'ga',
-    'he',
-    'hu',
-    'it',
-    'ja',
-    'ja_easy',
-    'ko',
-    'nb',
-    'nl',
-    'oc',
-    'pl',
-    'pt',
-    'ro',
-    'ru',
-    'te',
-    'zh'
-  ],
+  languages: ['en', ...Object.keys(loaders)],
   default: {
     en: require('./en.json')
   },

From 54fdc220017122c8e30e0fb16f0dd2534fc60947 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 10 Jun 2020 03:24:55 +0900
Subject: [PATCH 162/415] Add profile fields form

---
 src/boot/after_store.js                       |  2 +
 .../settings_modal/tabs/profile_tab.js        | 21 +++++++++
 .../settings_modal/tabs/profile_tab.scss      | 17 +++++++
 .../settings_modal/tabs/profile_tab.vue       | 46 +++++++++++++++++++
 4 files changed, 86 insertions(+)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0db03547..87c92a8a 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -207,6 +207,8 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
       store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
 
+      store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: metadata.fieldsLimits })
+
       store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
       store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
 
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 8658b097..896ff508 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -1,4 +1,5 @@
 import unescape from 'lodash/unescape'
+import merge from 'lodash/merge'
 import ImageCropper from 'src/components/image_cropper/image_cropper.vue'
 import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import fileSizeFormatService from 'src/components/../services/file_size_format/file_size_format.js'
@@ -16,6 +17,7 @@ const ProfileTab = {
       newLocked: this.$store.state.users.currentUser.locked,
       newNoRichText: this.$store.state.users.currentUser.no_rich_text,
       newDefaultScope: this.$store.state.users.currentUser.default_scope,
+      newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
       hideFollows: this.$store.state.users.currentUser.hide_follows,
       hideFollowers: this.$store.state.users.currentUser.hide_followers,
       hideFollowsCount: this.$store.state.users.currentUser.hide_follows_count,
@@ -62,6 +64,12 @@ const ProfileTab = {
         ...this.$store.state.instance.emoji,
         ...this.$store.state.instance.customEmoji
       ] })
+    },
+    fieldsLimits () {
+      return this.$store.state.instance.fieldsLimits
+    },
+    maxFields () {
+      return this.fieldsLimits ? this.fieldsLimits.maxFields : 0
     }
   },
   methods: {
@@ -74,6 +82,7 @@ const ProfileTab = {
             // Backend notation.
             /* eslint-disable camelcase */
             display_name: this.newName,
+            fields_attributes: this.newFields.filter(el => el != null),
             default_scope: this.newDefaultScope,
             no_rich_text: this.newNoRichText,
             hide_follows: this.hideFollows,
@@ -85,6 +94,8 @@ const ProfileTab = {
             show_role: this.showRole
             /* eslint-enable camelcase */
           } }).then((user) => {
+          this.newFields.splice(user.fields.length)
+          merge(this.newFields, user.fields)
           this.$store.commit('addNewUsers', [user])
           this.$store.commit('setCurrentUser', user)
         })
@@ -92,6 +103,16 @@ const ProfileTab = {
     changeVis (visibility) {
       this.newDefaultScope = visibility
     },
+    addField () {
+      if (this.newFields.length < this.maxFields) {
+        this.newFields.push({ name: '', value: '' })
+        return true
+      }
+      return false
+    },
+    deleteField (index, event) {
+      this.$delete(this.newFields, index)
+    },
     uploadFile (slot, e) {
       const file = e.target.files[0]
       if (!file) { return }
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 4aab81eb..b3dcf42c 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -79,4 +79,21 @@
   .setting-subitem {
     margin-left: 1.75em;
   }
+
+  .profile-fields {
+    display: flex;
+
+    &>.emoji-input {
+      flex: 1 1 auto;
+      margin: 0 .2em .5em;
+    }
+
+    &>.icon-container {
+      width: 20px;
+
+      &>.icon-cancel {
+        vertical-align: sub;
+      }
+    }
+  }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index fff4f970..2fa3021e 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -95,6 +95,52 @@
           {{ $t('settings.discoverable') }}
         </Checkbox>
       </p>
+      <div v-if="maxFields > 0">
+        <p>{{ $t('settings.profile_fields.label') }}</p>
+        <div
+          v-for="(_, i) in newFields"
+          :key="i"
+          class="profile-fields"
+        >
+          <EmojiInput
+            v-model="newFields[i].name"
+            :suggest="emojiSuggestor"
+            hide-emoji-button
+          >
+            <input
+              v-model="newFields[i].name"
+              :placeholder="$t('settings.profile_fields.name')"
+            >
+          </EmojiInput>
+          <EmojiInput
+            v-model="newFields[i].value"
+            :suggest="emojiSuggestor"
+            hide-emoji-button
+          >
+            <input
+              v-model="newFields[i].value"
+              :placeholder="$t('settings.profile_fields.value')"
+            >
+          </EmojiInput>
+          <div
+            class="icon-container"
+          >
+            <i
+              v-show="newFields.length > 1"
+              class="icon-cancel"
+              @click="deleteField(i)"
+            />
+          </div>
+        </div>
+        <a
+          v-if="newFields.length < maxFields"
+          class="add-field faint"
+          @click="addField"
+        >
+          <i class="icon-plus" />
+          {{ $t("settings.profile_fields.add_field") }}
+        </a>
+      </div>
       <button
         :disabled="newName && newName.length === 0"
         class="btn btn-default"

From de9cc033df32a4668ac8d05a770312c029d20c4c Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Fri, 15 Nov 2019 22:52:20 +0900
Subject: [PATCH 163/415] Add i18n en

---
 src/i18n/en.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index c322e538..ca49514e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -333,6 +333,12 @@
     "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
     "mutes_tab": "Mutes",
     "play_videos_in_modal": "Play videos in a popup frame",
+    "profile_fields": {
+      "label": "Profile metadata",
+      "add_field": "Add Field",
+      "name": "Label",
+      "value": "Content"
+    },
     "use_contain_fit": "Don't crop the attachment in thumbnails",
     "name": "Name",
     "name_bio": "Name & Bio",

From cc4691a4efec91318284869164419d286bda44a5 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Sun, 17 Nov 2019 22:34:00 +0900
Subject: [PATCH 164/415] Fix merging array field for users

---
 src/modules/users.js                  | 13 +++++++---
 test/unit/specs/modules/users.spec.js | 36 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index f9329f2a..fca01a56 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -1,6 +1,6 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import oauthApi from '../services/new_api/oauth.js'
-import { compact, map, each, merge, last, concat, uniq } from 'lodash'
+import { compact, map, each, mergeWith, last, concat, uniq, isArray } from 'lodash'
 import { set } from 'vue'
 import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
 
@@ -10,7 +10,7 @@ export const mergeOrAdd = (arr, obj, item) => {
   const oldItem = obj[item.id]
   if (oldItem) {
     // We already have this, so only merge the new info.
-    merge(oldItem, item)
+    mergeWith(oldItem, item, mergeArrayLength)
     return { item: oldItem, new: false }
   } else {
     // This is a new item, prepare it
@@ -23,6 +23,13 @@ export const mergeOrAdd = (arr, obj, item) => {
   }
 }
 
+const mergeArrayLength = (oldValue, newValue) => {
+  if (isArray(oldValue) && isArray(newValue)) {
+    oldValue.length = newValue.length
+    return mergeWith(oldValue, newValue, mergeArrayLength)
+  }
+}
+
 const getNotificationPermission = () => {
   const Notification = window.Notification
 
@@ -116,7 +123,7 @@ export const mutations = {
   },
   setCurrentUser (state, user) {
     state.lastLoginName = user.screen_name
-    state.currentUser = merge(state.currentUser || {}, user)
+    state.currentUser = mergeWith(state.currentUser || {}, user, mergeArrayLength)
   },
   clearCurrentUser (state) {
     state.currentUser = false
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
index 670acfc8..dfa5684d 100644
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@@ -18,6 +18,42 @@ describe('The users module', () => {
       expect(state.users).to.eql([user])
       expect(state.users[0].name).to.eql('Dude')
     })
+
+    it('merging array field in new information for old users', () => {
+      const state = cloneDeep(defaultState)
+      const user = {
+        id: '1',
+        fields: [
+          { name: 'Label 1', value: 'Content 1' }
+        ]
+      }
+      const firstModUser = {
+        id: '1',
+        fields: [
+          { name: 'Label 2', value: 'Content 2' },
+          { name: 'Label 3', value: 'Content 3' }
+        ]
+      }
+      const secondModUser = {
+        id: '1',
+        fields: [
+          { name: 'Label 4', value: 'Content 4' }
+        ]
+      }
+
+      mutations.addNewUsers(state, [user])
+      expect(state.users[0].fields).to.have.length(1)
+      expect(state.users[0].fields[0].name).to.eql('Label 1')
+
+      mutations.addNewUsers(state, [firstModUser])
+      expect(state.users[0].fields).to.have.length(2)
+      expect(state.users[0].fields[0].name).to.eql('Label 2')
+      expect(state.users[0].fields[1].name).to.eql('Label 3')
+
+      mutations.addNewUsers(state, [secondModUser])
+      expect(state.users[0].fields).to.have.length(1)
+      expect(state.users[0].fields[0].name).to.eql('Label 4')
+    })
   })
 
   describe('findUser', () => {

From cd9d732afa6d33f5db70161992a20e56ffd1d8cc Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 10 Jun 2020 11:01:38 +0300
Subject: [PATCH 165/415] add better visual indication for dropping files, make
 dropzone bigger

---
 src/components/media_upload/media_upload.js   | 14 --------
 src/components/media_upload/media_upload.vue  |  7 +---
 .../post_status_form/post_status_form.js      | 19 +++++++++--
 .../post_status_form/post_status_form.vue     | 32 +++++++++++++++++--
 4 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 5849b065..fbb2d03d 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -45,20 +45,6 @@ const mediaUpload = {
         this.$emit('all-uploaded')
       }
     },
-    fileDrop (e) {
-      if (e.dataTransfer.files.length > 0) {
-        e.preventDefault() // allow dropping text like before
-        this.multiUpload(e.dataTransfer.files)
-      }
-    },
-    fileDrag (e) {
-      let types = e.dataTransfer.types
-      if (types.contains('Files')) {
-        e.dataTransfer.dropEffect = 'copy'
-      } else {
-        e.dataTransfer.dropEffect = 'none'
-      }
-    },
     clearFile () {
       this.uploadReady = false
       this.$nextTick(() => {
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 0fc305ac..5e31730b 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,10 +1,5 @@
 <template>
-  <div
-    class="media-upload"
-    @drop.prevent
-    @dragover.prevent="fileDrag"
-    @drop="fileDrop"
-  >
+  <div class="media-upload">
     <label
       class="label"
       :title="$t('tool_tip.media_upload')"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 6164caa0..3de6f70a 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -82,7 +82,9 @@ const PostStatusForm = {
         contentType
       },
       caret: 0,
-      pollFormVisible: false
+      pollFormVisible: false,
+      showDropIcon: false,
+      dropStopTimeout: null
     }
   },
   computed: {
@@ -248,13 +250,26 @@ const PostStatusForm = {
       }
     },
     fileDrop (e) {
-      if (e.dataTransfer.files.length > 0) {
+      if (e.dataTransfer && e.dataTransfer.types.includes('Files')) {
         e.preventDefault() // allow dropping text like before
         this.dropFiles = e.dataTransfer.files
+        clearTimeout(this.dropStopTimeout)
+        this.showDropIcon = false
       }
     },
+    fileDragStop (e) {
+      // The false-setting is done with delay because just using leave-events
+      // directly caused unwanted flickering, this is not perfect either but
+      // much less noticable.
+      clearTimeout(this.dropStopTimeout)
+      this.dropStopTimeout = setTimeout(() => (this.showDropIcon = false), 100)
+    },
     fileDrag (e) {
       e.dataTransfer.dropEffect = 'copy'
+      if (e.dataTransfer && e.dataTransfer.types.includes('Files')) {
+        clearTimeout(this.dropStopTimeout)
+        this.showDropIcon = true
+      }
     },
     onEmojiInputInput (e) {
       this.$nextTick(() => {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 5629ceac..8e71d7b4 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -6,7 +6,14 @@
     <form
       autocomplete="off"
       @submit.prevent="postStatus(newStatus)"
+      @dragover.prevent.capture="fileDrag"
     >
+      <div
+        v-show="showDropIcon"
+        class="drop-indicator icon-upload"
+        @dragleave.capture="fileDragStop"
+        @drop.stop="fileDrop"
+      />
       <div class="form-group">
         <i18n
           v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private'"
@@ -97,8 +104,6 @@
             class="form-post-body"
             @keydown.meta.enter="postStatus(newStatus)"
             @keyup.ctrl.enter="postStatus(newStatus)"
-            @drop="fileDrop"
-            @dragover.prevent="fileDrag"
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
@@ -447,7 +452,8 @@
   form {
     display: flex;
     flex-direction: column;
-    padding: 0.6em;
+    margin: 0.6em;
+    position: relative;
   }
 
   .form-group {
@@ -505,5 +511,25 @@
     cursor: pointer;
     z-index: 4;
   }
+
+  .drop-indicator {
+    position: absolute;
+    z-index: 1;
+    width: 100%;
+    height: 100%;
+    font-size: 5em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: $fallback--text;
+    color: var(--text, $fallback--text);
+    opacity: 0.6;
+    background-color: $fallback--bg;
+    background-color: var(--bg, $fallback--bg);
+    border-radius: $fallback--tooltipRadius;
+    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+    border: 2px dashed $fallback--text;
+    border: 2px dashed var(--text, $fallback--text);
+  }
 }
 </style>

From 3cfdfec72dfd0fd390152c2bf2e80ee11f8ae525 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 10 Jun 2020 11:18:07 +0300
Subject: [PATCH 166/415] attempt to fix that one bug with submitting on
 copy-pasting

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 5629ceac..6477594c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -96,7 +96,7 @@
             :disabled="posting"
             class="form-post-body"
             @keydown.meta.enter="postStatus(newStatus)"
-            @keyup.ctrl.enter="postStatus(newStatus)"
+            @keydown.ctrl.enter="postStatus(newStatus)"
             @drop="fileDrop"
             @dragover.prevent="fileDrag"
             @input="resize"

From cad42eec2a4cf80026f8ddc072a105d99cb15d15 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 10 Jun 2020 11:20:40 +0300
Subject: [PATCH 167/415] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1467f133..32d72bb5 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/).
 - Removed the use of with_move parameters when fetching notifications
 
 ### Fixed
+- Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
 - Multiple issues with muted statuses/notifications
 
 ## [Unreleased patch]

From 1308fdd3bc4cc29264fcac6e3367e7f0cf93d498 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 10 Jun 2020 11:29:28 +0300
Subject: [PATCH 168/415] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1467f133..dc1be973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Change heart to thumbs up in reaction picker
 - Close the media modal on navigation events
 - Add colons to the emoji alt text, to make them copyable
+- Add better visual indication for drag-and-drop for files
 
 ### Fixed
 - Status ellipsis menu closes properly when selecting certain options

From d3187720c5cb2599b2dc2d83898e3f6d544cb6ae Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 10 Jun 2020 11:49:04 +0300
Subject: [PATCH 169/415] remove useless captures

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 8e71d7b4..873328f5 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -6,12 +6,12 @@
     <form
       autocomplete="off"
       @submit.prevent="postStatus(newStatus)"
-      @dragover.prevent.capture="fileDrag"
+      @dragover.prevent="fileDrag"
     >
       <div
         v-show="showDropIcon"
         class="drop-indicator icon-upload"
-        @dragleave.capture="fileDragStop"
+        @dragleave="fileDragStop"
         @drop.stop="fileDrop"
       />
       <div class="form-group">

From ea2b2a35bb5c419970b796ec010085302d8c9bd1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 10 Jun 2020 12:41:02 +0300
Subject: [PATCH 170/415] add fade-in fade-out

---
 .../post_status_form/post_status_form.js          |  9 +++++----
 .../post_status_form/post_status_form.vue         | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3de6f70a..9027566f 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -83,7 +83,7 @@ const PostStatusForm = {
       },
       caret: 0,
       pollFormVisible: false,
-      showDropIcon: false,
+      showDropIcon: 'hide',
       dropStopTimeout: null
     }
   },
@@ -254,7 +254,7 @@ const PostStatusForm = {
         e.preventDefault() // allow dropping text like before
         this.dropFiles = e.dataTransfer.files
         clearTimeout(this.dropStopTimeout)
-        this.showDropIcon = false
+        this.showDropIcon = 'hide'
       }
     },
     fileDragStop (e) {
@@ -262,13 +262,14 @@ const PostStatusForm = {
       // directly caused unwanted flickering, this is not perfect either but
       // much less noticable.
       clearTimeout(this.dropStopTimeout)
-      this.dropStopTimeout = setTimeout(() => (this.showDropIcon = false), 100)
+      this.showDropIcon = 'fade'
+      this.dropStopTimeout = setTimeout(() => (this.showDropIcon = 'hide'), 500)
     },
     fileDrag (e) {
       e.dataTransfer.dropEffect = 'copy'
       if (e.dataTransfer && e.dataTransfer.types.includes('Files')) {
         clearTimeout(this.dropStopTimeout)
-        this.showDropIcon = true
+        this.showDropIcon = 'show'
       }
     },
     onEmojiInputInput (e) {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index e23e9e48..c4d7f7e2 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -9,7 +9,8 @@
       @dragover.prevent="fileDrag"
     >
       <div
-        v-show="showDropIcon"
+        v-show="showDropIcon !== 'hide'"
+        :style="{ animation: showDropIcon === 'show' ? 'fade-in 0.25s' : 'fade-out 0.5s' }"
         class="drop-indicator icon-upload"
         @dragleave="fileDragStop"
         @drop.stop="fileDrop"
@@ -512,6 +513,16 @@
     z-index: 4;
   }
 
+  @keyframes fade-in {
+    from { opacity: 0; }
+    to   { opacity: 0.6; }
+  }
+
+  @keyframes fade-out {
+    from { opacity: 0.6; }
+    to   { opacity: 0; }
+  }
+
   .drop-indicator {
     position: absolute;
     z-index: 1;
@@ -521,9 +532,9 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    opacity: 0.6;
     color: $fallback--text;
     color: var(--text, $fallback--text);
-    opacity: 0.6;
     background-color: $fallback--bg;
     background-color: var(--bg, $fallback--bg);
     border-radius: $fallback--tooltipRadius;

From ff2cd3d672f7bec9e5985ecb86a491004cc53f74 Mon Sep 17 00:00:00 2001
From: hj <spam@hjkos.com>
Date: Sun, 7 Jun 2020 15:23:21 +0000
Subject: [PATCH 171/415] Translated using Weblate (Russian)

Currently translated at 60.0% (373 of 621 strings)

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 69b22618..f9a72954 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -456,9 +456,9 @@
   },
   "domain_mute_card": {
     "mute": "Игнорировать",
-    "mute_progress": "В процессе...",
+    "mute_progress": "В процессе…",
     "unmute": "Прекратить игнорирование",
-    "unmute_progress": "В процессе..."
+    "unmute_progress": "В процессе…"
   },
   "exporter": {
     "export": "Экспорт",

From 7b9fa325859683c31d5c5cfacab59b27921bb740 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Tue, 9 Jun 2020 16:32:41 +0000
Subject: [PATCH 172/415] Translated using Weblate (Italian)

Currently translated at 68.5% (426 of 621 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 360c72aa..101e1dd3 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -12,7 +12,12 @@
     "disable": "Disabilita",
     "enable": "Abilita",
     "confirm": "Conferma",
-    "verify": "Verifica"
+    "verify": "Verifica",
+    "peek": "Anteprima",
+    "close": "Chiudi",
+    "retry": "Riprova",
+    "error_retry": "Per favore, riprova",
+    "loading": "Carico…"
   },
   "nav": {
     "mentions": "Menzioni",
@@ -212,7 +217,34 @@
       },
       "common": {
         "opacity": "Opacità",
-        "color": "Colore"
+        "color": "Colore",
+        "contrast": {
+          "context": {
+            "text": "per il testo",
+            "18pt": "per il testo grande (oltre 17pt)"
+          },
+          "level": {
+            "bad": "non soddisfa le linee guida di alcun livello",
+            "aaa": "soddisfa le linee guida di livello AAA (ottimo)",
+            "aa": "soddisfa le linee guida di livello AA (sufficiente)"
+          },
+          "hint": "Il rapporto di contrasto è {ratio}, e {level} {context}"
+        }
+      },
+      "advanced_colors": {
+        "badge": "Sfondo medaglie",
+        "post": "Messaggi / Biografie",
+        "alert_neutral": "Neutro",
+        "alert_warning": "Attenzione",
+        "alert_error": "Errore",
+        "alert": "Sfondo degli avvertimenti",
+        "_tab_label": "Avanzate"
+      },
+      "common_colors": {
+        "rgbo": "Icone, accenti, medaglie",
+        "foreground_hint": "Seleziona l'etichetta \"Avanzate\" per controlli più fini",
+        "main": "Colori comuni",
+        "_tab_label": "Comuni"
       }
     },
     "enable_web_push_notifications": "Abilita notifiche web push",
@@ -273,7 +305,8 @@
     "accent": "Accento",
     "emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
     "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore",
-    "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più."
+    "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più.",
+    "mutes_and_blocks": "Zittiti e bloccati"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",

From 2b6a6fe7ea31e4e5b77d5ad0ff580f9e29df1849 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 11 Jun 2020 13:44:32 +0300
Subject: [PATCH 173/415] make object-fit cover work like it should

---
 src/components/still-image/still-image.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 08af26f6..f2ddeb7b 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -23,13 +23,6 @@
 
 <style lang="scss">
 @import '../../_variables.scss';
-.contain-fit {
-  .still-image {
-    img {
-      height: 100%;
-    }
-  }
-}
 
 .still-image {
   position: relative;
@@ -38,6 +31,7 @@
   width: 100%;
   height: 100%;
   display: flex;
+  align-items: center;
 
   &:hover canvas {
     display: none;
@@ -45,8 +39,8 @@
 
   img {
     width: 100%;
+    min-height: 100%;
     object-fit: contain;
-    align-self: center;
   }
 
   &.animated {

From 14348d8ddf15b3a5366de711daf3acf498fb570a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 11 Jun 2020 14:27:36 +0300
Subject: [PATCH 174/415] fix the contain option

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

diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue
index 7abc2161..1ffa7b3c 100644
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@@ -78,6 +78,7 @@
     video,
     canvas {
       object-fit: contain;
+      height: 100%;
     }
   }
 

From c59c0ec4be4a1d253c89e912ddce19029a5b5ba2 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Wed, 10 Jun 2020 13:46:42 +0000
Subject: [PATCH 175/415] Translated using Weblate (Italian)

Currently translated at 72.6% (451 of 621 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 101e1dd3..6c8be351 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -238,13 +238,42 @@
         "alert_warning": "Attenzione",
         "alert_error": "Errore",
         "alert": "Sfondo degli avvertimenti",
-        "_tab_label": "Avanzate"
+        "_tab_label": "Avanzate",
+        "tabs": "Etichette",
+        "disabled": "Disabilitato",
+        "selectedMenu": "Voce menù selezionata",
+        "selectedPost": "Messaggio selezionato",
+        "pressed": "Premuto",
+        "highlight": "Elementi evidenziati",
+        "icons": "Icone",
+        "poll": "Grafico sondaggi",
+        "underlay": "Sottostante",
+        "faint_text": "Testo sbiadito",
+        "inputs": "Campi d'immissione",
+        "buttons": "Pulsanti",
+        "borders": "Bordi",
+        "top_bar": "Barra superiore",
+        "panel_header": "Titolo pannello",
+        "badge_notification": "Notifica",
+        "popover": "Suggerimenti, menù, sbalzi"
       },
       "common_colors": {
         "rgbo": "Icone, accenti, medaglie",
         "foreground_hint": "Seleziona l'etichetta \"Avanzate\" per controlli più fini",
         "main": "Colori comuni",
         "_tab_label": "Comuni"
+      },
+      "shadows": {
+        "inset": "Includi",
+        "spread": "Spandi",
+        "blur": "Sfoca",
+        "shadow_id": "Ombra numero {value}",
+        "override": "Sostituisci",
+        "component": "Componente",
+        "_tab_label": "Luci ed ombre"
+      },
+      "radii": {
+        "_tab_label": "Raggio"
       }
     },
     "enable_web_push_notifications": "Abilita notifiche web push",
@@ -261,7 +290,7 @@
     "notifications": "Notifiche",
     "greentext": "Frecce da meme",
     "upload_a_photo": "Carica un'immagine",
-    "type_domains_to_mute": "Inserisci domini da zittire",
+    "type_domains_to_mute": "Cerca domini da zittire",
     "theme_help_v2_2": "Le icone dietro alcuni elementi sono indicatori del contrasto fra testo e sfondo, passaci sopra col puntatore per ulteriori informazioni. Se si usano delle trasparenze, questi indicatori mostrano il peggior caso possibile.",
     "theme_help_v2_1": "Puoi anche forzare colore ed opacità di alcuni elementi selezionando la casella. Usa il pulsante \"Azzera\" per azzerare tutte le forzature.",
     "useStreamingApiWarning": "(Sconsigliato, sperimentale, può saltare messaggi)",

From a52a393266744560c6c6b2cbd24da812d35562fb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:22:31 +0200
Subject: [PATCH 176/415] NotificationUtils: Extract preparation of
 notification object.

---
 src/modules/statuses.js                       | 41 ++----------------
 .../notification_utils/notification_utils.js  | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 9a2e0df1..073b15f1 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,7 +13,7 @@ import {
   omitBy
 } from 'lodash'
 import { set } from 'vue'
-import { isStatusNotification } from '../services/notification_utils/notification_utils.js'
+import { isStatusNotification, prepareNotificationObject } from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
 import { muteWordHits } from '../services/status_parser/status_parser.js'
 
@@ -344,42 +344,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
       state.notifications.idStore[notification.id] = notification
 
       if ('Notification' in window && window.Notification.permission === 'granted') {
-        const notifObj = {}
-        const status = notification.status
-        const title = notification.from_profile.name
-        notifObj.icon = notification.from_profile.profile_image_url
-        let i18nString
-        switch (notification.type) {
-          case 'like':
-            i18nString = 'favorited_you'
-            break
-          case 'repeat':
-            i18nString = 'repeated_you'
-            break
-          case 'follow':
-            i18nString = 'followed_you'
-            break
-          case 'move':
-            i18nString = 'migrated_to'
-            break
-          case 'follow_request':
-            i18nString = 'follow_request'
-            break
-        }
-
-        if (notification.type === 'pleroma:emoji_reaction') {
-          notifObj.body = rootGetters.i18n.t('notifications.reacted_with', [notification.emoji])
-        } else if (i18nString) {
-          notifObj.body = rootGetters.i18n.t('notifications.' + i18nString)
-        } else if (isStatusNotification(notification.type)) {
-          notifObj.body = notification.status.text
-        }
-
-        // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
-        if (status && status.attachments && status.attachments.length > 0 && !status.nsfw &&
-          status.attachments[0].mimetype.startsWith('image/')) {
-          notifObj.image = status.attachments[0].url
-        }
+        const notifObj = prepareNotificationObject(notification, rootGetters.i18n)
 
         const reasonsToMuteNotif = (
           notification.seen ||
@@ -393,7 +358,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
             )
         )
         if (!reasonsToMuteNotif) {
-          let desktopNotification = new window.Notification(title, notifObj)
+          let desktopNotification = new window.Notification(notifObj.title, notifObj)
           // Chrome is known for not closing notifications automatically
           // according to MDN, anyway.
           setTimeout(desktopNotification.close.bind(desktopNotification), 5000)
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index eb479227..4576ea83 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -43,3 +43,45 @@ export const filteredNotificationsFromStore = (store, types) => {
 
 export const unseenNotificationsFromStore = store =>
   filter(filteredNotificationsFromStore(store), ({ seen }) => !seen)
+
+export const prepareNotificationObject = (notification, i18n) => {
+  const notifObj = {}
+  const status = notification.status
+  const title = notification.from_profile.name
+  notifObj.title = title
+  notifObj.icon = notification.from_profile.profile_image_url
+  let i18nString
+  switch (notification.type) {
+    case 'like':
+      i18nString = 'favorited_you'
+      break
+    case 'repeat':
+      i18nString = 'repeated_you'
+      break
+    case 'follow':
+      i18nString = 'followed_you'
+      break
+    case 'move':
+      i18nString = 'migrated_to'
+      break
+    case 'follow_request':
+      i18nString = 'follow_request'
+      break
+  }
+
+  if (notification.type === 'pleroma:emoji_reaction') {
+    notifObj.body = i18n.t('notifications.reacted_with', [notification.emoji])
+  } else if (i18nString) {
+    notifObj.body = i18n.t('notifications.' + i18nString)
+  } else if (isStatusNotification(notification.type)) {
+    notifObj.body = notification.status.text
+  }
+
+  // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
+  if (status && status.attachments && status.attachments.length > 0 && !status.nsfw &&
+    status.attachments[0].mimetype.startsWith('image/')) {
+    notifObj.image = status.attachments[0].url
+  }
+
+  return notifObj
+}

From 5b0190bef5a9756453d0220b80a18469639c8fe9 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:22:58 +0200
Subject: [PATCH 177/415] ServiceWorker: Grab the notification and display it
 with i18n.

---
 src/sw.js | 76 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/sw.js b/src/sw.js
index 6cecb3f3..0aab275b 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -1,6 +1,48 @@
 /* eslint-env serviceworker */
 
 import localForage from 'localforage'
+import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
+import { prepareNotificationObject } from './services/notification_utils/notification_utils.js'
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+
+const messages = {
+  ar: require('./i18n/ar.json'),
+  ca: require('./i18n/ca.json'),
+  cs: require('./i18n/cs.json'),
+  de: require('./i18n/de.json'),
+  eo: require('./i18n/eo.json'),
+  es: require('./i18n/es.json'),
+  et: require('./i18n/et.json'),
+  eu: require('./i18n/eu.json'),
+  fi: require('./i18n/fi.json'),
+  fr: require('./i18n/fr.json'),
+  ga: require('./i18n/ga.json'),
+  he: require('./i18n/he.json'),
+  hu: require('./i18n/hu.json'),
+  it: require('./i18n/it.json'),
+  ja: require('./i18n/ja_pedantic.json'),
+  ja_easy: require('./i18n/ja_easy.json'),
+  ko: require('./i18n/ko.json'),
+  nb: require('./i18n/nb.json'),
+  nl: require('./i18n/nl.json'),
+  oc: require('./i18n/oc.json'),
+  pl: require('./i18n/pl.json'),
+  pt: require('./i18n/pt.json'),
+  ro: require('./i18n/ro.json'),
+  ru: require('./i18n/ru.json'),
+  te: require('./i18n/te.json'),
+  zh: require('./i18n/zh.json'),
+  en: require('./i18n/en.json')
+}
+
+Vue.use(VueI18n)
+const i18n = new VueI18n({
+  // By default, use the browser locale, we will update it if neccessary
+  locale: 'en',
+  fallbackLocale: 'en',
+  messages
+})
 
 function isEnabled () {
   return localForage.getItem('vuex-lz')
@@ -12,15 +54,33 @@ function getWindowClients () {
     .then((clientList) => clientList.filter(({ type }) => type === 'window'))
 }
 
-self.addEventListener('push', (event) => {
-  if (event.data) {
-    event.waitUntil(isEnabled().then((isEnabled) => {
-      return isEnabled && getWindowClients().then((list) => {
-        const data = event.data.json()
+const setLocale = async () => {
+  const state = await localForage.getItem('vuex-lz')
+  const locale = state.config.interfaceLanguage || 'en'
+  i18n.locale = locale
+}
 
-        if (list.length === 0) return self.registration.showNotification(data.title, data)
-      })
-    }))
+const maybeShowNotification = async (event) => {
+  const enabled = await isEnabled()
+  const activeClients = await getWindowClients()
+  await setLocale()
+  if (enabled && activeClients) {
+    const data = event.data.json()
+
+    const url = `${self.registration.scope}api/v1/notifications/${data.notification_id}`
+    const notification = await fetch(url, { headers: { Authorization: 'Bearer ' + data.access_token } })
+    let nj = await notification.json()
+    nj = parseNotification(nj)
+
+    const res = prepareNotificationObject(nj, i18n)
+
+    self.registration.showNotification(res.title, res)
+  }
+}
+
+self.addEventListener('push', async (event) => {
+  if (event.data) {
+    event.waitUntil(maybeShowNotification(event))
   }
 })
 

From e2ca107e01c5a0715aa1a1a68496fe514eb9e902 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:24:01 +0200
Subject: [PATCH 178/415] ServiceWorker: Don't show message via sw if a client
 is active.

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

diff --git a/src/sw.js b/src/sw.js
index 0aab275b..d0050b24 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -64,7 +64,7 @@ const maybeShowNotification = async (event) => {
   const enabled = await isEnabled()
   const activeClients = await getWindowClients()
   await setLocale()
-  if (enabled && activeClients) {
+  if (enabled && (activeClients.length === 0)) {
     const data = event.data.json()
 
     const url = `${self.registration.scope}api/v1/notifications/${data.notification_id}`

From 98819ae32c6f3962df955ee280cd6cc271625852 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:49:39 +0200
Subject: [PATCH 179/415] NotificationUtils: Add tag to notifications.

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

diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 4576ea83..5cc19215 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -45,7 +45,9 @@ export const unseenNotificationsFromStore = store =>
   filter(filteredNotificationsFromStore(store), ({ seen }) => !seen)
 
 export const prepareNotificationObject = (notification, i18n) => {
-  const notifObj = {}
+  const notifObj = {
+    tag: notification.id
+  }
   const status = notification.status
   const title = notification.from_profile.name
   notifObj.title = title

From 8d7d4980b9a9c68e3c36dc00dfc85e39842b03f7 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 18:39:19 +0200
Subject: [PATCH 180/415] StatusParser: Remove unused removeAttachmentLinks.

Brings down the vendor by over 200kb
---
 package.json                                    |  3 +--
 src/services/status_parser/status_parser.js     | 15 ---------------
 .../status_parser/status_parses.spec.js         | 17 -----------------
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 test/unit/specs/services/status_parser/status_parses.spec.js

diff --git a/package.json b/package.json
index 4d68cc6e..42efc7e9 100644
--- a/package.json
+++ b/package.json
@@ -22,12 +22,10 @@
     "cropperjs": "^1.4.3",
     "diff": "^3.0.1",
     "escape-html": "^1.0.3",
-    "karma-mocha-reporter": "^2.2.1",
     "localforage": "^1.5.0",
     "object-path": "^0.11.3",
     "phoenix": "^1.3.0",
     "portal-vue": "^2.1.4",
-    "sanitize-html": "^1.13.0",
     "v-click-outside": "^2.1.1",
     "vue": "^2.6.11",
     "vue-chat-scroll": "^1.2.1",
@@ -39,6 +37,7 @@
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
+    "karma-mocha-reporter": "^2.2.1",
     "@babel/core": "^7.7.5",
     "@babel/plugin-transform-runtime": "^7.7.6",
     "@babel/preset-env": "^7.7.6",
diff --git a/src/services/status_parser/status_parser.js b/src/services/status_parser/status_parser.js
index 3d517e3c..ed0f6d57 100644
--- a/src/services/status_parser/status_parser.js
+++ b/src/services/status_parser/status_parser.js
@@ -1,17 +1,4 @@
 import { filter } from 'lodash'
-import sanitize from 'sanitize-html'
-
-export const removeAttachmentLinks = (html) => {
-  return sanitize(html, {
-    allowedTags: false,
-    allowedAttributes: false,
-    exclusiveFilter: ({ tag, attribs }) => tag === 'a' && typeof attribs.class === 'string' && attribs.class.match(/attachment/)
-  })
-}
-
-export const parse = (html) => {
-  return removeAttachmentLinks(html)
-}
 
 export const muteWordHits = (status, muteWords) => {
   const statusText = status.text.toLowerCase()
@@ -22,5 +9,3 @@ export const muteWordHits = (status, muteWords) => {
 
   return hits
 }
-
-export default parse
diff --git a/test/unit/specs/services/status_parser/status_parses.spec.js b/test/unit/specs/services/status_parser/status_parses.spec.js
deleted file mode 100644
index 7afd5042..00000000
--- a/test/unit/specs/services/status_parser/status_parses.spec.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { removeAttachmentLinks } from '../../../../../src/services/status_parser/status_parser.js'
-
-const example = '<div class="status-content">@<a href="https://sealion.club/user/4" class="h-card mention" title="dewoo">dwmatiz</a> <a href="https://social.heldscal.la/file/3deb764ada10ce64a61b7a070b75dac45f86d2d5bf213bf18873da71d8714d86.png" title="https://social.heldscal.la/file/3deb764ada10ce64a61b7a070b75dac45f86d2d5bf213bf18873da71d8714d86.png" class="attachment" id="attachment-159853" rel="nofollow external">https://social.heldscal.la/attachment/159853</a></div>'
-
-describe('statusParser.removeAttachmentLinks', () => {
-  const exampleWithoutAttachmentLinks = '<div class="status-content">@<a href="https://sealion.club/user/4" class="h-card mention" title="dewoo">dwmatiz</a> </div>'
-
-  it('removes attachment links', () => {
-    const parsed = removeAttachmentLinks(example)
-    expect(parsed).to.eql(exampleWithoutAttachmentLinks)
-  })
-
-  it('works when the class is empty', () => {
-    const parsed = removeAttachmentLinks('<a></a>')
-    expect(parsed).to.eql('<a></a>')
-  })
-})

From 178ff1672d60320a5fbb8c11133eaee4a14c3781 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 18:44:45 +0200
Subject: [PATCH 181/415] PersistedState: Replace object-path with lodash
 function

We were loading that one anyway.
---
 package.json               | 1 -
 src/lib/persisted_state.js | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 42efc7e9..c131d21a 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "diff": "^3.0.1",
     "escape-html": "^1.0.3",
     "localforage": "^1.5.0",
-    "object-path": "^0.11.3",
     "phoenix": "^1.3.0",
     "portal-vue": "^2.1.4",
     "v-click-outside": "^2.1.1",
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index cad7ea25..8ecb66a8 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -1,13 +1,12 @@
 import merge from 'lodash.merge'
-import objectPath from 'object-path'
 import localforage from 'localforage'
-import { each } from 'lodash'
+import { each, get, set } from 'lodash'
 
 let loaded = false
 
 const defaultReducer = (state, paths) => (
   paths.length === 0 ? state : paths.reduce((substate, path) => {
-    objectPath.set(substate, path, objectPath.get(state, path))
+    set(substate, path, get(state, path))
     return substate
   }, {})
 )

From 0c364862991907ecd3073503af6b389c305fd53e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 18:49:39 +0200
Subject: [PATCH 182/415] API: Remove fetch polyfill

All browser except IE have supported this for longer than
Pleroma even exists.
---
 package.json                    | 3 +--
 src/services/api/api.service.js | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c131d21a..c0665f6e 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,7 @@
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.6.11",
     "vuelidate": "^0.7.4",
-    "vuex": "^3.0.1",
-    "whatwg-fetch": "^2.0.3"
+    "vuex": "^3.0.1"
   },
   "devDependencies": {
     "karma-mocha-reporter": "^2.2.1",
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b3082bc5..dfffc291 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,6 +1,5 @@
 import { each, map, concat, last, get } from 'lodash'
 import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'
-import 'whatwg-fetch'
 import { RegistrationError, StatusCodeError } from '../errors/errors'
 
 /* eslint-env browser */

From 17b6396333de072d2bd271bbe88f02f266cc2d0e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 19:11:56 +0200
Subject: [PATCH 183/415] Update lockfile

---
 yarn.lock | 100 +++++-------------------------------------------------
 1 file changed, 9 insertions(+), 91 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 61afa7ca..f05b00b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1062,7 +1062,7 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
-array-uniq@^1.0.1, array-uniq@^1.0.2:
+array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
@@ -2545,7 +2545,7 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
 
@@ -2559,12 +2559,6 @@ domhandler@2.1:
   dependencies:
     domelementtype "1"
 
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  dependencies:
-    domelementtype "1"
-
 domutils@1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
@@ -2578,13 +2572,6 @@ domutils@1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -2711,7 +2698,7 @@ ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
 
-entities@^1.1.1, entities@~1.1.1:
+entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
 
@@ -3762,17 +3749,6 @@ html-webpack-plugin@^3.0.0, html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
-htmlparser2@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464"
-  dependencies:
-    domelementtype "^1.3.0"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.0.6"
-
 htmlparser2@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
@@ -4757,10 +4733,6 @@ lodash.clone@3.0.3:
     lodash._bindcallback "^3.0.0"
     lodash._isiterateecall "^3.0.0"
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-
 lodash.create@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
@@ -4780,10 +4752,6 @@ lodash.defaultsdeep@4.3.2:
     lodash.mergewith "^4.0.0"
     lodash.rest "^4.0.0"
 
-lodash.escaperegexp@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-
 lodash.find@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-3.2.1.tgz#046e319f3ace912ac6c9246c7f683c5ec07b36ad"
@@ -4815,14 +4783,10 @@ lodash.isplainobject@^3.0.0, lodash.isplainobject@^3.2.0:
     lodash.isarguments "^3.0.0"
     lodash.keysin "^3.0.0"
 
-lodash.isplainobject@^4.0.0, lodash.isplainobject@^4.0.6:
+lodash.isplainobject@^4.0.0:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
 
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-
 lodash.istypedarray@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62"
@@ -4871,7 +4835,7 @@ lodash.merge@^3.3.2:
     lodash.keysin "^3.0.0"
     lodash.toplainobject "^3.0.0"
 
-lodash.mergewith@^4.0.0, lodash.mergewith@^4.6.1:
+lodash.mergewith@^4.0.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
 
@@ -5538,10 +5502,6 @@ object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
 
-object-path@^0.11.3:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz#370ae752fbf37de3ea70a861c23bba8915691949"
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -6245,14 +6205,6 @@ postcss@^7.0.0:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7.0.5:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.8.tgz#2a3c5f2bdd00240cd0d0901fd998347c93d36696"
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.0.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6521,14 +6473,6 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^3.0.6:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -6839,21 +6783,6 @@ samsam@1.x, samsam@^1.1.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
-sanitize-html@^1.13.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.0.tgz#9a602beb1c9faf960fb31f9890f61911cc4d9156"
-  dependencies:
-    chalk "^2.4.1"
-    htmlparser2 "^3.10.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.escaperegexp "^4.1.2"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.1"
-    postcss "^7.0.5"
-    srcset "^1.0.0"
-    xtend "^4.0.1"
-
 "sass-loader@git://github.com/webpack-contrib/sass-loader":
   version "7.1.0"
   resolved "git://github.com/webpack-contrib/sass-loader#e279f2a129eee0bd0b624b5acd498f23a81ee35e"
@@ -7225,13 +7154,6 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
-srcset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz#a5669de12b42f3b1d5e83ed03c71046fc48f41ef"
-  dependencies:
-    array-uniq "^1.0.2"
-    number-is-nan "^1.0.0"
-
 sshpk@^1.7.0:
   version "1.16.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de"
@@ -7331,7 +7253,7 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string_decoder@^1.0.0, string_decoder@^1.1.1:
+string_decoder@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
   dependencies:
@@ -7415,7 +7337,7 @@ supports-color@^5.3.0, supports-color@^5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.0.0, supports-color@^6.1.0:
+supports-color@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
   dependencies:
@@ -7780,7 +7702,7 @@ useragent@2.3.0:
     lru-cache "4.1.x"
     tmp "0.0.x"
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
@@ -8015,10 +7937,6 @@ webpack@^4.0.0:
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
-whatwg-fetch@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
@@ -8090,7 +8008,7 @@ xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
 
-xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
+xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 

From 9bfb3754c1bc0d1033afda97f2884e721d1ab3d8 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 13 Jun 2020 11:47:34 +0200
Subject: [PATCH 184/415] ServiceWorker: Use loader to only notification
 messages.

This keeps the translation size very small and makes it easy to
integrate all the languages, as dynamically loading them isn't
easy in the service worker.
---
 src/lib/notification-i18n-loader.js |  9 +++++
 src/sw.js                           | 55 +++++++++++++++--------------
 2 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 src/lib/notification-i18n-loader.js

diff --git a/src/lib/notification-i18n-loader.js b/src/lib/notification-i18n-loader.js
new file mode 100644
index 00000000..a61755c8
--- /dev/null
+++ b/src/lib/notification-i18n-loader.js
@@ -0,0 +1,9 @@
+// This somewhat mysterious module
+module.exports = function(source) {
+  var object = JSON.parse(source)
+  var smol = {
+    notifications: object.notifications || {}
+  }
+
+  return JSON.stringify(smol)
+}
diff --git a/src/sw.js b/src/sw.js
index d0050b24..6e31516a 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -1,4 +1,5 @@
 /* eslint-env serviceworker */
+/* eslint-disable import/no-webpack-loader-syntax */
 
 import localForage from 'localforage'
 import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
@@ -7,33 +8,33 @@ import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 
 const messages = {
-  ar: require('./i18n/ar.json'),
-  ca: require('./i18n/ca.json'),
-  cs: require('./i18n/cs.json'),
-  de: require('./i18n/de.json'),
-  eo: require('./i18n/eo.json'),
-  es: require('./i18n/es.json'),
-  et: require('./i18n/et.json'),
-  eu: require('./i18n/eu.json'),
-  fi: require('./i18n/fi.json'),
-  fr: require('./i18n/fr.json'),
-  ga: require('./i18n/ga.json'),
-  he: require('./i18n/he.json'),
-  hu: require('./i18n/hu.json'),
-  it: require('./i18n/it.json'),
-  ja: require('./i18n/ja_pedantic.json'),
-  ja_easy: require('./i18n/ja_easy.json'),
-  ko: require('./i18n/ko.json'),
-  nb: require('./i18n/nb.json'),
-  nl: require('./i18n/nl.json'),
-  oc: require('./i18n/oc.json'),
-  pl: require('./i18n/pl.json'),
-  pt: require('./i18n/pt.json'),
-  ro: require('./i18n/ro.json'),
-  ru: require('./i18n/ru.json'),
-  te: require('./i18n/te.json'),
-  zh: require('./i18n/zh.json'),
-  en: require('./i18n/en.json')
+  ar: require('./lib/notification-i18n-loader.js!./i18n/ar.json'),
+  ca: require('./lib/notification-i18n-loader.js!./i18n/ca.json'),
+  cs: require('./lib/notification-i18n-loader.js!./i18n/cs.json'),
+  de: require('./lib/notification-i18n-loader.js!./i18n/de.json'),
+  eo: require('./lib/notification-i18n-loader.js!./i18n/eo.json'),
+  es: require('./lib/notification-i18n-loader.js!./i18n/es.json'),
+  et: require('./lib/notification-i18n-loader.js!./i18n/et.json'),
+  eu: require('./lib/notification-i18n-loader.js!./i18n/eu.json'),
+  fi: require('./lib/notification-i18n-loader.js!./i18n/fi.json'),
+  fr: require('./lib/notification-i18n-loader.js!./i18n/fr.json'),
+  ga: require('./lib/notification-i18n-loader.js!./i18n/ga.json'),
+  he: require('./lib/notification-i18n-loader.js!./i18n/he.json'),
+  hu: require('./lib/notification-i18n-loader.js!./i18n/hu.json'),
+  it: require('./lib/notification-i18n-loader.js!./i18n/it.json'),
+  ja: require('./lib/notification-i18n-loader.js!./i18n/ja_pedantic.json'),
+  ja_easy: require('./lib/notification-i18n-loader.js!./i18n/ja_easy.json'),
+  ko: require('./lib/notification-i18n-loader.js!./i18n/ko.json'),
+  nb: require('./lib/notification-i18n-loader.js!./i18n/nb.json'),
+  nl: require('./lib/notification-i18n-loader.js!./i18n/nl.json'),
+  oc: require('./lib/notification-i18n-loader.js!./i18n/oc.json'),
+  pl: require('./lib/notification-i18n-loader.js!./i18n/pl.json'),
+  pt: require('./lib/notification-i18n-loader.js!./i18n/pt.json'),
+  ro: require('./lib/notification-i18n-loader.js!./i18n/ro.json'),
+  ru: require('./lib/notification-i18n-loader.js!./i18n/ru.json'),
+  te: require('./lib/notification-i18n-loader.js!./i18n/te.json'),
+  zh: require('./lib/notification-i18n-loader.js!./i18n/zh.json'),
+  en: require('./lib/notification-i18n-loader.js!./i18n/en.json')
 }
 
 Vue.use(VueI18n)

From 1e57adf6d4a46ab5be677bba7ae3c7f0ba0fc520 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 13 Jun 2020 11:53:16 +0200
Subject: [PATCH 185/415] Linting + docs

---
 src/lib/notification-i18n-loader.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/notification-i18n-loader.js b/src/lib/notification-i18n-loader.js
index a61755c8..71f9156a 100644
--- a/src/lib/notification-i18n-loader.js
+++ b/src/lib/notification-i18n-loader.js
@@ -1,5 +1,8 @@
-// This somewhat mysterious module
-module.exports = function(source) {
+// This somewhat mysterious module will load a json string
+// and then extract only the 'notifications' part. This is
+// meant to be used to load the partial i18n we need for
+// the service worker.
+module.exports = function (source) {
   var object = JSON.parse(source)
   var smol = {
     notifications: object.notifications || {}

From c13d5b4f1bc102c0ae3603e6316ab6822e830277 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 13 Jun 2020 13:09:55 +0300
Subject: [PATCH 186/415] Fix faint links in notifications

---
 .../notifications/notifications.scss          | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index b675af5a..20797cf9 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -54,25 +54,20 @@
     flex-wrap: nowrap;
     padding: 0.6em;
     min-width: 0;
+
     .avatar-container {
       width: 32px;
       height: 32px;
     }
-    .status-el {
-      .status {
-        padding: 0.25em 0;
-        color: $fallback--faint;
-        color: var(--faint, $fallback--faint);
-        a {
-          color: var(--faintLink);
-        }
-        .status-content a {
-          color: var(--postFaintLink);
-        }
+
+    .status-body {
+      color: $fallback--faint;
+      color: var(--faint, $fallback--faint);
+      a {
+        color: var(--faintLink);
       }
-      padding: 0;
-      .media-body {
-        margin: 0;
+      .status-content a {
+        color: var(--postFaintLink);
       }
     }
   }

From e4b18deece3dd211e70d8c48405f813fac95a926 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 13 Jun 2020 13:16:53 +0300
Subject: [PATCH 187/415] fix redmond themes

---
 static/themes/redmond-xx-se.json | 4 +++-
 static/themes/redmond-xx.json    | 4 +++-
 static/themes/redmond-xxi.json   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/static/themes/redmond-xx-se.json b/static/themes/redmond-xx-se.json
index 7a4a29da..24480d2c 100644
--- a/static/themes/redmond-xx-se.json
+++ b/static/themes/redmond-xx-se.json
@@ -286,7 +286,9 @@
       "cGreen": "#008000",
       "cOrange": "#808000",
       "highlight": "--accent",
-      "selectedPost": "--bg,-10"
+      "selectedPost": "--bg,-10",
+      "selectedMenu": "--accent",
+      "selectedMenuPopover": "--accent"
     },
     "radii": {
       "btn": "0",
diff --git a/static/themes/redmond-xx.json b/static/themes/redmond-xx.json
index ff95b1e0..cf9010fe 100644
--- a/static/themes/redmond-xx.json
+++ b/static/themes/redmond-xx.json
@@ -277,7 +277,9 @@
       "cGreen": "#008000",
       "cOrange": "#808000",
       "highlight": "--accent",
-      "selectedPost": "--bg,-10"
+      "selectedPost": "--bg,-10",
+      "selectedMenu": "--accent",
+      "selectedMenuPopover": "--accent"
     },
     "radii": {
       "btn": "0",
diff --git a/static/themes/redmond-xxi.json b/static/themes/redmond-xxi.json
index f788bdb8..7fdc4a6d 100644
--- a/static/themes/redmond-xxi.json
+++ b/static/themes/redmond-xxi.json
@@ -259,7 +259,9 @@
       "cGreen": "#669966",
       "cOrange": "#cc6633",
       "highlight": "--accent",
-      "selectedPost": "--bg,-10"
+      "selectedPost": "--bg,-10",
+      "selectedMenu": "--accent",
+      "selectedMenuPopover": "--accent"
     },
     "radii": {
       "btn": "0",

From 8cd5041663077a2a5dafe9c23d5495339fa31fc6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 13 Jun 2020 13:23:54 +0300
Subject: [PATCH 188/415] add support for defining the greentext

---
 src/components/settings_modal/tabs/theme_tab/theme_tab.vue | 7 +++++++
 src/components/status_content/status_content.vue           | 2 +-
 src/services/theme_data/pleromafe.js                       | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index fcfad23b..d14f854c 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -256,6 +256,13 @@
               :label="$t('settings.links')"
             />
             <ContrastRatio :contrast="previewContrast.postLink" />
+            <ColorInput
+              v-model="postGreentextColorLocal"
+              name="postGreentextColor"
+              :fallback="previewTheme.colors.cGreen"
+              :label="$t('settings.greentext')"
+            />
+            <ContrastRatio :contrast="previewContrast.postGreentext" />
             <h4>{{ $t('settings.style.advanced_colors.alert') }}</h4>
             <ColorInput
               v-model="alertErrorColorLocal"
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 8c2e8749..7adb67ae 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -226,7 +226,7 @@ $status-margin: 0.75em;
 
 .greentext {
   color: $fallback--cGreen;
-  color: var(--cGreen, $fallback--cGreen);
+  color: var(--postGreentext, $fallback--cGreen);
 }
 
 .timeline :not(.panel-disabled) > {
diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index 0c1fe543..b577cfab 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -356,6 +356,12 @@ export const SLOT_INHERITANCE = {
     textColor: 'preserve'
   },
 
+  postGreentext: {
+    depends: ['cGreen'],
+    layer: 'bg',
+    textColor: 'preserve'
+  },
+
   border: {
     depends: ['fg'],
     opacity: 'border',

From ac270d7060213c0ebb0369ef5ccd2e659d2b5ee9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 13 Jun 2020 14:42:53 +0300
Subject: [PATCH 189/415] fix #866

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

diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index be945400..b44354db 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -13,6 +13,9 @@ const PostStatusModal = {
     }
   },
   computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
     modalActivated () {
       return this.$store.state.postStatus.modalActivated
     },
diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue
index 07c58f74..dbcd321e 100644
--- a/src/components/post_status_modal/post_status_modal.vue
+++ b/src/components/post_status_modal/post_status_modal.vue
@@ -1,5 +1,6 @@
 <template>
   <Modal
+    v-if="isLoggedIn && !resettingForm"
     :is-open="modalActivated"
     class="post-form-modal-view"
     @backdropClicked="closeModal"

From d41c9a717ca3f52b0a67bbb2b0ab8b0c898bba4b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 14 Jun 2020 13:16:08 +0200
Subject: [PATCH 190/415] Polls: Construct an html field during normalization.

---
 src/components/poll/poll.vue                              | 8 +++++++-
 .../entity_normalizer/entity_normalizer.service.js        | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 56e91cca..28f90006 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -17,7 +17,7 @@
           <span class="result-percentage">
             {{ percentageForOption(option.votes_count) }}%
           </span>
-          <span>{{ option.title }}</span>
+          <span v-html="option.title_html"></span>
         </div>
         <div
           class="result-fill"
@@ -75,6 +75,12 @@
 @import '../../_variables.scss';
 
 .poll {
+  img.emoji {
+    vertical-align: middle;
+    object-fit: contain;
+    width: 32px;
+    height: 32px;
+  }
   .votes {
     display: flex;
     flex-direction: column;
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index c7ed65a4..e93eea5b 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -258,6 +258,12 @@ export const parseStatus = (data) => {
     output.summary_html = addEmojis(escape(data.spoiler_text), data.emojis)
     output.external_url = data.url
     output.poll = data.poll
+    if (output.poll) {
+      output.poll.options = (output.poll.options || []).map(field => {
+        field.title_html = addEmojis(field.title, data.emojis)
+        return field
+      })
+    }
     output.pinned = data.pinned
     output.muted = data.muted
   } else {

From 72ee51c85c9ab74de2009b90cfd7e3e50a2e00af Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 14 Jun 2020 13:09:14 +0000
Subject: [PATCH 191/415] Apply suggestion to
 src/services/entity_normalizer/entity_normalizer.service.js

---
 .../entity_normalizer/entity_normalizer.service.js        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index e93eea5b..883e7a02 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -259,10 +259,10 @@ export const parseStatus = (data) => {
     output.external_url = data.url
     output.poll = data.poll
     if (output.poll) {
-      output.poll.options = (output.poll.options || []).map(field => {
-        field.title_html = addEmojis(field.title, data.emojis)
-        return field
-      })
+      output.poll.options = (output.poll.options || []).map(field => ({
+        ...field,
+        title_html: addEmojis(field.title, data.emojis)
+      }))
     }
     output.pinned = data.pinned
     output.muted = data.muted

From c0a4752bd5435f7c99cc711a111bd45b8d85a1fc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 14 Jun 2020 16:14:32 +0300
Subject: [PATCH 192/415] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad03c760..623c642f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ 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]
 ### Changed
+- Greentext now has separate color slot for it
 - Removed the use of with_move parameters when fetching notifications
 
 ### Fixed

From 8427c5a067a8b06ebb1e47d23ff3f70a16f921b8 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 15 Jun 2020 09:59:39 +0200
Subject: [PATCH 193/415] Changelog: Add info about poll option emoji.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad03c760..829f408f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add better visual indication for drag-and-drop for files
 
 ### Fixed
+- Custom Emoji will display in poll options now.
 - Status ellipsis menu closes properly when selecting certain options
 - Cropped images look correct in Chrome
 - Newlines in the muted words settings work again

From 14540e2a078bd59ca8f13cd5c0b894acad3d639f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 16 Jun 2020 13:27:36 +0200
Subject: [PATCH 194/415] Service Worker: Extract messages to own module.

---
 src/i18n/service_worker_messages.js | 35 +++++++++++++++++++++++++++++
 src/sw.js                           | 32 +-------------------------
 2 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 src/i18n/service_worker_messages.js

diff --git a/src/i18n/service_worker_messages.js b/src/i18n/service_worker_messages.js
new file mode 100644
index 00000000..270ed043
--- /dev/null
+++ b/src/i18n/service_worker_messages.js
@@ -0,0 +1,35 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+// This module exports only the notification part of the i18n,
+// which is useful for the service worker
+
+const messages = {
+  ar: require('../lib/notification-i18n-loader.js!./ar.json'),
+  ca: require('../lib/notification-i18n-loader.js!./ca.json'),
+  cs: require('../lib/notification-i18n-loader.js!./cs.json'),
+  de: require('../lib/notification-i18n-loader.js!./de.json'),
+  eo: require('../lib/notification-i18n-loader.js!./eo.json'),
+  es: require('../lib/notification-i18n-loader.js!./es.json'),
+  et: require('../lib/notification-i18n-loader.js!./et.json'),
+  eu: require('../lib/notification-i18n-loader.js!./eu.json'),
+  fi: require('../lib/notification-i18n-loader.js!./fi.json'),
+  fr: require('../lib/notification-i18n-loader.js!./fr.json'),
+  ga: require('../lib/notification-i18n-loader.js!./ga.json'),
+  he: require('../lib/notification-i18n-loader.js!./he.json'),
+  hu: require('../lib/notification-i18n-loader.js!./hu.json'),
+  it: require('../lib/notification-i18n-loader.js!./it.json'),
+  ja: require('../lib/notification-i18n-loader.js!./ja_pedantic.json'),
+  ja_easy: require('../lib/notification-i18n-loader.js!./ja_easy.json'),
+  ko: require('../lib/notification-i18n-loader.js!./ko.json'),
+  nb: require('../lib/notification-i18n-loader.js!./nb.json'),
+  nl: require('../lib/notification-i18n-loader.js!./nl.json'),
+  oc: require('../lib/notification-i18n-loader.js!./oc.json'),
+  pl: require('../lib/notification-i18n-loader.js!./pl.json'),
+  pt: require('../lib/notification-i18n-loader.js!./pt.json'),
+  ro: require('../lib/notification-i18n-loader.js!./ro.json'),
+  ru: require('../lib/notification-i18n-loader.js!./ru.json'),
+  te: require('../lib/notification-i18n-loader.js!./te.json'),
+  zh: require('../lib/notification-i18n-loader.js!./zh.json'),
+  en: require('../lib/notification-i18n-loader.js!./en.json')
+}
+
+export default messages
diff --git a/src/sw.js b/src/sw.js
index 6e31516a..c971222e 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -1,41 +1,11 @@
 /* eslint-env serviceworker */
-/* eslint-disable import/no-webpack-loader-syntax */
 
 import localForage from 'localforage'
 import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
 import { prepareNotificationObject } from './services/notification_utils/notification_utils.js'
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
-
-const messages = {
-  ar: require('./lib/notification-i18n-loader.js!./i18n/ar.json'),
-  ca: require('./lib/notification-i18n-loader.js!./i18n/ca.json'),
-  cs: require('./lib/notification-i18n-loader.js!./i18n/cs.json'),
-  de: require('./lib/notification-i18n-loader.js!./i18n/de.json'),
-  eo: require('./lib/notification-i18n-loader.js!./i18n/eo.json'),
-  es: require('./lib/notification-i18n-loader.js!./i18n/es.json'),
-  et: require('./lib/notification-i18n-loader.js!./i18n/et.json'),
-  eu: require('./lib/notification-i18n-loader.js!./i18n/eu.json'),
-  fi: require('./lib/notification-i18n-loader.js!./i18n/fi.json'),
-  fr: require('./lib/notification-i18n-loader.js!./i18n/fr.json'),
-  ga: require('./lib/notification-i18n-loader.js!./i18n/ga.json'),
-  he: require('./lib/notification-i18n-loader.js!./i18n/he.json'),
-  hu: require('./lib/notification-i18n-loader.js!./i18n/hu.json'),
-  it: require('./lib/notification-i18n-loader.js!./i18n/it.json'),
-  ja: require('./lib/notification-i18n-loader.js!./i18n/ja_pedantic.json'),
-  ja_easy: require('./lib/notification-i18n-loader.js!./i18n/ja_easy.json'),
-  ko: require('./lib/notification-i18n-loader.js!./i18n/ko.json'),
-  nb: require('./lib/notification-i18n-loader.js!./i18n/nb.json'),
-  nl: require('./lib/notification-i18n-loader.js!./i18n/nl.json'),
-  oc: require('./lib/notification-i18n-loader.js!./i18n/oc.json'),
-  pl: require('./lib/notification-i18n-loader.js!./i18n/pl.json'),
-  pt: require('./lib/notification-i18n-loader.js!./i18n/pt.json'),
-  ro: require('./lib/notification-i18n-loader.js!./i18n/ro.json'),
-  ru: require('./lib/notification-i18n-loader.js!./i18n/ru.json'),
-  te: require('./lib/notification-i18n-loader.js!./i18n/te.json'),
-  zh: require('./lib/notification-i18n-loader.js!./i18n/zh.json'),
-  en: require('./lib/notification-i18n-loader.js!./i18n/en.json')
-}
+import messages from './i18n/service_worker_messages.js'
 
 Vue.use(VueI18n)
 const i18n = new VueI18n({

From 5cf1574fdb36e14e342e3cbdd9733e0a1817a7cb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Jun 2020 17:20:36 +0300
Subject: [PATCH 195/415] fix popovers cutting off in notifications, port
 popover changes from chats mr

---
 src/components/account_actions/account_actions.vue |  1 +
 src/components/extra_buttons/extra_buttons.vue     |  1 +
 src/components/popover/popover.js                  | 11 ++++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 744b77d5..029e7096 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -3,6 +3,7 @@
     <Popover
       trigger="click"
       placement="bottom"
+      :bound-to="{ x: 'container' }"
     >
       <div
         slot="content"
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index bca93ea7..68db6fd8 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -3,6 +3,7 @@
     trigger="click"
     placement="top"
     class="extra-button-popover"
+    :bound-to="{ x: 'container' }"
   >
     <div
       slot="content"
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 5881d266..f1abe3ad 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -10,6 +10,9 @@ const Popover = {
     // '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,
@@ -27,6 +30,11 @@ const Popover = {
     }
   },
   methods: {
+    containerBoundingClientRect () {
+      const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent
+      console.log('test', container)
+      return container.getBoundingClientRect()
+    },
     updateStyles () {
       if (this.hidden) {
         this.styles = {
@@ -45,7 +53,8 @@ const Popover = {
       // Minor optimization, don't call a slow reflow call if we don't have to
       const parentBounds = this.boundTo &&
         (this.boundTo.x === 'container' || this.boundTo.y === 'container') &&
-        this.$el.offsetParent.getBoundingClientRect()
+        this.containerBoundingClientRect()
+
       const margin = this.margin || {}
 
       // What are the screen bounds for the popover? Viewport vs container

From 5a8a428c154984b953724214284c01f270af5eb8 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Jun 2020 17:30:56 +0300
Subject: [PATCH 196/415] remove log whoops

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

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index f1abe3ad..ded7066f 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -32,7 +32,6 @@ const Popover = {
   methods: {
     containerBoundingClientRect () {
       const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent
-      console.log('test', container)
       return container.getBoundingClientRect()
     },
     updateStyles () {

From fc6ca20a42ff699ac08e22af4d5f5659d2726115 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Jun 2020 17:34:22 +0300
Subject: [PATCH 197/415] disable subject field when posting

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 623c642f..7e3eaf17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Newlines in the muted words settings work again
 - Clicking on non-latin hashtags won't open a new window
 - Uploading and drag-dropping multiple files works correctly now.
+- Subject field now appears disabled when posting
 
 ## [2.0.3] - 2020-05-02
 ### Fixed
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index c4d7f7e2..e3d8d087 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -81,6 +81,7 @@
             v-model="newStatus.spoilerText"
             type="text"
             :placeholder="$t('post_status.content_warning')"
+            :disabled="posting"
             class="form-post-subject"
           >
         </EmojiInput>

From c18a8ab308e6ebbc552e623d6e035032cec4a619 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Jun 2020 17:35:12 +0300
Subject: [PATCH 198/415] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 623c642f..9a9a9046 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Newlines in the muted words settings work again
 - Clicking on non-latin hashtags won't open a new window
 - Uploading and drag-dropping multiple files works correctly now.
+- Fix status ellipsis menu being cut off in notifications column.
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From 24e47eb604330a8858dac9761545e499f73be8c4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 16 Jun 2020 15:12:44 +0000
Subject: [PATCH 199/415] Update popover.js

---
 src/components/popover/popover.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index ded7066f..a40a9195 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -1,4 +1,3 @@
-
 const Popover = {
   name: 'Popover',
   props: {
@@ -31,7 +30,7 @@ const Popover = {
   },
   methods: {
     containerBoundingClientRect () {
-      const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent
+      const container = this.boundToSelector ? this.$el.closest(this.boundToSelector) : this.$el.offsetParent
       return container.getBoundingClientRect()
     },
     updateStyles () {

From 580fcd3ad9508befbe93658c2ee7a4e8d776db4b Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Jun 2020 18:26:06 +0300
Subject: [PATCH 200/415] restyle the fields

---
 src/components/user_profile/user_profile.vue  | 22 ++++++++++++++-----
 .../entity_normalizer.service.js              |  4 ++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 0c36f2e2..2892a121 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -133,12 +133,14 @@
 <script src="./user_profile.js"></script>
 
 <style lang="scss">
+@import '../../_variables.scss';
 
 .user-profile {
   flex: 2;
   flex-basis: 500px;
 
   .user-profile-fields {
+    margin: 0 0.5em;
     img {
       object-fit: contain;
       vertical-align: middle;
@@ -146,28 +148,28 @@
       max-height: 400px;
 
       &.emoji {
-        width: 18px;
-        height: 18px;
+        width: 24px;
+        height: 24px;
       }
     }
 
     .user-profile-field {
       display: flex;
-      margin: 1em 1.5em;
+      margin: 0.25em auto;
+      max-width: 32em;
 
       .user-profile-field-name {
-        flex: 0 0 auto;
+        flex: 0 1 30%;
         font-weight: 500;
         text-align: right;
         color: var(--lightText);
-        width: 30%;
         min-width: 120px;
       }
 
       .user-profile-field-value {
         flex: 1 1 auto;
         color: var(--text);
-        margin-left: 10px;
+        margin: 0 0 0 0.25em;
       }
 
       .user-profile-field-name, .user-profile-field-value {
@@ -175,6 +177,14 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
+        padding: 0.5em 1.5em;
+        box-sizing: border-box;
+
+        border: var(--border, $fallback--border);
+        border-radius: $fallback--inputRadius;
+        border-radius: var(--inputRadius, $fallback--inputRadius);
+        border-style: solid;
+        border-width: 1px;
       }
     }
   }
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ff99e944..c30f6f0a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -58,8 +58,8 @@ export const parseUser = (data) => {
     })
     output.fields_text = data.fields.map(field => {
       return {
-        name: field.name.replace(/<[^>]*>/g, ''),
-        value: field.value.replace(/<[^>]*>/g, '')
+        name: unescape(field.name.replace(/<[^>]*>/g, '')),
+        value: unescape(field.value.replace(/<[^>]*>/g, ''))
       }
     })
 

From 632f62ee0f24fc87d29550b961b9e3b0230e3812 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Jun 2020 18:34:24 +0300
Subject: [PATCH 201/415] resume the previous emoji size for now

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 2892a121..445f0471 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -148,8 +148,8 @@
       max-height: 400px;
 
       &.emoji {
-        width: 24px;
-        height: 24px;
+        width: 18px;
+        height: 18px;
       }
     }
 

From 9c884fef11e52541ab64508c9a9e0b8694432cbb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 12:29:13 +0300
Subject: [PATCH 202/415] remove search blocker, fix debounce params

---
 src/components/emoji_input/suggestor.js |  8 ++++----
 src/modules/users.js                    | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 15a71eff..91d5cfb9 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 /**
  * suggest - generates a suggestor function to be used by emoji-input
  * data: object providing source information for specific types of suggestions:
@@ -13,7 +13,7 @@ import { debounce } from 'lodash'
 
 const debounceUserSearch = debounce((data, input) => {
   data.updateUsersList(input)
-}, 500, { leading: true, trailing: false })
+}, 500)
 
 export default data => input => {
   const firstChar = input[0]
@@ -97,8 +97,8 @@ export const suggestUsers = data => input => {
     replacement: '@' + screen_name + ' '
   }))
 
-  // BE search users if there are no matches
-  if (newUsers.length === 0 && data.updateUsersList) {
+  // BE search users to get more comprehensive results
+  if (data.updateUsersList) {
     debounceUserSearch(data, noPrefix)
   }
   return newUsers
diff --git a/src/modules/users.js b/src/modules/users.js
index f9329f2a..a640fb3b 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -225,6 +225,12 @@ export const mutations = {
   signUpFailure (state, errors) {
     state.signUpPending = false
     state.signUpErrors = errors
+  },
+  addRecentQuery (state, query) {
+    state.recentQueries = state.recentQueries.concat(query)
+    if (state.recentQueries.length > 10) {
+      state.recentQueries = state.recentQueries.slice(1)
+    }
   }
 }
 
@@ -251,7 +257,8 @@ export const defaultState = {
   usersObject: {},
   signUpPending: false,
   signUpErrors: [],
-  relationships: {}
+  relationships: {},
+  recentQueries: []
 }
 
 const users = {
@@ -428,10 +435,15 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers (store, { query }) {
-      return store.rootState.api.backendInteractor.searchUsers({ query })
+    searchUsers ({ rootState, commit }, { query }) {
+      // Don't fetch if this query was already done recently
+      if (rootState.users.recentQueries.includes(query)) {
+        return []
+      }
+      return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          store.commit('addNewUsers', users)
+          commit('addRecentQuery', query)
+          commit('addNewUsers', users)
           return users
         })
     },

From abbad84b00fbfe365ba6bf5015278b296265b98a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 12:56:22 +0300
Subject: [PATCH 203/415] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dfe741c..f2580bad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Uploading and drag-dropping multiple files works correctly now.
 - Subject field now appears disabled when posting
 - Fix status ellipsis menu being cut off in notifications column
+- Fixed autocomplete sometimes not returning the right user when there's already some results
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From fa7bcb74cecb8af095e6e22271243f2d51835f39 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 13:00:09 +0300
Subject: [PATCH 204/415] return the correct promise type from action

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

diff --git a/src/modules/users.js b/src/modules/users.js
index a640fb3b..df710ac9 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -438,7 +438,7 @@ const users = {
     searchUsers ({ rootState, commit }, { query }) {
       // Don't fetch if this query was already done recently
       if (rootState.users.recentQueries.includes(query)) {
-        return []
+        return Promise.resolve([])
       }
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {

From f1175b4e9b9558e304bc56e1a3d4c9daafefd89f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 13:41:04 +0300
Subject: [PATCH 205/415] revert import style

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

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 91d5cfb9..8330345b 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -1,4 +1,4 @@
-import debounce from 'lodash/debounce'
+import { debounce } from 'lodash'
 /**
  * suggest - generates a suggestor function to be used by emoji-input
  * data: object providing source information for specific types of suggestions:

From bb513dd9615759668ae216042a85ca0d8f087fa0 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Thu, 18 Jun 2020 20:08:00 +0900
Subject: [PATCH 206/415] change key-value to look like one

---
 src/components/user_profile/user_profile.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 445f0471..ccd7c794 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -157,6 +157,9 @@
       display: flex;
       margin: 0.25em auto;
       max-width: 32em;
+      border: 1px solid var(--border, $fallback--border);
+      border-radius: $fallback--inputRadius;
+      border-radius: var(--inputRadius, $fallback--inputRadius);
 
       .user-profile-field-name {
         flex: 0 1 30%;
@@ -164,6 +167,7 @@
         text-align: right;
         color: var(--lightText);
         min-width: 120px;
+        border-right: 1px solid var(--border, $fallback--border);
       }
 
       .user-profile-field-value {
@@ -179,12 +183,6 @@
         overflow: hidden;
         padding: 0.5em 1.5em;
         box-sizing: border-box;
-
-        border: var(--border, $fallback--border);
-        border-radius: $fallback--inputRadius;
-        border-radius: var(--inputRadius, $fallback--inputRadius);
-        border-style: solid;
-        border-width: 1px;
       }
     }
   }

From eed58a7b97bc8c6cddfd367c8d49972a96dfd08e Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Thu, 18 Jun 2020 20:13:44 +0900
Subject: [PATCH 207/415] fix width of long field value

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index ccd7c794..361a3b5c 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -171,7 +171,7 @@
       }
 
       .user-profile-field-value {
-        flex: 1 1 auto;
+        flex: 1 1 70%;
         color: var(--text);
         margin: 0 0 0 0.25em;
       }

From 4e0b4427a969b2d0584a3a1c1ffd3fe3fbfc2998 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 14:19:21 +0300
Subject: [PATCH 208/415] remove recentqueries thing

---
 src/modules/users.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index df710ac9..5e32bb49 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -225,12 +225,6 @@ export const mutations = {
   signUpFailure (state, errors) {
     state.signUpPending = false
     state.signUpErrors = errors
-  },
-  addRecentQuery (state, query) {
-    state.recentQueries = state.recentQueries.concat(query)
-    if (state.recentQueries.length > 10) {
-      state.recentQueries = state.recentQueries.slice(1)
-    }
   }
 }
 
@@ -257,8 +251,7 @@ export const defaultState = {
   usersObject: {},
   signUpPending: false,
   signUpErrors: [],
-  relationships: {},
-  recentQueries: []
+  relationships: {}
 }
 
 const users = {
@@ -436,13 +429,8 @@ const users = {
       })
     },
     searchUsers ({ rootState, commit }, { query }) {
-      // Don't fetch if this query was already done recently
-      if (rootState.users.recentQueries.includes(query)) {
-        return Promise.resolve([])
-      }
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          commit('addRecentQuery', query)
           commit('addNewUsers', users)
           return users
         })

From b0b33be9ddeb96fe808770604f6fab9c4d8d15c0 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 18 Jun 2020 14:41:40 +0200
Subject: [PATCH 209/415] Poll, StatusContent: Move emoji css to status body.

---
 src/components/poll/poll.vue                  |  6 -----
 .../status_content/status_content.vue         | 24 +++++++++----------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 28f90006..adbb0555 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -75,12 +75,6 @@
 @import '../../_variables.scss';
 
 .poll {
-  img.emoji {
-    vertical-align: middle;
-    object-fit: contain;
-    width: 32px;
-    height: 32px;
-  }
   .votes {
     display: flex;
     flex-direction: column;
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 8c2e8749..89f917dc 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -164,23 +164,23 @@ $status-margin: 0.75em;
     word-break: break-all;
   }
 
+  img, video {
+    max-width: 100%;
+    max-height: 400px;
+    vertical-align: middle;
+    object-fit: contain;
+
+    &.emoji {
+      width: 32px;
+      height: 32px;
+    }
+  }
+
   .status-content {
     font-family: var(--postFont, sans-serif);
     line-height: 1.4em;
     white-space: pre-wrap;
 
-    img, video {
-      max-width: 100%;
-      max-height: 400px;
-      vertical-align: middle;
-      object-fit: contain;
-
-      &.emoji {
-        width: 32px;
-        height: 32px;
-      }
-    }
-
     blockquote {
       margin: 0.2em 0 0.2em 2em;
       font-style: italic;

From 6d2befa452d6b42e47968f382a7ff62d4eb0d9b9 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 16:47:32 +0300
Subject: [PATCH 210/415] move favicon to name

---
 src/components/status/status.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ec32b60c..a4d12e3e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -121,6 +121,11 @@
                   :to="userProfileLink"
                 >
                   {{ status.user.screen_name }}
+                  <img
+                    height="18px"
+                    v-if="!!(status.user && status.user.favicon)"
+                    :src="status.user.favicon"
+                  >
                 </router-link>
               </div>
 
@@ -154,14 +159,14 @@
                     height="18px"
                     v-if="!!(status.user && status.user.favicon)"
                     :src="status.user.favicon"
-                  />
+                  >
                   <i v-else class="button-icon icon-link-ext-alt" />
                 </a>
                 <img
                   v-else-if="!!(status.user && status.user.favicon)"
                   height="18px"
                   :src="status.user.favicon"
-                />
+                >
                 <template v-if="expandable && !isPreview">
                   <a
                     href="#"

From c4340ad46786cef557a2cc11d1248fcfef16d366 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 17:09:30 +0300
Subject: [PATCH 211/415] move favicon

---
 src/components/status/status.vue | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0afb67fd..88be3c0c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -142,12 +142,12 @@
                   :to="userProfileLink"
                 >
                   {{ status.user.screen_name }}
-                  <img
-                    height="18px"
-                    v-if="!!(status.user && status.user.favicon)"
-                    :src="status.user.favicon"
-                  >
                 </router-link>
+                <img
+                  class="status-favicon"
+                  v-if="!!(status.user && status.user.favicon)"
+                  :src="status.user.favicon"
+                >
               </div>
 
               <span class="heading-right">
@@ -176,18 +176,8 @@
                   class="source_url"
                   title="Source"
                 >
-                  <img
-                    height="18px"
-                    v-if="!!(status.user && status.user.favicon)"
-                    :src="status.user.favicon"
-                  >
-                  <i v-else class="button-icon icon-link-ext-alt" />
+                  <i class="button-icon icon-link-ext-alt" />
                 </a>
-                <img
-                  v-else-if="!!(status.user && status.user.favicon)"
-                  height="18px"
-                  :src="status.user.favicon"
-                >
                 <template v-if="expandable && !isPreview">
                   <a
                     href="#"
@@ -441,6 +431,12 @@ $status-margin: 0.75em;
     }
   }
 
+  .status-favicon {
+    height: 18px;
+    width: 18px;
+    margin-right: 0.4em;
+  }
+
   .media-heading {
     padding: 0;
     vertical-align: bottom;

From a79bad5cdb896fd965e544df3ba8d0a87b3db458 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 19 Jun 2020 12:46:48 +0200
Subject: [PATCH 212/415] StatusContent: Better separate subject from status
 content.

---
 .../status_content/status_content.js          |  6 -----
 .../status_content/status_content.vue         | 22 +++++++++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index c0a71e8f..cfee77a3 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -142,12 +142,6 @@ const StatusContent = {
         return html
       }
     },
-    contentHtml () {
-      if (!this.status.summary_html) {
-        return this.postBodyHtml
-      }
-      return this.status.summary_html + '<br />' + this.postBodyHtml
-    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       betterShadow: state => state.interface.browserSupport.cssFilter,
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index efc2485e..df980a71 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -31,7 +31,7 @@
       <div
         class="status-content media-body"
         @click.prevent="linkClicked"
-        v-html="contentHtml"
+        v-html="postBodyHtml"
       />
       <a
         v-if="showingLongSubject"
@@ -52,17 +52,17 @@
         href="#"
         @click.prevent="toggleShowMore"
       >{{ $t("general.show_more") }}</a>
+      <div
+        v-if="status.summary_html"
+        class="status-content media-body summary"
+        @click.prevent="linkClicked"
+        v-html="status.summary_html"
+      />
       <div
         v-if="!hideSubjectStatus"
         class="status-content media-body"
         @click.prevent="linkClicked"
-        v-html="contentHtml"
-      />
-      <div
-        v-else
-        class="status-content media-body"
-        @click.prevent="linkClicked"
-        v-html="status.summary_html"
+        v-html="postBodyHtml"
       />
       <a
         v-if="hideSubjectStatus"
@@ -181,6 +181,10 @@ $status-margin: 0.75em;
     line-height: 1.4em;
     white-space: pre-wrap;
 
+    &.summary {
+      font-weight: bold;
+    }
+
     blockquote {
       margin: 0.2em 0 0.2em 2em;
       font-style: italic;
@@ -226,7 +230,7 @@ $status-margin: 0.75em;
 
 .greentext {
   color: $fallback--cGreen;
-  color: var(--postGreentext, $fallback--cGreen);
+  color: var(--cGreen, $fallback--cGreen);
 }
 
 .timeline :not(.panel-disabled) > {

From 4da0a0c0bfcfaccd58def8d2170b952c1d15106a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 19 Jun 2020 12:49:42 +0200
Subject: [PATCH 213/415] StatusContent: Fix greentext.

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

diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index df980a71..431661eb 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -230,7 +230,7 @@ $status-margin: 0.75em;
 
 .greentext {
   color: $fallback--cGreen;
-  color: var(--cGreen, $fallback--cGreen);
+  color: var(--postGreentext, $fallback--cGreen);
 }
 
 .timeline :not(.panel-disabled) > {

From fd2157efe48e49f40f17b81cd79d9b45a304bc62 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Mon, 2 Dec 2019 23:03:06 +0900
Subject: [PATCH 214/415] Fix emoji input error

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

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index f4c3479c..7974a66d 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -431,6 +431,7 @@ const EmojiInput = {
       const offsetBottom = offsetTop + offsetHeight
 
       panel.style.top = offsetBottom + 'px'
+      if (!picker) return
       picker.$el.style.top = offsetBottom + 'px'
       picker.$el.style.bottom = 'auto'
     }

From bad3dacfac1ef3dd2c0f55b53fb78f4bf410a01e Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Fri, 19 Jun 2020 21:18:36 +0900
Subject: [PATCH 215/415] implement user suggestor for profile fields

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

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 896ff508..0874e0c8 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -65,6 +65,12 @@ const ProfileTab = {
         ...this.$store.state.instance.customEmoji
       ] })
     },
+    userSuggestor () {
+      return suggestor({
+        users: this.$store.state.users.users,
+        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
+      })
+    },
     fieldsLimits () {
       return this.$store.state.instance.fieldsLimits
     },
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 2fa3021e..20a68f7d 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -104,8 +104,9 @@
         >
           <EmojiInput
             v-model="newFields[i].name"
-            :suggest="emojiSuggestor"
+            enable-emoji-picker
             hide-emoji-button
+            :suggest="userSuggestor"
           >
             <input
               v-model="newFields[i].name"
@@ -114,8 +115,9 @@
           </EmojiInput>
           <EmojiInput
             v-model="newFields[i].value"
-            :suggest="emojiSuggestor"
+            enable-emoji-picker
             hide-emoji-button
+            :suggest="userSuggestor"
           >
             <input
               v-model="newFields[i].value"

From 5aa65e32ef0b14d6a70257e35559360e696f878c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 19 Jun 2020 16:09:44 +0300
Subject: [PATCH 216/415] fix huge emoji in usernames

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

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 336f912a..7ec29b28 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -418,7 +418,7 @@ $status-margin: 0.75em;
     max-width: 85%;
     font-weight: bold;
 
-    img {
+    img.emoji {
       width: 14px;
       height: 14px;
       vertical-align: middle;

From aa725010c5a3eeeb2dae3e6618b057e08fc5fd49 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 19 Jun 2020 15:24:06 +0200
Subject: [PATCH 217/415] ServiceWorker: Use clearer variable names

---
 src/sw.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sw.js b/src/sw.js
index c971222e..f5e34dd6 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -40,10 +40,10 @@ const maybeShowNotification = async (event) => {
 
     const url = `${self.registration.scope}api/v1/notifications/${data.notification_id}`
     const notification = await fetch(url, { headers: { Authorization: 'Bearer ' + data.access_token } })
-    let nj = await notification.json()
-    nj = parseNotification(nj)
+    const notificationJson = await notification.json()
+    const parsedNotification = parseNotification(notificationJson)
 
-    const res = prepareNotificationObject(nj, i18n)
+    const res = prepareNotificationObject(parsedNotification, i18n)
 
     self.registration.showNotification(res.title, res)
   }

From ed908e0195db26ec9c51d124315bc084c5576a29 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 19 Jun 2020 15:25:57 +0200
Subject: [PATCH 218/415] Changelog: Add info about push notifications.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad03c760..19ac4ba3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Changed
 - Removed the use of with_move parameters when fetching notifications
+- Push notifications now are the same as normal notfication, and are localized.
 
 ### Fixed
 - Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)

From 2451956d838d132a14a3089546ceac59c07e1b3a Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Sun, 21 Jun 2020 14:59:05 +0200
Subject: [PATCH 219/415] Add 'bot' flag to Profile settings

---
 src/components/settings_modal/tabs/profile_tab.js  | 2 ++
 src/components/settings_modal/tabs/profile_tab.vue | 5 +++++
 src/i18n/en.json                                   | 1 +
 src/i18n/ru.json                                   | 1 +
 4 files changed, 9 insertions(+)

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 8658b097..56e956cd 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -23,6 +23,7 @@ const ProfileTab = {
       showRole: this.$store.state.users.currentUser.show_role,
       role: this.$store.state.users.currentUser.role,
       discoverable: this.$store.state.users.currentUser.discoverable,
+      bot: this.$store.state.users.currentUser.bot,
       allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
       pickAvatarBtnVisible: true,
       bannerUploading: false,
@@ -79,6 +80,7 @@ const ProfileTab = {
             hide_follows: this.hideFollows,
             hide_followers: this.hideFollowers,
             discoverable: this.discoverable,
+            bot: this.bot,
             allow_following_move: this.allowFollowingMove,
             hide_follows_count: this.hideFollowsCount,
             hide_followers_count: this.hideFollowersCount,
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index fff4f970..decdb389 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -95,6 +95,11 @@
           {{ $t('settings.discoverable') }}
         </Checkbox>
       </p>
+      <p>
+        <Checkbox v-model="bot">
+          {{ $t('settings.bot') }}
+        </Checkbox>
+      </p>
       <button
         :disabled="newName && newName.length === 0"
         class="btn btn-default"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index eefe10e5..4553d25d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -266,6 +266,7 @@
     "block_import_error": "Error importing blocks",
     "blocks_imported": "Blocks imported! Processing them will take a while.",
     "blocks_tab": "Blocks",
+    "bot": "This is a bot account",
     "btnRadius": "Buttons",
     "cBlue": "Blue (Reply, follow)",
     "cGreen": "Green (Retweet)",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index f9a72954..aa78db26 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -130,6 +130,7 @@
     "background": "Фон",
     "bio": "Описание",
     "btnRadius": "Кнопки",
+    "bot": "Это аккаунт бота",
     "cBlue": "Ответить, читать",
     "cGreen": "Повторить",
     "cOrange": "Нравится",

From c04f8b2ccb29e02595e4abd7a75ed42feee5f640 Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Sun, 21 Jun 2020 15:02:44 +0200
Subject: [PATCH 220/415] Show a 'bot' badge on the service account page

---
 CHANGELOG.md                           |  1 +
 src/components/user_card/user_card.vue | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b41a04d..feabbf06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added private notifications option for push notifications
 - 'Copy link' button for statuses (in the ellipsis menu)
 - Autocomplete domains from list of known instances
+- 'Bot' settings option and badge
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c4a5ce9d..243a46f1 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -70,10 +70,20 @@
               >
                 @{{ user.screen_name }}
               </router-link>
-              <span
-                v-if="!hideBio && !!visibleRole"
-                class="alert staff"
-              >{{ visibleRole }}</span>
+              <template v-if="!hideBio">
+                <span
+                  v-if="!!visibleRole"
+                  class="alert staff"
+                >
+                  {{ visibleRole }}
+                </span>
+                <span
+                  v-if="user.bot"
+                  class="alert staff"
+                >
+                  bot
+                </span>
+              </template>
               <span v-if="user.locked"><i class="icon icon-lock" /></span>
               <span
                 v-if="!mergedConfig.hideUserStats && !hideBio"

From 2b6d16900b9f0bd515dbb616ef0f031f6c026dcc Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Sun, 21 Jun 2020 15:36:20 +0200
Subject: [PATCH 221/415] Use more correct class name for user badges

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

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 243a46f1..9529d7f6 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -73,13 +73,13 @@
               <template v-if="!hideBio">
                 <span
                   v-if="!!visibleRole"
-                  class="alert staff"
+                  class="alert user-role"
                 >
                   {{ visibleRole }}
                 </span>
                 <span
                   v-if="user.bot"
-                  class="alert staff"
+                  class="alert user-role"
                 >
                   bot
                 </span>
@@ -468,7 +468,7 @@
       color: var(--text, $fallback--text);
     }
 
-    .staff {
+    .user-role {
       flex: none;
       text-transform: capitalize;
       color: $fallback--text;

From 504d48fc5a707a60f5c7f5d5cf92ab2af762bb2e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 24 Jun 2020 17:54:35 +0200
Subject: [PATCH 222/415] After Store: Remove last statusnet vestiges.

---
 src/boot/after_store.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5213fbbd..2398c43c 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -8,14 +8,15 @@ import backendInteractorService from '../services/backend_interactor_service/bac
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
 
-const getStatusnetConfig = async ({ store }) => {
+const getInstanceConfig = async ({ store }) => {
   try {
-    const res = await window.fetch('/api/statusnet/config.json')
+    const res = await window.fetch('/api/v1/instance')
     if (res.ok) {
       const data = await res.json()
-      const { textlimit, vapidPublicKey } = data.site
+      const textlimit = data.max_toot_chars
+      const vapidPublicKey = data.pleroma.vapid_public_key
 
-      store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
+      store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
@@ -24,7 +25,7 @@ const getStatusnetConfig = async ({ store }) => {
       throw (res)
     }
   } catch (error) {
-    console.error('Could not load statusnet config, potentially fatal')
+    console.error('Could not load instance config, potentially fatal')
     console.error(error)
   }
 }
@@ -319,7 +320,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
     getInstancePanel({ store }),
     getStickers({ store }),
     getNodeInfo({ store }),
-    getStatusnetConfig({ store })
+    getInstanceConfig({ store })
   ])
 
   // Start fetching things that don't need to block the UI

From 8e1e7144fdbdea944988f1ed775d35c77c05b2d2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 25 Jun 2020 15:34:48 -0500
Subject: [PATCH 223/415] Change notification settings keys to new names,
 remove the defunct non_follows key.

---
 src/i18n/de.json | 4 ++--
 src/i18n/et.json | 7 +++----
 src/i18n/fi.json | 7 +++----
 src/i18n/fr.json | 7 +++----
 src/i18n/it.json | 7 +++----
 src/i18n/nl.json | 7 +++----
 src/i18n/pl.json | 7 +++----
 src/i18n/ru.json | 7 +++----
 src/i18n/zh.json | 7 +++----
 9 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/i18n/de.json b/src/i18n/de.json
index a44e58cb..feb5748f 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -401,8 +401,8 @@
     "changed_email": "Email Adresse erfolgreich geändert!",
     "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
     "change_email": "Ändere Email",
-    "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
-    "notification_setting_followers": "Nutzer, die dir folgen",
+    "notification_setting_from_strangers": "Nutzer, die dir nicht folgen",
+    "notification_setting_from_followers": "Nutzer, die dir folgen",
     "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
     "accent": "Akzent"
   },
diff --git a/src/i18n/et.json b/src/i18n/et.json
index b5ae4275..656dd2f9 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -308,10 +308,9 @@
     "notifications": "Teated",
     "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.",
     "notification_setting_privacy": "Privaatsus",
-    "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi",
-    "notification_setting_followers": "Kasutajatelt, kes jälgivad sind",
-    "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi",
-    "notification_setting_follows": "Kasutajatelt, keda jälgid",
+    "notification_setting_from_strangers": "Kasutajatelt, kes sind ei jälgi",
+    "notification_setting_from_followers": "Kasutajatelt, kes jälgivad sind",
+    "notification_setting_from_following": "Kasutajatelt, keda jälgid",
     "notification_setting_filters": "Filtrid",
     "greentext": "Meemi nooled",
     "fun": "Naljad",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 99a1b53a..920b7cf1 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -479,10 +479,9 @@
     "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
     "mutes_tab": "Mykistykset",
     "new_email": "Uusi sähköpostiosoite",
-    "notification_setting_follows": "Käyttäjät joita seuraat",
-    "notification_setting_non_follows": "Käyttäjät joita et seuraa",
-    "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
-    "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
+    "notification_setting_from_following": "Käyttäjät joita seuraat",
+    "notification_setting_from_followers": "Käyttäjät jotka seuraavat sinua",
+    "notification_setting_from_strangers": "Käyttäjät jotka eivät seuraa sinua",
     "notification_setting_privacy": "Yksityisyys",
     "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
     "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 31b69a0f..3a750b08 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -320,10 +320,9 @@
     },
     "notifications": "Notifications",
     "notification_setting": "Reçevoir les notifications de :",
-    "notification_setting_follows": "Utilisateurs que vous suivez",
-    "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
-    "notification_setting_followers": "Utilisateurs qui vous suivent",
-    "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas",
+    "notification_setting_from_following": "Utilisateurs que vous suivez",
+    "notification_setting_from_followers": "Utilisateurs qui vous suivent",
+    "notification_setting_from_strangers": "Utilisateurs qui ne vous suivent pas",
     "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.",
     "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.",
     "enable_web_push_notifications": "Activer les notifications de push web",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 6c8be351..9e877389 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -281,10 +281,9 @@
     "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.",
     "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push",
     "notification_setting_privacy": "Privacy",
-    "notification_setting_followers": "Utenti che ti seguono",
-    "notification_setting_non_followers": "Utenti che non ti seguono",
-    "notification_setting_non_follows": "Utenti che non segui",
-    "notification_setting_follows": "Utenti che segui",
+    "notification_setting_from_followers": "Utenti che ti seguono",
+    "notification_setting_from_strangers": "Utenti che non ti seguono",
+    "notification_setting_from_following": "Utenti che segui",
     "notification_setting": "Ricevi notifiche da:",
     "notification_setting_filters": "Filtri",
     "notifications": "Notifiche",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index af728b6e..ce02ea3e 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -385,9 +385,8 @@
         "link": "een leuke kleine link"
       }
     },
-    "notification_setting_follows": "Gebruikers die je volgt",
-    "notification_setting_non_follows": "Gebruikers die je niet volgt",
-    "notification_setting_followers": "Gebruikers die je volgen",
+    "notification_setting_from_following": "Gebruikers die je volgt",
+    "notification_setting_from_followers": "Gebruikers die je volgen",
     "notification_setting_privacy": "Privacy",
     "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
     "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
@@ -464,7 +463,7 @@
     "hide_follows_description": "Niet tonen wie ik volg",
     "show_moderator_badge": "Moderators badge tonen in mijn profiel",
     "notification_setting_filters": "Filters",
-    "notification_setting_non_followers": "Gebruikers die je niet volgen",
+    "notification_setting_from_strangers": "Gebruikers die je niet volgen",
     "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
     "version": {
       "frontend_version": "Frontend Versie",
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 61e09318..d259ecf4 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -406,10 +406,9 @@
     "greentext": "Memiczne strzałki",
     "notifications": "Powiadomienia",
     "notification_setting": "Otrzymuj powiadomienia od:",
-    "notification_setting_follows": "Ludzi których obserwujesz",
-    "notification_setting_non_follows": "Ludzi których nie obserwujesz",
-    "notification_setting_followers": "Ludzi którzy obserwują ciebie",
-    "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
+    "notification_setting_from_following": "Ludzi których obserwujesz",
+    "notification_setting_from_followers": "Ludzi którzy obserwują ciebie",
+    "notification_setting_from_strangers": "Ludzi którzy nie obserwują ciebie",
     "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
     "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
     "enable_web_push_notifications": "Włącz powiadomienia push",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index aa78db26..fabb370e 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -349,12 +349,11 @@
         "link": "ссылка"
       }
     },
-    "notification_setting_non_followers": "Не читающие вас",
+    "notification_setting_from_strangers": "Не читающие вас",
     "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
     "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
-    "notification_setting_followers": "Читающие вас",
-    "notification_setting_follows": "Читаемые вами",
-    "notification_setting_non_follows": "Не читаемые вами"
+    "notification_setting_from_followers": "Читающие вас",
+    "notification_setting_from_following": "Читаемые вами",
   },
   "timeline": {
     "collapse": "Свернуть",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index f95dc498..b95037ac 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -337,10 +337,9 @@
     },
     "notifications": "通知",
     "notification_setting": "通知来源：",
-    "notification_setting_follows": "你所关注的用户",
-    "notification_setting_non_follows": "你没有关注的用户",
-    "notification_setting_followers": "关注你的用户",
-    "notification_setting_non_followers": "没有关注你的用户",
+    "notification_setting_from_following": "你所关注的用户",
+    "notification_setting_from_followers": "关注你的用户",
+    "notification_setting_from_strangers": "没有关注你的用户",
     "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
     "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
     "enable_web_push_notifications": "启用 web 推送通知",

From 44edb730c1e2298a00be0c1a139f80a1335ad7cf Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Jun 2020 14:07:39 +0300
Subject: [PATCH 224/415] rip restyle subject, fix some issues with long
 subject

---
 .../status_content/status_content.js          |   2 +-
 .../status_content/status_content.vue         | 133 +++++++++++-------
 2 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index cfee77a3..66501b3e 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -44,7 +44,7 @@ const StatusContent = {
       return lengthScore > 20
     },
     longSubject () {
-      return this.status.summary.length > 900
+      return this.status.summary.length > 240
     },
     // When a status has a subject and is also tall, we should only have one show more/less button. If the default is to collapse statuses with subjects, we just treat it like a status with a subject; otherwise, we just treat it like a tall status.
     mightHideBecauseSubject () {
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 431661eb..5698b4c0 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -3,16 +3,55 @@
   <div class="status-body">
     <slot name="header" />
     <div
-      v-if="longSubject"
+      v-if="status.summary_html"
+      class="summary-wrapper"
+      :class="{ 'tall-subject': (longSubject && !showingLongSubject) }"
+    >
+      <div
+        class="media-body summary"
+        @click.prevent="linkClicked"
+        v-html="status.summary_html"
+      />
+      <a
+        v-if="longSubject && showingLongSubject"
+        href="#"
+        class="tall-subject-hider"
+        @click.prevent="showingLongSubject=false"
+      >{{ $t("general.show_less") }}</a>
+      <a
+        v-else-if="longSubject"
+        class="tall-subject-hider"
+        :class="{ 'tall-subject-hider_focused': focused }"
+        href="#"
+        @click.prevent="showingLongSubject=true"
+      >
+        {{ $t("general.show_more") }}
+      </a>
+    </div>
+    <div
+      :class="{'tall-status': hideTallStatus}"
       class="status-content-wrapper"
-      :class="{ 'tall-status': !showingLongSubject }"
     >
       <a
-        v-if="!showingLongSubject"
+        v-if="hideTallStatus"
         class="tall-status-hider"
         :class="{ 'tall-status-hider_focused': focused }"
         href="#"
-        @click.prevent="showingLongSubject=true"
+        @click.prevent="toggleShowMore"
+      >
+        {{ $t("general.show_more") }}
+      </a>
+      <div
+        v-if="!hideSubjectStatus"
+        class="status-content media-body"
+        @click.prevent="linkClicked"
+        v-html="postBodyHtml"
+      />
+      <a
+        v-if="hideSubjectStatus"
+        href="#"
+        class="cw-status-hider"
+        @click.prevent="toggleShowMore"
       >
         {{ $t("general.show_more") }}
         <span
@@ -28,48 +67,6 @@
           class="icon-link"
         />
       </a>
-      <div
-        class="status-content media-body"
-        @click.prevent="linkClicked"
-        v-html="postBodyHtml"
-      />
-      <a
-        v-if="showingLongSubject"
-        href="#"
-        class="status-unhider"
-        @click.prevent="showingLongSubject=false"
-      >{{ $t("general.show_less") }}</a>
-    </div>
-    <div
-      v-else
-      :class="{'tall-status': hideTallStatus}"
-      class="status-content-wrapper"
-    >
-      <a
-        v-if="hideTallStatus"
-        class="tall-status-hider"
-        :class="{ 'tall-status-hider_focused': focused }"
-        href="#"
-        @click.prevent="toggleShowMore"
-      >{{ $t("general.show_more") }}</a>
-      <div
-        v-if="status.summary_html"
-        class="status-content media-body summary"
-        @click.prevent="linkClicked"
-        v-html="status.summary_html"
-      />
-      <div
-        v-if="!hideSubjectStatus"
-        class="status-content media-body"
-        @click.prevent="linkClicked"
-        v-html="postBodyHtml"
-      />
-      <a
-        v-if="hideSubjectStatus"
-        href="#"
-        class="cw-status-hider"
-        @click.prevent="toggleShowMore"
-      >{{ $t("general.show_more") }}</a>
       <a
         v-if="showingMore"
         href="#"
@@ -129,6 +126,12 @@ $status-margin: 0.75em;
   flex: 1;
   min-width: 0;
 
+  .status-content-wrapper {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+  }
+
   .tall-status {
     position: relative;
     height: 220px;
@@ -136,7 +139,7 @@ $status-margin: 0.75em;
     overflow-y: hidden;
     z-index: 1;
     .status-content {
-      height: 100%;
+      min-height: 0;
       mask: linear-gradient(to top, white, transparent) bottom/100% 70px no-repeat,
             linear-gradient(to top, white, white);
       /* Autoprefixed seem to ignore this one, and also syntax is different */
@@ -176,15 +179,43 @@ $status-margin: 0.75em;
     }
   }
 
+  .summary-wrapper {
+    margin-bottom: 0.5em;
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    border-color: var(--border, $fallback--border);
+    flex-grow: 0;
+  }
+
+  .summary {
+    font-style: italic;
+    padding-bottom: 0.5em;
+  }
+
+  .tall-subject {
+    position: relative;
+    .summary {
+      max-height: 2em;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+
+  .tall-subject-hider {
+    display: inline-block;
+    word-break: break-all;
+    // position: absolute;
+    width: 100%;
+    text-align: center;
+    padding-bottom: 0.5em;
+  }
+
   .status-content {
     font-family: var(--postFont, sans-serif);
     line-height: 1.4em;
     white-space: pre-wrap;
 
-    &.summary {
-      font-weight: bold;
-    }
-
     blockquote {
       margin: 0.2em 0 0.2em 2em;
       font-style: italic;

From a2c5175d14b322062f8fc07b11a6a45f1d5aba4f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Jun 2020 14:47:02 +0300
Subject: [PATCH 225/415] add basic preloading for nodeinfo/config

---
 src/boot/after_store.js | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0db03547..0c213ea3 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -8,9 +8,34 @@ import backendInteractorService from '../services/backend_interactor_service/bac
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
 
+let staticInitialResults = null
+
+const parsedInitialResults = () => {
+  if (!document.getElementById('initial-results')) {
+    return null
+  }
+  if (!staticInitialResults) {
+    staticInitialResults = JSON.parse(document.getElementById('initial-results').textContent)
+  }
+  return staticInitialResults
+}
+
+const preloadFetch = async (request) => {
+  const data = parsedInitialResults()
+  if (!data || !data[request]) {
+    return window.fetch(request)
+  }
+  const requestJson = atob(data[request])
+  return {
+    ok: true,
+    json: () => JSON.parse(requestJson),
+    text: () => requestJson
+  }
+}
+
 const getStatusnetConfig = async ({ store }) => {
   try {
-    const res = await window.fetch('/api/statusnet/config.json')
+    const res = await preloadFetch('/api/statusnet/config.json')
     if (res.ok) {
       const data = await res.json()
       const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey, safeDMMentionsEnabled } = data.site
@@ -132,7 +157,7 @@ const getTOS = async ({ store }) => {
 
 const getInstancePanel = async ({ store }) => {
   try {
-    const res = await window.fetch('/instance/panel.html')
+    const res = await preloadFetch('/instance/panel.html')
     if (res.ok) {
       const html = await res.text()
       store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
@@ -195,7 +220,7 @@ const resolveStaffAccounts = ({ store, accounts }) => {
 
 const getNodeInfo = async ({ store }) => {
   try {
-    const res = await window.fetch('/nodeinfo/2.0.json')
+    const res = await preloadFetch('/nodeinfo/2.0.json')
     if (res.ok) {
       const data = await res.json()
       const metadata = data.metadata

From 8c3106c588f964a8e26c69784d5808ad1f72625c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Jun 2020 18:20:32 +0300
Subject: [PATCH 226/415] Change the show/hide strings about, remove subjected
 status toggle when 'collapse' option not used

---
 src/components/status_content/status_content.js  |  4 ++--
 src/components/status_content/status_content.vue | 10 ++++++----
 src/i18n/en.json                                 |  6 +++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 66501b3e..09ea3a20 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -48,10 +48,10 @@ const StatusContent = {
     },
     // When a status has a subject and is also tall, we should only have one show more/less button. If the default is to collapse statuses with subjects, we just treat it like a status with a subject; otherwise, we just treat it like a tall status.
     mightHideBecauseSubject () {
-      return this.status.summary && (!this.tallStatus || this.localCollapseSubjectDefault)
+      return !!this.status.summary && this.localCollapseSubjectDefault
     },
     mightHideBecauseTall () {
-      return this.tallStatus && (!this.status.summary || !this.localCollapseSubjectDefault)
+      return this.tallStatus && !(this.status.summary && this.localCollapseSubjectDefault)
     },
     hideSubjectStatus () {
       return this.mightHideBecauseSubject && !this.expandingSubject
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 5698b4c0..3460c2fa 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -17,7 +17,7 @@
         href="#"
         class="tall-subject-hider"
         @click.prevent="showingLongSubject=false"
-      >{{ $t("general.show_less") }}</a>
+      >{{ $t("status.hide_full_subject") }}</a>
       <a
         v-else-if="longSubject"
         class="tall-subject-hider"
@@ -25,7 +25,7 @@
         href="#"
         @click.prevent="showingLongSubject=true"
       >
-        {{ $t("general.show_more") }}
+        {{ $t("status.show_full_subject") }}
       </a>
     </div>
     <div
@@ -53,7 +53,7 @@
         class="cw-status-hider"
         @click.prevent="toggleShowMore"
       >
-        {{ $t("general.show_more") }}
+        {{ $t("status.show_content") }}
         <span
           v-if="hasImageAttachments"
           class="icon-picture"
@@ -72,7 +72,9 @@
         href="#"
         class="status-unhider"
         @click.prevent="toggleShowMore"
-      >{{ $t("general.show_less") }}</a>
+      >
+        {{ tallStatus ? $t("general.show_less") : $t("status.hide_content") }}
+      </a>
     </div>
 
     <div v-if="status.poll && status.poll.options">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index eefe10e5..ede8c3d8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -629,7 +629,11 @@
     "status_unavailable": "Status unavailable",
     "copy_link": "Copy link to status",
     "thread_muted": "Thread muted",
-    "thread_muted_and_words": ", has words:"
+    "thread_muted_and_words": ", has words:",
+    "show_full_subject": "Show full subject",
+    "hide_full_subject": "Hide full subject",
+    "show_content": "Show content",
+    "hide_content": "Hide content"
   },
   "user_card": {
     "approve": "Approve",

From 5321415641d977c40421d11647574fa832e55258 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 26 Jun 2020 16:56:31 -0500
Subject: [PATCH 227/415] Update notification filters to reflect new settings

---
 .../settings_modal/tabs/notifications_tab.vue      | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index 19dedf45..d33e2a04 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -5,16 +5,6 @@
       <div class="select-multiple">
         <span class="label">{{ $t('settings.notification_setting') }}</span>
         <ul class="option-list">
-          <li>
-            <Checkbox v-model="notificationSettings.from_following">
-              {{ $t('settings.notification_setting_from_following') }}
-            </Checkbox>
-          </li>
-          <li>
-            <Checkbox v-model="notificationSettings.from_followers">
-              {{ $t('settings.notification_setting_from_followers') }}
-            </Checkbox>
-          </li>
           <li>
             <Checkbox v-model="notificationSettings.from_strangers">
               {{ $t('settings.notification_setting_from_strangers') }}
@@ -27,8 +17,8 @@
     <div class="setting-item">
       <h2>{{ $t('settings.notification_setting_privacy') }}</h2>
       <p>
-        <Checkbox v-model="notificationSettings.privacy_option">
-          {{ $t('settings.notification_setting_privacy_option') }}
+        <Checkbox v-model="notificationSettings.hide_notification_contents">
+          {{ $t('settings.notification_setting_hide_notification_contents') }}
         </Checkbox>
       </p>
     </div>

From caf9a2a8f642d0991d99dec05822bcc6ddb8796c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 26 Jun 2020 16:56:57 -0500
Subject: [PATCH 228/415] Revert i18n to develop

---
 src/i18n/de.json          | 4 ++--
 src/i18n/en.json          | 7 ++++---
 src/i18n/es.json          | 7 ++++---
 src/i18n/et.json          | 7 ++++---
 src/i18n/eu.json          | 9 +++++----
 src/i18n/fi.json          | 7 ++++---
 src/i18n/fr.json          | 7 ++++---
 src/i18n/it.json          | 7 ++++---
 src/i18n/ja_easy.json     | 7 ++++---
 src/i18n/ja_pedantic.json | 7 ++++---
 src/i18n/nb.json          | 7 ++++---
 src/i18n/nl.json          | 7 ++++---
 src/i18n/oc.json          | 9 +++++----
 src/i18n/pl.json          | 7 ++++---
 src/i18n/ru.json          | 7 ++++---
 src/i18n/zh.json          | 7 ++++---
 16 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/src/i18n/de.json b/src/i18n/de.json
index feb5748f..a44e58cb 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -401,8 +401,8 @@
     "changed_email": "Email Adresse erfolgreich geändert!",
     "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
     "change_email": "Ändere Email",
-    "notification_setting_from_strangers": "Nutzer, die dir nicht folgen",
-    "notification_setting_from_followers": "Nutzer, die dir folgen",
+    "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
+    "notification_setting_followers": "Nutzer, die dir folgen",
     "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
     "accent": "Akzent"
   },
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ea445830..4553d25d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -414,9 +414,10 @@
     "notifications": "Notifications",
     "notification_setting_filters": "Filters",
     "notification_setting": "Receive notifications from:",
-    "notification_setting_from_following": "Users you follow",
-    "notification_setting_from_followers": "Users who follow you",
-    "notification_setting_from_strangers": "Users who do not follow you",
+    "notification_setting_follows": "Users you follow",
+    "notification_setting_non_follows": "Users you do not follow",
+    "notification_setting_followers": "Users who follow you",
+    "notification_setting_non_followers": "Users who do not follow you",
     "notification_setting_privacy": "Privacy",
     "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
     "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index b03d89bd..931d4c64 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -345,9 +345,10 @@
     },
     "notifications": "Notificaciones",
     "notification_setting": "Recibir notificaciones de:",
-    "notification_setting_from_following": "Usuarios que sigues",
-    "notification_setting_from_followers": "Usuarios que te siguen",
-    "notification_setting_from_strangers": "Usuarios que no te siguen",
+    "notification_setting_follows": "Usuarios que sigues",
+    "notification_setting_non_follows": "Usuarios que no sigues",
+    "notification_setting_followers": "Usuarios que te siguen",
+    "notification_setting_non_followers": "Usuarios que no te siguen",
     "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
     "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.",
     "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
diff --git a/src/i18n/et.json b/src/i18n/et.json
index 656dd2f9..b5ae4275 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -308,9 +308,10 @@
     "notifications": "Teated",
     "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.",
     "notification_setting_privacy": "Privaatsus",
-    "notification_setting_from_strangers": "Kasutajatelt, kes sind ei jälgi",
-    "notification_setting_from_followers": "Kasutajatelt, kes jälgivad sind",
-    "notification_setting_from_following": "Kasutajatelt, keda jälgid",
+    "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi",
+    "notification_setting_followers": "Kasutajatelt, kes jälgivad sind",
+    "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi",
+    "notification_setting_follows": "Kasutajatelt, keda jälgid",
     "notification_setting_filters": "Filtrid",
     "greentext": "Meemi nooled",
     "fun": "Naljad",
diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 8484805f..1c75bf75 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -345,9 +345,10 @@
     },
     "notifications": "Jakinarazpenak",
     "notification_setting": "Jaso pertsona honen jakinarazpenak:",
-    "notification_setting_from_following": "Jarraitutako erabiltzaileak",
-    "notification_setting_from_followers": "Zu jarraitzen zaituzten erabiltzaileak",
-    "notification_setting_from_strangers": "Zu jarraitzen ez zaituzten erabiltzaileak",
+    "notification_setting_follows": "Jarraitutako erabiltzaileak",
+    "notification_setting_non_follows": "Jarraitzen ez dituzun erabiltzaileak",
+    "notification_setting_followers": "Zu jarraitzen zaituzten erabiltzaileak",
+    "notification_setting_non_followers": "Zu jarraitzen ez zaituzten erabiltzaileak",
     "notification_mutes": "Erabiltzaile jakin baten jakinarazpenak jasotzeari uzteko, isilarazi ezazu.",
     "notification_blocks": "Erabiltzaile bat blokeatzeak jakinarazpen guztiak gelditzen ditu eta harpidetza ezeztatu.",
     "enable_web_push_notifications": "Gaitu web jakinarazpenak",
@@ -638,4 +639,4 @@
     "password_reset_required": "Pasahitza berrezarri behar duzu saioa hasteko.",
     "password_reset_required_but_mailer_is_disabled": "Pasahitza berrezarri behar duzu, baina pasahitza berrezartzeko aukera desgaituta dago. Mesedez, jarri harremanetan instantziaren administratzailearekin."
   }
-}
+}
\ No newline at end of file
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 920b7cf1..99a1b53a 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -479,9 +479,10 @@
     "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
     "mutes_tab": "Mykistykset",
     "new_email": "Uusi sähköpostiosoite",
-    "notification_setting_from_following": "Käyttäjät joita seuraat",
-    "notification_setting_from_followers": "Käyttäjät jotka seuraavat sinua",
-    "notification_setting_from_strangers": "Käyttäjät jotka eivät seuraa sinua",
+    "notification_setting_follows": "Käyttäjät joita seuraat",
+    "notification_setting_non_follows": "Käyttäjät joita et seuraa",
+    "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
+    "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
     "notification_setting_privacy": "Yksityisyys",
     "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
     "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 3a750b08..31b69a0f 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -320,9 +320,10 @@
     },
     "notifications": "Notifications",
     "notification_setting": "Reçevoir les notifications de :",
-    "notification_setting_from_following": "Utilisateurs que vous suivez",
-    "notification_setting_from_followers": "Utilisateurs qui vous suivent",
-    "notification_setting_from_strangers": "Utilisateurs qui ne vous suivent pas",
+    "notification_setting_follows": "Utilisateurs que vous suivez",
+    "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
+    "notification_setting_followers": "Utilisateurs qui vous suivent",
+    "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas",
     "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.",
     "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.",
     "enable_web_push_notifications": "Activer les notifications de push web",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 9e877389..6c8be351 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -281,9 +281,10 @@
     "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.",
     "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push",
     "notification_setting_privacy": "Privacy",
-    "notification_setting_from_followers": "Utenti che ti seguono",
-    "notification_setting_from_strangers": "Utenti che non ti seguono",
-    "notification_setting_from_following": "Utenti che segui",
+    "notification_setting_followers": "Utenti che ti seguono",
+    "notification_setting_non_followers": "Utenti che non ti seguono",
+    "notification_setting_non_follows": "Utenti che non segui",
+    "notification_setting_follows": "Utenti che segui",
     "notification_setting": "Ricevi notifiche da:",
     "notification_setting_filters": "Filtri",
     "notifications": "Notifiche",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index b547ce6a..978e43b3 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -383,9 +383,10 @@
     "greentext": "ミームやじるし",
     "notifications": "つうち",
     "notification_setting": "つうちをうけとる:",
-    "notification_setting_from_following": "あなたがフォローしているひとから",
-    "notification_setting_from_followers": "あなたをフォローしているひとから",
-    "notification_setting_from_strangers": "あなたをフォローしていないひとから",
+    "notification_setting_follows": "あなたがフォローしているひとから",
+    "notification_setting_non_follows": "あなたがフォローしていないひとから",
+    "notification_setting_followers": "あなたをフォローしているひとから",
+    "notification_setting_non_followers": "あなたをフォローしていないひとから",
     "notification_mutes": "あるユーザーからのつうちをとめるには、ミュートしてください。",
     "notification_blocks": "ブロックしているユーザーからのつうちは、すべてとまります。",
     "enable_web_push_notifications": "ウェブプッシュつうちをゆるす",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 186e3f64..2ca7dca8 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -346,9 +346,10 @@
     },
     "notifications": "通知",
     "notification_setting": "通知を受け取る:",
-    "notification_setting_from_following": "あなたがフォローしているユーザーから",
-    "notification_setting_from_followers": "あなたをフォローしているユーザーから",
-    "notification_setting_from_strangers": "あなたをフォローしていないユーザーから",
+    "notification_setting_follows": "あなたがフォローしているユーザーから",
+    "notification_setting_non_follows": "あなたがフォローしていないユーザーから",
+    "notification_setting_followers": "あなたをフォローしているユーザーから",
+    "notification_setting_non_followers": "あなたをフォローしていないユーザーから",
     "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートしてください。",
     "notification_blocks": "ブロックしているユーザーからの通知は、すべて止まります。",
     "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index 0df14f97..248b05bc 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -331,9 +331,10 @@
     },
     "notifications": "Varsler",
     "notification_setting": "Motta varsler i fra:",
-    "notification_setting_from_following": "Brukere du følger",
-    "notification_setting_from_followers": "Brukere som følger deg",
-    "notification_setting_from_strangers": "Brukere som ikke følger deg",
+    "notification_setting_follows": "Brukere du følger",
+    "notification_setting_non_follows": "Brukere du ikke følger",
+    "notification_setting_followers": "Brukere som følger deg",
+    "notification_setting_non_followers": "Brukere som ikke følger deg",
     "notification_mutes": "For å stoppe å motta varsler i fra en spesifikk bruker, kan du dempe dem.",
     "notification_blocks": "Hvis du blokkerer en bruker vil det stoppe alle varsler og i tilleg få dem til å slutte å følge deg",
     "enable_web_push_notifications": "Skru på pushnotifikasjoner i nettlesere",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index ce02ea3e..af728b6e 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -385,8 +385,9 @@
         "link": "een leuke kleine link"
       }
     },
-    "notification_setting_from_following": "Gebruikers die je volgt",
-    "notification_setting_from_followers": "Gebruikers die je volgen",
+    "notification_setting_follows": "Gebruikers die je volgt",
+    "notification_setting_non_follows": "Gebruikers die je niet volgt",
+    "notification_setting_followers": "Gebruikers die je volgen",
     "notification_setting_privacy": "Privacy",
     "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
     "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
@@ -463,7 +464,7 @@
     "hide_follows_description": "Niet tonen wie ik volg",
     "show_moderator_badge": "Moderators badge tonen in mijn profiel",
     "notification_setting_filters": "Filters",
-    "notification_setting_from_strangers": "Gebruikers die je niet volgen",
+    "notification_setting_non_followers": "Gebruikers die je niet volgen",
     "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
     "version": {
       "frontend_version": "Frontend Versie",
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index 09f64500..680ad6dd 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -289,9 +289,10 @@
     },
     "notifications": "Notificacions",
     "notification_setting": "Recebre las notificacions de :",
-    "notification_setting_from_following": "Utilizaires que seguissètz",
-    "notification_setting_from_followers": "Utilizaires que vos seguisson",
-    "notification_setting_from_strangers": "Utilizaires que vos seguisson pas",
+    "notification_setting_follows": "Utilizaires que seguissètz",
+    "notification_setting_non_follows": "Utilizaires que seguissètz pas",
+    "notification_setting_followers": "Utilizaires que vos seguisson",
+    "notification_setting_non_followers": "Utilizaires que vos seguisson pas",
     "notification_mutes": "Per recebre pas mai d’un utilizaire en particular, botatz-lo en silenci.",
     "notification_blocks": "Blocar un utilizaire arrèsta totas las notificacions tan coma quitar de los seguir.",
     "enable_web_push_notifications": "Activar las notificacions web push",
@@ -549,4 +550,4 @@
     "people_talking": "{count} personas ne parlan",
     "no_results": "Cap de resultats"
   }
-}
+}
\ No newline at end of file
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index d259ecf4..61e09318 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -406,9 +406,10 @@
     "greentext": "Memiczne strzałki",
     "notifications": "Powiadomienia",
     "notification_setting": "Otrzymuj powiadomienia od:",
-    "notification_setting_from_following": "Ludzi których obserwujesz",
-    "notification_setting_from_followers": "Ludzi którzy obserwują ciebie",
-    "notification_setting_from_strangers": "Ludzi którzy nie obserwują ciebie",
+    "notification_setting_follows": "Ludzi których obserwujesz",
+    "notification_setting_non_follows": "Ludzi których nie obserwujesz",
+    "notification_setting_followers": "Ludzi którzy obserwują ciebie",
+    "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
     "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
     "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
     "enable_web_push_notifications": "Włącz powiadomienia push",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index fabb370e..aa78db26 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -349,11 +349,12 @@
         "link": "ссылка"
       }
     },
-    "notification_setting_from_strangers": "Не читающие вас",
+    "notification_setting_non_followers": "Не читающие вас",
     "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
     "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
-    "notification_setting_from_followers": "Читающие вас",
-    "notification_setting_from_following": "Читаемые вами",
+    "notification_setting_followers": "Читающие вас",
+    "notification_setting_follows": "Читаемые вами",
+    "notification_setting_non_follows": "Не читаемые вами"
   },
   "timeline": {
     "collapse": "Свернуть",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index b95037ac..f95dc498 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -337,9 +337,10 @@
     },
     "notifications": "通知",
     "notification_setting": "通知来源：",
-    "notification_setting_from_following": "你所关注的用户",
-    "notification_setting_from_followers": "关注你的用户",
-    "notification_setting_from_strangers": "没有关注你的用户",
+    "notification_setting_follows": "你所关注的用户",
+    "notification_setting_non_follows": "你没有关注的用户",
+    "notification_setting_followers": "关注你的用户",
+    "notification_setting_non_followers": "没有关注你的用户",
     "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
     "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
     "enable_web_push_notifications": "启用 web 推送通知",

From 6606b57f440356be27156a5115ed57373e983df6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 26 Jun 2020 16:59:22 -0500
Subject: [PATCH 229/415] Update english i18n

---
 src/i18n/en.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4553d25d..4a6c94cc 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -413,13 +413,10 @@
     "greentext": "Meme arrows",
     "notifications": "Notifications",
     "notification_setting_filters": "Filters",
-    "notification_setting": "Receive notifications from:",
-    "notification_setting_follows": "Users you follow",
-    "notification_setting_non_follows": "Users you do not follow",
-    "notification_setting_followers": "Users who follow you",
-    "notification_setting_non_followers": "Users who do not follow you",
+    "notification_setting": "Block notifications from:",
+    "notification_setting_block_from_strangers": "Users who you do not follow",
     "notification_setting_privacy": "Privacy",
-    "notification_setting_privacy_option": "Hide the sender and contents of push notifications",
+    "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications",
     "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",

From 2eda3d687e8c986a982057c6f5eb969aa8d403d5 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 26 Jun 2020 17:02:17 -0500
Subject: [PATCH 230/415] Sync up key names properly

---
 src/components/settings_modal/tabs/notifications_tab.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index d33e2a04..eb9d5598 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -6,8 +6,8 @@
         <span class="label">{{ $t('settings.notification_setting') }}</span>
         <ul class="option-list">
           <li>
-            <Checkbox v-model="notificationSettings.from_strangers">
-              {{ $t('settings.notification_setting_from_strangers') }}
+            <Checkbox v-model="notificationSettings.block_from_strangers">
+              {{ $t('settings.notification_setting_block_from_strangers') }}
             </Checkbox>
           </li>
         </ul>

From 4528b31256cc719c4f17ab5103af0d345ba5181a Mon Sep 17 00:00:00 2001
From: translate <jp+translate@supplntr.io>
Date: Sat, 27 Jun 2020 07:21:32 +0000
Subject: [PATCH 231/415] Translated using Weblate (Italian)

Currently translated at 72.7% (452 of 621 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json |  3 ++-
 src/i18n/nl.json | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 6c8be351..7311f0b6 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -255,7 +255,8 @@
         "top_bar": "Barra superiore",
         "panel_header": "Titolo pannello",
         "badge_notification": "Notifica",
-        "popover": "Suggerimenti, menù, sbalzi"
+        "popover": "Suggerimenti, menù, sbalzi",
+        "toggled": "Scambiato"
       },
       "common_colors": {
         "rgbo": "Icone, accenti, medaglie",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index af728b6e..15ce5cbe 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -28,7 +28,12 @@
     "enable": "Inschakelen",
     "confirm": "Bevestigen",
     "verify": "Verifiëren",
-    "generic_error": "Er is een fout opgetreden"
+    "generic_error": "Er is een fout opgetreden",
+    "peek": "Spiek",
+    "close": "Sluiten",
+    "retry": "Opnieuw proberen",
+    "error_retry": "Probeer het opnieuw",
+    "loading": "Laden…"
   },
   "login": {
     "login": "Log in",
@@ -90,7 +95,7 @@
       "text/bbcode": "BBCode"
     },
     "content_warning": "Onderwerp (optioneel)",
-    "default": "Zojuist geland in L.A.",
+    "default": "Tijd voor anime!",
     "direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
     "posting": "Plaatsen",
     "scope": {
@@ -377,7 +382,7 @@
         "button": "Knop",
         "text": "Nog een boel andere {0} en {1}",
         "mono": "inhoud",
-        "input": "Zojuist geland in L.A.",
+        "input": "Tijd voor anime!",
         "faint_link": "handige gebruikershandleiding",
         "fine_print": "Lees onze {0} om niets nuttig te leren!",
         "header_faint": "Alles komt goed",
@@ -451,7 +456,7 @@
     "user_mutes": "Gebruikers",
     "useStreamingApi": "Berichten en meldingen in real-time ontvangen",
     "useStreamingApiWarning": "(Afgeraden, experimenteel, kan berichten overslaan)",
-    "type_domains_to_mute": "Voer domeinen in om te negeren",
+    "type_domains_to_mute": "Zoek domeinen om te negeren",
     "upload_a_photo": "Upload een foto",
     "fun": "Plezier",
     "greentext": "Meme pijlen",
@@ -470,7 +475,8 @@
       "frontend_version": "Frontend Versie",
       "backend_version": "Backend Versie",
       "title": "Versie"
-    }
+    },
+    "mutes_and_blocks": "Negeringen en Blokkades"
   },
   "timeline": {
     "collapse": "Inklappen",
@@ -708,7 +714,9 @@
     "unpin": "Van profiel losmaken",
     "delete": "Status verwijderen",
     "repeats": "Herhalingen",
-    "favorites": "Favorieten"
+    "favorites": "Favorieten",
+    "thread_muted_and_words": ", heeft woorden:",
+    "thread_muted": "Thread genegeerd"
   },
   "time": {
     "years_short": "{0}j",

From 3113d904b921b1258c3709101d7e688767037079 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 27 Jun 2020 10:34:28 +0300
Subject: [PATCH 232/415] update changelog with profile fields

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index feabbf06..887588f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 'Copy link' button for statuses (in the ellipsis menu)
 - Autocomplete domains from list of known instances
 - 'Bot' settings option and badge
+- Added profile meta data fields that can be set in profile settings
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it

From a8cb5e71d9ab3025786838d7123ad676a1e7fb66 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 27 Jun 2020 12:32:01 +0300
Subject: [PATCH 233/415] don't block ui with stickers or tos

---
 src/boot/after_store.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 01074b8c..de7c3ef4 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -340,17 +340,18 @@ const afterStoreSetup = async ({ store, i18n }) => {
   }
 
   // Now we can try getting the server settings and logging in
+  // Most of these are preloaded into the index.html so blocking is minimized
   await Promise.all([
     checkOAuthToken({ store }),
-    getTOS({ store }),
     getInstancePanel({ store }),
-    getStickers({ store }),
     getNodeInfo({ store }),
     getInstanceConfig({ store })
   ])
 
   // Start fetching things that don't need to block the UI
   store.dispatch('fetchMutes')
+  getTOS({ store })
+  getStickers({ store })
 
   const router = new VueRouter({
     mode: 'history',

From 46cf50a4d653b9f9b2b9d3f13d88a7af7b950d18 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 27 Jun 2020 12:59:24 +0300
Subject: [PATCH 234/415] rename variable requestJson when it's not actually
 json

---
 src/boot/after_store.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index de7c3ef4..1796eb1b 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -25,11 +25,11 @@ const preloadFetch = async (request) => {
   if (!data || !data[request]) {
     return window.fetch(request)
   }
-  const requestJson = atob(data[request])
+  const requestData = atob(data[request])
   return {
     ok: true,
-    json: () => JSON.parse(requestJson),
-    text: () => requestJson
+    json: () => JSON.parse(requestData),
+    text: () => requestData
   }
 }
 

From 2c6ec37e6a796d2d7be7be58ac0e3c6c8bbd6a18 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 18 Feb 2019 05:03:26 +0000
Subject: [PATCH 235/415] media description support

---
 src/components/attachment/attachment.vue             | 2 +-
 src/components/media_modal/media_modal.vue           | 2 ++
 src/components/post_status_form/post_status_form.js  | 3 +++
 src/components/post_status_form/post_status_form.vue | 6 ++++++
 src/components/still-image/still-image.js            | 3 ++-
 src/components/still-image/still-image.vue           | 2 ++
 src/i18n/en.json                                     | 1 +
 src/services/api/api.service.js                      | 4 +++-
 src/services/status_poster/status_poster.service.js  | 5 +++--
 9 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index a7e217c1..98f772c0 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -51,7 +51,6 @@
       :class="{'hidden': hidden && preloadImage }"
       :href="attachment.url"
       target="_blank"
-      :title="attachment.description"
       @click="openModal"
     >
       <StillImage
@@ -59,6 +58,7 @@
         :mimetype="attachment.mimetype"
         :src="attachment.large_thumb_url || attachment.url"
         :image-load-handler="onImageLoad"
+        :alt="attachment.description"
       />
     </a>
 
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index 80d2a8b9..d52f00a5 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -8,6 +8,8 @@
       v-if="type === 'image'"
       class="modal-image"
       :src="currentMedia.url"
+      :alt="currentMedia.description"
+      :title="currentMedia.description"
       @touchstart.stop="mediaTouchStart"
       @touchmove.stop="mediaTouchMove"
       @click="hide"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 9027566f..df2999f2 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -78,6 +78,7 @@ const PostStatusForm = {
         nsfw: false,
         files: [],
         poll: {},
+        mediaDescriptions: {},
         visibility: scope,
         contentType
       },
@@ -190,6 +191,7 @@ const PostStatusForm = {
         visibility: newStatus.visibility,
         sensitive: newStatus.nsfw,
         media: newStatus.files,
+        mediaDescriptions: newStatus.mediaDescriptions || {},
         store: this.$store,
         inReplyToStatusId: this.replyTo,
         contentType: newStatus.contentType,
@@ -200,6 +202,7 @@ const PostStatusForm = {
             status: '',
             spoilerText: '',
             files: [],
+            mediaDescriptions: {},
             visibility: newStatus.visibility,
             contentType: newStatus.contentType,
             poll: {}
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index e3d8d087..551df948 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -266,6 +266,7 @@
               :href="file.url"
             >{{ file.url }}</a>
           </div>
+          <input type="text" :placeholder="$t('post_status.media_description')" v-model="newStatus.mediaDescriptions[file.id]"></input>
         </div>
       </div>
       <div
@@ -399,6 +400,11 @@
       border-bottom-left-radius: 0;
       border-bottom-right-radius: 0;
     }
+
+    input {
+      min-width: 300px;
+      flex: 1;
+    }
   }
 
   .status-input-wrapper {
diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js
index e48fef47..ab40bbd7 100644
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@@ -4,7 +4,8 @@ const StillImage = {
     'referrerpolicy',
     'mimetype',
     'imageLoadError',
-    'imageLoadHandler'
+    'imageLoadHandler',
+    'alt'
   ],
   data () {
     return {
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index f2ddeb7b..9130ec98 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -10,6 +10,8 @@
     <!-- NOTE: key is required to force to re-render img tag when src is changed -->
     <img
       ref="src"
+      :alt="alt"
+      :title="alt"
       :key="src"
       :src="src"
       :referrerpolicy="referrerpolicy"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 2840904f..a0b70572 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -174,6 +174,7 @@
     "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
     "account_not_locked_warning_link": "locked",
     "attachments_sensitive": "Mark attachments as sensitive",
+    "media_description": "Media description",
     "content_type": {
       "text/plain": "Plain text",
       "text/html": "HTML",
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index dfffc291..cb205e3f 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -617,7 +617,8 @@ const postStatus = ({
   poll,
   mediaIds = [],
   inReplyToStatusId,
-  contentType
+  contentType,
+  mediaDescriptions
 }) => {
   const form = new FormData()
   const pollOptions = poll.options || []
@@ -644,6 +645,7 @@ const postStatus = ({
       form.append('poll[options][]', option)
     })
   }
+  form.append('descriptions', JSON.stringify(mediaDescriptions))
   if (inReplyToStatusId) {
     form.append('in_reply_to_id', inReplyToStatusId)
   }
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 9e904d3a..090ff673 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -1,7 +1,7 @@
 import { map } from 'lodash'
 import apiService from '../api/api.service.js'
 
-const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, media = [], inReplyToStatusId = undefined, contentType = 'text/plain' }) => {
+const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, media = [], inReplyToStatusId = undefined, contentType = 'text/plain', mediaDescriptions = {} }) => {
   const mediaIds = map(media, 'id')
 
   return apiService.postStatus({
@@ -13,7 +13,8 @@ const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, m
     mediaIds,
     inReplyToStatusId,
     contentType,
-    poll })
+    poll,
+    mediaDescriptions })
     .then((data) => {
       if (!data.error) {
         store.dispatch('addNewStatuses', {

From 1ff55e17b1931f0578458256f4ca912e3c50e0cc Mon Sep 17 00:00:00 2001
From: xenofem <xenofem@xeno.science>
Date: Sun, 28 Jun 2020 02:16:58 -0400
Subject: [PATCH 236/415] fix invalid end tag on input element

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 551df948..6eefc853 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -266,7 +266,7 @@
               :href="file.url"
             >{{ file.url }}</a>
           </div>
-          <input type="text" :placeholder="$t('post_status.media_description')" v-model="newStatus.mediaDescriptions[file.id]"></input>
+          <input type="text" :placeholder="$t('post_status.media_description')" v-model="newStatus.mediaDescriptions[file.id]">
         </div>
       </div>
       <div

From 195e83d0c8ab660a1dd6b29137295c2a6a36dca9 Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Sat, 27 Jun 2020 15:04:52 +0000
Subject: [PATCH 237/415] Translated using Weblate (Dutch)

Currently translated at 100.0% (626 of 626 strings)

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

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 15ce5cbe..bf270f87 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -476,7 +476,14 @@
       "backend_version": "Backend Versie",
       "title": "Versie"
     },
-    "mutes_and_blocks": "Negeringen en Blokkades"
+    "mutes_and_blocks": "Negeringen en Blokkades",
+    "profile_fields": {
+      "value": "Inhoud",
+      "name": "Label",
+      "add_field": "Veld Toevoegen",
+      "label": "Profiel metadata"
+    },
+    "bot": "Dit is een bot account"
   },
   "timeline": {
     "collapse": "Inklappen",

From 03aa1f315406a238eb1cea6b9cc64abf1567b978 Mon Sep 17 00:00:00 2001
From: xenofem <xenofem@xeno.science>
Date: Sun, 28 Jun 2020 02:31:57 -0400
Subject: [PATCH 238/415] fix vue style warnings

---
 src/components/post_status_form/post_status_form.vue | 6 +++++-
 src/components/still-image/still-image.vue           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 6eefc853..49291455 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -266,7 +266,11 @@
               :href="file.url"
             >{{ file.url }}</a>
           </div>
-          <input type="text" :placeholder="$t('post_status.media_description')" v-model="newStatus.mediaDescriptions[file.id]">
+          <input
+            v-model="newStatus.mediaDescriptions[file.id]"
+            type="text"
+            :placeholder="$t('post_status.media_description')"
+          >
         </div>
       </div>
       <div
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 9130ec98..2ebf33ba 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -10,9 +10,9 @@
     <!-- NOTE: key is required to force to re-render img tag when src is changed -->
     <img
       ref="src"
+      :key="src"
       :alt="alt"
       :title="alt"
-      :key="src"
       :src="src"
       :referrerpolicy="referrerpolicy"
       @load="onLoad"

From 223fabfe90512122ee9d51c22deb01241ba931cd Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 12:16:41 +0300
Subject: [PATCH 239/415] add rich text preview

---
 .../post_status_form/post_status_form.js      |  52 +++++++-
 .../post_status_form/post_status_form.vue     | 113 ++++++++++++++++--
 src/i18n/en.json                              |   5 +-
 src/services/api/api.service.js               |  14 +--
 .../status_poster/status_poster.service.js    |  19 ++-
 5 files changed, 180 insertions(+), 23 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 9027566f..3f7e36a6 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -3,6 +3,7 @@ import MediaUpload from '../media_upload/media_upload.vue'
 import ScopeSelector from '../scope_selector/scope_selector.vue'
 import EmojiInput from '../emoji_input/emoji_input.vue'
 import PollForm from '../poll/poll_form.vue'
+import StatusContent from '../status_content/status_content.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 import { reject, map, uniqBy } from 'lodash'
@@ -38,7 +39,8 @@ const PostStatusForm = {
     EmojiInput,
     PollForm,
     ScopeSelector,
-    Checkbox
+    Checkbox,
+    StatusContent
   },
   mounted () {
     this.resize(this.$refs.textarea)
@@ -84,7 +86,9 @@ const PostStatusForm = {
       caret: 0,
       pollFormVisible: false,
       showDropIcon: 'hide',
-      dropStopTimeout: null
+      dropStopTimeout: null,
+      preview: null,
+      previewLoading: false
     }
   },
   computed: {
@@ -163,8 +167,20 @@ const PostStatusForm = {
         this.newStatus.poll &&
         this.newStatus.poll.error
     },
+    showPreview () {
+      return !!this.preview || this.previewLoading
+    },
     ...mapGetters(['mergedConfig'])
   },
+  watch: {
+    'newStatus.contentType': function (newType) {
+      if (newType === 'text/plain') {
+        this.closePreview()
+      } else if (this.preview) {
+        this.previewStatus(this.newStatus)
+      }
+    }
+  },
   methods: {
     postStatus (newStatus) {
       if (this.posting) { return }
@@ -218,6 +234,38 @@ const PostStatusForm = {
         this.posting = false
       })
     },
+    previewStatus (newStatus) {
+      this.previewLoading = true
+      statusPoster.postStatus({
+        status: newStatus.status,
+        spoilerText: newStatus.spoilerText || null,
+        visibility: newStatus.visibility,
+        sensitive: newStatus.nsfw,
+        media: newStatus.files,
+        store: this.$store,
+        inReplyToStatusId: this.replyTo,
+        contentType: newStatus.contentType,
+        poll: {},
+        preview: true
+      }).then((data) => {
+        // Don't apply preview if not loading, because it means
+        // user has closed the preview manually.
+        if (!this.previewLoading) return
+        if (!data.error) {
+          this.preview = data
+        } else {
+          this.preview = { error: data.error }
+        }
+      }).catch((error) => {
+        this.preview = { error }
+      }).finally(() => {
+        this.previewLoading = false
+      })
+    },
+    closePreview () {
+      this.preview = null
+      this.previewLoading = false
+    },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
     },
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index e3d8d087..9931f5ca 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -16,6 +16,58 @@
         @drop.stop="fileDrop"
       />
       <div class="form-group">
+        <a
+          v-if="newStatus.contentType !== 'text/plain' && !showPreview"
+          class="preview-start faint"
+          type="button"
+          @click.stop.prevent="previewStatus(newStatus)"
+        >
+          {{ $t('status.preview') }}
+        </a>
+        <div
+          v-if="showPreview && newStatus.contentType !== 'text/plain'"
+          class="preview-container"
+        >
+          <span class="preview-heading">
+            <span class="faint preview-title">
+              {{ $t('status.status_preview') }}
+            </span>
+            <i
+              v-if="previewLoading"
+              class="icon-spin3 animate-spin"
+            />
+            <a
+              v-else
+              class="faint preview-update"
+              @click.stop.prevent="previewStatus(newStatus)"
+            >
+              {{ $t('status.preview_update') }}
+            </a>
+            <a
+              class="preview-close"
+              @click.stop.prevent="closePreview"
+            >
+              <i class="icon-cancel" />
+            </a>
+          </span>
+          <div
+            v-if="!preview"
+            class="preview-status"
+          >
+            {{ $t('general.loading') }}
+          </div>
+          <div
+            v-else-if="preview.error"
+            class="preview-status preview-error"
+          >
+            {{ preview.error }}
+          </div>
+          <StatusContent
+            v-else
+            :status="preview"
+            class="preview-status"
+          />
+        </div>
         <i18n
           v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private'"
           path="post_status.account_not_locked_warning"
@@ -77,7 +129,6 @@
           class="form-control"
         >
           <input
-
             v-model="newStatus.spoilerText"
             type="text"
             :placeholder="$t('post_status.content_warning')"
@@ -302,14 +353,6 @@
   }
 }
 
-.post-status-form {
-  .visibility-tray {
-    display: flex;
-    justify-content: space-between;
-    padding-top: 5px;
-  }
-}
-
 .post-status-form {
   .form-bottom {
     display: flex;
@@ -336,6 +379,52 @@
     max-width: 10em;
   }
 
+  .preview-start {
+    margin-left: auto;
+    cursor: pointer;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  .preview-container {
+    margin-bottom: 1em;
+  }
+
+  .preview-heading {
+    display: flex;
+    width: 100%;
+  }
+
+  .preview-title {
+    flex-grow: 1;
+  }
+
+  .preview-close {
+    margin-left: 0.5em;
+  }
+
+  .preview-update {
+    cursor: pointer;
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  .preview-error {
+    color: $fallback--faint;
+    color: var(--faint, $fallback--faint);
+    font-style: italic;
+  }
+
+  .preview-status {
+    border: 1px solid $fallback--border;
+    border: 1px solid var(--border, $fallback--border);
+    border-radius: $fallback--tooltipRadius;
+    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+    padding: 0.5em;
+  }
+
   .text-format {
     .only-format {
       color: $fallback--faint;
@@ -343,6 +432,12 @@
     }
   }
 
+  .visibility-tray {
+    display: flex;
+    justify-content: space-between;
+    padding-top: 5px;
+  }
+
   .media-upload-icon, .poll-icon, .emoji-icon {
     font-size: 26px;
     flex: 1;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 2840904f..7b884c7c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -636,7 +636,10 @@
     "status_unavailable": "Status unavailable",
     "copy_link": "Copy link to status",
     "thread_muted": "Thread muted",
-    "thread_muted_and_words": ", has words:"
+    "thread_muted_and_words": ", has words:",
+    "preview": "Preview",
+    "status_preview": "Status preview",
+    "preview_update": "Update"
   },
   "user_card": {
     "approve": "Approve",
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index dfffc291..2f579ed2 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -617,7 +617,8 @@ const postStatus = ({
   poll,
   mediaIds = [],
   inReplyToStatusId,
-  contentType
+  contentType,
+  preview
 }) => {
   const form = new FormData()
   const pollOptions = poll.options || []
@@ -647,6 +648,9 @@ const postStatus = ({
   if (inReplyToStatusId) {
     form.append('in_reply_to_id', inReplyToStatusId)
   }
+  if (preview) {
+    form.append('preview', 'true')
+  }
 
   return fetch(MASTODON_POST_STATUS_URL, {
     body: form,
@@ -654,13 +658,7 @@ const postStatus = ({
     headers: authHeaders(credentials)
   })
     .then((response) => {
-      if (response.ok) {
-        return response.json()
-      } else {
-        return {
-          error: response
-        }
-      }
+      return response.json()
     })
     .then((data) => data.error ? data : parseStatus(data))
 }
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 9e904d3a..86fc5601 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -1,7 +1,18 @@
 import { map } from 'lodash'
 import apiService from '../api/api.service.js'
 
-const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, media = [], inReplyToStatusId = undefined, contentType = 'text/plain' }) => {
+const postStatus = ({
+  store,
+  status,
+  spoilerText,
+  visibility,
+  sensitive,
+  poll,
+  media = [],
+  inReplyToStatusId = undefined,
+  contentType = 'text/plain',
+  preview = false
+}) => {
   const mediaIds = map(media, 'id')
 
   return apiService.postStatus({
@@ -13,9 +24,11 @@ const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, m
     mediaIds,
     inReplyToStatusId,
     contentType,
-    poll })
+    poll,
+    preview
+  })
     .then((data) => {
-      if (!data.error) {
+      if (!data.error && !preview) {
         store.dispatch('addNewStatuses', {
           statuses: [data],
           timeline: 'friends',

From 3d5da3caf99e4a81e1837ecf2c7dc94defbfb569 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 12:35:05 +0300
Subject: [PATCH 240/415] update styles in preview heading

---
 .../post_status_form/post_status_form.vue        | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 9931f5ca..848d6af7 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -18,7 +18,7 @@
       <div class="form-group">
         <a
           v-if="newStatus.contentType !== 'text/plain' && !showPreview"
-          class="preview-start faint"
+          class="preview-start"
           type="button"
           @click.stop.prevent="previewStatus(newStatus)"
         >
@@ -29,7 +29,7 @@
           class="preview-container"
         >
           <span class="preview-heading">
-            <span class="faint preview-title">
+            <span class="preview-title">
               {{ $t('status.status_preview') }}
             </span>
             <i
@@ -38,7 +38,7 @@
             />
             <a
               v-else
-              class="faint preview-update"
+              class="preview-update"
               @click.stop.prevent="previewStatus(newStatus)"
             >
               {{ $t('status.preview_update') }}
@@ -382,9 +382,6 @@
   .preview-start {
     margin-left: auto;
     cursor: pointer;
-    &:hover {
-      text-decoration: underline;
-    }
   }
 
   .preview-container {
@@ -394,6 +391,8 @@
   .preview-heading {
     display: flex;
     width: 100%;
+    color: $fallback--faint;
+    color: var(--faint, $fallback--faint);
   }
 
   .preview-title {
@@ -406,15 +405,12 @@
 
   .preview-update {
     cursor: pointer;
-    &:hover {
-      text-decoration: underline;
-    }
   }
 
   .preview-error {
+    font-style: italic;
     color: $fallback--faint;
     color: var(--faint, $fallback--faint);
-    font-style: italic;
   }
 
   .preview-status {

From 9d6f2332024a86a6d51ec92fd2fb77e27f749fd1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 12:48:17 +0300
Subject: [PATCH 241/415] fix preview attachments getting wrong styles

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 848d6af7..31fac47b 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -499,7 +499,7 @@
     flex-direction: column;
   }
 
-  .attachments {
+  .media-upload-wrapper .attachments {
     padding: 0 0.5em;
 
     .attachment {

From cecf3d4f8999d247378bfb4ee444348d5d4eba0a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 13:03:25 +0300
Subject: [PATCH 242/415] remove unnecessary type=button

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 31fac47b..f1455cfd 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -19,7 +19,6 @@
         <a
           v-if="newStatus.contentType !== 'text/plain' && !showPreview"
           class="preview-start"
-          type="button"
           @click.stop.prevent="previewStatus(newStatus)"
         >
           {{ $t('status.preview') }}

From 6e2de2036755287de0a6123236644842a91b9fea Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 13:17:04 +0300
Subject: [PATCH 243/415] show preview with plaintext too

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index f1455cfd..0bee8bb5 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -17,14 +17,14 @@
       />
       <div class="form-group">
         <a
-          v-if="newStatus.contentType !== 'text/plain' && !showPreview"
+          v-if="!showPreview"
           class="preview-start"
           @click.stop.prevent="previewStatus(newStatus)"
         >
           {{ $t('status.preview') }}
         </a>
         <div
-          v-if="showPreview && newStatus.contentType !== 'text/plain'"
+          v-else
           class="preview-container"
         >
           <span class="preview-heading">

From 0287d5c07e28f54be09825dcc5280dbef1c740c2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 13:29:07 +0300
Subject: [PATCH 244/415] update changelog with status previews

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 887588f3..feaa354d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Autocomplete domains from list of known instances
 - 'Bot' settings option and badge
 - Added profile meta data fields that can be set in profile settings
+- Added status preview option to preview your statuses before posting
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it

From 3c47036101c4767b4e2fb316d9ea35535197af79 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 15:14:01 +0300
Subject: [PATCH 245/415] add automatic updating

---
 .../post_status_form/post_status_form.js           | 14 +++++++++++++-
 .../post_status_form/post_status_form.vue          |  7 -------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3f7e36a6..75b02ffb 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -6,7 +6,7 @@ import PollForm from '../poll/poll_form.vue'
 import StatusContent from '../status_content/status_content.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
-import { reject, map, uniqBy } from 'lodash'
+import { reject, map, uniqBy, debounce } from 'lodash'
 import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
@@ -228,6 +228,7 @@ const PostStatusForm = {
           el.style.height = 'auto'
           el.style.height = undefined
           this.error = null
+          this.closePreview()
         } else {
           this.error = data.error
         }
@@ -262,16 +263,25 @@ const PostStatusForm = {
         this.previewLoading = false
       })
     },
+    debouncePreviewStatus: debounce(function (newStatus) {
+      this.previewStatus(newStatus)
+    }, 750),
+    autoPreview () {
+      this.previewLoading = true
+      this.debouncePreviewStatus(this.newStatus)
+    },
     closePreview () {
       this.preview = null
       this.previewLoading = false
     },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
+      this.autoPreview()
     },
     removeMediaFile (fileInfo) {
       let index = this.newStatus.files.indexOf(fileInfo)
       this.newStatus.files.splice(index, 1)
+      this.autoPreview()
     },
     uploadFailed (errString, templateArgs) {
       templateArgs = templateArgs || {}
@@ -287,6 +297,7 @@ const PostStatusForm = {
       return fileTypeService.fileType(fileInfo.mimetype)
     },
     paste (e) {
+      this.autoPreview()
       this.resize(e)
       if (e.clipboardData.files.length > 0) {
         // prevent pasting of file as text
@@ -321,6 +332,7 @@ const PostStatusForm = {
       }
     },
     onEmojiInputInput (e) {
+      this.autoPreview()
       this.$nextTick(() => {
         this.resize(this.$refs['textarea'])
       })
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 0bee8bb5..31a4b388 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -35,13 +35,6 @@
               v-if="previewLoading"
               class="icon-spin3 animate-spin"
             />
-            <a
-              v-else
-              class="preview-update"
-              @click.stop.prevent="previewStatus(newStatus)"
-            >
-              {{ $t('status.preview_update') }}
-            </a>
             <a
               class="preview-close"
               @click.stop.prevent="closePreview"

From ed5b36f751e0799b5e56fd21f4e28cd5aaea8d53 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 15:43:08 +0300
Subject: [PATCH 246/415] make line sizes match for errors/loading and
 statuses, make X hitbox bigger, remove attachments, add shorter custom
 message for empty status preview. fix auto update triggering

---
 .../post_status_form/post_status_form.js      | 23 +++++++++++--------
 .../post_status_form/post_status_form.vue     | 16 +++++--------
 src/i18n/en.json                              |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 75b02ffb..bb5dbf97 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -170,6 +170,9 @@ const PostStatusForm = {
     showPreview () {
       return !!this.preview || this.previewLoading
     },
+    emptyStatus () {
+      return this.newStatus.status === '' && this.newStatus.files.length === 0
+    },
     ...mapGetters(['mergedConfig'])
   },
   watch: {
@@ -185,12 +188,9 @@ const PostStatusForm = {
     postStatus (newStatus) {
       if (this.posting) { return }
       if (this.submitDisabled) { return }
-
-      if (this.newStatus.status === '') {
-        if (this.newStatus.files.length === 0) {
-          this.error = 'Cannot post an empty status with no files'
-          return
-        }
+      if (this.emptyStatus) {
+        this.error = 'Cannot post an empty status with no files'
+        return
       }
 
       const poll = this.pollFormVisible ? this.newStatus.poll : {}
@@ -236,13 +236,19 @@ const PostStatusForm = {
       })
     },
     previewStatus (newStatus) {
+      if (this.emptyStatus) {
+        this.preview = { error: this.$t('status.preview_empty') }
+        this.previewLoading = false
+        return
+      }
+
       this.previewLoading = true
       statusPoster.postStatus({
         status: newStatus.status,
         spoilerText: newStatus.spoilerText || null,
         visibility: newStatus.visibility,
         sensitive: newStatus.nsfw,
-        media: newStatus.files,
+        media: [],
         store: this.$store,
         inReplyToStatusId: this.replyTo,
         contentType: newStatus.contentType,
@@ -267,6 +273,7 @@ const PostStatusForm = {
       this.previewStatus(newStatus)
     }, 750),
     autoPreview () {
+      if (!this.preview) return
       this.previewLoading = true
       this.debouncePreviewStatus(this.newStatus)
     },
@@ -276,12 +283,10 @@ const PostStatusForm = {
     },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
-      this.autoPreview()
     },
     removeMediaFile (fileInfo) {
       let index = this.newStatus.files.indexOf(fileInfo)
       this.newStatus.files.splice(index, 1)
-      this.autoPreview()
     },
     uploadFailed (errString, templateArgs) {
       templateArgs = templateArgs || {}
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 31a4b388..8201911e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -35,12 +35,10 @@
               v-if="previewLoading"
               class="icon-spin3 animate-spin"
             />
-            <a
-              class="preview-close"
+            <i
+              class="preview-close icon-cancel"
               @click.stop.prevent="closePreview"
-            >
-              <i class="icon-cancel" />
-            </a>
+            />
           </span>
           <div
             v-if="!preview"
@@ -392,11 +390,7 @@
   }
 
   .preview-close {
-    margin-left: 0.5em;
-  }
-
-  .preview-update {
-    cursor: pointer;
+    padding-left: 0.5em;
   }
 
   .preview-error {
@@ -411,6 +405,8 @@
     border-radius: $fallback--tooltipRadius;
     border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
     padding: 0.5em;
+    margin: 0;
+    line-height: 1.4em;
   }
 
   .text-format {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7b884c7c..44afb59c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -639,7 +639,7 @@
     "thread_muted_and_words": ", has words:",
     "preview": "Preview",
     "status_preview": "Status preview",
-    "preview_update": "Update"
+    "preview_empty": "Empty"
   },
   "user_card": {
     "approve": "Approve",

From 61f34ff361a24a287ac0bf0c79fd2f77b4f2b708 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 28 Jun 2020 16:40:39 +0300
Subject: [PATCH 247/415] remove panel-footer in userpanel, simplify preview
 header, fix word-wrap in preview

---
 .../post_status_form/post_status_form.js      | 17 +++--
 .../post_status_form/post_status_form.vue     | 74 +++++++++----------
 src/components/status/status.vue              |  3 -
 .../status_content/status_content.vue         |  3 +
 src/components/user_panel/user_panel.vue      |  4 +-
 src/i18n/en.json                              |  1 -
 6 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index bb5dbf97..732691e7 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -235,13 +235,13 @@ const PostStatusForm = {
         this.posting = false
       })
     },
-    previewStatus (newStatus) {
+    previewStatus () {
       if (this.emptyStatus) {
         this.preview = { error: this.$t('status.preview_empty') }
         this.previewLoading = false
         return
       }
-
+      const newStatus = this.newStatus
       this.previewLoading = true
       statusPoster.postStatus({
         status: newStatus.status,
@@ -269,18 +269,23 @@ const PostStatusForm = {
         this.previewLoading = false
       })
     },
-    debouncePreviewStatus: debounce(function (newStatus) {
-      this.previewStatus(newStatus)
-    }, 750),
+    debouncePreviewStatus: debounce(function () { this.previewStatus() }, 750),
     autoPreview () {
       if (!this.preview) return
       this.previewLoading = true
-      this.debouncePreviewStatus(this.newStatus)
+      this.debouncePreviewStatus()
     },
     closePreview () {
       this.preview = null
       this.previewLoading = false
     },
+    togglePreview () {
+      if (this.showPreview) {
+        this.closePreview()
+      } else {
+        this.previewStatus()
+      }
+    },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
     },
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 8201911e..0cebd36e 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -16,30 +16,26 @@
         @drop.stop="fileDrop"
       />
       <div class="form-group">
-        <a
-          v-if="!showPreview"
-          class="preview-start"
-          @click.stop.prevent="previewStatus(newStatus)"
-        >
-          {{ $t('status.preview') }}
-        </a>
+        <div class="preview-heading faint">
+          <a
+            class="preview-toggle faint"
+            @click.stop.prevent="togglePreview"
+          >
+            {{ $t('status.preview') }}
+            <i
+              class="icon-down-open"
+              :style="{ transform: showPreview ? 'rotate(0deg)' : 'rotate(-90deg)' }"
+            />
+          </a>
+          <i
+            v-show="previewLoading"
+            class="icon-spin3 animate-spin"
+          />
+        </div>
         <div
-          v-else
+          v-if="showPreview"
           class="preview-container"
         >
-          <span class="preview-heading">
-            <span class="preview-title">
-              {{ $t('status.status_preview') }}
-            </span>
-            <i
-              v-if="previewLoading"
-              class="icon-spin3 animate-spin"
-            />
-            <i
-              class="preview-close icon-cancel"
-              @click.stop.prevent="closePreview"
-            />
-          </span>
           <div
             v-if="!preview"
             class="preview-status"
@@ -369,30 +365,32 @@
     max-width: 10em;
   }
 
-  .preview-start {
-    margin-left: auto;
+  .preview-heading {
+    display: flex;
+    width: 100%;
+
+    .icon-spin3 {
+      margin-left: auto;
+    }
+  }
+
+  .preview-toggle {
+    display: flex;
     cursor: pointer;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  .icon-down-open {
+    transition: transform 0.1s;
   }
 
   .preview-container {
     margin-bottom: 1em;
   }
 
-  .preview-heading {
-    display: flex;
-    width: 100%;
-    color: $fallback--faint;
-    color: var(--faint, $fallback--faint);
-  }
-
-  .preview-title {
-    flex-grow: 1;
-  }
-
-  .preview-close {
-    padding-left: 0.5em;
-  }
-
   .preview-error {
     font-style: italic;
     color: $fallback--faint;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 7ec29b28..1c36d883 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -372,9 +372,6 @@ $status-margin: 0.75em;
 }
 
 .status-el {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  word-break: break-word;
   border-left-width: 0px;
   min-width: 0;
   border-color: $fallback--border;
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index efc2485e..373802af 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -180,6 +180,9 @@ $status-margin: 0.75em;
     font-family: var(--postFont, sans-serif);
     line-height: 1.4em;
     white-space: pre-wrap;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    word-break: break-word;
 
     blockquote {
       margin: 0.2em 0 0.2em 2em;
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 1db4f648..5685916a 100644
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@@ -10,9 +10,7 @@
         :hide-bio="true"
         rounded="top"
       />
-      <div class="panel-footer">
-        <PostStatusForm />
-      </div>
+      <PostStatusForm />
     </div>
     <auth-form
       v-else
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 44afb59c..21df3e73 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -638,7 +638,6 @@
     "thread_muted": "Thread muted",
     "thread_muted_and_words": ", has words:",
     "preview": "Preview",
-    "status_preview": "Status preview",
     "preview_empty": "Empty"
   },
   "user_card": {

From 529d72c2970a7eff46cc83e9a8465d8eec8a5dec Mon Sep 17 00:00:00 2001
From: xenofem <xenofem@xeno.science>
Date: Sun, 28 Jun 2020 16:05:22 -0400
Subject: [PATCH 248/415] suppress enter key on media description input field

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 49291455..76fa30d8 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -270,6 +270,7 @@
             v-model="newStatus.mediaDescriptions[file.id]"
             type="text"
             :placeholder="$t('post_status.media_description')"
+            @keydown.enter.prevent=""
           >
         </div>
       </div>

From 96d2c86d3bc1c26da2ca46ec04fb27a9de348e47 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 29 Jun 2020 14:48:22 +0300
Subject: [PATCH 249/415] change placeholders to use descriptions, use icons
 with placeholders, change uploads to use attachment component

---
 src/components/attachment/attachment.js       | 28 ++++++---
 src/components/attachment/attachment.vue      | 28 +++++----
 src/components/media_modal/media_modal.vue    |  8 +++
 .../post_status_form/post_status_form.js      |  4 +-
 .../post_status_form/post_status_form.vue     | 60 ++++++-------------
 .../video_attachment/video_attachment.vue     |  2 +
 src/modules/media_viewer.js                   |  2 +-
 static/fontello.json                          |  6 ++
 8 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index b832e10f..561a5a98 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -8,7 +8,6 @@ const Attachment = {
   props: [
     'attachment',
     'nsfw',
-    'statusId',
     'size',
     'allowPlay',
     'setMedia',
@@ -30,9 +29,21 @@ const Attachment = {
     VideoAttachment
   },
   computed: {
-    usePlaceHolder () {
+    usePlaceholder () {
       return this.size === 'hide' || this.type === 'unknown'
     },
+    placeholderName () {
+      if (this.attachment.description === '' || !this.attachment.description) {
+        return this.type.toUpperCase()
+      }
+      return this.attachment.description
+    },
+    placeholderIconClass () {
+      if (this.type === 'image') return 'icon-picture'
+      if (this.type === 'video') return 'icon-video'
+      if (this.type === 'audio') return 'icon-music'
+      return 'icon-link'
+    },
     referrerpolicy () {
       return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer'
     },
@@ -51,6 +62,12 @@ const Attachment = {
     fullwidth () {
       return this.type === 'html' || this.type === 'audio'
     },
+    useModal () {
+      return this.size === 'hide' ? ['image', 'video', 'audio']
+        : this.mergedConfig.playVideosInModal
+          ? ['image', 'video']
+          : ['image']
+    },
     ...mapGetters(['mergedConfig'])
   },
   methods: {
@@ -60,12 +77,7 @@ const Attachment = {
       }
     },
     openModal (event) {
-      const modalTypes = this.mergedConfig.playVideosInModal
-        ? ['image', 'video']
-        : ['image']
-      if (fileTypeService.fileMatchesSomeType(modalTypes, this.attachment) ||
-        this.usePlaceHolder
-      ) {
+      if (this.useModal) {
         event.stopPropagation()
         event.preventDefault()
         this.setMedia()
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 98f772c0..a18bf186 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="usePlaceHolder"
+    v-if="usePlaceholder"
     @click="openModal"
   >
     <a
@@ -8,8 +8,11 @@
       class="placeholder"
       target="_blank"
       :href="attachment.url"
+      :alt="attachment.description"
+      :title="attachment.description"
     >
-      [{{ nsfw ? "NSFW/" : "" }}{{ type.toUpperCase() }}]
+      <span :class="placeholderIconClass" />
+      <b>{{ nsfw ? "NSFW / " : "" }}</b>{{ placeholderName }}
     </a>
   </div>
   <div
@@ -22,6 +25,8 @@
       v-if="hidden"
       class="image-attachment"
       :href="attachment.url"
+      :alt="attachment.description"
+      :title="attachment.description"
       @click.prevent="toggleHidden"
     >
       <img
@@ -83,6 +88,8 @@
     <audio
       v-if="type === 'audio'"
       :src="attachment.url"
+      :alt="attachment.description"
+      :title="attachment.description"
       controls
     />
 
@@ -116,22 +123,19 @@
   display: flex;
   flex-wrap: wrap;
 
-  .attachment.media-upload-container {
-    flex: 0 0 auto;
-    max-height: 200px;
+  .non-gallery {
     max-width: 100%;
-    display: flex;
-    align-items: center;
-    video {
-      max-width: 100%;
-    }
   }
 
   .placeholder {
-    margin-right: 8px;
-    margin-bottom: 4px;
+    display: inline-block;
+    padding: 0.3em 1em 0.3em 0;
     color: $fallback--link;
     color: var(--postLink, $fallback--link);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 100%;
   }
 
   .nsfw-placeholder {
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index d52f00a5..46931667 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -20,6 +20,14 @@
       :attachment="currentMedia"
       :controls="true"
     />
+    <audio
+      v-if="type === 'audio'"
+      class="modal-image"
+      :src="currentMedia.url"
+      :alt="currentMedia.description"
+      :title="currentMedia.description"
+      controls
+    />
     <button
       v-if="canNavigate"
       :title="$t('media_modal.previous')"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index df2999f2..6bbf6cf1 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -3,6 +3,7 @@ import MediaUpload from '../media_upload/media_upload.vue'
 import ScopeSelector from '../scope_selector/scope_selector.vue'
 import EmojiInput from '../emoji_input/emoji_input.vue'
 import PollForm from '../poll/poll_form.vue'
+import Attachment from '../attachment/attachment.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 import { reject, map, uniqBy } from 'lodash'
@@ -38,7 +39,8 @@ const PostStatusForm = {
     EmojiInput,
     PollForm,
     ScopeSelector,
-    Checkbox
+    Checkbox,
+    Attachment
   },
   mounted () {
     this.resize(this.$refs.textarea)
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 49291455..a33e1a59 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -245,31 +245,17 @@
             class="fa button-icon icon-cancel"
             @click="removeMediaFile(file)"
           />
-          <div class="media-upload-container attachment">
-            <img
-              v-if="type(file) === 'image'"
-              class="thumbnail media-upload"
-              :src="file.url"
-            >
-            <video
-              v-if="type(file) === 'video'"
-              :src="file.url"
-              controls
-            />
-            <audio
-              v-if="type(file) === 'audio'"
-              :src="file.url"
-              controls
-            />
-            <a
-              v-if="type(file) === 'unknown'"
-              :href="file.url"
-            >{{ file.url }}</a>
-          </div>
+          <attachment
+            :attachment="file"
+            :set-media="() => $store.dispatch('setMedia', newStatus.files)"
+            size="small"
+            allow-play="false"
+          />
           <input
             v-model="newStatus.mediaDescriptions[file.id]"
             type="text"
             :placeholder="$t('post_status.media_description')"
+            @keydown.prevent.enter=""
           >
         </div>
       </div>
@@ -386,11 +372,9 @@
   }
 
   .media-upload-wrapper {
-    flex: 0 0 auto;
-    max-width: 100%;
-    min-width: 50px;
     margin-right: .2em;
     margin-bottom: .5em;
+    width: 260px;
 
     .icon-cancel {
       display: inline-block;
@@ -405,9 +389,18 @@
       border-bottom-right-radius: 0;
     }
 
+    img, video {
+      object-fit: contain;
+      max-height: 140px;
+    }
+
+    .video {
+      max-height: 140px;
+    }
+
     input {
-      min-width: 300px;
       flex: 1;
+      width: 100%;
     }
   }
 
@@ -423,23 +416,8 @@
 
     .attachment {
       margin: 0;
+      padding: 0;
       position: relative;
-      flex: 0 0 auto;
-      border: 1px solid $fallback--border;
-      border: 1px solid var(--border, $fallback--border);
-      text-align: center;
-
-      audio {
-        min-width: 300px;
-        flex: 1 0 auto;
-      }
-
-      a {
-        display: block;
-        text-align: left;
-        line-height: 1.2;
-        padding: .5em;
-      }
     }
 
     i {
diff --git a/src/components/video_attachment/video_attachment.vue b/src/components/video_attachment/video_attachment.vue
index 97ddf1cd..1ffed4e0 100644
--- a/src/components/video_attachment/video_attachment.vue
+++ b/src/components/video_attachment/video_attachment.vue
@@ -4,6 +4,8 @@
     :src="attachment.url"
     :loop="loopVideo"
     :controls="controls"
+    :alt="attachment.description"
+    :title="attachment.description"
     playsinline
     @loadeddata="onVideoDataLoad"
   />
diff --git a/src/modules/media_viewer.js b/src/modules/media_viewer.js
index a24b408d..721c25e6 100644
--- a/src/modules/media_viewer.js
+++ b/src/modules/media_viewer.js
@@ -22,7 +22,7 @@ const mediaViewer = {
     setMedia ({ commit }, attachments) {
       const media = attachments.filter(attachment => {
         const type = fileTypeService.fileType(attachment.mimetype)
-        return type === 'image' || type === 'video'
+        return type === 'image' || type === 'video' || type === 'audio'
       })
       commit('setMedia', media)
     },
diff --git a/static/fontello.json b/static/fontello.json
index ac3f0a18..f3053b8d 100755
--- a/static/fontello.json
+++ b/static/fontello.json
@@ -375,6 +375,12 @@
       "css": "download",
       "code": 59429,
       "src": "fontawesome"
+    },
+    {
+      "uid": "9ea0a737ccc45d6c510dcbae56058849",
+      "css": "music",
+      "code": 59430,
+      "src": "fontawesome"
     }
   ]
 }
\ No newline at end of file

From a09709f71d5477e2620d04e1cf6178fdb87671b3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 29 Jun 2020 15:37:46 +0300
Subject: [PATCH 250/415] update changelog with media-descriptions and the
 fixes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 887588f3..e3387b51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Autocomplete domains from list of known instances
 - 'Bot' settings option and badge
 - Added profile meta data fields that can be set in profile settings
+- Descriptions can be set on uploaded files before posting
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it
@@ -26,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Close the media modal on navigation events
 - Add colons to the emoji alt text, to make them copyable
 - Add better visual indication for drag-and-drop for files
+- When disabling attachments, the placeholder links now show an icon and the description instead of just IMAGE or VIDEO etc
 
 ### Fixed
 - Custom Emoji will display in poll options now.
@@ -37,6 +39,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Subject field now appears disabled when posting
 - Fix status ellipsis menu being cut off in notifications column
 - Fixed autocomplete sometimes not returning the right user when there's already some results
+- Videos and audio and misc files show description as alt/title properly now
+- Clicking on non-image/video files no longer opens an empty modal
+- Audio files can now be played back in the frontend with hidden attachments
+- Videos are not cropped awkwardly in the uploads section anymore
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From 0ca3a6e63d6dd8ed59cdf0c14780b5616667accc Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 30 Jun 2020 11:02:10 +0300
Subject: [PATCH 251/415] fix gallery-videos being weirdly offset

---
 src/components/gallery/gallery.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue
index 1ffa7b3c..ca91c9c1 100644
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@@ -50,9 +50,7 @@
     align-content: stretch;
   }
 
-  // FIXME: specificity problem with this and .attachments.attachment
-  // we shouldn't have the need for .image here
-  .attachment.image {
+  .gallery-row-inner .attachment {
     margin: 0 0.5em 0 0;
     flex-grow: 1;
     height: 100%;

From 6529f9fa34c5e4e4786f76f63068d70c771d868e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 30 Jun 2020 15:04:16 +0300
Subject: [PATCH 252/415] add strikethrough when parent isn't visible

---
 src/components/status/status.vue                      | 11 ++++++++++-
 .../entity_normalizer/entity_normalizer.service.js    |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 7ec29b28..c537358b 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -208,7 +208,12 @@
                     @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
                   >
                     <i class="button-icon icon-reply" />
-                    <span class="faint-link reply-to-text">{{ $t('status.reply_to') }}</span>
+                    <span
+                      class="faint-link reply-to-text"
+                      :class="{ 'strikethrough': !status.parent_visible }"
+                    >
+                      {{ $t('status.reply_to') }}
+                    </span>
                   </a>
                 </StatusPopover>
                 <span
@@ -526,6 +531,10 @@ $status-margin: 0.75em;
       margin: 0 0.4em 0 0.2em;
     }
 
+    .strikethrough {
+      text-decoration: line-through;
+    }
+
     .replies-separator {
       margin-left: 0.4em;
     }
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 3bdb92f3..10111045 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -248,6 +248,7 @@ export const parseStatus = (data) => {
       output.in_reply_to_screen_name = data.pleroma.in_reply_to_account_acct
       output.thread_muted = pleroma.thread_muted
       output.emoji_reactions = pleroma.emoji_reactions
+      output.parent_visible = pleroma.parent_visible === undefined ? true : pleroma.parent_visible
     } else {
       output.text = data.content
       output.summary = data.spoiler_text

From ee1364a16770792e2a1040a0ea0b8f1693b5da52 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 30 Jun 2020 15:15:27 +0300
Subject: [PATCH 253/415] add no-statusId support for status popover

---
 src/components/status/status.vue                | 2 +-
 src/components/status_popover/status_popover.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index c537358b..8237be6c 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -197,7 +197,7 @@
               >
                 <StatusPopover
                   v-if="!isPreview"
-                  :status-id="status.in_reply_to_status_id"
+                  :status-id="status.parent_visible && status.in_reply_to_status_id"
                   class="reply-to-popover"
                   style="min-width: 0"
                 >
diff --git a/src/components/status_popover/status_popover.js b/src/components/status_popover/status_popover.js
index 159132a9..51e7680c 100644
--- a/src/components/status_popover/status_popover.js
+++ b/src/components/status_popover/status_popover.js
@@ -22,6 +22,10 @@ const StatusPopover = {
   methods: {
     enter () {
       if (!this.status) {
+        if (!this.statusId) {
+          this.error = true
+          return
+        }
         this.$store.dispatch('fetchStatus', this.statusId)
           .then(data => (this.error = false))
           .catch(e => (this.error = true))

From 3a79918b89fa41f8676e7f19862e6e29abd4ea14 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 30 Jun 2020 15:23:47 +0300
Subject: [PATCH 254/415] update changelog for reply-to strikethrough

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 887588f3..e98b2728 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Autocomplete domains from list of known instances
 - 'Bot' settings option and badge
 - Added profile meta data fields that can be set in profile settings
+- When a post is a reply to an unavailable post, the 'Reply to'-text has a strike-through style
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it

From ea09bbecf8b7715a1242a104b6233a7c3b5ac588 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 30 Jun 2020 17:02:38 +0300
Subject: [PATCH 255/415] Make use of backend reply filtering

---
 CHANGELOG.md                                  |  1 +
 .../settings_modal/tabs/filtering_tab.js      |  3 ++
 src/components/status/status.js               | 33 +------------------
 src/components/timeline/timeline.js           |  6 ++--
 src/components/timeline/timeline.vue          |  4 +--
 src/modules/statuses.js                       |  8 +++++
 src/services/api/api.service.js               |  6 +++-
 .../timeline_fetcher.service.js               |  4 ++-
 8 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 887588f3..d978d362 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Subject field now appears disabled when posting
 - Fix status ellipsis menu being cut off in notifications column
 - Fixed autocomplete sometimes not returning the right user when there's already some results
+- Reply filtering options in Settings -> Filtering now work again using filtering on server
 
 ## [2.0.3] - 2020-05-02
 ### Fixed
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 224a7f47..3b2df556 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -37,6 +37,9 @@ const FilteringTab = {
         })
       },
       deep: true
+    },
+    replyVisibility () {
+      this.$store.dispatch('queueFlushAll')
     }
   }
 }
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 73382521..ad0b72a9 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -141,7 +141,7 @@ const Status = {
       return this.mergedConfig.hideFilteredStatuses
     },
     hideStatus () {
-      return (this.hideReply || this.deleted) || (this.muted && this.hideFilteredStatuses)
+      return this.deleted || (this.muted && this.hideFilteredStatuses)
     },
     isFocused () {
       // retweet or root of an expanded conversation
@@ -164,37 +164,6 @@ const Status = {
         return user && user.screen_name
       }
     },
-    hideReply () {
-      if (this.mergedConfig.replyVisibility === 'all') {
-        return false
-      }
-      if (this.inConversation || !this.isReply) {
-        return false
-      }
-      if (this.status.user.id === this.currentUser.id) {
-        return false
-      }
-      if (this.status.type === 'retweet') {
-        return false
-      }
-      const checkFollowing = this.mergedConfig.replyVisibility === 'following'
-      for (var i = 0; i < this.status.attentions.length; ++i) {
-        if (this.status.user.id === this.status.attentions[i].id) {
-          continue
-        }
-        // There's zero guarantee of this working. If we happen to have that user and their
-        // relationship in store then it will work, but there's kinda little chance of having
-        // them for people you're not following.
-        const relationship = this.$store.state.users.relationships[this.status.attentions[i].id]
-        if (checkFollowing && relationship && relationship.following) {
-          return false
-        }
-        if (this.status.attentions[i].id === this.currentUser.id) {
-          return false
-        }
-      }
-      return this.status.attentions.length > 0
-    },
     replySubject () {
       if (!this.status.summary) return ''
       const decodedSummary = unescape(this.status.summary)
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 9a53acd6..3a244c83 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -45,6 +45,10 @@ const Timeline = {
     newStatusCount () {
       return this.timeline.newStatusCount
     },
+    showLoadButton () {
+      if (this.timelineError || this.errorData) return false
+      return this.timeline.newStatusCount > 0 || this.timeline.flushMarker !== 0
+    },
     newStatusCountStr () {
       if (this.timeline.flushMarker !== 0) {
         return ''
@@ -112,8 +116,6 @@ const Timeline = {
       if (e.key === '.') this.showNewStatuses()
     },
     showNewStatuses () {
-      if (this.newStatusCount === 0) return
-
       if (this.timeline.flushMarker !== 0) {
         this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true })
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 9777bd0c..bd8389b9 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -19,14 +19,14 @@
         {{ errorData.statusText }}
       </div>
       <button
-        v-if="timeline.newStatusCount > 0 && !timelineError && !errorData"
+        v-else-if="showLoadButton"
         class="loadmore-button"
         @click.prevent="showNewStatuses"
       >
         {{ $t('timeline.show_new') }}{{ newStatusCountStr }}
       </button>
       <div
-        v-if="!timeline.newStatusCount > 0 && !timelineError && !errorData"
+        v-else
         class="loadmore-text faint"
         @click.prevent
       >
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 073b15f1..4d3f8031 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -515,6 +515,11 @@ export const mutations = {
   queueFlush (state, { timeline, id }) {
     state.timelines[timeline].flushMarker = id
   },
+  queueFlushAll (state) {
+    Object.keys(state.timelines).forEach((timeline) => {
+      state.timelines[timeline].flushMarker = state.timelines[timeline].maxId
+    })
+  },
   addRepeats (state, { id, rebloggedByUsers, currentUser }) {
     const newStatus = state.allStatusesObject[id]
     newStatus.rebloggedBy = rebloggedByUsers.filter(_ => _)
@@ -664,6 +669,9 @@ const statuses = {
     queueFlush ({ rootState, commit }, { timeline, id }) {
       commit('queueFlush', { timeline, id })
     },
+    queueFlushAll ({ rootState, commit }) {
+      commit('queueFlushAll')
+    },
     markNotificationsAsSeen ({ rootState, commit }) {
       commit('markNotificationsAsSeen')
       apiService.markNotificationsAsSeen({
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index dfffc291..7e5e9645 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -498,7 +498,8 @@ const fetchTimeline = ({
   until = false,
   userId = false,
   tag = false,
-  withMuted = false
+  withMuted = false,
+  replyVisibility = 'all'
 }) => {
   const timelineUrls = {
     public: MASTODON_PUBLIC_TIMELINE,
@@ -541,6 +542,9 @@ const fetchTimeline = ({
   if (timeline !== 'favorites') {
     params.push(['with_muted', withMuted])
   }
+  if (replyVisibility !== 'all') {
+    params.push(['reply_visibility', replyVisibility])
+  }
 
   params.push(['limit', 20])
 
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index c6b28ad5..30fb26bd 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -30,7 +30,8 @@ const fetchAndUpdate = ({
   const rootState = store.rootState || store.state
   const { getters } = store
   const timelineData = rootState.statuses.timelines[camelCase(timeline)]
-  const hideMutedPosts = getters.mergedConfig.hideMutedPosts
+  const { hideMutedPosts, replyVisibility } = getters.mergedConfig
+  const loggedIn = !!rootState.users.currentUser
 
   if (older) {
     args['until'] = until || timelineData.minId
@@ -41,6 +42,7 @@ const fetchAndUpdate = ({
   args['userId'] = userId
   args['tag'] = tag
   args['withMuted'] = !hideMutedPosts
+  if (loggedIn) args['replyVisibility'] = replyVisibility
 
   const numStatusesBeforeFetch = timelineData.statuses.length
 

From 38d8526660df4ca664c9ea50a660868be2cb5e49 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 30 Jun 2020 17:37:36 +0300
Subject: [PATCH 256/415] change Show New text to Reload when flushing

---
 src/components/timeline/timeline.js  | 6 +++---
 src/components/timeline/timeline.vue | 2 +-
 src/i18n/en.json                     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 3a244c83..d6519f4a 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -49,11 +49,11 @@ const Timeline = {
       if (this.timelineError || this.errorData) return false
       return this.timeline.newStatusCount > 0 || this.timeline.flushMarker !== 0
     },
-    newStatusCountStr () {
+    loadButtonString () {
       if (this.timeline.flushMarker !== 0) {
-        return ''
+        return this.$t('timeline.reload')
       } else {
-        return ` (${this.newStatusCount})`
+        return `${this.$t('timeline.show_new')} (${this.newStatusCount})`
       }
     },
     classes () {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index bd8389b9..111c0976 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -23,7 +23,7 @@
         class="loadmore-button"
         @click.prevent="showNewStatuses"
       >
-        {{ $t('timeline.show_new') }}{{ newStatusCountStr }}
+        {{ loadButtonString }}
       </button>
       <div
         v-else
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e6af4266..59f69e57 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -617,6 +617,7 @@
     "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
     "repeated": "repeated",
     "show_new": "Show new",
+    "reload": "Reload",
     "up_to_date": "Up-to-date",
     "no_more_statuses": "No more statuses",
     "no_statuses": "No statuses"

From 62d0bc47b333135f31abea90b4f5a3c28e608733 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 14:15:04 +0300
Subject: [PATCH 257/415] remove unnecessary fetchAndUpdate, change
 notifications fetcher to not double fetch

---
 src/components/notifications/notifications.js              | 5 -----
 src/modules/api.js                                         | 3 ---
 .../backend_interactor_service.js                          | 4 ----
 .../notifications_fetcher/notifications_fetcher.service.js | 7 +++++--
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 26ffbab6..e999a18e 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -56,11 +56,6 @@ const Notifications = {
   components: {
     Notification
   },
-  created () {
-    const { dispatch } = this.$store
-
-    dispatch('fetchAndUpdateNotifications')
-  },
   watch: {
     unseenCount (count) {
       if (count > 0) {
diff --git a/src/modules/api.js b/src/modules/api.js
index 748570e5..04ef6ab4 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -138,9 +138,6 @@ const api = {
       if (!fetcher) return
       store.commit('removeFetcher', { fetcherName: 'notifications', fetcher })
     },
-    fetchAndUpdateNotifications (store) {
-      store.state.backendInteractor.fetchAndUpdateNotifications({ store })
-    },
 
     // Follow requests
     startFetchingFollowRequests (store) {
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index e1c32860..45e6bd0e 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -12,10 +12,6 @@ const backendInteractorService = credentials => ({
     return notificationsFetcher.startFetching({ store, credentials })
   },
 
-  fetchAndUpdateNotifications ({ store }) {
-    return notificationsFetcher.fetchAndUpdate({ store, credentials })
-  },
-
   startFetchingFollowRequests ({ store }) {
     return followRequestFetcher.startFetching({ store, credentials })
   },
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 64499a1b..581931f5 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -31,8 +31,11 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
     const notifications = timelineData.data
     const readNotifsIds = notifications.filter(n => n.seen).map(n => n.id)
     if (readNotifsIds.length) {
-      args['since'] = Math.max(...readNotifsIds)
-      fetchNotifications({ store, args, older })
+      const possibleMax = Math.max(...readNotifsIds)
+      if (possibleMax !== timelineData.maxId) {
+        args['since'] = possibleMax
+        fetchNotifications({ store, args, older })
+      }
     }
 
     return result

From a3e370e9f816e3c98028bf82e8ac020b8e294466 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 15:19:45 +0300
Subject: [PATCH 258/415] add initial fetching back in a more streamlined way

---
 src/components/notifications/notifications.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index e999a18e..30187072 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -27,6 +27,11 @@ const Notifications = {
       seenToDisplayCount: DEFAULT_SEEN_TO_DISPLAY_COUNT
     }
   },
+  created () {
+    const store = this.$store
+    const credentials = store.state.users.currentUser.credentials
+    notificationsFetcher.fetchAndUpdate({ store: this.$store, credentials })
+  },
   computed: {
     mainClass () {
       return this.minimalMode ? '' : 'panel panel-default'

From ca997f45e8b2e6c8df72833d774bad7266af76bf Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 15:56:45 +0300
Subject: [PATCH 259/415] allow overscrolling enough to not have FAB block
 interactables

---
 src/App.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/App.scss b/src/App.scss
index f2972eda..6597b6f4 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -858,6 +858,10 @@ nav {
     display: block;
     margin-right: 0.8em;
   }
+
+  .main {
+    margin-bottom: 7em;
+  }
 }
 
 .select-multiple {

From 3ebd4e4429a9680046daeac2ed8753471365be9e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 17:55:42 +0300
Subject: [PATCH 260/415] document the 'mark-as-read-detection' system

---
 .../notifications_fetcher.service.js            | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 581931f5..c2552480 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -27,17 +27,18 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
     }
     const result = fetchNotifications({ store, args, older })
 
-    // load unread notifications repeatedly to provide consistency between browser tabs
+    // If there's any unread notifications, try fetch notifications since
+    // the newest read notification to check if any of the unread notifs
+    // have changed their 'seen' state (marked as read in another session), so
+    // we can update the state in this session to mark them as read as well.
+    // The normal maxId-check does not tell if older notifications have changed
     const notifications = timelineData.data
     const readNotifsIds = notifications.filter(n => n.seen).map(n => n.id)
-    if (readNotifsIds.length) {
-      const possibleMax = Math.max(...readNotifsIds)
-      if (possibleMax !== timelineData.maxId) {
-        args['since'] = possibleMax
-        fetchNotifications({ store, args, older })
-      }
+    const numUnseenNotifs = notifications.length - readNotifsIds.length
+    if (numUnseenNotifs > 0) {
+      args['since'] = Math.max(...readNotifsIds)
+      fetchNotifications({ store, args, older })
     }
-
     return result
   }
 }

From d30b0b28c9371e56ffe54b5a8b56087718221c1d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 19:15:28 +0300
Subject: [PATCH 261/415] catch localforage error and let the application work,
 add an alert for user to dismiss

---
 src/App.js               |  6 ++++++
 src/App.scss             |  9 +++++++++
 src/App.vue              | 10 ++++++++++
 src/i18n/en.json         |  3 +++
 src/main.js              | 13 +++++++++++--
 src/modules/instance.js  |  2 +-
 src/modules/interface.js |  7 +++++++
 7 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/App.js b/src/App.js
index 040138c9..da66fe21 100644
--- a/src/App.js
+++ b/src/App.js
@@ -107,6 +107,9 @@ export default {
       return {
         'order': this.$store.state.instance.sidebarRight ? 99 : 0
       }
+    },
+    showStorageError () {
+      return this.$store.state.interface.storageError === 'show'
     }
   },
   methods: {
@@ -129,6 +132,9 @@ export default {
       if (changed) {
         this.$store.dispatch('setMobileLayout', mobileLayout)
       }
+    },
+    hideStorageError () {
+      this.$store.dispatch('setStorageError', 'hide')
     }
   }
 }
diff --git a/src/App.scss b/src/App.scss
index f2972eda..db447f1c 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -806,6 +806,15 @@ nav {
   }
 }
 
+.storage-error-notice {
+  text-align: center;
+  i {
+    cursor: pointer;
+    color: $fallback--text;
+    color: var(--alertErrorText, $fallback--text);
+  }
+}
+
 .button-icon {
   font-size: 1.2em;
 }
diff --git a/src/App.vue b/src/App.vue
index 7b9ad3dc..23991eac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -101,6 +101,16 @@
         </div>
       </div>
       <div class="main">
+        <div
+          v-if="showStorageError"
+          class="alert error storage-error-notice"
+        >
+          {{ $t("errors.storage_unavailable") }}
+          <i
+            class="icon-cancel"
+            @click="hideStorageError"
+          />
+        </div>
         <div
           v-if="!currentUser"
           class="login-hint panel panel-default"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 59f69e57..4856008f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -163,6 +163,9 @@
     "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
     "load_all": "Loading all {emojiAmount} emoji"
   },
+  "errors": {
+    "storage_unavailable": "Pleroma could not access browser storage. You may encounter issues and your login or your local settings won't be saved. Try enabling cookies."
+  },
   "interactions": {
     "favs_repeats": "Repeats and Favorites",
     "follows": "New follows",
diff --git a/src/main.js b/src/main.js
index 9a201e4f..bb2c8cd3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -62,7 +62,16 @@ const persistedStateOptions = {
 };
 
 (async () => {
-  const persistedState = await createPersistedState(persistedStateOptions)
+  console.log('before perse state')
+  let persistedState
+  let storageError = 'none'
+  try {
+    persistedState = await createPersistedState(persistedStateOptions)
+  } catch (e) {
+    console.error(e)
+    storageError = 'show'
+    persistedState = _ => _
+  }
   const store = new Vuex.Store({
     modules: {
       i18n: {
@@ -89,7 +98,7 @@ const persistedStateOptions = {
     strict: false // Socket modifies itself, let's ignore this for now.
     // strict: process.env.NODE_ENV !== 'production'
   })
-
+  store.dispatch('setStorageError', storageError)
   afterStoreSetup({ store, i18n })
 })()
 
diff --git a/src/modules/instance.js b/src/modules/instance.js
index ec5f4e54..cc884317 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -8,7 +8,7 @@ const defaultState = {
   // Stuff from apiConfig
   name: 'Pleroma FE',
   registrationOpen: true,
-  server: 'http://localhost:4040/',
+  server: 'http://lain.com:4040',
   textlimit: 5000,
   themeData: undefined,
   vapidPublicKey: undefined,
diff --git a/src/modules/interface.js b/src/modules/interface.js
index eeebd65e..4b5b5b5d 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -8,6 +8,7 @@ const defaultState = {
     noticeClearTimeout: null,
     notificationPermission: null
   },
+  storageError: 'none',
   browserSupport: {
     cssFilter: window.CSS && window.CSS.supports && (
       window.CSS.supports('filter', 'drop-shadow(0 0)') ||
@@ -58,6 +59,9 @@ const interfaceMod = {
       if (!state.settingsModalLoaded) {
         state.settingsModalLoaded = true
       }
+    },
+    setStorageError (state, value) {
+      state.storageError = value
     }
   },
   actions: {
@@ -81,6 +85,9 @@ const interfaceMod = {
     },
     togglePeekSettingsModal ({ commit }) {
       commit('togglePeekSettingsModal')
+    },
+    setStorageError ({ commit }, value) {
+      commit('setStorageError', value)
     }
   }
 }

From 43b7a5d9b387e005a47debb5962c76c773cd862c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 19:22:39 +0300
Subject: [PATCH 262/415] update the message and changelog

---
 CHANGELOG.md     | 1 +
 src/i18n/en.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d978d362..b57e9afb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix status ellipsis menu being cut off in notifications column
 - Fixed autocomplete sometimes not returning the right user when there's already some results
 - Reply filtering options in Settings -> Filtering now work again using filtering on server
+- Don't show just blank-screen when cookies are disabled
 
 ## [2.0.3] - 2020-05-02
 ### Fixed
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4856008f..0b34ae07 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -164,7 +164,7 @@
     "load_all": "Loading all {emojiAmount} emoji"
   },
   "errors": {
-    "storage_unavailable": "Pleroma could not access browser storage. You may encounter issues and your login or your local settings won't be saved. Try enabling cookies."
+    "storage_unavailable": "Pleroma could not access browser storage. Your login or your local settings won't be saved and you might encounter unexpected issues. Try enabling cookies."
   },
   "interactions": {
     "favs_repeats": "Repeats and Favorites",

From 15d492ace4db5243330741a007daa9929e221f64 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 19:24:17 +0300
Subject: [PATCH 263/415] revert accidental change in instance.js

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

diff --git a/src/modules/instance.js b/src/modules/instance.js
index cc884317..ec5f4e54 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -8,7 +8,7 @@ const defaultState = {
   // Stuff from apiConfig
   name: 'Pleroma FE',
   registrationOpen: true,
-  server: 'http://lain.com:4040',
+  server: 'http://localhost:4040/',
   textlimit: 5000,
   themeData: undefined,
   vapidPublicKey: undefined,

From 0997e5ff668a57d58002ec646f698c5503f66c35 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 1 Jul 2020 19:25:31 +0300
Subject: [PATCH 264/415] remove accidental log

---
 src/main.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index bb2c8cd3..a7294ea0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -62,7 +62,6 @@ const persistedStateOptions = {
 };
 
 (async () => {
-  console.log('before perse state')
   let persistedState
   let storageError = 'none'
   try {

From 1293bec77e5137acf64d3536c286f8ba3df284f4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 2 Jul 2020 10:40:41 +0300
Subject: [PATCH 265/415] change storage error one-off into a global notice
 system

---
 src/App.js                                    | 10 +--
 src/App.scss                                  |  9 ---
 src/App.vue                                   | 11 +--
 .../global_notice_list/global_notice_list.js  | 15 ++++
 .../global_notice_list/global_notice_list.vue | 77 +++++++++++++++++++
 src/main.js                                   | 16 ++--
 src/modules/interface.js                      | 33 ++++++--
 src/services/theme_data/pleromafe.js          | 36 ++++++++-
 8 files changed, 167 insertions(+), 40 deletions(-)
 create mode 100644 src/components/global_notice_list/global_notice_list.js
 create mode 100644 src/components/global_notice_list/global_notice_list.vue

diff --git a/src/App.js b/src/App.js
index da66fe21..92c4e2f5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -13,6 +13,7 @@ import MobilePostStatusButton from './components/mobile_post_status_button/mobil
 import MobileNav from './components/mobile_nav/mobile_nav.vue'
 import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
 import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
+import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
 import { windowWidth } from './services/window_utils/window_utils'
 
 export default {
@@ -32,7 +33,8 @@ export default {
     MobileNav,
     SettingsModal,
     UserReportingModal,
-    PostStatusModal
+    PostStatusModal,
+    GlobalNoticeList
   },
   data: () => ({
     mobileActivePanel: 'timeline',
@@ -107,9 +109,6 @@ export default {
       return {
         'order': this.$store.state.instance.sidebarRight ? 99 : 0
       }
-    },
-    showStorageError () {
-      return this.$store.state.interface.storageError === 'show'
     }
   },
   methods: {
@@ -132,9 +131,6 @@ export default {
       if (changed) {
         this.$store.dispatch('setMobileLayout', mobileLayout)
       }
-    },
-    hideStorageError () {
-      this.$store.dispatch('setStorageError', 'hide')
     }
   }
 }
diff --git a/src/App.scss b/src/App.scss
index db447f1c..f2972eda 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -806,15 +806,6 @@ nav {
   }
 }
 
-.storage-error-notice {
-  text-align: center;
-  i {
-    cursor: pointer;
-    color: $fallback--text;
-    color: var(--alertErrorText, $fallback--text);
-  }
-}
-
 .button-icon {
   font-size: 1.2em;
 }
diff --git a/src/App.vue b/src/App.vue
index 23991eac..03b632ec 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -101,16 +101,6 @@
         </div>
       </div>
       <div class="main">
-        <div
-          v-if="showStorageError"
-          class="alert error storage-error-notice"
-        >
-          {{ $t("errors.storage_unavailable") }}
-          <i
-            class="icon-cancel"
-            @click="hideStorageError"
-          />
-        </div>
         <div
           v-if="!currentUser"
           class="login-hint panel panel-default"
@@ -138,6 +128,7 @@
     <PostStatusModal />
     <SettingsModal />
     <portal-target name="modal" />
+    <GlobalNoticeList />
   </div>
 </template>
 
diff --git a/src/components/global_notice_list/global_notice_list.js b/src/components/global_notice_list/global_notice_list.js
new file mode 100644
index 00000000..3af29c23
--- /dev/null
+++ b/src/components/global_notice_list/global_notice_list.js
@@ -0,0 +1,15 @@
+
+const GlobalNoticeList = {
+  computed: {
+    notices () {
+      return this.$store.state.interface.globalNotices
+    }
+  },
+  methods: {
+    closeNotice (notice) {
+      this.$store.dispatch('removeGlobalNotice', notice)
+    }
+  }
+}
+
+export default GlobalNoticeList
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
new file mode 100644
index 00000000..0e4285cc
--- /dev/null
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="global-notice-list">
+    <div
+      v-for="(notice, index) in notices"
+      :key="index"
+      class="alert global-notice"
+      :class="{ ['global-' + notice.level]: true }"
+    >
+      <div class="notice-message">
+        {{ $t(notice.messageKey, notice.messageArgs) }}
+      </div>
+      <i
+        class="button-icon icon-cancel"
+        @click="closeNotice(notice)"
+      />
+    </div>
+  </div>
+</template>
+
+<script src="./global_notice_list.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.global-notice-list {
+  position: fixed;
+  top: 50px;
+  width: 100%;
+  pointer-events: none;
+  z-index: 1001;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .global-notice {
+    pointer-events: auto;
+    text-align: center;
+    width: 40em;
+    max-width: calc(100% - 3em);
+    display: flex;
+    padding-left: 1.5em;
+    line-height: 2em;
+    .notice-message {
+      flex: 1 1 100%;
+    }
+    i {
+      flex: 0 0;
+      width: 1.5em;
+      cursor: pointer;
+    }
+  }
+
+  .global-error {
+    background-color: var(--alertPopupError, $fallback--cRed);
+    color: var(--alertPopupErrorText, $fallback--text);
+    i {
+      color: var(--alertPopupErrorText, $fallback--text);
+    }
+  }
+
+  .global-warning {
+    background-color: var(--alertPopupWarning, $fallback--cOrange);
+    color: var(--alertPopupWarningText, $fallback--text);
+    i {
+      color: var(--alertPopupWarningText, $fallback--text);
+    }
+  }
+
+  .global-info {
+    background-color: var(--alertPopupNeutral, $fallback--fg);
+    color: var(--alertPopupNeutralText, $fallback--text);
+    i {
+      color: var(--alertPopupNeutralText, $fallback--text);
+    }
+  }
+}
+</style>
diff --git a/src/main.js b/src/main.js
index a7294ea0..5bddc76e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -62,14 +62,14 @@ const persistedStateOptions = {
 };
 
 (async () => {
-  let persistedState
-  let storageError = 'none'
+  let storageError = false
+  const plugins = [pushNotifications]
   try {
-    persistedState = await createPersistedState(persistedStateOptions)
+    const persistedState = await createPersistedState(persistedStateOptions)
+    plugins.push(persistedState)
   } catch (e) {
     console.error(e)
-    storageError = 'show'
-    persistedState = _ => _
+    storageError = true
   }
   const store = new Vuex.Store({
     modules: {
@@ -93,11 +93,13 @@ const persistedStateOptions = {
       polls: pollsModule,
       postStatus: postStatusModule
     },
-    plugins: [persistedState, pushNotifications],
+    plugins,
     strict: false // Socket modifies itself, let's ignore this for now.
     // strict: process.env.NODE_ENV !== 'production'
   })
-  store.dispatch('setStorageError', storageError)
+  if (storageError) {
+    store.dispatch('pushGlobalNotice', { messageKey: 'errors.storage_unavailable', level: 'error' })
+  }
   afterStoreSetup({ store, i18n })
 })()
 
diff --git a/src/modules/interface.js b/src/modules/interface.js
index 4b5b5b5d..338ef651 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -8,14 +8,14 @@ const defaultState = {
     noticeClearTimeout: null,
     notificationPermission: null
   },
-  storageError: 'none',
   browserSupport: {
     cssFilter: window.CSS && window.CSS.supports && (
       window.CSS.supports('filter', 'drop-shadow(0 0)') ||
       window.CSS.supports('-webkit-filter', 'drop-shadow(0 0)')
     )
   },
-  mobileLayout: false
+  mobileLayout: false,
+  globalNotices: []
 }
 
 const interfaceMod = {
@@ -60,8 +60,11 @@ const interfaceMod = {
         state.settingsModalLoaded = true
       }
     },
-    setStorageError (state, value) {
-      state.storageError = value
+    pushGlobalNotice (state, notice) {
+      state.globalNotices.push(notice)
+    },
+    removeGlobalNotice (state, notice) {
+      state.globalNotices = state.globalNotices.filter(n => n !== notice)
     }
   },
   actions: {
@@ -86,8 +89,26 @@ const interfaceMod = {
     togglePeekSettingsModal ({ commit }) {
       commit('togglePeekSettingsModal')
     },
-    setStorageError ({ commit }, value) {
-      commit('setStorageError', value)
+    pushGlobalNotice (
+      { commit, dispatch },
+      {
+        messageKey,
+        messageArgs = {},
+        level = 'error',
+        timeout = 0
+      }) {
+      const notice = {
+        messageKey,
+        messageArgs,
+        level
+      }
+      if (timeout) {
+        setTimeout(() => dispatch('removeGlobalNotice', notice), timeout)
+      }
+      commit('pushGlobalNotice', notice)
+    },
+    removeGlobalNotice ({ commit }, notice) {
+      commit('removeGlobalNotice', notice)
     }
   }
 }
diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index b577cfab..83c878ed 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -34,7 +34,8 @@ export const DEFAULT_OPACITY = {
   alert: 0.5,
   input: 0.5,
   faint: 0.5,
-  underlay: 0.15
+  underlay: 0.15,
+  alertPopup: 0.85
 }
 
 /**  SUBJECT TO CHANGE IN THE FUTURE, this is all beta
@@ -627,6 +628,39 @@ export const SLOT_INHERITANCE = {
     textColor: true
   },
 
+  alertPopupError: {
+    depends: ['alertError'],
+    opacity: 'alertPopup'
+  },
+  alertPopupErrorText: {
+    depends: ['alertErrorText'],
+    layer: 'popover',
+    variant: 'alertPopupError',
+    textColor: true
+  },
+
+  alertPopupWarning: {
+    depends: ['alertWarning'],
+    opacity: 'alertPopup'
+  },
+  alertPopupWarningText: {
+    depends: ['alertWarningText'],
+    layer: 'popover',
+    variant: 'alertPopupWarning',
+    textColor: true
+  },
+
+  alertPopupNeutral: {
+    depends: ['alertNeutral'],
+    opacity: 'alertPopup'
+  },
+  alertPopupNeutralText: {
+    depends: ['alertNeutralText'],
+    layer: 'popover',
+    variant: 'alertPopupNeutral',
+    textColor: true
+  },
+
   badgeNotification: '--cRed',
   badgeNotificationText: {
     depends: ['text', 'badgeNotification'],

From 685ab4f33ee57e1dc4997b58314e5c0d38581e9d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 2 Jul 2020 10:46:43 +0300
Subject: [PATCH 266/415] make the addNotice dispatch return the notice

---
 src/modules/interface.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/interface.js b/src/modules/interface.js
index 338ef651..e31630fc 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -106,6 +106,7 @@ const interfaceMod = {
         setTimeout(() => dispatch('removeGlobalNotice', notice), timeout)
       }
       commit('pushGlobalNotice', notice)
+      return notice
     },
     removeGlobalNotice ({ commit }, notice) {
       commit('removeGlobalNotice', notice)

From f0668c9ff8b985cd5f537fbb0d1083480cbfb065 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 2 Jul 2020 12:19:33 +0300
Subject: [PATCH 267/415] add follow request users to store

---
 .../follow_request_fetcher/follow_request_fetcher.service.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/services/follow_request_fetcher/follow_request_fetcher.service.js b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
index 786740b7..93fac9bc 100644
--- a/src/services/follow_request_fetcher/follow_request_fetcher.service.js
+++ b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
@@ -4,6 +4,7 @@ const fetchAndUpdate = ({ store, credentials }) => {
   return apiService.fetchFollowRequests({ credentials })
     .then((requests) => {
       store.commit('setFollowRequests', requests)
+      store.commit('addNewUsers', requests)
     }, () => {})
     .catch(() => {})
 }

From b8ed904c0c4a387dccc1b107452bc0d669c174e2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 2 Jul 2020 14:28:35 +0300
Subject: [PATCH 268/415] change px to em

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 0b79c9d8..442b9297 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -374,7 +374,7 @@
   .media-upload-wrapper {
     margin-right: .2em;
     margin-bottom: .5em;
-    width: 260px;
+    width: 18em;
 
     .icon-cancel {
       display: inline-block;
@@ -391,11 +391,11 @@
 
     img, video {
       object-fit: contain;
-      max-height: 140px;
+      max-height: 10em;
     }
 
     .video {
-      max-height: 140px;
+      max-height: 10em;
     }
 
     input {

From 9cac5d94dd78ea331254307871e876da7e266a6f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 2 Jul 2020 15:17:58 +0300
Subject: [PATCH 269/415] change alert popup alpha

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

diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index 83c878ed..6b25cd6f 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -35,7 +35,7 @@ export const DEFAULT_OPACITY = {
   input: 0.5,
   faint: 0.5,
   underlay: 0.15,
-  alertPopup: 0.85
+  alertPopup: 0.95
 }
 
 /**  SUBJECT TO CHANGE IN THE FUTURE, this is all beta

From 961099d34a3852d1019a00d390ad638fe45118e4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 2 Jul 2020 18:03:02 +0300
Subject: [PATCH 270/415] basic version done, needs cleanup from nav panel
 styles

---
 src/components/nav_panel/nav_panel.vue        | 20 ++----
 src/components/timeline/timeline.js           | 10 +--
 src/components/timeline/timeline.vue          |  4 +-
 src/components/timeline_menu/timeline_menu.js | 30 +++++++++
 .../timeline_menu/timeline_menu.vue           | 62 +++++++++++++++++++
 5 files changed, 104 insertions(+), 22 deletions(-)
 create mode 100644 src/components/timeline_menu/timeline_menu.js
 create mode 100644 src/components/timeline_menu/timeline_menu.vue

diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 8cd04dc7..ed70f019 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -7,14 +7,14 @@
             <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
           </router-link>
         </li>
-        <li v-if="currentUser">
-          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
+        <li v-else-if="!privateMode">
+          <router-link :to="{ name: 'public-timeline' }">
+            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
           </router-link>
         </li>
         <li v-if="currentUser">
-          <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
+          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
+            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
           </router-link>
         </li>
         <li v-if="currentUser && currentUser.locked">
@@ -28,16 +28,6 @@
             </span>
           </router-link>
         </li>
-        <li v-if="currentUser || !privateMode">
-          <router-link :to="{ name: 'public-timeline' }">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
-        <li v-if="federating && (currentUser || !privateMode)">
-          <router-link :to="{ name: 'public-external-timeline' }">
-            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
-          </router-link>
-        </li>
         <li>
           <router-link :to="{ name: 'about' }">
             <i class="button-icon icon-info-circled" /> {{ $t("nav.about") }}
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index d6519f4a..3a7a4268 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,6 +1,7 @@
 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 { throttle, keyBy } from 'lodash'
 
 export const getExcludedStatusIdsByPinning = (statuses, pinnedStatusIds) => {
@@ -35,6 +36,11 @@ const Timeline = {
       bottomedOut: false
     }
   },
+  components: {
+    Status,
+    Conversation,
+    TimelineMenu
+  },
   computed: {
     timelineError () {
       return this.$store.state.statuses.error
@@ -74,10 +80,6 @@ const Timeline = {
       return keyBy(this.pinnedStatusIds)
     }
   },
-  components: {
-    Status,
-    Conversation
-  },
   created () {
     const store = this.$store
     const credentials = store.state.users.currentUser.credentials
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 111c0976..f8baaf19 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,9 +1,7 @@
 <template>
   <div :class="classes.root">
     <div :class="classes.header">
-      <div class="title">
-        {{ title }}
-      </div>
+      <TimelineMenu />
       <div
         v-if="timelineError"
         class="loadmore-error alert error"
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
new file mode 100644
index 00000000..912dd79a
--- /dev/null
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -0,0 +1,30 @@
+import Popover from '../popover/popover.vue'
+import { mapState } from 'vuex'
+
+const TimelineMenu = {
+  components: {
+    Popover
+  },
+  created () {
+    if (this.currentUser && this.currentUser.locked) {
+      this.$store.dispatch('startFetchingFollowRequests')
+    }
+  },
+  computed: {
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      privateMode: state => state.instance.private,
+      federating: state => state.instance.federating
+    }),
+    timelineNamesForRoute () {
+      return {
+        'friends': this.$t('nav.timeline'),
+        'dms': this.$t('nav.dms'),
+        'public-timeline': this.$t('nav.public_tl'),
+        'public-external-timeline': this.$t('nav.twkn')
+      }
+    }
+  }
+}
+
+export default TimelineMenu
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
new file mode 100644
index 00000000..dfdf7180
--- /dev/null
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -0,0 +1,62 @@
+<template>
+  <Popover
+    trigger="click"
+    class="timeline-menu"
+    popover-class="nav-panel timeline-menu-popover"
+  >
+    <div slot="content">
+      <ul>
+        <li v-if="currentUser">
+          <router-link :to="{ name: 'friends' }">
+            <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
+          </router-link>
+        </li>
+        <li v-if="currentUser">
+          <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
+            <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
+          </router-link>
+        </li>
+        <li v-if="currentUser || !privateMode">
+          <router-link :to="{ name: 'public-timeline' }">
+            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
+          </router-link>
+        </li>
+        <li v-if="federating && (currentUser || !privateMode)">
+          <router-link :to="{ name: 'public-external-timeline' }">
+            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
+          </router-link>
+        </li>
+      </ul>
+    </div>
+    <div
+      slot="trigger"
+      class="title timeline-menu-title"
+    >
+      {{ timelineNamesForRoute[$route.name] }}
+      <i class="icon-down-open" />
+    </div>
+  </Popover>
+</template>
+
+<script src="./timeline_menu.js" ></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.timeline-menu {
+  flex-grow: 1;
+  .timeline-menu-popover {
+    width: 20rem;
+    font-size: 1rem;
+    margin-left: -0.6em;
+    margin-top: 0.6em;
+  }
+
+  .timeline-menu-title {
+    flex-grow: 0;
+    width: 20rem;
+    margin: 0;
+  }
+}
+
+</style>

From 21d1f557f64cceda54755e2817d4799f1dbbea4f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 3 Jul 2020 12:56:31 +0300
Subject: [PATCH 271/415] change styles for the dropdown, make things work
 nicely on mobile

---
 src/App.vue                                   |   2 +-
 src/components/nav_panel/nav_panel.js         |  26 +++-
 src/components/nav_panel/nav_panel.vue        |   5 +-
 src/components/popover/popover.js             |   6 +-
 src/components/popover/popover.vue            |   5 +-
 src/components/side_drawer/side_drawer.vue    |  53 +++----
 .../status_popover/status_popover.vue         |   2 +-
 src/components/timeline/timeline.vue          |  11 ++
 src/components/timeline_menu/timeline_menu.js |  14 ++
 .../timeline_menu/timeline_menu.vue           | 140 ++++++++++++++++--
 src/i18n/de.json                              |   2 +-
 src/i18n/en.json                              |   2 +-
 src/i18n/fi.json                              |   2 +-
 13 files changed, 204 insertions(+), 66 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7b9ad3dc..cad25ba1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -112,7 +112,7 @@
             {{ $t("login.hint") }}
           </router-link>
         </div>
-        <transition name="fade">
+        <transition>
           <router-view />
         </transition>
       </div>
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 8f7edb7f..eda01d35 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,18 +1,30 @@
 import { mapState } from 'vuex'
 
+const timelineRoutes = [
+  'friends',
+  'dms',
+  'public-timeline',
+  'public-external-timeline'
+]
+
 const NavPanel = {
   created () {
     if (this.currentUser && this.currentUser.locked) {
       this.$store.dispatch('startFetchingFollowRequests')
     }
   },
-  computed: mapState({
-    currentUser: state => state.users.currentUser,
-    chat: state => state.chat.channel,
-    followRequestCount: state => state.api.followRequests.length,
-    privateMode: state => state.instance.private,
-    federating: state => state.instance.federating
-  })
+  computed: {
+    onTimelineRoute () {
+      return timelineRoutes.includes(this.$route.name)
+    },
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      chat: state => state.chat.channel,
+      followRequestCount: state => state.api.followRequests.length,
+      privateMode: state => state.instance.private,
+      federating: state => state.instance.federating
+    })
+  }
 }
 
 export default NavPanel
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index ed70f019..1622eafa 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -3,7 +3,10 @@
     <div class="panel panel-default">
       <ul>
         <li v-if="currentUser">
-          <router-link :to="{ name: 'friends' }">
+          <router-link
+            :to="{ name: 'friends' }"
+            :class="onTimelineRoute && 'router-link-active'"
+          >
             <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
           </router-link>
         </li>
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index a40a9195..695f73b9 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -18,7 +18,9 @@ const Popover = {
     // Takes a x/y object and tells how many pixels to offset from
     // anchor point on either axis
     offset: Object,
-    // Additional styles you may want for the popover container
+    // 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
   },
   data () {
@@ -106,7 +108,7 @@ const Popover = {
       // single translate or translate3d resulted in blurry text.
       this.styles = {
         opacity: 1,
-        transform: `translateX(${Math.floor(translateX)}px) translateY(${Math.floor(translateY)}px)`
+        transform: `translateX(${Math.round(translateX)}px) translateY(${Math.round(translateY)}px)`
       }
     },
     showPopover () {
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index a271cb1b..5c99c509 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -14,7 +14,7 @@
       ref="content"
       :style="styles"
       class="popover"
-      :class="popoverClass"
+      :class="popoverClass || 'popover-default'"
     >
       <slot
         name="content"
@@ -34,6 +34,9 @@
   z-index: 8;
   position: absolute;
   min-width: 0;
+}
+
+.popover-default {
   transition: opacity 0.3s;
 
   box-shadow: 1px 1px 4px rgba(0,0,0,.6);
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index f253742d..a941143c 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -39,24 +39,6 @@
             <i class="button-icon icon-login" /> {{ $t("login.login") }}
           </router-link>
         </li>
-        <li
-          v-if="currentUser"
-          @click="toggleDrawer"
-        >
-          <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
-          </router-link>
-        </li>
-        <li
-          v-if="currentUser"
-          @click="toggleDrawer"
-        >
-          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
-          </router-link>
-        </li>
-      </ul>
-      <ul>
         <li
           v-if="currentUser"
           @click="toggleDrawer"
@@ -66,7 +48,22 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser && currentUser.locked"
+          v-else
+          @click="toggleDrawer"
+        >
+          <router-link :to="{ name: 'public-timeline' }">
+            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
+          </router-link>
+        </li>
+      </ul>
+      <ul v-if="currentUser">
+        <li @click="toggleDrawer">
+          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
+            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
+          </router-link>
+        </li>
+        <li
+          v-if="currentUser.locked"
           @click="toggleDrawer"
         >
           <router-link to="/friend-requests">
@@ -80,23 +77,7 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser || !privateMode"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/public">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
-        <li
-          v-if="federating && (currentUser || !privateMode)"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/all">
-            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
-          </router-link>
-        </li>
-        <li
-          v-if="currentUser && chat"
+          v-if="chat"
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index f5948207..2a8503e8 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -1,7 +1,7 @@
 <template>
   <Popover
     trigger="hover"
-    popover-class="status-popover"
+    popover-class="popover-default status-popover"
     :bound-to="{ x: 'container' }"
     @show="enter"
   >
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index f8baaf19..caac5538 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -104,4 +104,15 @@
     opacity: 1;
   }
 }
+
+.timeline-heading {
+  max-width: 100%;
+  flex-wrap: nowrap;
+  .loadmore-button {
+    flex-shrink: 0;
+  }
+  .loadmore-text {
+    flex-shrink: 0;
+  }
+}
 </style>
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 912dd79a..d35b7789 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -5,11 +5,25 @@ const TimelineMenu = {
   components: {
     Popover
   },
+  data () {
+    return {
+      isOpen: false
+    }
+  },
   created () {
     if (this.currentUser && this.currentUser.locked) {
       this.$store.dispatch('startFetchingFollowRequests')
     }
   },
+  methods: {
+    openMenu () {
+      // Tried using $nextTick, but the animation wouldn't
+      // play, I assume it played too quickly
+      setTimeout(() => {
+        this.isOpen = true
+      }, 1)
+    }
+  },
   computed: {
     ...mapState({
       currentUser: state => state.users.currentUser,
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index dfdf7180..9cb40262 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -2,28 +2,36 @@
   <Popover
     trigger="click"
     class="timeline-menu"
-    popover-class="nav-panel timeline-menu-popover"
+    :class="{ 'open': isOpen }"
+    :margin="{ left: -15, right: -200 }"
+    :bound-to="{ x: 'container' }"
+    popover-class="timeline-menu-popover-wrap"
+    @show="openMenu"
+    @close="() => isOpen = false"
   >
-    <div slot="content">
+    <div
+      slot="content"
+      class="timeline-menu-popover panel panel-default"
+    >
       <ul>
         <li v-if="currentUser">
           <router-link :to="{ name: 'friends' }">
-            <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
+            <i class="button-icon icon-home-2" />{{ $t("nav.timeline") }}
           </router-link>
         </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
+            <i class="button-icon icon-mail-alt" />{{ $t("nav.dms") }}
           </router-link>
         </li>
         <li v-if="currentUser || !privateMode">
           <router-link :to="{ name: 'public-timeline' }">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
+            <i class="button-icon icon-users" />{{ $t("nav.public_tl") }}
           </router-link>
         </li>
         <li v-if="federating && (currentUser || !privateMode)">
           <router-link :to="{ name: 'public-external-timeline' }">
-            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
+            <i class="button-icon icon-globe" />{{ $t("nav.twkn") }}
           </router-link>
         </li>
       </ul>
@@ -32,7 +40,7 @@
       slot="trigger"
       class="title timeline-menu-title"
     >
-      {{ timelineNamesForRoute[$route.name] }}
+      <span>{{ timelineNamesForRoute[$route.name] }}</span>
       <i class="icon-down-open" />
     </div>
   </Popover>
@@ -44,18 +52,122 @@
 @import '../../_variables.scss';
 
 .timeline-menu {
-  flex-grow: 1;
-  .timeline-menu-popover {
-    width: 20rem;
-    font-size: 1rem;
-    margin-left: -0.6em;
+  flex-shrink: 1;
+  margin-right: auto;
+  min-width: 0;
+  width: 24rem;
+  .timeline-menu-popover-wrap {
+    overflow: hidden;
     margin-top: 0.6em;
+    padding: 0 15px 15px 15px;
+  }
+  .timeline-menu-popover {
+    width: 24rem;
+    max-width: 100vw;
+    margin: 0;
+    font-size: 1rem;
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+    transform: translateY(-100%);
+    transition: transform 100ms;
+  }
+  .panel::after {
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+  }
+  &.open .timeline-menu-popover {
+    transform: translateY(0);
   }
 
   .timeline-menu-title {
-    flex-grow: 0;
-    width: 20rem;
     margin: 0;
+    cursor: pointer;
+    display: flex;
+    user-select: none;
+    width: 100%;
+
+    span {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    i {
+      margin-left: 0.6em;
+      flex-shrink: 0;
+      font-size: 1rem;
+      transition: transform 100ms;
+    }
+  }
+
+  &.open .timeline-menu-title i {
+    color: $fallback--text;
+    color: var(--panelText, $fallback--text);
+    transform: rotate(180deg);
+  }
+
+  .panel {
+    box-shadow: var(--popoverShadow);
+  }
+
+  ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  li {
+    border-bottom: 1px solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+    padding: 0;
+
+    &:last-child a {
+      border-bottom-right-radius: $fallback--panelRadius;
+      border-bottom-right-radius: var(--panelRadius, $fallback--panelRadius);
+      border-bottom-left-radius: $fallback--panelRadius;
+      border-bottom-left-radius: var(--panelRadius, $fallback--panelRadius);
+    }
+
+    &:last-child {
+      border: none;
+    }
+
+    i {
+      margin: 0 0.5em;
+    }
+  }
+
+  a {
+    display: block;
+    padding: 0.6em 0;
+
+    &:hover {
+      background-color: $fallback--lightBg;
+      background-color: var(--selectedMenu, $fallback--lightBg);
+      color: $fallback--link;
+      color: var(--selectedMenuText, $fallback--link);
+      --faint: var(--selectedMenuFaintText, $fallback--faint);
+      --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
+      --lightText: var(--selectedMenuLightText, $fallback--lightText);
+      --icon: var(--selectedMenuIcon, $fallback--icon);
+    }
+
+    &.router-link-active {
+      font-weight: bolder;
+      background-color: $fallback--lightBg;
+      background-color: var(--selectedMenu, $fallback--lightBg);
+      color: $fallback--text;
+      color: var(--selectedMenuText, $fallback--text);
+      --faint: var(--selectedMenuFaintText, $fallback--faint);
+      --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
+      --lightText: var(--selectedMenuLightText, $fallback--lightText);
+      --icon: var(--selectedMenuIcon, $fallback--icon);
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
   }
 }
 
diff --git a/src/i18n/de.json b/src/i18n/de.json
index a44e58cb..1258dd9f 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -58,7 +58,7 @@
     "dms": "Direktnachrichten",
     "public_tl": "Öffentliche Zeitleiste",
     "timeline": "Zeitleiste",
-    "twkn": "Das gesamte bekannte Netzwerk",
+    "twkn": "Bekannte Netzwerk",
     "user_search": "Benutzersuche",
     "search": "Suche",
     "preferences": "Voreinstellungen",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 59f69e57..bfe7b40d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -119,7 +119,7 @@
     "dms": "Direct Messages",
     "public_tl": "Public Timeline",
     "timeline": "Timeline",
-    "twkn": "The Whole Known Network",
+    "twkn": "Known Fediverse",
     "user_search": "User Search",
     "search": "Search",
     "who_to_follow": "Who to follow",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 99a1b53a..f8652d19 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -58,7 +58,7 @@
     "dms": "Yksityisviestit",
     "public_tl": "Julkinen Aikajana",
     "timeline": "Aikajana",
-    "twkn": "Koko Tunnettu Verkosto",
+    "twkn": "Tunnettu Verkosto",
     "user_search": "Käyttäjähaku",
     "who_to_follow": "Seurausehdotukset",
     "preferences": "Asetukset",

From ebe885953c023e96dd8574ce7667b84884bab3cc Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 3 Jul 2020 12:59:30 +0300
Subject: [PATCH 272/415] change more opinionated translation

---
 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 bfe7b40d..4329b8f8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -119,7 +119,7 @@
     "dms": "Direct Messages",
     "public_tl": "Public Timeline",
     "timeline": "Timeline",
-    "twkn": "Known Fediverse",
+    "twkn": "Known Network",
     "user_search": "User Search",
     "search": "Search",
     "who_to_follow": "Who to follow",

From 08b593746faf54ac41df25bb2cc5a1f72ae1a9b5 Mon Sep 17 00:00:00 2001
From: Ilja <pleroma@spectraltheorem.be>
Date: Fri, 3 Jul 2020 10:17:42 +0000
Subject: [PATCH 273/415] FE part of BE issue 1586 provide index md

* I added an index.md which will be the landing page for the docs. It has an explanation of Pleroma-FE from the user point of view
* See also BE MR: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2669
* And issue: https://git.pleroma.social/pleroma/pleroma/-/issues/1586
---
 docs/USER_GUIDE.md | 2 --
 docs/index.md      | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 docs/index.md

diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
index f417f33d..241ad331 100644
--- a/docs/USER_GUIDE.md
+++ b/docs/USER_GUIDE.md
@@ -8,8 +8,6 @@
 >
 > --Catbag
 
-Pleroma-FE user interface is modeled after Qvitter which is modeled after older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options.
-
 ## Posting, reading, basic functions.
 
 After registering and logging in you're presented with your timeline in right column and new post form with timeline list and notifications in the left column.
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..8764f9ab
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,8 @@
+# Introduction to Pleroma-FE
+## What is Pleroma-FE?
+
+Pleroma-FE is the default user-facing frontend for Pleroma. It's user interface is modeled after Qvitter which is modeled after an older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options.
+
+## How can I use it?
+
+If your instance uses Pleroma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Pleroma-FE User Guide](./USER_GUIDE.md). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).

From 77bb31b474f16aa2bbda66e2aa73cf0d20eb934e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 3 Jul 2020 13:26:11 +0300
Subject: [PATCH 274/415] remove extra computed from nav panel

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

diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index eda01d35..f09f43a0 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -19,7 +19,6 @@ const NavPanel = {
     },
     ...mapState({
       currentUser: state => state.users.currentUser,
-      chat: state => state.chat.channel,
       followRequestCount: state => state.api.followRequests.length,
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating

From de291e2e33f1d9e04b27ed30ba3b012d73178e63 Mon Sep 17 00:00:00 2001
From: Eugenij <eugenijm@protonmail.com>
Date: Fri, 3 Jul 2020 19:45:49 +0000
Subject: [PATCH 275/415] Add bookmarks

Co-authored-by: jared <jaredrmain@gmail.com>
---
 CHANGELOG.md                                  |  1 +
 package.json                                  |  1 +
 src/boot/routes.js                            |  2 +
 .../bookmark_timeline/bookmark_timeline.js    | 17 ++++++++
 .../bookmark_timeline/bookmark_timeline.vue   |  9 ++++
 src/components/extra_buttons/extra_buttons.js | 10 +++++
 .../extra_buttons/extra_buttons.vue           | 16 +++++++
 src/components/nav_panel/nav_panel.vue        |  5 +++
 src/components/side_drawer/side_drawer.vue    |  8 ++++
 src/components/timeline/timeline.js           |  2 +-
 src/i18n/en.json                              |  6 ++-
 src/i18n/ru.json                              |  7 ++-
 src/modules/statuses.js                       | 43 +++++++++++++++----
 src/services/api/api.service.js               | 34 +++++++++++++--
 .../entity_normalizer.service.js              | 16 +++++++
 .../notifications_fetcher.service.js          |  2 +-
 .../timeline_fetcher.service.js               | 17 +++++---
 static/fontello.json                          | 12 ++++++
 .../entity_normalizer.spec.js                 | 22 +++++++++-
 yarn.lock                                     |  7 +++
 20 files changed, 213 insertions(+), 24 deletions(-)
 create mode 100644 src/components/bookmark_timeline/bookmark_timeline.js
 create mode 100644 src/components/bookmark_timeline/bookmark_timeline.vue
 mode change 100755 => 100644 static/fontello.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d978d362..2595af1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,6 +99,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Ability to change user's email
 - About page
 - Added remote user redirect
+- Bookmarks
 ### Changed
 - changed the way fading effects for user profile/long statuses works, now uses css-mask instead of gradient background hacks which weren't exactly compatible with semi-transparent themes
 ### Fixed
diff --git a/package.json b/package.json
index c0665f6e..96231171 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "cropperjs": "^1.4.3",
     "diff": "^3.0.1",
     "escape-html": "^1.0.3",
+    "parse-link-header": "^1.0.1",
     "localforage": "^1.5.0",
     "phoenix": "^1.3.0",
     "portal-vue": "^2.1.4",
diff --git a/src/boot/routes.js b/src/boot/routes.js
index d98a3b50..f63d8adf 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -2,6 +2,7 @@ import PublicTimeline from 'components/public_timeline/public_timeline.vue'
 import PublicAndExternalTimeline from 'components/public_and_external_timeline/public_and_external_timeline.vue'
 import FriendsTimeline from 'components/friends_timeline/friends_timeline.vue'
 import TagTimeline from 'components/tag_timeline/tag_timeline.vue'
+import BookmarkTimeline from 'components/bookmark_timeline/bookmark_timeline.vue'
 import ConversationPage from 'components/conversation-page/conversation-page.vue'
 import Interactions from 'components/interactions/interactions.vue'
 import DMs from 'components/dm_timeline/dm_timeline.vue'
@@ -40,6 +41,7 @@ export default (store) => {
     { name: 'public-timeline', path: '/main/public', component: PublicTimeline },
     { name: 'friends', path: '/main/friends', component: FriendsTimeline, beforeEnter: validateAuthenticatedRoute },
     { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
+    { name: 'bookmarks', path: '/bookmarks', component: BookmarkTimeline },
     { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
     { name: 'remote-user-profile-acct',
       path: '/remote-users/(@?):username([^/@]+)@:hostname([^/@]+)',
diff --git a/src/components/bookmark_timeline/bookmark_timeline.js b/src/components/bookmark_timeline/bookmark_timeline.js
new file mode 100644
index 00000000..64b69e5d
--- /dev/null
+++ b/src/components/bookmark_timeline/bookmark_timeline.js
@@ -0,0 +1,17 @@
+import Timeline from '../timeline/timeline.vue'
+
+const Bookmarks = {
+  computed: {
+    timeline () {
+      return this.$store.state.statuses.timelines.bookmarks
+    }
+  },
+  components: {
+    Timeline
+  },
+  destroyed () {
+    this.$store.commit('clearTimeline', { timeline: 'bookmarks' })
+  }
+}
+
+export default Bookmarks
diff --git a/src/components/bookmark_timeline/bookmark_timeline.vue b/src/components/bookmark_timeline/bookmark_timeline.vue
new file mode 100644
index 00000000..8da6884b
--- /dev/null
+++ b/src/components/bookmark_timeline/bookmark_timeline.vue
@@ -0,0 +1,9 @@
+<template>
+  <Timeline
+    :title="$t('nav.bookmarks')"
+    :timeline="timeline"
+    :timeline-name="'bookmarks'"
+  />
+</template>
+
+<script src="./bookmark_timeline.js"></script>
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index e4b19d01..5e0c36bb 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -34,6 +34,16 @@ const ExtraButtons = {
       navigator.clipboard.writeText(this.statusLink)
         .then(() => this.$emit('onSuccess'))
         .catch(err => this.$emit('onError', err.error.error))
+    },
+    bookmarkStatus () {
+      this.$store.dispatch('bookmark', { id: this.status.id })
+        .then(() => this.$emit('onSuccess'))
+        .catch(err => this.$emit('onError', err.error.error))
+    },
+    unbookmarkStatus () {
+      this.$store.dispatch('unbookmark', { id: this.status.id })
+        .then(() => this.$emit('onSuccess'))
+        .catch(err => this.$emit('onError', err.error.error))
     }
   },
   computed: {
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 68db6fd8..7a4e8642 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -40,6 +40,22 @@
         >
           <i class="icon-pin" /><span>{{ $t("status.unpin") }}</span>
         </button>
+        <button
+          v-if="!status.bookmarked"
+          class="dropdown-item dropdown-item-icon"
+          @click.prevent="bookmarkStatus"
+          @click="close"
+        >
+          <i class="icon-bookmark-empty" /><span>{{ $t("status.bookmark") }}</span>
+        </button>
+        <button
+          v-if="status.bookmarked"
+          class="dropdown-item dropdown-item-icon"
+          @click.prevent="unbookmarkStatus"
+          @click="close"
+        >
+          <i class="icon-bookmark" /><span>{{ $t("status.unbookmark") }}</span>
+        </button>
         <button
           v-if="canDelete"
           class="dropdown-item dropdown-item-icon"
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 8cd04dc7..f164b2b0 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -17,6 +17,11 @@
             <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
           </router-link>
         </li>
+        <li v-if="currentUser">
+          <router-link :to="{ name: 'bookmarks'}">
+            <i class="button-icon icon-bookmark" /> {{ $t("nav.bookmarks") }}
+          </router-link>
+        </li>
         <li v-if="currentUser && currentUser.locked">
           <router-link :to="{ name: 'friend-requests' }">
             <i class="button-icon icon-user-plus" /> {{ $t("nav.friend_requests") }}
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index f253742d..0ac53b34 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -65,6 +65,14 @@
             <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
           </router-link>
         </li>
+        <li
+          v-if="currentUser"
+          @click="toggleDrawer"
+        >
+          <router-link :to="{ name: 'bookmarks'}">
+            <i class="button-icon icon-bookmark" /> {{ $t("nav.bookmarks") }}
+          </router-link>
+        </li>
         <li
           v-if="currentUser && currentUser.locked"
           @click="toggleDrawer"
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index d6519f4a..bac73022 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -137,7 +137,7 @@ const Timeline = {
         showImmediately: true,
         userId: this.userId,
         tag: this.tag
-      }).then(statuses => {
+      }).then(({ statuses }) => {
         store.commit('setLoading', { timeline: this.timelineName, value: false })
         if (statuses && statuses.length === 0) {
           this.bottomedOut = true
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 59f69e57..2e48c473 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -120,6 +120,7 @@
     "public_tl": "Public Timeline",
     "timeline": "Timeline",
     "twkn": "The Whole Known Network",
+    "bookmarks": "Bookmarks",
     "user_search": "User Search",
     "search": "Search",
     "who_to_follow": "Who to follow",
@@ -629,6 +630,8 @@
     "pin": "Pin on profile",
     "unpin": "Unpin from profile",
     "pinned": "Pinned",
+    "bookmark": "Bookmark",
+    "unbookmark": "Unbookmark",
     "delete_confirm": "Do you really want to delete this status?",
     "reply_to": "Reply to",
     "replies_list": "Replies:",
@@ -724,7 +727,8 @@
     "add_reaction": "Add Reaction",
     "user_settings": "User Settings",
     "accept_follow_request": "Accept follow request",
-    "reject_follow_request": "Reject follow request"
+    "reject_follow_request": "Reject follow request",
+    "bookmark": "Bookmark"
   },
   "upload": {
     "error": {
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index aa78db26..08f05d18 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -45,7 +45,8 @@
     "timeline": "Лента",
     "twkn": "Федеративная лента",
     "search": "Поиск",
-    "friend_requests": "Запросы на чтение"
+    "friend_requests": "Запросы на чтение",
+    "bookmarks": "Закладки"
   },
   "notifications": {
     "broken_favorite": "Неизвестный статус, ищем...",
@@ -366,6 +367,10 @@
     "show_new": "Показать новые",
     "up_to_date": "Обновлено"
   },
+  "status": {
+    "bookmark": "В закладки",
+    "unbookmark": "Удалить из закладок"
+  },
   "user_card": {
     "block": "Заблокировать",
     "blocked": "Заблокирован",
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 4d3f8031..7fbf685c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -62,7 +62,8 @@ export const defaultState = () => ({
     publicAndExternal: emptyTl(),
     friends: emptyTl(),
     tag: emptyTl(),
-    dms: emptyTl()
+    dms: emptyTl(),
+    bookmarks: emptyTl()
   }
 })
 
@@ -163,8 +164,7 @@ const removeStatusFromGlobalStorage = (state, status) => {
   }
 }
 
-const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {},
-  noIdUpdate = false, userId }) => {
+const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {}, noIdUpdate = false, userId, pagination = {} }) => {
   // Sanity check
   if (!isArray(statuses)) {
     return false
@@ -173,8 +173,13 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   const allStatuses = state.allStatuses
   const timelineObject = state.timelines[timeline]
 
-  const maxNew = statuses.length > 0 ? maxBy(statuses, 'id').id : 0
-  const minNew = statuses.length > 0 ? minBy(statuses, 'id').id : 0
+  // Mismatch between API pagination and our internal minId/maxId tracking systems:
+  // pagination.maxId is the oldest of the returned statuses when fetching older,
+  // and pagination.minId is the newest when fetching newer. The names come directly
+  // from the arguments they're supposed to be passed as for the next fetch.
+  const minNew = pagination.maxId || (statuses.length > 0 ? minBy(statuses, 'id').id : 0)
+  const maxNew = pagination.minId || (statuses.length > 0 ? maxBy(statuses, 'id').id : 0)
+
   const newer = timeline && (maxNew > timelineObject.maxId || timelineObject.maxId === 0) && statuses.length > 0
   const older = timeline && (minNew < timelineObject.minId || timelineObject.minId === 0) && statuses.length > 0
 
@@ -315,7 +320,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   })
 
   // Keep the visible statuses sorted
-  if (timeline) {
+  if (timeline && !(timeline === 'bookmarks')) {
     sortTimeline(timelineObject)
   }
 }
@@ -463,6 +468,14 @@ export const mutations = {
       newStatus.rebloggedBy.push(user)
     }
   },
+  setBookmarked (state, { status, value }) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.bookmarked = value
+  },
+  setBookmarkedConfirm (state, { status }) {
+    const newStatus = state.allStatusesObject[status.id]
+    newStatus.bookmarked = status.bookmarked
+  },
   setDeleted (state, { status }) {
     const newStatus = state.allStatusesObject[status.id]
     newStatus.deleted = true
@@ -590,8 +603,8 @@ export const mutations = {
 const statuses = {
   state: defaultState(),
   actions: {
-    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId }) {
-      commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId })
+    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId, pagination }) {
+      commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId, pagination })
     },
     addNewNotifications ({ rootState, commit, dispatch, rootGetters }, { notifications, older }) {
       commit('addNewNotifications', { visibleNotificationTypes: visibleNotificationTypes(rootState), dispatch, notifications, older, rootGetters })
@@ -666,6 +679,20 @@ const statuses = {
       rootState.api.backendInteractor.unretweet({ id: status.id })
         .then(status => commit('setRetweetedConfirm', { status, user: rootState.users.currentUser }))
     },
+    bookmark ({ rootState, commit }, status) {
+      commit('setBookmarked', { status, value: true })
+      rootState.api.backendInteractor.bookmarkStatus({ id: status.id })
+        .then(status => {
+          commit('setBookmarkedConfirm', { status })
+        })
+    },
+    unbookmark ({ rootState, commit }, status) {
+      commit('setBookmarked', { status, value: false })
+      rootState.api.backendInteractor.unbookmarkStatus({ id: status.id })
+        .then(status => {
+          commit('setBookmarkedConfirm', { status })
+        })
+    },
     queueFlush ({ rootState, commit }, { timeline, id }) {
       commit('queueFlush', { timeline, id })
     },
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 7e5e9645..c9ec88b7 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,5 +1,5 @@
 import { each, map, concat, last, get } from 'lodash'
-import { parseStatus, parseUser, parseNotification, parseAttachment } from '../entity_normalizer/entity_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification, parseAttachment, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js'
 import { RegistrationError, StatusCodeError } from '../errors/errors'
 
 /* eslint-env browser */
@@ -50,6 +50,7 @@ const MASTODON_USER_URL = '/api/v1/accounts'
 const MASTODON_USER_RELATIONSHIPS_URL = '/api/v1/accounts/relationships'
 const MASTODON_USER_TIMELINE_URL = id => `/api/v1/accounts/${id}/statuses`
 const MASTODON_TAG_TIMELINE_URL = tag => `/api/v1/timelines/tag/${tag}`
+const MASTODON_BOOKMARK_TIMELINE_URL = '/api/v1/bookmarks'
 const MASTODON_USER_BLOCKS_URL = '/api/v1/blocks/'
 const MASTODON_USER_MUTES_URL = '/api/v1/mutes/'
 const MASTODON_BLOCK_USER_URL = id => `/api/v1/accounts/${id}/block`
@@ -58,6 +59,8 @@ const MASTODON_MUTE_USER_URL = id => `/api/v1/accounts/${id}/mute`
 const MASTODON_UNMUTE_USER_URL = id => `/api/v1/accounts/${id}/unmute`
 const MASTODON_SUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/subscribe`
 const MASTODON_UNSUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/unsubscribe`
+const MASTODON_BOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/bookmark`
+const MASTODON_UNBOOKMARK_STATUS_URL = id => `/api/v1/statuses/${id}/unbookmark`
 const MASTODON_POST_STATUS_URL = '/api/v1/statuses'
 const MASTODON_MEDIA_UPLOAD_URL = '/api/v1/media'
 const MASTODON_VOTE_URL = id => `/api/v1/polls/${id}/votes`
@@ -510,7 +513,8 @@ const fetchTimeline = ({
     user: MASTODON_USER_TIMELINE_URL,
     media: MASTODON_USER_TIMELINE_URL,
     favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
-    tag: MASTODON_TAG_TIMELINE_URL
+    tag: MASTODON_TAG_TIMELINE_URL,
+    bookmarks: MASTODON_BOOKMARK_TIMELINE_URL
   }
   const isNotifications = timeline === 'notifications'
   const params = []
@@ -539,7 +543,7 @@ const fetchTimeline = ({
   if (timeline === 'public' || timeline === 'publicAndExternal') {
     params.push(['only_media', false])
   }
-  if (timeline !== 'favorites') {
+  if (timeline !== 'favorites' && timeline !== 'bookmarks') {
     params.push(['with_muted', withMuted])
   }
   if (replyVisibility !== 'all') {
@@ -552,16 +556,20 @@ const fetchTimeline = ({
   url += `?${queryString}`
   let status = ''
   let statusText = ''
+  let pagination = {}
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => {
       status = data.status
       statusText = data.statusText
+      pagination = parseLinkHeaderPagination(data.headers.get('Link'), {
+        flakeId: timeline !== 'bookmarks' && timeline !== 'notifications'
+      })
       return data
     })
     .then((data) => data.json())
     .then((data) => {
       if (!data.error) {
-        return data.map(isNotifications ? parseNotification : parseStatus)
+        return { data: data.map(isNotifications ? parseNotification : parseStatus), pagination }
       } else {
         data.status = status
         data.statusText = statusText
@@ -612,6 +620,22 @@ const unretweet = ({ id, credentials }) => {
     .then((data) => parseStatus(data))
 }
 
+const bookmarkStatus = ({ id, credentials }) => {
+  return promisedRequest({
+    url: MASTODON_BOOKMARK_STATUS_URL(id),
+    headers: authHeaders(credentials),
+    method: 'POST'
+  })
+}
+
+const unbookmarkStatus = ({ id, credentials }) => {
+  return promisedRequest({
+    url: MASTODON_UNBOOKMARK_STATUS_URL(id),
+    headers: authHeaders(credentials),
+    method: 'POST'
+  })
+}
+
 const postStatus = ({
   credentials,
   status,
@@ -1150,6 +1174,8 @@ const apiService = {
   unfavorite,
   retweet,
   unretweet,
+  bookmarkStatus,
+  unbookmarkStatus,
   postStatus,
   deleteStatus,
   uploadMedia,
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 3bdb92f3..0d27dc97 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -1,4 +1,5 @@
 import escape from 'escape-html'
+import parseLinkHeader from 'parse-link-header'
 import { isStatusNotification } from '../notification_utils/notification_utils.js'
 
 const qvitterStatusType = (status) => {
@@ -232,6 +233,8 @@ export const parseStatus = (data) => {
     output.repeated = data.reblogged
     output.repeat_num = data.reblogs_count
 
+    output.bookmarked = data.bookmarked
+
     output.type = data.reblog ? 'retweet' : 'status'
     output.nsfw = data.sensitive
 
@@ -381,3 +384,16 @@ const isNsfw = (status) => {
   const nsfwRegex = /#nsfw/i
   return (status.tags || []).includes('nsfw') || !!(status.text || '').match(nsfwRegex)
 }
+
+export const parseLinkHeaderPagination = (linkHeader, opts = {}) => {
+  const flakeId = opts.flakeId
+  const parsedLinkHeader = parseLinkHeader(linkHeader)
+  if (!parsedLinkHeader) return
+  const maxId = parsedLinkHeader.next.max_id
+  const minId = parsedLinkHeader.prev.min_id
+
+  return {
+    maxId: flakeId ? maxId : parseInt(maxId, 10),
+    minId: flakeId ? minId : parseInt(minId, 10)
+  }
+}
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 64499a1b..4644e449 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -41,7 +41,7 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
 
 const fetchNotifications = ({ store, args, older }) => {
   return apiService.fetchTimeline(args)
-    .then((notifications) => {
+    .then(({ data: notifications }) => {
       update({ store, notifications, older })
       return notifications
     }, () => store.dispatch('setNotificationsError', { value: true }))
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 30fb26bd..214294eb 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -2,7 +2,7 @@ import { camelCase } from 'lodash'
 
 import apiService from '../api/api.service.js'
 
-const update = ({ store, statuses, timeline, showImmediately, userId }) => {
+const update = ({ store, statuses, timeline, showImmediately, userId, pagination }) => {
   const ccTimeline = camelCase(timeline)
 
   store.dispatch('setError', { value: false })
@@ -12,7 +12,8 @@ const update = ({ store, statuses, timeline, showImmediately, userId }) => {
     timeline: ccTimeline,
     userId,
     statuses,
-    showImmediately
+    showImmediately,
+    pagination
   })
 }
 
@@ -47,16 +48,18 @@ const fetchAndUpdate = ({
   const numStatusesBeforeFetch = timelineData.statuses.length
 
   return apiService.fetchTimeline(args)
-    .then((statuses) => {
-      if (statuses.error) {
-        store.dispatch('setErrorData', { value: statuses })
+    .then(response => {
+      if (response.error) {
+        store.dispatch('setErrorData', { value: response })
         return
       }
+
+      const { data: statuses, pagination } = response
       if (!older && statuses.length >= 20 && !timelineData.loading && numStatusesBeforeFetch > 0) {
         store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId })
       }
-      update({ store, statuses, timeline, showImmediately, userId })
-      return statuses
+      update({ store, statuses, timeline, showImmediately, userId, pagination })
+      return { statuses, pagination }
     }, () => store.dispatch('setError', { value: true }))
 }
 
diff --git a/static/fontello.json b/static/fontello.json
old mode 100755
new mode 100644
index ac3f0a18..6083c0bf
--- a/static/fontello.json
+++ b/static/fontello.json
@@ -375,6 +375,18 @@
       "css": "download",
       "code": 59429,
       "src": "fontawesome"
+    },
+    {
+      "uid": "f04a5d24e9e659145b966739c4fde82a",
+      "css": "bookmark",
+      "code": 59430,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "2f5ef6f6b7aaebc56458ab4e865beff5",
+      "css": "bookmark-empty",
+      "code": 61591,
+      "src": "fontawesome"
     }
   ]
 }
\ No newline at end of file
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 ccb57942..e1f7a958 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -1,4 +1,4 @@
-import { parseStatus, parseUser, parseNotification, addEmojis } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification, addEmojis, parseLinkHeaderPagination } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
 import mastoapidata from '../../../../fixtures/mastoapi.json'
 import qvitterapidata from '../../../../fixtures/statuses.json'
 
@@ -383,4 +383,24 @@ describe('API Entities normalizer', () => {
       expect(result).to.include('title=\':[a-z] {|}*:\'')
     })
   })
+
+  describe('Link header pagination', () => {
+    it('Parses min and max ids as integers', () => {
+      const linkHeader = '<https://example.com/api/v1/notifications?max_id=861676>; rel="next", <https://example.com/api/v1/notifications?min_id=861741>; rel="prev"'
+      const result = parseLinkHeaderPagination(linkHeader)
+      expect(result).to.eql({
+        'maxId': 861676,
+        'minId': 861741
+      })
+    })
+
+    it('Parses min and max ids as flakes', () => {
+      const linkHeader = '<http://example.com/api/v1/timelines/home?max_id=9waQx5IIS48qVue2Ai>; rel="next", <http://example.com/api/v1/timelines/home?min_id=9wi61nIPnfn674xgie>; rel="prev"'
+      const result = parseLinkHeaderPagination(linkHeader, { flakeId: true })
+      expect(result).to.eql({
+        'maxId': '9waQx5IIS48qVue2Ai',
+        'minId': '9wi61nIPnfn674xgie'
+      })
+    })
+  })
 })
diff --git a/yarn.lock b/yarn.lock
index f05b00b1..09316863 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5751,6 +5751,13 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-link-header@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-link-header/-/parse-link-header-1.0.1.tgz#bedfe0d2118aeb84be75e7b025419ec8a61140a7"
+  integrity sha1-vt/g0hGK64S+deewJUGeyKYRQKc=
+  dependencies:
+    xtend "~4.0.1"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"

From 9b40cf43d80f61d2afdaed757e4f873bf2dfd0a4 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Sat, 4 Jul 2020 18:42:15 +0900
Subject: [PATCH 276/415] fix height for emoji panel of settings modal

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

diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 833ff89a..0da4d9a8 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -30,7 +30,7 @@
       height: 100vh;
     }
 
-    .panel-body {
+    >.panel-body {
       height: 100%;
       overflow-y: hidden;
 

From 9178908c1ea8d0ad99b4a631abb9594edc3765bf Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Sun, 5 Jul 2020 06:54:12 +0000
Subject: [PATCH 277/415] Apply suggestion to
 src/components/notifications/notifications.js

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

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 30187072..d8a327b0 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -30,7 +30,7 @@ const Notifications = {
   created () {
     const store = this.$store
     const credentials = store.state.users.currentUser.credentials
-    notificationsFetcher.fetchAndUpdate({ store: this.$store, credentials })
+    notificationsFetcher.fetchAndUpdate({ store, credentials })
   },
   computed: {
     mainClass () {

From f254a847d2fa7e57c3686a3b51fef234fcf253bd Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 6 Jul 2020 10:53:03 +0300
Subject: [PATCH 278/415] move translation strings to correct place, translate
 error message

---
 src/components/post_status_form/post_status_form.js  | 4 ++--
 src/components/post_status_form/post_status_form.vue | 2 +-
 src/i18n/en.json                                     | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 1bf5dae3..18661235 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -192,7 +192,7 @@ const PostStatusForm = {
       if (this.posting) { return }
       if (this.submitDisabled) { return }
       if (this.emptyStatus) {
-        this.error = 'Cannot post an empty status with no files'
+        this.error = this.$t('post_status.empty_status_error')
         return
       }
 
@@ -240,7 +240,7 @@ const PostStatusForm = {
     },
     previewStatus () {
       if (this.emptyStatus && this.newStatus.spoilerText.trim() === '') {
-        this.preview = { error: this.$t('status.preview_empty') }
+        this.preview = { error: this.$t('post_status.preview_empty') }
         this.previewLoading = false
         return
       }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 0cebd36e..94729f75 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -21,7 +21,7 @@
             class="preview-toggle faint"
             @click.stop.prevent="togglePreview"
           >
-            {{ $t('status.preview') }}
+            {{ $t('post_status.preview') }}
             <i
               class="icon-down-open"
               :style="{ transform: showPreview ? 'rotate(0deg)' : 'rotate(-90deg)' }"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d7938405..264c4879 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -189,6 +189,9 @@
     "direct_warning_to_all": "This post will be visible to all the mentioned users.",
     "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
     "posting": "Posting",
+    "preview": "Preview",
+    "preview_empty": "Empty",
+    "empty_status_error": "Can't post an empty status with no files",
     "scope_notice": {
       "public": "This post will be visible to everyone",
       "private": "This post will be visible to your followers only",
@@ -644,8 +647,6 @@
     "copy_link": "Copy link to status",
     "thread_muted": "Thread muted",
     "thread_muted_and_words": ", has words:",
-    "preview": "Preview",
-    "preview_empty": "Empty",
     "show_full_subject": "Show full subject",
     "hide_full_subject": "Hide full subject",
     "show_content": "Show content",

From 7bdc3d6ce9c7e1d3831ee3e95fcc352ccc670ae8 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 6 Jul 2020 11:12:33 +0300
Subject: [PATCH 279/415] remove contenttype check from content type watcher

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 18661235..3d731ae4 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -176,12 +176,8 @@ const PostStatusForm = {
     ...mapGetters(['mergedConfig'])
   },
   watch: {
-    'newStatus.contentType': function (newType) {
-      if (newType === 'text/plain') {
-        this.closePreview()
-      } else if (this.preview) {
-        this.previewStatus(this.newStatus)
-      }
+    'newStatus.contentType': function () {
+      this.autoPreview()
     },
     'newStatus.spoilerText': function () {
       this.autoPreview()

From ada5a3806b3c36ad67d3a76f41bc1a9f18445759 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 6 Jul 2020 11:36:35 +0300
Subject: [PATCH 280/415] don't close preview on post, move visibility notices
 above the preview where they belong

---
 .../post_status_form/post_status_form.js      |  2 +-
 .../post_status_form/post_status_form.vue     | 76 +++++++++----------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3d731ae4..daadc10f 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -227,7 +227,7 @@ const PostStatusForm = {
           el.style.height = 'auto'
           el.style.height = undefined
           this.error = null
-          this.closePreview()
+          this.previewStatus()
         } else {
           this.error = data.error
         }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 94729f75..60dc4a21 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -16,44 +16,6 @@
         @drop.stop="fileDrop"
       />
       <div class="form-group">
-        <div class="preview-heading faint">
-          <a
-            class="preview-toggle faint"
-            @click.stop.prevent="togglePreview"
-          >
-            {{ $t('post_status.preview') }}
-            <i
-              class="icon-down-open"
-              :style="{ transform: showPreview ? 'rotate(0deg)' : 'rotate(-90deg)' }"
-            />
-          </a>
-          <i
-            v-show="previewLoading"
-            class="icon-spin3 animate-spin"
-          />
-        </div>
-        <div
-          v-if="showPreview"
-          class="preview-container"
-        >
-          <div
-            v-if="!preview"
-            class="preview-status"
-          >
-            {{ $t('general.loading') }}
-          </div>
-          <div
-            v-else-if="preview.error"
-            class="preview-status preview-error"
-          >
-            {{ preview.error }}
-          </div>
-          <StatusContent
-            v-else
-            :status="preview"
-            class="preview-status"
-          />
-        </div>
         <i18n
           v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private'"
           path="post_status.account_not_locked_warning"
@@ -107,6 +69,44 @@
           <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
           <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
         </p>
+        <div class="preview-heading faint">
+          <a
+            class="preview-toggle faint"
+            @click.stop.prevent="togglePreview"
+          >
+            {{ $t('post_status.preview') }}
+            <i
+              class="icon-down-open"
+              :style="{ transform: showPreview ? 'rotate(0deg)' : 'rotate(-90deg)' }"
+            />
+          </a>
+          <i
+            v-show="previewLoading"
+            class="icon-spin3 animate-spin"
+          />
+        </div>
+        <div
+          v-if="showPreview"
+          class="preview-container"
+        >
+          <div
+            v-if="!preview"
+            class="preview-status"
+          >
+            {{ $t('general.loading') }}
+          </div>
+          <div
+            v-else-if="preview.error"
+            class="preview-status preview-error"
+          >
+            {{ preview.error }}
+          </div>
+          <StatusContent
+            v-else
+            :status="preview"
+            class="preview-status"
+          />
+        </div>
         <EmojiInput
           v-if="newStatus.spoilerText || alwaysShowSubject"
           v-model="newStatus.spoilerText"

From 4d25be7cb35f86ba2abe883116dc6442c93a1d9d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 6 Jul 2020 13:42:33 +0300
Subject: [PATCH 281/415] fix modal types check being broken

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

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 561a5a98..fe28e5f3 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -63,10 +63,11 @@ const Attachment = {
       return this.type === 'html' || this.type === 'audio'
     },
     useModal () {
-      return this.size === 'hide' ? ['image', 'video', 'audio']
+      const modalTypes = this.size === 'hide' ? ['image', 'video', 'audio']
         : this.mergedConfig.playVideosInModal
           ? ['image', 'video']
           : ['image']
+      return modalTypes.includes(this.type)
     },
     ...mapGetters(['mergedConfig'])
   },

From d55c09df1844bf8fc99b7a3414cbd71ae2c8bad3 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 6 Jul 2020 15:06:13 +0300
Subject: [PATCH 282/415] fix edge case of videos and unknown files together

---
 src/components/attachment/attachment.js  | 3 ++-
 src/components/attachment/attachment.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 23af693f..cb31020d 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -60,7 +60,8 @@ const Attachment = {
       return this.size === 'small'
     },
     fullwidth () {
-      return this.type === 'html' || this.type === 'audio'
+      if (this.size === 'hide') return false
+      return this.type === 'html' || this.type === 'audio' || this.type === 'unknown'
     },
     useModal () {
       const modalTypes = this.size === 'hide' ? ['image', 'video', 'audio']
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index a18bf186..be7377e9 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -1,6 +1,7 @@
 <template>
   <div
     v-if="usePlaceholder"
+    :class="{ 'fullwidth': fullwidth }"
     @click="openModal"
   >
     <a

From b4709f93d46d1d88eb5cb0104b3ae07bd5cd823c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 7 Jul 2020 09:07:20 +0300
Subject: [PATCH 283/415] add more ways to set description

---
 .../post_status_form/post_status_form.js      | 73 ++++++++++++-------
 .../post_status_form/post_status_form.vue     |  1 +
 src/services/api/api.service.js               | 16 +++-
 .../status_poster/status_poster.service.js    | 15 +++-
 4 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 6bbf6cf1..6c0947af 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -6,7 +6,7 @@ import PollForm from '../poll/poll_form.vue'
 import Attachment from '../attachment/attachment.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
-import { reject, map, uniqBy } from 'lodash'
+import { reject, map, uniqBy, debounce } from 'lodash'
 import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
@@ -169,7 +169,7 @@ const PostStatusForm = {
     ...mapGetters(['mergedConfig'])
   },
   methods: {
-    postStatus (newStatus) {
+    async postStatus (newStatus) {
       if (this.posting) { return }
       if (this.submitDisabled) { return }
 
@@ -187,41 +187,43 @@ const PostStatusForm = {
       }
 
       this.posting = true
-      statusPoster.postStatus({
+
+      await this.setAllMediaDescriptions()
+
+      const data = await statusPoster.postStatus({
         status: newStatus.status,
         spoilerText: newStatus.spoilerText || null,
         visibility: newStatus.visibility,
         sensitive: newStatus.nsfw,
         media: newStatus.files,
-        mediaDescriptions: newStatus.mediaDescriptions || {},
         store: this.$store,
         inReplyToStatusId: this.replyTo,
         contentType: newStatus.contentType,
         poll
-      }).then((data) => {
-        if (!data.error) {
-          this.newStatus = {
-            status: '',
-            spoilerText: '',
-            files: [],
-            mediaDescriptions: {},
-            visibility: newStatus.visibility,
-            contentType: newStatus.contentType,
-            poll: {}
-          }
-          this.pollFormVisible = false
-          this.$refs.mediaUpload.clearFile()
-          this.clearPollForm()
-          this.$emit('posted')
-          let el = this.$el.querySelector('textarea')
-          el.style.height = 'auto'
-          el.style.height = undefined
-          this.error = null
-        } else {
-          this.error = data.error
-        }
-        this.posting = false
       })
+
+      if (!data.error) {
+        this.newStatus = {
+          status: '',
+          spoilerText: '',
+          files: [],
+          visibility: newStatus.visibility,
+          contentType: newStatus.contentType,
+          poll: {}
+        }
+        this.pollFormVisible = false
+        this.$refs.mediaUpload.clearFile()
+        this.clearPollForm()
+        this.$emit('posted')
+        let el = this.$el.querySelector('textarea')
+        el.style.height = 'auto'
+        el.style.height = undefined
+        this.error = null
+      } else {
+        this.error = data.error
+      }
+
+      this.posting = false
     },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
@@ -393,6 +395,23 @@ const PostStatusForm = {
     },
     dismissScopeNotice () {
       this.$store.dispatch('setOption', { name: 'hideScopeNotice', value: true })
+    },
+    debounceSendDescription: debounce(function (id, description) {
+      statusPoster.setMediaDescription({ store: this.$store, id, description })
+    }, 500),
+    updateMediaDescription (fileId, e) {
+      const description = e.target.value
+      this.newStatus.mediaDescriptions[fileId] = description
+      this.debounceSendDescription(fileId, description)
+    },
+    setMediaDescription (id) {
+      const description = this.newStatus.mediaDescriptions[id]
+      if (!description || description.trim() === '') return
+      return statusPoster.setMediaDescription({ store: this.$store, id, description })
+    },
+    setAllMediaDescriptions () {
+      const ids = this.newStatus.files.map(file => file.id)
+      return Promise.all(ids.map(id => this.setMediaDescription(id)))
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 442b9297..ea7b5b80 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -255,6 +255,7 @@
             v-model="newStatus.mediaDescriptions[file.id]"
             type="text"
             :placeholder="$t('post_status.media_description')"
+            @blur="setMediaDescription(file.id)"
             @keydown.enter.prevent=""
           >
         </div>
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index c4d7fb53..067acbe9 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -645,8 +645,7 @@ const postStatus = ({
   poll,
   mediaIds = [],
   inReplyToStatusId,
-  contentType,
-  mediaDescriptions
+  contentType
 }) => {
   const form = new FormData()
   const pollOptions = poll.options || []
@@ -673,7 +672,6 @@ const postStatus = ({
       form.append('poll[options][]', option)
     })
   }
-  form.append('descriptions', JSON.stringify(mediaDescriptions))
   if (inReplyToStatusId) {
     form.append('in_reply_to_id', inReplyToStatusId)
   }
@@ -712,6 +710,17 @@ const uploadMedia = ({ formData, credentials }) => {
     .then((data) => parseAttachment(data))
 }
 
+const setMediaDescription = ({ id, description, credentials }) => {
+  return promisedRequest({
+    url: `${MASTODON_MEDIA_UPLOAD_URL}/${id}`,
+    method: 'PUT',
+    headers: authHeaders(credentials),
+    payload: {
+      description
+    }
+  }).then((data) => parseAttachment(data))
+}
+
 const importBlocks = ({ file, credentials }) => {
   const formData = new FormData()
   formData.append('list', file)
@@ -1181,6 +1190,7 @@ const apiService = {
   postStatus,
   deleteStatus,
   uploadMedia,
+  setMediaDescription,
   fetchMutes,
   muteUser,
   unmuteUser,
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 090ff673..7f5f501c 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -1,7 +1,7 @@
 import { map } from 'lodash'
 import apiService from '../api/api.service.js'
 
-const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, media = [], inReplyToStatusId = undefined, contentType = 'text/plain', mediaDescriptions = {} }) => {
+const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, media = [], inReplyToStatusId = undefined, contentType = 'text/plain' }) => {
   const mediaIds = map(media, 'id')
 
   return apiService.postStatus({
@@ -13,8 +13,8 @@ const postStatus = ({ store, status, spoilerText, visibility, sensitive, poll, m
     mediaIds,
     inReplyToStatusId,
     contentType,
-    poll,
-    mediaDescriptions })
+    poll
+  })
     .then((data) => {
       if (!data.error) {
         store.dispatch('addNewStatuses', {
@@ -39,9 +39,16 @@ const uploadMedia = ({ store, formData }) => {
   return apiService.uploadMedia({ credentials, formData })
 }
 
+const setMediaDescription = ({ store, id, description }) => {
+  const credentials = store.state.users.currentUser.credentials
+
+  return apiService.setMediaDescription({ credentials, id, description })
+}
+
 const statusPosterService = {
   postStatus,
-  uploadMedia
+  uploadMedia,
+  setMediaDescription
 }
 
 export default statusPosterService

From f4bdbf76917ba1eb36586ecd1a37d393f672e931 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 7 Jul 2020 09:08:50 +0300
Subject: [PATCH 284/415] remove unnecessary code

---
 src/components/post_status_form/post_status_form.js  | 10 +---------
 src/components/post_status_form/post_status_form.vue |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 6c0947af..dc5a0386 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -6,7 +6,7 @@ import PollForm from '../poll/poll_form.vue'
 import Attachment from '../attachment/attachment.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
-import { reject, map, uniqBy, debounce } from 'lodash'
+import { reject, map, uniqBy } from 'lodash'
 import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
@@ -396,14 +396,6 @@ const PostStatusForm = {
     dismissScopeNotice () {
       this.$store.dispatch('setOption', { name: 'hideScopeNotice', value: true })
     },
-    debounceSendDescription: debounce(function (id, description) {
-      statusPoster.setMediaDescription({ store: this.$store, id, description })
-    }, 500),
-    updateMediaDescription (fileId, e) {
-      const description = e.target.value
-      this.newStatus.mediaDescriptions[fileId] = description
-      this.debounceSendDescription(fileId, description)
-    },
     setMediaDescription (id) {
       const description = this.newStatus.mediaDescriptions[id]
       if (!description || description.trim() === '') return
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index ea7b5b80..442b9297 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -255,7 +255,6 @@
             v-model="newStatus.mediaDescriptions[file.id]"
             type="text"
             :placeholder="$t('post_status.media_description')"
-            @blur="setMediaDescription(file.id)"
             @keydown.enter.prevent=""
           >
         </div>

From 84d728b9708fbb64f20de1f65f9bb1af7f426d59 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 7 Jul 2020 11:31:24 +0300
Subject: [PATCH 285/415] fix issue on posting another status

---
 src/components/post_status_form/post_status_form.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 48c3615d..18f02eba 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -230,7 +230,8 @@ const PostStatusForm = {
           files: [],
           visibility: newStatus.visibility,
           contentType: newStatus.contentType,
-          poll: {}
+          poll: {},
+          mediaDescriptions: {}
         }
         this.pollFormVisible = false
         this.$refs.mediaUpload.clearFile()
@@ -240,7 +241,7 @@ const PostStatusForm = {
         el.style.height = 'auto'
         el.style.height = undefined
         this.error = null
-        this.previewStatus()
+        if (this.preview) this.previewStatus()
       } else {
         this.error = data.error
       }

From 97c62587d06d3bf657973e4c2d8fce2fb9707d85 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 7 Jul 2020 11:34:40 +0300
Subject: [PATCH 286/415] remove console log

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

diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 2b9ea50c..67d9bd3c 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -100,7 +100,6 @@ const StatusContent = {
       )
     },
     attachmentTypes () {
-      console.log(this.status.attachments)
       return this.status.attachments.map(file => fileType.fileType(file.mimetype))
     },
     maxThumbnails () {

From 1f97f36e1ccded9a1cab1e777427cfea0cff4964 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 7 Jul 2020 13:17:25 +0200
Subject: [PATCH 287/415] After Store: Correctly handle preloaded HTML

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

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 1796eb1b..d9f2da78 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -29,7 +29,7 @@ const preloadFetch = async (request) => {
   return {
     ok: true,
     json: () => JSON.parse(requestData),
-    text: () => requestData
+    text: () => JSON.parse(requestData)
   }
 }
 

From f7f8181dcf5d2a699c0d870bd8873cbe7784a6af Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 7 Jul 2020 14:46:53 +0300
Subject: [PATCH 288/415] fix preview opening automatically

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index daadc10f..62e0d7e4 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -227,7 +227,7 @@ const PostStatusForm = {
           el.style.height = 'auto'
           el.style.height = undefined
           this.error = null
-          this.previewStatus()
+          if (this.preview) this.previewStatus()
         } else {
           this.error = data.error
         }

From 7c9ba8995ca49c0fa4eb987467bc1aab13fc67f3 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 7 Jul 2020 11:47:01 +0000
Subject: [PATCH 289/415] Apply suggestion to src/boot/after_store.js

---
 src/boot/after_store.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index d9f2da78..47524112 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -25,11 +25,11 @@ const preloadFetch = async (request) => {
   if (!data || !data[request]) {
     return window.fetch(request)
   }
-  const requestData = atob(data[request])
+  const requestData = JSON.parse(atob(data[request]))
   return {
     ok: true,
-    json: () => JSON.parse(requestData),
-    text: () => JSON.parse(requestData)
+    json: () => requestData,
+    text: () => requestData
   }
 }
 

From 431b3f527deb318b723e3d2a41f560b970697dff Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 7 Jul 2020 14:39:43 +0200
Subject: [PATCH 290/415] StaffPanel: Move staff loading to panel creation.

---
 src/boot/after_store.js                   | 1 -
 src/components/staff_panel/staff_panel.js | 4 ++++
 src/modules/users.js                      | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 47524112..302b278c 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -215,7 +215,6 @@ const getAppSecret = async ({ store }) => {
 
 const resolveStaffAccounts = ({ store, accounts }) => {
   const nicknames = accounts.map(uri => uri.split('/').pop())
-  nicknames.map(nickname => store.dispatch('fetchUser', nickname))
   store.dispatch('setInstanceOption', { name: 'staffAccounts', value: nicknames })
 }
 
diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 4f98fff6..8c2abcd8 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -2,6 +2,10 @@ import map from 'lodash/map'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
 const StaffPanel = {
+  created() {
+    const nicknames = this.$store.state.instance.staffAccounts
+    nicknames.forEach(nickname => this.$store.dispatch('fetchUserIfMissing', nickname))
+  },
   components: {
     BasicUserCard
   },
diff --git a/src/modules/users.js b/src/modules/users.js
index 68d02931..7e136c61 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -266,6 +266,11 @@ const users = {
   mutations,
   getters,
   actions: {
+    fetchUserIfMissing (store, id) {
+      if (!store.getters.findUser(id)) {
+        store.dispatch('fetchUser', id)
+      }
+    },
     fetchUser (store, id) {
       return store.rootState.api.backendInteractor.fetchUser({ id })
         .then((user) => {

From 7d881d97fe7ac96ecfa58b18a87b5d9379858b4c Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 7 Jul 2020 12:44:29 +0000
Subject: [PATCH 291/415] Apply suggestion to
 src/components/staff_panel/staff_panel.js

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

diff --git a/src/components/staff_panel/staff_panel.js b/src/components/staff_panel/staff_panel.js
index 8c2abcd8..8665648a 100644
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@@ -2,7 +2,7 @@ import map from 'lodash/map'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 
 const StaffPanel = {
-  created() {
+  created () {
     const nicknames = this.$store.state.instance.staffAccounts
     nicknames.forEach(nickname => this.$store.dispatch('fetchUserIfMissing', nickname))
   },

From e9be206a65564243e0196da5cb0a9cd33e4c01c7 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Tue, 7 Jul 2020 00:43:21 +0000
Subject: [PATCH 292/415] Translated using Weblate (Finnish)

Currently translated at 95.4% (610 of 639 strings)

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

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 99a1b53a..c4ad4399 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -66,7 +66,7 @@
     "search": "Haku"
   },
   "notifications": {
-    "broken_favorite": "Viestiä ei löydetty...",
+    "broken_favorite": "Viestiä ei löydetty…",
     "favorited_you": "tykkäsi viestistäsi",
     "followed_you": "seuraa sinua",
     "load_older": "Lataa vanhempia ilmoituksia",
@@ -101,7 +101,7 @@
   },
   "post_status": {
     "new_status": "Uusi viesti",
-    "account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
+    "account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi.",
     "account_not_locked_warning_link": "lukittu",
     "attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
     "content_type": {
@@ -288,7 +288,7 @@
       "authentication_methods": "Todennus",
       "warning_of_generate_new_codes": "Luodessasi uudet palautuskoodit, vanhat koodisi lakkaavat toimimasta.",
       "recovery_codes": "Palautuskoodit.",
-      "waiting_a_recovery_codes": "Odotetaan palautuskoodeja...",
+      "waiting_a_recovery_codes": "Odotetaan palautuskoodeja…",
       "recovery_codes_warning": "Kirjoita koodit ylös tai tallenna ne turvallisesti, muuten et näe niitä uudestaan. Jos et voi käyttää monivaihetodennusta ja sinulla ei ole palautuskoodeja, et voi enää kirjautua sisään tilillesi.",
       "scan": {
         "title": "Skannaa",
@@ -575,7 +575,7 @@
     "statuses": "Viestit",
     "hidden": "Piilotettu",
     "media": "Media",
-    "block_progress": "Estetään...",
+    "block_progress": "Estetään…",
     "admin_menu": {
       "grant_admin": "Anna Ylläpitöoikeudet",
       "force_nsfw": "Merkitse kaikki viestit NSFW:nä",
@@ -601,10 +601,10 @@
     "subscribe": "Tilaa",
     "unsubscribe": "Poista tilaus",
     "unblock": "Poista esto",
-    "unblock_progress": "Postetaan estoa...",
+    "unblock_progress": "Postetaan estoa…",
     "unmute": "Poista mykistys",
-    "unmute_progress": "Poistetaan mykistystä...",
-    "mute_progress": "Mykistetään...",
+    "unmute_progress": "Poistetaan mykistystä…",
+    "mute_progress": "Mykistetään…",
     "hide_repeats": "Piilota toistot",
     "show_repeats": "Näytä toistot"
   },
@@ -674,8 +674,8 @@
   "domain_mute_card": {
     "mute": "Mykistä",
     "unmute": "Poista mykistys",
-    "mute_progress": "Mykistetään...",
-    "unmute_progress": "Poistetaan mykistyst..."
+    "mute_progress": "Mykistetään…",
+    "unmute_progress": "Poistetaan mykistyst…"
   },
   "exporter": {
     "export": "Vie",

From 5b48954644d36a12c3a7d46553469f86fa177fbc Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Mon, 6 Jul 2020 20:50:19 +0000
Subject: [PATCH 293/415] Translated using Weblate (Italian)

Currently translated at 75.1% (480 of 639 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 7311f0b6..35bbeabf 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -34,7 +34,8 @@
     "user_search": "Ricerca utenti",
     "search": "Ricerca",
     "who_to_follow": "Chi seguire",
-    "preferences": "Preferenze"
+    "preferences": "Preferenze",
+    "bookmarks": "Segnalibri"
   },
   "notifications": {
     "followed_you": "ti segue",
@@ -271,10 +272,34 @@
         "shadow_id": "Ombra numero {value}",
         "override": "Sostituisci",
         "component": "Componente",
-        "_tab_label": "Luci ed ombre"
+        "_tab_label": "Luci ed ombre",
+        "components": {
+          "avatarStatus": "Icona utente (vista messaggio)",
+          "avatar": "Icona utente (vista profilo)",
+          "topBar": "Barra superiore",
+          "panelHeader": "Intestazione pannello",
+          "panel": "Pannello",
+          "input": "Campo d'immissione",
+          "buttonPressedHover": "Pulsante (puntato e premuto)",
+          "buttonPressed": "Pulsante (premuto)",
+          "buttonHover": "Pulsante (puntato)",
+          "button": "Pulsante",
+          "popup": "Sbalzi e suggerimenti"
+        },
+        "filter_hint": {
+          "inset_classic": "Le ombre incluse usano {0}",
+          "spread_zero": "Lo spandimento maggiore di zero si azzera sulle ombre",
+          "avatar_inset": "Tieni presente che combinare ombre (sia incluse che non) sulle icone utente potrebbe dare risultati strani con quelle trasparenti.",
+          "drop_shadow_syntax": "{0} non supporta il parametro {1} né la keyword {2}.",
+          "always_drop_shadow": "Attenzione: quest'ombra usa sempre {0} se il tuo browser lo supporta."
+        },
+        "hintV3": "Per le ombre puoi anche usare la sintassi {0} per sfruttare il secondo colore."
       },
       "radii": {
         "_tab_label": "Raggio"
+      },
+      "fonts": {
+        "_tab_label": "Font"
       }
     },
     "enable_web_push_notifications": "Abilita notifiche web push",
@@ -336,7 +361,14 @@
     "emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
     "pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore",
     "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più.",
-    "mutes_and_blocks": "Zittiti e bloccati"
+    "mutes_and_blocks": "Zittiti e bloccati",
+    "profile_fields": {
+      "value": "Contenuto",
+      "name": "Etichetta",
+      "add_field": "Aggiungi campo",
+      "label": "Metadati profilo"
+    },
+    "bot": "Questo profilo è di un robot"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",
@@ -425,7 +457,10 @@
     },
     "direct_warning_to_first_only": "Questo messaggio sarà visibile solo agli utenti menzionati all'inizio.",
     "direct_warning_to_all": "Questo messaggio sarà visibile a tutti i menzionati.",
-    "new_status": "Nuovo messaggio"
+    "new_status": "Nuovo messaggio",
+    "empty_status_error": "Non puoi pubblicare messaggi vuoti senza allegati",
+    "preview_empty": "Vuoto",
+    "preview": "Anteprima"
   },
   "registration": {
     "bio": "Introduzione",
@@ -548,5 +583,8 @@
     "error": "Non trovato.",
     "searching_for": "Cerco",
     "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."
   }
 }

From a6606df01a47fa2afbfc9dbb9ca4979c71b63c96 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Tue, 7 Jul 2020 00:39:45 +0000
Subject: [PATCH 294/415] Translated using Weblate (Chinese (Simplified))

Currently translated at 88.2% (564 of 639 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, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index f95dc498..7e620bdf 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -85,7 +85,7 @@
     "administration": "管理员"
   },
   "notifications": {
-    "broken_favorite": "未知的状态，正在搜索中...",
+    "broken_favorite": "未知的状态，正在搜索中…",
     "favorited_you": "收藏了你的状态",
     "followed_you": "关注了你",
     "load_older": "加载更早的通知",
@@ -185,7 +185,7 @@
       "generate_new_recovery_codes": "生成新的恢复码",
       "warning_of_generate_new_codes": "当你生成新的恢复码时，你的旧恢复码就失效了。",
       "recovery_codes": "恢复码。",
-      "waiting_a_recovery_codes": "正在接收备份码……",
+      "waiting_a_recovery_codes": "正在接收备份码…",
       "recovery_codes_warning": "抄写这些号码，或者保存在安全的地方。这些号码不会再次显示。如果你无法访问你的 2FA app，也丢失了你的恢复码，你的账号就再也无法登录了。",
       "authentication_methods": "身份验证方法",
       "scan": {
@@ -564,11 +564,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": "赋予管理权限",
@@ -690,9 +690,9 @@
     }
   },
   "domain_mute_card": {
-    "unmute_progress": "正在取消隐藏……",
+    "unmute_progress": "正在取消隐藏…",
     "unmute": "取消隐藏",
-    "mute_progress": "隐藏中……",
+    "mute_progress": "隐藏中…",
     "mute": "隐藏"
   }
 }

From 0ab6d92ab8c60aa47fd17a42e19b51bc6674a0f5 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Tue, 7 Jul 2020 01:10:06 +0000
Subject: [PATCH 295/415] Translated using Weblate (Italian)

Currently translated at 85.2% (545 of 639 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 35bbeabf..ed78e656 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -299,7 +299,32 @@
         "_tab_label": "Raggio"
       },
       "fonts": {
-        "_tab_label": "Font"
+        "_tab_label": "Font",
+        "custom": "Personalizzato",
+        "weight": "Peso (grassettatura)",
+        "size": "Dimensione (in pixel)",
+        "family": "Nome font",
+        "components": {
+          "postCode": "Font a spaziatura fissa incluso in un messaggio",
+          "post": "Testo del messaggio",
+          "input": "Campi d'immissione",
+          "interface": "Interfaccia"
+        },
+        "help": "Seleziona il font da usare per gli elementi dell'interfaccia. Se scegli \"personalizzato\" devi inserire il suo nome di sistema."
+      },
+      "preview": {
+        "link": "un bel collegamentino",
+        "checkbox": "Ho dato uno sguardo a termini e condizioni",
+        "header_faint": "Tutto bene",
+        "fine_print": "Leggi il nostro {0} per imparare un bel niente!",
+        "faint_link": "utilissimo manuale",
+        "input": "Sono appena atterrato a Fiumicino.",
+        "mono": "contenuto",
+        "text": "Altro {0} e {1}",
+        "content": "Contenuto",
+        "button": "Pulsante",
+        "error": "Errore d'esempio",
+        "header": "Anteprima"
       }
     },
     "enable_web_push_notifications": "Abilita notifiche web push",
@@ -368,7 +393,12 @@
       "add_field": "Aggiungi campo",
       "label": "Metadati profilo"
     },
-    "bot": "Questo profilo è di un robot"
+    "bot": "Questo profilo è di un robot",
+    "version": {
+      "frontend_version": "Versione interfaccia",
+      "backend_version": "Versione backend",
+      "title": "Versione"
+    }
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",
@@ -378,7 +408,10 @@
     "collapse": "Riduci",
     "conversation": "Conversazione",
     "no_retweet_hint": "Il messaggio è diretto o solo per seguaci e non può essere condiviso",
-    "repeated": "condiviso"
+    "repeated": "condiviso",
+    "no_statuses": "Nessun messaggio",
+    "no_more_statuses": "Fine dei messaggi",
+    "reload": "Ricarica"
   },
   "user_card": {
     "follow": "Segui",
@@ -586,5 +619,47 @@
   },
   "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."
+  },
+  "status": {
+    "pinned": "Intestato",
+    "unpin": "De-intesta",
+    "pin": "Intesta al profilo",
+    "delete": "Elimina messaggio",
+    "repeats": "Condivisi",
+    "favorites": "Preferiti"
+  },
+  "time": {
+    "years_short": "{0}a",
+    "year_short": "{0}a",
+    "years": "{0} anni",
+    "year": "{0} anno",
+    "weeks_short": "{0}set",
+    "week_short": "{0}set",
+    "seconds_short": "{0}sec",
+    "second_short": "{0}sec",
+    "weeks": "{0} settimane",
+    "week": "{0} settimana",
+    "seconds": "{0} secondi",
+    "second": "{0} secondo",
+    "now_short": "ora",
+    "now": "adesso",
+    "months_short": "{0}me",
+    "month_short": "{0}me",
+    "months": "{0} mesi",
+    "month": "{0} mese",
+    "minutes_short": "{0}min",
+    "minute_short": "{0}min",
+    "minutes": "{0} minuti",
+    "minute": "{0} minuto",
+    "in_past": "{0} fa",
+    "in_future": "fra {0}",
+    "hours_short": "{0}h",
+    "days_short": "{0}g",
+    "hour_short": "{0}h",
+    "hours": "{0} ore",
+    "hour": "{0} ora",
+    "day_short": "{0}g",
+    "days": "{0} giorni",
+    "day": "{0} giorno"
   }
 }

From cde6acdbbd3a363832cfaf192b211c2576e5cc10 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 7 Jul 2020 18:20:37 +0300
Subject: [PATCH 296/415] update navigation, rename timeline link in nav panel
 to timelines

---
 src/components/nav_panel/nav_panel.js      |  3 +++
 src/components/nav_panel/nav_panel.vue     |  9 ++-------
 src/components/side_drawer/side_drawer.js  |  3 +++
 src/components/side_drawer/side_drawer.vue | 19 +++----------------
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 42637a82..d9e87a1b 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -11,6 +11,9 @@ const NavPanel = {
     onTimelineRoute () {
       return !!timelineNames()[this.$route.name]
     },
+    timelinesRoute () {
+      return this.currentUser ? 'friends' : 'public-timeline'
+    },
     ...mapState({
       currentUser: state => state.users.currentUser,
       followRequestCount: state => state.api.followRequests.length,
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index d0e626e6..dd6a433b 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -2,19 +2,14 @@
   <div class="nav-panel">
     <div class="panel panel-default">
       <ul>
-        <li v-if="currentUser">
+        <li v-if="currentUser || !privateMode">
           <router-link
-            :to="{ name: 'friends' }"
+            :to="{ name: timelinesRoute }"
             :class="onTimelineRoute && 'router-link-active'"
           >
             <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
-        <li v-else-if="!privateMode">
-          <router-link :to="{ name: 'public-timeline' }">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
             <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index d1f044f6..b955729c 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -47,6 +47,9 @@ const SideDrawer = {
     },
     federating () {
       return this.$store.state.instance.federating
+    },
+    timelinesRoute () {
+      return this.currentUser ? 'friends' : 'public-timeline'
     }
   },
   methods: {
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 6a0a86b4..5541b2cf 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -40,19 +40,11 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser"
+          v-if="currentUser || !privateMode"
           @click="toggleDrawer"
         >
-          <router-link :to="{ name: 'friends' }">
-            <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
-          </router-link>
-        </li>
-        <li
-          v-else
-          @click="toggleDrawer"
-        >
-          <router-link :to="{ name: 'public-timeline' }">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
+          <router-link :to="{ name: timelinesRoute }">
+            <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
       </ul>
@@ -62,11 +54,6 @@
             <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
           </router-link>
         </li>
-        <li @click="toggleDrawer">
-          <router-link :to="{ name: 'bookmarks'}">
-            <i class="button-icon icon-bookmark" /> {{ $t("nav.bookmarks") }}
-          </router-link>
-        </li>
         <li
           v-if="currentUser.locked"
           @click="toggleDrawer"

From 1767ee01d08545ea7b15867732c4988ab1b54e68 Mon Sep 17 00:00:00 2001
From: Dym Sohin <pleroma-git@dym.sh>
Date: Tue, 7 Jul 2020 19:34:45 +0000
Subject: [PATCH 297/415] corrected tos.html location

---
 static/terms-of-service.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/terms-of-service.html b/static/terms-of-service.html
index b2c66815..3b6bbb36 100644
--- a/static/terms-of-service.html
+++ b/static/terms-of-service.html
@@ -2,7 +2,7 @@
 
 <p>This is the default placeholder ToS.  You should copy it over to your static folder and edit it to fit the needs of your instance.</p>
 
-<p>To do so, place a file at <code>"/instance/static/terms-of-service.html"</code> in your
+<p>To do so, place a file at <code>"/instance/static/static/terms-of-service.html"</code> in your
    Pleroma install containing the real ToS for your instance.</p>
 <p>See the <a href='https://docs.pleroma.social/backend/configuration/static_dir/'>Pleroma documentation</a> for more information.</p>
 <br>

From 5186929efa0212c272f963e43e0167b12a1cddbf Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 8 Jul 2020 10:42:40 +0300
Subject: [PATCH 298/415] add hack to not overlap menu with timeline header

---
 src/components/timeline_menu/timeline_menu.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index e30bfe34..9a3719f7 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -63,7 +63,11 @@
   width: 24rem;
   .timeline-menu-popover-wrap {
     overflow: hidden;
-    margin-top: 0.6em;
+    // Hack: timeline heading padding is 0.6em with 14px font font-size
+    // in theory 0.6rem should match that exactly, but in reality it doesn't
+    // for seemingly rounding errors in both major browsers. This looks
+    // correct in firefox in chromium.
+    margin-top: calc(0.6rem + 1.5px);
     padding: 0 15px 15px 15px;
   }
   .timeline-menu-popover {

From eea002e6f5e3da4c4415d45cffd9cff64fd6c052 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Wed, 8 Jul 2020 10:11:17 +0000
Subject: [PATCH 299/415] streamline profile image api, update reset ui for all
 profile images to match avatar, remove unnecessary stuff

---
 CHANGELOG.md                                  |  1 +
 .../settings_modal/tabs/profile_tab.js        | 61 ++++++++++++++++---
 .../settings_modal/tabs/profile_tab.scss      | 39 ++++++++++--
 .../settings_modal/tabs/profile_tab.vue       | 51 +++++++++++-----
 src/components/user_avatar/user_avatar.js     | 16 ++---
 src/components/user_avatar/user_avatar.vue    |  2 +-
 .../who_to_follow_panel.js                    | 17 +++---
 src/i18n/en.json                              |  8 ++-
 src/modules/instance.js                       |  2 +
 src/services/api/api.service.js               | 32 ++--------
 10 files changed, 153 insertions(+), 76 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f54352d..49ec550c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Autocomplete domains from list of known instances
 - 'Bot' settings option and badge
 - Added profile meta data fields that can be set in profile settings
+- Added option to reset avatar/banner in profile settings
 - Descriptions can be set on uploaded files before posting
 - Added status preview option to preview your statuses before posting
 - When a post is a reply to an unavailable post, the 'Reply to'-text has a strike-through style
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index e6db802d..bd6bef6a 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -77,6 +77,33 @@ const ProfileTab = {
     },
     maxFields () {
       return this.fieldsLimits ? this.fieldsLimits.maxFields : 0
+    },
+    defaultAvatar () {
+      return this.$store.state.instance.server + this.$store.state.instance.defaultAvatar
+    },
+    defaultBanner () {
+      return this.$store.state.instance.server + this.$store.state.instance.defaultBanner
+    },
+    isDefaultAvatar () {
+      const baseAvatar = this.$store.state.instance.defaultAvatar
+      return !(this.$store.state.users.currentUser.profile_image_url) ||
+      this.$store.state.users.currentUser.profile_image_url.includes(baseAvatar)
+    },
+    isDefaultBanner () {
+      const baseBanner = this.$store.state.instance.defaultBanner
+      return !(this.$store.state.users.currentUser.cover_photo) ||
+      this.$store.state.users.currentUser.cover_photo.includes(baseBanner)
+    },
+    isDefaultBackground () {
+      return !(this.$store.state.users.currentUser.background_image)
+    },
+    avatarImgSrc () {
+      const src = this.$store.state.users.currentUser.profile_image_url_original
+      return (!src) ? this.defaultAvatar : src
+    },
+    bannerImgSrc () {
+      const src = this.$store.state.users.currentUser.cover_photo
+      return (!src) ? this.defaultBanner : src
     }
   },
   methods: {
@@ -150,11 +177,29 @@ const ProfileTab = {
       }
       reader.readAsDataURL(file)
     },
+    resetAvatar () {
+      const confirmed = window.confirm(this.$t('settings.reset_avatar_confirm'))
+      if (confirmed) {
+        this.submitAvatar(undefined, '')
+      }
+    },
+    resetBanner () {
+      const confirmed = window.confirm(this.$t('settings.reset_banner_confirm'))
+      if (confirmed) {
+        this.submitBanner('')
+      }
+    },
+    resetBackground () {
+      const confirmed = window.confirm(this.$t('settings.reset_background_confirm'))
+      if (confirmed) {
+        this.submitBackground('')
+      }
+    },
     submitAvatar (cropper, file) {
       const that = this
       return new Promise((resolve, reject) => {
         function updateAvatar (avatar) {
-          that.$store.state.api.backendInteractor.updateAvatar({ avatar })
+          that.$store.state.api.backendInteractor.updateProfileImages({ avatar })
             .then((user) => {
               that.$store.commit('addNewUsers', [user])
               that.$store.commit('setCurrentUser', user)
@@ -172,11 +217,11 @@ const ProfileTab = {
         }
       })
     },
-    submitBanner () {
-      if (!this.bannerPreview) { return }
+    submitBanner (banner) {
+      if (!this.bannerPreview && banner !== '') { return }
 
       this.bannerUploading = true
-      this.$store.state.api.backendInteractor.updateBanner({ banner: this.banner })
+      this.$store.state.api.backendInteractor.updateProfileImages({ banner })
         .then((user) => {
           this.$store.commit('addNewUsers', [user])
           this.$store.commit('setCurrentUser', user)
@@ -187,11 +232,11 @@ const ProfileTab = {
         })
         .then(() => { this.bannerUploading = false })
     },
-    submitBg () {
-      if (!this.backgroundPreview) { return }
-      let background = this.background
+    submitBackground (background) {
+      if (!this.backgroundPreview && background !== '') { return }
+
       this.backgroundUploading = true
-      this.$store.state.api.backendInteractor.updateBg({ background }).then((data) => {
+      this.$store.state.api.backendInteractor.updateProfileImages({ background }).then((data) => {
         if (!data.error) {
           this.$store.commit('addNewUsers', [data])
           this.$store.commit('setCurrentUser', data)
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index b3dcf42c..e14cf054 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -13,8 +13,14 @@
     height: auto;
   }
 
-  .banner {
+  .banner-background-preview {
     max-width: 100%;
+    width: 300px;
+    position: relative;
+
+    img {
+      width: 100%;
+    }
   }
 
   .uploading {
@@ -26,18 +32,40 @@
     width: 100%;
   }
 
-  .bg {
-    max-width: 100%;
+  .current-avatar-container {
+    position: relative;
+    width: 150px;
+    height: 150px;
   }
 
   .current-avatar {
     display: block;
-    width: 150px;
-    height: 150px;
+    width: 100%;
+    height: 100%;
     border-radius: $fallback--avatarRadius;
     border-radius: var(--avatarRadius, $fallback--avatarRadius);
   }
 
+  .reset-button {
+    position: absolute;
+    top: 0.2em;
+    right: 0.2em;
+    border-radius: $fallback--tooltipRadius;
+    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+    background-color: rgba(0, 0, 0, 0.6);
+    opacity: 0.7;
+    color: white;
+    width: 1.5em;
+    height: 1.5em;
+    text-align: center;
+    line-height: 1.5em;
+    font-size: 1.5em;
+    cursor: pointer;
+    &:hover {
+      opacity: 1;
+    }
+  }
+
   .oauth-tokens {
     width: 100%;
 
@@ -86,6 +114,7 @@
     &>.emoji-input {
       flex: 1 1 auto;
       margin: 0 .2em .5em;
+      min-width: 0;
     }
 
     &>.icon-container {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 0f9210a6..cf88c4e4 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -161,11 +161,19 @@
       <p class="visibility-notice">
         {{ $t('settings.avatar_size_instruction') }}
       </p>
-      <p>{{ $t('settings.current_avatar') }}</p>
-      <img
-        :src="user.profile_image_url_original"
-        class="current-avatar"
-      >
+      <div class="current-avatar-container">
+        <img
+          :src="user.profile_image_url_original"
+          class="current-avatar"
+        >
+        <i
+          v-if="!isDefaultAvatar && pickAvatarBtnVisible"
+          :title="$t('settings.reset_avatar')"
+          class="reset-button icon-cancel"
+          type="button"
+          @click="resetAvatar"
+        />
+      </div>
       <p>{{ $t('settings.set_new_avatar') }}</p>
       <button
         v-show="pickAvatarBtnVisible"
@@ -184,15 +192,20 @@
     </div>
     <div class="setting-item">
       <h2>{{ $t('settings.profile_banner') }}</h2>
-      <p>{{ $t('settings.current_profile_banner') }}</p>
-      <img
-        :src="user.cover_photo"
-        class="banner"
-      >
+      <div class="banner-background-preview">
+        <img :src="user.cover_photo">
+        <i
+          v-if="!isDefaultBanner"
+          :title="$t('settings.reset_profile_banner')"
+          class="reset-button icon-cancel"
+          type="button"
+          @click="resetBanner"
+        />
+      </div>
       <p>{{ $t('settings.set_new_profile_banner') }}</p>
       <img
         v-if="bannerPreview"
-        class="banner"
+        class="banner-background-preview"
         :src="bannerPreview"
       >
       <div>
@@ -208,7 +221,7 @@
       <button
         v-else-if="bannerPreview"
         class="btn btn-default"
-        @click="submitBanner"
+        @click="submitBanner(banner)"
       >
         {{ $t('general.submit') }}
       </button>
@@ -225,10 +238,20 @@
     </div>
     <div class="setting-item">
       <h2>{{ $t('settings.profile_background') }}</h2>
+      <div class="banner-background-preview">
+        <img :src="user.background_image">
+        <i
+          v-if="!isDefaultBackground"
+          :title="$t('settings.reset_profile_background')"
+          class="reset-button icon-cancel"
+          type="button"
+          @click="resetBackground"
+        />
+      </div>
       <p>{{ $t('settings.set_new_profile_background') }}</p>
       <img
         v-if="backgroundPreview"
-        class="bg"
+        class="banner-background-preview"
         :src="backgroundPreview"
       >
       <div>
@@ -244,7 +267,7 @@
       <button
         v-else-if="backgroundPreview"
         class="btn btn-default"
-        @click="submitBg"
+        @click="submitBackground(background)"
       >
         {{ $t('general.submit') }}
       </button>
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index 4adf8211..94653004 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -8,26 +8,20 @@ const UserAvatar = {
   ],
   data () {
     return {
-      showPlaceholder: false
+      showPlaceholder: false,
+      defaultAvatar: `${this.$store.state.instance.server + this.$store.state.instance.defaultAvatar}`
     }
   },
   components: {
     StillImage
   },
-  computed: {
-    imgSrc () {
-      return this.showPlaceholder ? '/images/avi.png' : this.user.profile_image_url_original
-    }
-  },
   methods: {
+    imgSrc (src) {
+      return (!src || this.showPlaceholder) ? this.defaultAvatar : src
+    },
     imageLoadError () {
       this.showPlaceholder = true
     }
-  },
-  watch: {
-    src () {
-      this.showPlaceholder = false
-    }
   }
 }
 
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 9ffb28d8..3545b801 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -3,7 +3,7 @@
     class="avatar"
     :alt="user.screen_name"
     :title="user.screen_name"
-    :src="imgSrc"
+    :src="imgSrc(user.profile_image_url_original)"
     :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }"
     :image-load-error="imageLoadError"
   />
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index dcb56106..818e8bd5 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -7,7 +7,7 @@ function showWhoToFollow (panel, reply) {
 
   panel.usersToFollow.forEach((toFollow, index) => {
     let user = shuffled[index]
-    let img = user.avatar || '/images/avi.png'
+    let img = user.avatar || this.$store.state.instance.defaultAvatar
     let name = user.acct
 
     toFollow.img = img
@@ -38,13 +38,7 @@ function getWhoToFollow (panel) {
 
 const WhoToFollowPanel = {
   data: () => ({
-    usersToFollow: new Array(3).fill().map(x => (
-      {
-        img: '/images/avi.png',
-        name: '',
-        id: 0
-      }
-    ))
+    usersToFollow: []
   }),
   computed: {
     user: function () {
@@ -68,6 +62,13 @@ const WhoToFollowPanel = {
   },
   mounted:
     function () {
+      this.usersToFollow = new Array(3).fill().map(x => (
+        {
+          img: this.$store.state.instance.defaultAvatar,
+          name: '',
+          id: 0
+        }
+      ))
       if (this.suggestionsEnabled) {
         getWhoToFollow(this)
       }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b331a3e0..72c3b1f7 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -290,9 +290,7 @@
     "collapse_subject": "Collapse posts with subjects",
     "composing": "Composing",
     "confirm_new_password": "Confirm new password",
-    "current_avatar": "Your current avatar",
     "current_password": "Current password",
-    "current_profile_banner": "Your current profile banner",
     "mutes_and_blocks": "Mutes and Blocks",
     "data_import_export_tab": "Data Import / Export",
     "default_vis": "Default visibility scope",
@@ -399,6 +397,12 @@
     "set_new_avatar": "Set new avatar",
     "set_new_profile_background": "Set new profile background",
     "set_new_profile_banner": "Set new profile banner",
+    "reset_avatar": "Reset avatar",
+    "reset_profile_background": "Reset profile background",
+    "reset_profile_banner": "Reset profile banner",
+    "reset_avatar_confirm": "Do you really want to reset the avatar?",
+    "reset_banner_confirm": "Do you really want to reset the banner?",
+    "reset_background_confirm": "Do you really want to reset the background?",
     "settings": "Settings",
     "subject_input_always_show": "Always show subject field",
     "subject_line_behavior": "Copy subject when replying",
diff --git a/src/modules/instance.js b/src/modules/instance.js
index ec5f4e54..45a8eeca 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -15,6 +15,8 @@ const defaultState = {
 
   // Stuff from static/config.json
   alwaysShowSubjectInput: true,
+  defaultAvatar: '/images/avi.png',
+  defaultBanner: '/images/banner.png',
   background: '/static/aurora_borealis.jpg',
   collapseMessageWithSubject: false,
   disableChat: false,
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index ad543c6c..14e63e4f 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -141,20 +141,11 @@ const updateNotificationSettings = ({ credentials, settings }) => {
   }).then((data) => data.json())
 }
 
-const updateAvatar = ({ credentials, avatar }) => {
+const updateProfileImages = ({ credentials, avatar = null, banner = null, background = null }) => {
   const form = new FormData()
-  form.append('avatar', avatar)
-  return fetch(MASTODON_PROFILE_UPDATE_URL, {
-    headers: authHeaders(credentials),
-    method: 'PATCH',
-    body: form
-  }).then((data) => data.json())
-    .then((data) => parseUser(data))
-}
-
-const updateBg = ({ credentials, background }) => {
-  const form = new FormData()
-  form.append('pleroma_background_image', background)
+  if (avatar !== null) form.append('avatar', avatar)
+  if (banner !== null) form.append('header', banner)
+  if (background !== null) form.append('pleroma_background_image', background)
   return fetch(MASTODON_PROFILE_UPDATE_URL, {
     headers: authHeaders(credentials),
     method: 'PATCH',
@@ -164,17 +155,6 @@ const updateBg = ({ credentials, background }) => {
     .then((data) => parseUser(data))
 }
 
-const updateBanner = ({ credentials, banner }) => {
-  const form = new FormData()
-  form.append('header', banner)
-  return fetch(MASTODON_PROFILE_UPDATE_URL, {
-    headers: authHeaders(credentials),
-    method: 'PATCH',
-    body: form
-  }).then((data) => data.json())
-    .then((data) => parseUser(data))
-}
-
 const updateProfile = ({ credentials, params }) => {
   return promisedRequest({
     url: MASTODON_PROFILE_UPDATE_URL,
@@ -1206,10 +1186,8 @@ const apiService = {
   deactivateUser,
   register,
   getCaptcha,
-  updateAvatar,
-  updateBg,
+  updateProfileImages,
   updateProfile,
-  updateBanner,
   importBlocks,
   importFollows,
   deleteAccount,

From 60921be5a050ae2e56e2f12c462ced15b4696843 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 8 Jul 2020 14:11:42 +0300
Subject: [PATCH 300/415] give notification timeago a min width

---
 src/components/notifications/notifications.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 20797cf9..b1a3ad70 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -118,6 +118,11 @@
     flex: 1;
     padding-left: 0.8em;
     min-width: 0;
+
+    .timeago {
+      min-width: 3em;
+      text-align: right;
+    }
   }
 
   .emoji-reaction-emoji {

From aa2cf51c05ebdf411d74af5debbbc8fa4d3cf457 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 7 May 2020 16:10:53 +0300
Subject: [PATCH 301/415] Add Chats

---
 src/App.js                                    |  16 +-
 src/App.scss                                  |  14 +
 src/App.vue                                   |   3 +-
 src/_variables.scss                           |   1 +
 src/boot/after_store.js                       |   1 +
 src/boot/routes.js                            |  15 +-
 .../account_actions/account_actions.js        |  12 +
 .../account_actions/account_actions.vue       |   7 +
 src/components/chat/chat.js                   | 304 ++++++++++++++++++
 src/components/chat/chat.scss                 | 161 ++++++++++
 src/components/chat/chat.vue                  |  99 ++++++
 src/components/chat/chat_layout.js            | 100 ++++++
 src/components/chat/chat_layout_utils.js      |  27 ++
 src/components/chat_avatar/chat_avatar.js     |  23 ++
 src/components/chat_avatar/chat_avatar.vue    |  53 +++
 src/components/chat_list/chat_list.js         |  37 +++
 src/components/chat_list/chat_list.vue        |  48 +++
 .../chat_list_item/chat_list_item.js          |  65 ++++
 .../chat_list_item/chat_list_item.scss        |  94 ++++++
 .../chat_list_item/chat_list_item.vue         |  49 +++
 src/components/chat_message/chat_message.js   | 109 +++++++
 src/components/chat_message/chat_message.scss | 157 +++++++++
 src/components/chat_message/chat_message.vue  |  99 ++++++
 .../chat_message_date/chat_message_date.vue   |  24 ++
 src/components/chat_new/chat_new.js           |  74 +++++
 src/components/chat_new/chat_new.scss         |  29 ++
 src/components/chat_new/chat_new.vue          |  46 +++
 src/components/chat_panel/chat_panel.vue      |  94 +++---
 src/components/chat_title/chat_title.js       |  20 ++
 src/components/chat_title/chat_title.vue      |  56 ++++
 src/components/emoji_input/emoji_input.js     |  38 ++-
 src/components/emoji_input/emoji_input.vue    |   5 +-
 .../features_panel/features_panel.js          |   1 +
 .../features_panel/features_panel.vue         |   3 +
 src/components/media_upload/media_upload.js   |   3 +-
 src/components/media_upload/media_upload.vue  |  21 +-
 src/components/mobile_nav/mobile_nav.js       |   5 +-
 src/components/mobile_nav/mobile_nav.vue      |   1 +
 .../mobile_post_status_button.js              |   7 +
 src/components/nav_panel/nav_panel.js         |  20 +-
 src/components/nav_panel/nav_panel.vue        |  11 +
 src/components/notification/notification.js   |   6 +-
 src/components/notifications/notifications.js |   9 +-
 .../post_status_form/post_status_form.js      | 138 +++++---
 .../post_status_form/post_status_form.vue     |  50 ++-
 .../tabs/theme_tab/theme_tab.js               |   6 +-
 .../tabs/theme_tab/theme_tab.vue              |  67 ++++
 src/components/side_drawer/side_drawer.js     |   7 +-
 src/components/side_drawer/side_drawer.vue    |  22 +-
 .../status_content/status_content.js          |   2 +-
 .../status_content/status_content.vue         |   2 +-
 src/hocs/with_load_more/with_load_more.scss   |   4 +
 src/i18n/en.json                              |  33 +-
 src/main.js                                   |   4 +-
 src/modules/api.js                            |  24 +-
 src/modules/chats.js                          | 228 +++++++++++++
 src/modules/config.js                         |   3 +-
 src/modules/instance.js                       |   1 +
 src/modules/interface.js                      |   9 +-
 src/modules/statuses.js                       |   5 +-
 src/modules/users.js                          |   5 +
 src/services/api/api.service.js               | 117 ++++++-
 src/services/chat_service/chat_service.js     | 150 +++++++++
 .../entity_normalizer.service.js              |  34 +-
 src/services/style_setter/style_setter.js     |   3 +-
 src/services/theme_data/pleromafe.js          |  53 ++-
 src/services/window_utils/window_utils.js     |   5 +
 static/fontello.json                          |   6 +
 test/unit/specs/boot/routes.spec.js           |  10 +-
 69 files changed, 2794 insertions(+), 161 deletions(-)
 create mode 100644 src/components/chat/chat.js
 create mode 100644 src/components/chat/chat.scss
 create mode 100644 src/components/chat/chat.vue
 create mode 100644 src/components/chat/chat_layout.js
 create mode 100644 src/components/chat/chat_layout_utils.js
 create mode 100644 src/components/chat_avatar/chat_avatar.js
 create mode 100644 src/components/chat_avatar/chat_avatar.vue
 create mode 100644 src/components/chat_list/chat_list.js
 create mode 100644 src/components/chat_list/chat_list.vue
 create mode 100644 src/components/chat_list_item/chat_list_item.js
 create mode 100644 src/components/chat_list_item/chat_list_item.scss
 create mode 100644 src/components/chat_list_item/chat_list_item.vue
 create mode 100644 src/components/chat_message/chat_message.js
 create mode 100644 src/components/chat_message/chat_message.scss
 create mode 100644 src/components/chat_message/chat_message.vue
 create mode 100644 src/components/chat_message_date/chat_message_date.vue
 create mode 100644 src/components/chat_new/chat_new.js
 create mode 100644 src/components/chat_new/chat_new.scss
 create mode 100644 src/components/chat_new/chat_new.vue
 create mode 100644 src/components/chat_title/chat_title.js
 create mode 100644 src/components/chat_title/chat_title.vue
 create mode 100644 src/modules/chats.js
 create mode 100644 src/services/chat_service/chat_service.js

diff --git a/src/App.js b/src/App.js
index 92c4e2f5..84300e00 100644
--- a/src/App.js
+++ b/src/App.js
@@ -14,7 +14,7 @@ import MobileNav from './components/mobile_nav/mobile_nav.vue'
 import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
 import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
 import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
-import { windowWidth } from './services/window_utils/window_utils'
+import { windowWidth, windowHeight } from './services/window_utils/window_utils'
 
 export default {
   name: 'app',
@@ -45,7 +45,8 @@ export default {
         window.CSS.supports('-moz-mask-size', 'contain') ||
         window.CSS.supports('-ms-mask-size', 'contain') ||
         window.CSS.supports('-o-mask-size', 'contain')
-    )
+    ),
+    transitionName: 'fade'
   }),
   created () {
     // Load the locale from the storage
@@ -127,10 +128,21 @@ export default {
     },
     updateMobileState () {
       const mobileLayout = windowWidth() <= 800
+      const layoutHeight = windowHeight()
       const changed = mobileLayout !== this.isMobileLayout
       if (changed) {
         this.$store.dispatch('setMobileLayout', mobileLayout)
       }
+      this.$store.dispatch('setLayoutHeight', layoutHeight)
+    }
+  },
+  watch: {
+    '$route' (to, from) {
+      if ((to.name === 'chat' && from.name === 'chats') || (to.name === 'chats' && from.name === 'chat')) {
+        this.transitionName = 'none'
+      } else {
+        this.transitionName = 'fade'
+      }
     }
   }
 }
diff --git a/src/App.scss b/src/App.scss
index 6597b6f4..29ce73a8 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -56,6 +56,7 @@ body {
   overflow-x: hidden;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  overscroll-behavior: none;
 
   &.hidden {
     display: none;
@@ -928,3 +929,16 @@ nav {
   background-color: $fallback--fg;
   background-color: var(--panel, $fallback--fg);
 }
+
+.unread-chat-count {
+  font-size: 0.9em;
+  font-weight: bolder;
+  font-style: normal;
+  position: absolute;
+  right: 0.6rem;
+  padding: 0 0.3em;
+  min-width: 1.3rem;
+  min-height: 1.3rem;
+  max-height: 1.3rem;
+  line-height: 1.3rem;
+}
diff --git a/src/App.vue b/src/App.vue
index 03b632ec..5d429934 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -77,6 +77,7 @@
         </div>
       </div>
     </nav>
+    <div class="app-bg-wrapper app-container-wrapper" />
     <div
       id="content"
       class="container underlay"
@@ -112,7 +113,7 @@
             {{ $t("login.hint") }}
           </router-link>
         </div>
-        <transition name="fade">
+        <transition :name="transitionName">
           <router-view />
         </transition>
       </div>
diff --git a/src/_variables.scss b/src/_variables.scss
index 30dc3e42..9004d551 100644
--- a/src/_variables.scss
+++ b/src/_variables.scss
@@ -27,5 +27,6 @@ $fallback--tooltipRadius: 5px;
 $fallback--avatarRadius: 4px;
 $fallback--avatarAltRadius: 10px;
 $fallback--attachmentRadius: 10px;
+$fallback--chatMessageRadius: 10px;
 
 $fallback--buttonShadow: 0px 0px 2px 0px rgba(0, 0, 0, 1), 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 302b278c..7160434f 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -230,6 +230,7 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
       store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
       store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
+      store.dispatch('setInstanceOption', { name: 'pleromaChatMessagesAvailable', value: features.includes('pleroma_chat_messages') })
       store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
       store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
diff --git a/src/boot/routes.js b/src/boot/routes.js
index f63d8adf..b5d3c631 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -6,6 +6,8 @@ import BookmarkTimeline from 'components/bookmark_timeline/bookmark_timeline.vue
 import ConversationPage from 'components/conversation-page/conversation-page.vue'
 import Interactions from 'components/interactions/interactions.vue'
 import DMs from 'components/dm_timeline/dm_timeline.vue'
+import ChatList from 'components/chat_list/chat_list.vue'
+import Chat from 'components/chat/chat.vue'
 import UserProfile from 'components/user_profile/user_profile.vue'
 import Search from 'components/search/search.vue'
 import Registration from 'components/registration/registration.vue'
@@ -28,7 +30,7 @@ export default (store) => {
     }
   }
 
-  return [
+  let routes = [
     { name: 'root',
       path: '/',
       redirect: _to => {
@@ -62,11 +64,20 @@ export default (store) => {
     { name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute },
     { name: 'notifications', path: '/:username/notifications', component: Notifications, beforeEnter: validateAuthenticatedRoute },
     { name: 'login', path: '/login', component: AuthForm },
-    { name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
+    { name: 'chat-panel', path: '/chat-panel', component: ChatPanel, props: () => ({ floating: false }) },
     { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },
     { name: 'search', path: '/search', component: Search, props: (route) => ({ query: route.query.query }) },
     { name: 'who-to-follow', path: '/who-to-follow', component: WhoToFollow, beforeEnter: validateAuthenticatedRoute },
     { name: 'about', path: '/about', component: About },
     { name: 'user-profile', path: '/(users/)?:name', component: UserProfile }
   ]
+
+  if (store.state.instance.pleromaChatMessagesAvailable) {
+    routes = routes.concat([
+      { name: 'chat', path: '/users/:username/chats/:recipient_id', component: Chat, meta: { dontScroll: false }, beforeEnter: validateAuthenticatedRoute },
+      { name: 'chats', path: '/users/:username/chats', component: ChatList, meta: { dontScroll: false }, beforeEnter: validateAuthenticatedRoute }
+    ])
+  }
+
+  return routes
 }
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 0826c275..6d345bc7 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -1,3 +1,4 @@
+import { mapState } from 'vuex'
 import ProgressButton from '../progress_button/progress_button.vue'
 import Popover from '../popover/popover.vue'
 
@@ -27,7 +28,18 @@ const AccountActions = {
     },
     reportUser () {
       this.$store.dispatch('openUserReportingModal', this.user.id)
+    },
+    openChat () {
+      this.$router.push({
+        name: 'chat',
+        params: { recipient_id: this.user.id }
+      })
     }
+  },
+  computed: {
+    ...mapState({
+      pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
+    })
   }
 }
 
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 029e7096..987e94b7 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -50,6 +50,13 @@
           >
             {{ $t('user_card.report') }}
           </button>
+          <button
+            v-if="pleromaChatMessagesAvailable"
+            class="btn btn-default btn-block dropdown-item"
+            @click="openChat"
+          >
+            {{ $t('user_card.message') }}
+          </button>
         </div>
       </div>
       <div
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
new file mode 100644
index 00000000..6e23c20c
--- /dev/null
+++ b/src/components/chat/chat.js
@@ -0,0 +1,304 @@
+import _ from 'lodash'
+import { WSConnectionStatus } from '../../services/api/api.service.js'
+import { mapGetters, mapState } from 'vuex'
+import ChatMessage from '../chat_message/chat_message.vue'
+import ChatAvatar from '../chat_avatar/chat_avatar.vue'
+import PostStatusForm from '../post_status_form/post_status_form.vue'
+import ChatTitle from '../chat_title/chat_title.vue'
+import chatService from '../../services/chat_service/chat_service.js'
+import ChatLayout from './chat_layout.js'
+import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContainerHeight } from './chat_layout_utils.js'
+
+const BOTTOMED_OUT_OFFSET = 10
+const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 150
+
+const Chat = {
+  components: {
+    ChatMessage,
+    ChatTitle,
+    ChatAvatar,
+    PostStatusForm
+  },
+  mixins: [ChatLayout],
+  data () {
+    return {
+      jumpToBottomButtonVisible: false,
+      hoveredMessageChainId: undefined,
+      scrollPositionBeforeResize: {},
+      scrollableContainerHeight: '100%',
+      errorLoadingChat: false
+    }
+  },
+  created () {
+    this.startFetching()
+    window.addEventListener('resize', this.handleLayoutChange)
+  },
+  mounted () {
+    window.addEventListener('scroll', this.handleScroll)
+    if (typeof document.hidden !== 'undefined') {
+      document.addEventListener('visibilitychange', this.handleVisibilityChange, false)
+    }
+
+    this.$nextTick(() => {
+      this.updateScrollableContainerHeight()
+      this.handleResize()
+    })
+    this.setChatLayout()
+  },
+  destroyed () {
+    window.removeEventListener('scroll', this.handleScroll)
+    window.removeEventListener('resize', this.handleLayoutChange)
+    this.unsetChatLayout()
+    if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false)
+    this.$store.dispatch('clearCurrentChat')
+  },
+  computed: {
+    recipient () {
+      return this.currentChat && this.currentChat.account
+    },
+    recipientId () {
+      return this.$route.params.recipient_id
+    },
+    formPlaceholder () {
+      if (this.recipient) {
+        return this.$t('chats.message_user', { nickname: this.recipient.screen_name })
+      } else {
+        return ''
+      }
+    },
+    chatViewItems () {
+      return chatService.getView(this.currentChatMessageService)
+    },
+    newMessageCount () {
+      return this.currentChatMessageService && this.currentChatMessageService.newMessageCount
+    },
+    streamingEnabled () {
+      return this.mergedConfig.useStreamingApi && this.mastoUserSocketStatus === WSConnectionStatus.JOINED
+    },
+    ...mapGetters([
+      'currentChat',
+      'currentChatMessageService',
+      'findOpenedChatByRecipientId',
+      'mergedConfig'
+    ]),
+    ...mapState({
+      backendInteractor: state => state.api.backendInteractor,
+      mastoUserSocketStatus: state => state.api.mastoUserSocketStatus,
+      mobileLayout: state => state.interface.mobileLayout,
+      layoutHeight: state => state.interface.layoutHeight,
+      currentUser: state => state.users.currentUser
+    })
+  },
+  watch: {
+    chatViewItems () {
+      // We don't want to scroll to the bottom on a new message when the user is viewing older messages.
+      // Therefore we need to know whether the scroll position was at the bottom before the DOM update.
+      const bottomedOutBeforeUpdate = this.bottomedOut(BOTTOMED_OUT_OFFSET)
+      this.$nextTick(() => {
+        if (bottomedOutBeforeUpdate) {
+          this.scrollDown({ forceRead: !document.hidden })
+        }
+      })
+    },
+    '$route': function () {
+      this.startFetching()
+    },
+    layoutHeight () {
+      this.handleResize({ expand: true })
+    },
+    mastoUserSocketStatus (newValue) {
+      if (newValue === WSConnectionStatus.JOINED) {
+        this.fetchChat({ isFirstFetch: true })
+      }
+    }
+  },
+  methods: {
+    // Used to animate the avatar near the first message of the message chain when any message belonging to the chain is hovered
+    onMessageHover ({ isHovered, messageChainId }) {
+      this.hoveredMessageChainId = isHovered ? messageChainId : undefined
+    },
+    onFilesDropped () {
+      this.$nextTick(() => {
+        this.updateScrollableContainerHeight()
+      })
+    },
+    handleVisibilityChange () {
+      this.$nextTick(() => {
+        if (!document.hidden && this.bottomedOut(BOTTOMED_OUT_OFFSET)) {
+          this.scrollDown({ forceRead: true })
+        }
+      })
+    },
+    handleLayoutChange () {
+      this.updateScrollableContainerHeight()
+      if (this.mobileLayout) {
+        this.setMobileChatLayout()
+      } else {
+        this.unsetMobileChatLayout()
+      }
+      this.$nextTick(() => {
+        this.updateScrollableContainerHeight()
+        this.scrollDown()
+      })
+    },
+    // Ensures the proper position of the posting form in the mobile layout (the mobile browser panel does not overlap or hide it)
+    updateScrollableContainerHeight () {
+      const header = this.$refs.header
+      const footer = this.$refs.footer
+      const inner = this.mobileLayout ? window.document.body : this.$refs.inner
+      this.scrollableContainerHeight = scrollableContainerHeight(inner, header, footer) + 'px'
+    },
+    // Preserves the scroll position when OSK appears or the posting form changes its height.
+    handleResize (opts) {
+      this.$nextTick(() => {
+        this.updateScrollableContainerHeight()
+
+        const { offsetHeight = undefined } = this.scrollPositionBeforeResize
+        this.scrollPositionBeforeResize = getScrollPosition(this.$refs.scrollable)
+
+        const diff = this.scrollPositionBeforeResize.offsetHeight - offsetHeight
+        if (diff < 0 || (!this.bottomedOut() && opts && opts.expand)) {
+          this.$nextTick(() => {
+            this.updateScrollableContainerHeight()
+            this.$refs.scrollable.scrollTo({
+              top: this.$refs.scrollable.scrollTop - diff,
+              left: 0
+            })
+          })
+        }
+      })
+    },
+    scrollDown (options = {}) {
+      const { behavior = 'auto', forceRead = false } = options
+      const scrollable = this.$refs.scrollable
+      if (!scrollable) { return }
+      this.$nextTick(() => {
+        scrollable.scrollTo({ top: scrollable.scrollHeight, left: 0, behavior })
+      })
+      if (forceRead || this.newMessageCount > 0) {
+        this.readChat()
+      }
+    },
+    readChat () {
+      if (!(this.currentChatMessageService && this.currentChatMessageService.lastMessage)) { return }
+      if (document.hidden) { return }
+      const lastReadId = this.currentChatMessageService.lastMessage.id
+      this.$store.dispatch('readChat', { id: this.currentChat.id, lastReadId })
+    },
+    bottomedOut (offset) {
+      return isBottomedOut(this.$refs.scrollable, offset)
+    },
+    reachedTop () {
+      const scrollable = this.$refs.scrollable
+      return scrollable && scrollable.scrollTop <= 0
+    },
+    handleScroll: _.throttle(function () {
+      if (!this.currentChat) { return }
+
+      if (this.reachedTop()) {
+        this.fetchChat({ maxId: this.currentChatMessageService.minId })
+      } else if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) {
+        this.jumpToBottomButtonVisible = false
+        if (this.newMessageCount > 0) {
+          this.readChat()
+        }
+      } else {
+        this.jumpToBottomButtonVisible = true
+      }
+    }, 100),
+    handleScrollUp (positionBeforeLoading) {
+      const positionAfterLoading = getScrollPosition(this.$refs.scrollable)
+      this.$refs.scrollable.scrollTo({
+        top: getNewTopPosition(positionBeforeLoading, positionAfterLoading),
+        left: 0
+      })
+    },
+    fetchChat ({ isFirstFetch = false, fetchLatest = false, maxId }) {
+      const chatMessageService = this.currentChatMessageService
+      if (!chatMessageService) { return }
+      if (fetchLatest && this.streamingEnabled) { return }
+
+      const chatId = chatMessageService.chatId
+      const fetchOlderMessages = !!maxId
+      const sinceId = fetchLatest && chatMessageService.lastMessage && chatMessageService.lastMessage.id
+
+      this.backendInteractor.chatMessages({ id: chatId, maxId, sinceId })
+        .then((messages) => {
+          // Clear the current chat in case we're recovering from a ws connection loss.
+          if (isFirstFetch) {
+            chatService.clear(chatMessageService)
+          }
+
+          const positionBeforeUpdate = getScrollPosition(this.$refs.scrollable)
+          this.$store.dispatch('addChatMessages', { chatId, messages }).then(() => {
+            this.$nextTick(() => {
+              if (fetchOlderMessages) {
+                this.handleScrollUp(positionBeforeUpdate)
+              }
+
+              if (isFirstFetch) {
+                this.updateScrollableContainerHeight()
+              }
+            })
+          })
+        })
+    },
+    async startFetching () {
+      let chat = this.findOpenedChatByRecipientId(this.recipientId)
+      if (!chat) {
+        try {
+          chat = await this.backendInteractor.getOrCreateChat({ accountId: this.recipientId })
+        } catch (e) {
+          console.error('Error creating or getting a chat', e)
+          this.errorLoadingChat = true
+        }
+      }
+      if (chat) {
+        this.$nextTick(() => {
+          this.scrollDown({ forceRead: true })
+        })
+        this.$store.dispatch('addOpenedChat', { chat })
+        this.doStartFetching()
+      }
+    },
+    doStartFetching () {
+      this.$store.dispatch('startFetchingCurrentChat', {
+        fetcher: () => setInterval(() => this.fetchChat({ fetchLatest: true }), 5000)
+      })
+      this.fetchChat({ isFirstFetch: true })
+    },
+    sendMessage ({ status, media }) {
+      const params = {
+        id: this.currentChat.id,
+        content: status
+      }
+
+      if (media[0]) {
+        params.mediaId = media[0].id
+      }
+
+      return this.backendInteractor.sendChatMessage(params)
+        .then(data => {
+          this.$store.dispatch('addChatMessages', { chatId: this.currentChat.id, messages: [data] }).then(() => {
+            this.$nextTick(() => {
+              this.updateScrollableContainerHeight()
+              this.scrollDown({ forceRead: true })
+            })
+          })
+
+          return data
+        })
+        .catch(error => {
+          console.error('Error sending message', error)
+          return {
+            error: this.$t('chats.error_sending_message')
+          }
+        })
+    },
+    goBack () {
+      this.$router.push({ name: 'chats', params: { username: this.currentUser.screen_name } })
+    }
+  }
+}
+
+export default Chat
diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
new file mode 100644
index 00000000..13c52ea3
--- /dev/null
+++ b/src/components/chat/chat.scss
@@ -0,0 +1,161 @@
+.chat-view {
+  display: flex;
+  height: calc(100vh - 60px);
+  width: 100%;
+
+  .chat-view-inner {
+    height: auto;
+    width: 100%;
+    overflow: visible;
+    display: flex;
+    margin-top: 0.5em;
+    margin-left: 0.5em;
+    margin-right: 0.5em;
+  }
+
+  .chat-view-body {
+    background-color: var(--chatBg, $fallback--bg);
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    overflow: visible;
+    border-radius: none;
+    min-height: 100%;
+    margin-left: 0;
+    margin-right: 0;
+    margin-bottom: 0em;
+    margin-top: 0em;
+    border-radius: 10px 10px 0 0;
+    border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0 ;
+
+    &::after {
+      border-radius: none;
+      box-shadow: none;
+    }
+  }
+
+  .scrollable-message-list {
+    padding: 0 10px;
+    height: 100%;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .footer {
+    position: sticky;
+    bottom: 0px;
+  }
+
+  .chat-view-heading {
+    align-items: center;
+    justify-content: space-between;
+    top: 50px;
+    display: flex;
+    z-index: 2;
+    border-radius: none;
+    position: sticky;
+    display: flex;
+    overflow: hidden;
+  }
+
+  .go-back-button {
+    margin-right: 1.2em;
+    cursor: pointer;
+  }
+
+  .jump-to-bottom-button {
+    width: 2.5em;
+    height: 2.5em;
+    border-radius: 100%;
+    position: absolute;
+    right: 1.3em;
+    top: -3.2em;
+    background-color: $fallback--fg;
+    background-color: var(--btn, $fallback--fg);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3), 0px 2px 4px rgba(0, 0, 0, 0.3);
+    z-index: 10;
+    transition: 0.35s all;
+    transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
+    opacity: 0;
+    visibility: hidden;
+    cursor: pointer;
+
+    &.visible {
+      opacity: 1;
+      visibility: visible;
+    }
+
+    i {
+      font-size: 1em;
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
+    }
+
+    .unread-message-count {
+      font-size: 0.8em;
+      left: 50%;
+      transform: translate(-50%, 0);
+      border-radius: 100%;
+      margin-top: -1rem;
+      padding: 0;
+    }
+
+    .chat-loading-error {
+      width: 100%;
+      display: flex;
+      align-items: flex-end;
+      height: 100%;
+
+      .error {
+        width: 100%;
+      }
+    }
+  }
+
+  @media all and (max-width: 800px) {
+    height: 100%;
+    overflow: hidden;
+
+    .chat-view-inner {
+      overflow: hidden;
+      height: 100%;
+      margin-top: 0;
+      margin-left: 0;
+      margin-right: 0;
+    }
+
+    .chat-view-body {
+      display: flex;
+      min-height: auto;
+      overflow: hidden;
+      height: 100%;
+      margin: 0;
+      border-radius: 0 !important;
+    }
+
+    .chat-view-heading {
+      position: static;
+      z-index: 9999;
+      top: 0;
+      margin-top: 0;
+      border-radius: 0;
+    }
+
+    .scrollable-message-list {
+      display: unset;
+      overflow-y: scroll;
+      overflow-x: hidden;
+      -webkit-overflow-scrolling: touch;
+    }
+
+    .footer {
+      position: sticky;
+      bottom: auto;
+    }
+  }
+}
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
new file mode 100644
index 00000000..d8c91dbe
--- /dev/null
+++ b/src/components/chat/chat.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="chat-view">
+    <div class="chat-view-inner">
+      <div
+        id="nav"
+        ref="inner"
+        class="panel-default panel chat-view-body"
+      >
+        <div
+          ref="header"
+          class="panel-heading chat-view-heading mobile-hidden"
+        >
+          <a
+            class="go-back-button"
+            @click="goBack"
+          >
+            <i class="button-icon icon-left-open" />
+          </a>
+          <div class="title text-center">
+            <ChatTitle
+              :user="recipient"
+              :with-avatar="true"
+            />
+          </div>
+        </div>
+        <template>
+          <div
+            ref="scrollable"
+            class="scrollable-message-list"
+            :style="{ height: scrollableContainerHeight }"
+            @scroll="handleScroll"
+          >
+            <template v-if="!errorLoadingChat">
+              <ChatMessage
+                v-for="chatViewItem in chatViewItems"
+                :key="chatViewItem.id"
+                :author="recipient"
+                :chat-view-item="chatViewItem"
+                :hovered-message-chain="chatViewItem.messageChainId === hoveredMessageChainId"
+                @hover="onMessageHover"
+              />
+            </template>
+            <div
+              v-else
+              class="chat-loading-error"
+            >
+              <div class="alert error">
+                {{ $t('chats.error_loading_chat') }}
+              </div>
+            </div>
+          </div>
+          <div
+            ref="footer"
+            class="panel-body footer"
+          >
+            <div
+              class="jump-to-bottom-button"
+              :class="{ 'visible': jumpToBottomButtonVisible }"
+              @click="scrollDown({ behavior: 'smooth' })"
+            >
+              <i class="icon-down-open">
+                <div
+                  v-if="newMessageCount"
+                  class="badge badge-notification unread-chat-count unread-message-count"
+                >
+                  {{ newMessageCount }}
+                </div>
+              </i>
+            </div>
+            <PostStatusForm
+              :disable-subject="true"
+              :disable-scope-selector="true"
+              :disable-notice="true"
+              :disable-lock-warning="true"
+              :disable-polls="true"
+              :disable-sensitivity-checkbox="true"
+              :disable-submit="errorLoadingChat || !currentChat"
+              :request="sendMessage"
+              :submit-on-enter="!mobileLayout"
+              :preserve-focus="!mobileLayout"
+              :auto-focus="!mobileLayout"
+              :placeholder="formPlaceholder"
+              :file-limit="1"
+              max-height="160"
+              emoji-picker-placement="top"
+              @resize="handleResize"
+            />
+          </div>
+        </template>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./chat.js"></script>
+<style lang="scss">
+@import '../../_variables.scss';
+@import './chat.scss';
+</style>
diff --git a/src/components/chat/chat_layout.js b/src/components/chat/chat_layout.js
new file mode 100644
index 00000000..07ae3abf
--- /dev/null
+++ b/src/components/chat/chat_layout.js
@@ -0,0 +1,100 @@
+const ChatLayout = {
+  methods: {
+    setChatLayout () {
+      if (this.mobileLayout) {
+        this.setMobileChatLayout()
+      }
+    },
+    unsetChatLayout () {
+      this.unsetMobileChatLayout()
+    },
+    setMobileChatLayout () {
+      // This is a hacky way to adjust the global layout to the mobile chat (without modifying the rest of the app).
+      // This layout prevents empty spaces from being visible at the bottom
+      // of the chat on iOS Safari (`safe-area-inset`) when
+      // - the on-screen keyboard appears and the user starts typing
+      // - the user selects the text inside the input area
+      // - the user selects and deletes the text that is multiple lines long
+      // TODO: unify the chat layout with the global layout.
+
+      let html = document.querySelector('html')
+      if (html) {
+        html.style.overflow = 'hidden'
+        html.style.height = '100%'
+      }
+
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.height = '100%'
+      }
+
+      let app = document.getElementById('app')
+      if (app) {
+        app.style.height = '100%'
+        app.style.overflow = 'hidden'
+        app.style.minHeight = 'auto'
+      }
+
+      let appBgWrapper = window.document.getElementById('app_bg_wrapper')
+      if (appBgWrapper) {
+        appBgWrapper.style.overflow = 'hidden'
+      }
+
+      let main = document.getElementsByClassName('main')[0]
+      if (main) {
+        main.style.overflow = 'hidden'
+        main.style.height = '100%'
+      }
+
+      let content = document.getElementById('content')
+      if (content) {
+        content.style.paddingTop = '0'
+        content.style.height = '100%'
+        content.style.overflow = 'visible'
+      }
+
+      this.$nextTick(() => {
+        this.updateScrollableContainerHeight()
+      })
+    },
+    unsetMobileChatLayout () {
+      let html = document.querySelector('html')
+      if (html) {
+        html.style.overflow = 'visible'
+        html.style.height = 'unset'
+      }
+
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.height = 'unset'
+      }
+
+      let app = document.getElementById('app')
+      if (app) {
+        app.style.height = '100%'
+        app.style.overflow = 'visible'
+        app.style.minHeight = '100vh'
+      }
+
+      let appBgWrapper = document.getElementById('app_bg_wrapper')
+      if (appBgWrapper) {
+        appBgWrapper.style.overflow = 'visible'
+      }
+
+      let main = document.getElementsByClassName('main')[0]
+      if (main) {
+        main.style.overflow = 'visible'
+        main.style.height = 'unset'
+      }
+
+      let content = document.getElementById('content')
+      if (content) {
+        content.style.paddingTop = '60px'
+        content.style.height = 'unset'
+        content.style.overflow = 'unset'
+      }
+    }
+  }
+}
+
+export default ChatLayout
diff --git a/src/components/chat/chat_layout_utils.js b/src/components/chat/chat_layout_utils.js
new file mode 100644
index 00000000..f07ba2a1
--- /dev/null
+++ b/src/components/chat/chat_layout_utils.js
@@ -0,0 +1,27 @@
+// Captures a scroll position
+export const getScrollPosition = (el) => {
+  return {
+    scrollTop: el.scrollTop,
+    scrollHeight: el.scrollHeight,
+    offsetHeight: el.offsetHeight
+  }
+}
+
+// A helper function that is used to keep the scroll position fixed as the new elements are added to the top
+// Takes two scroll positions, before and after the update.
+export const getNewTopPosition = (previousPosition, newPosition) => {
+  return previousPosition.scrollTop + (newPosition.scrollHeight - previousPosition.scrollHeight)
+}
+
+export const isBottomedOut = (el, offset = 0) => {
+  if (!el) { return }
+  const scrollHeight = el.scrollTop + offset
+  const totalHeight = el.scrollHeight - el.offsetHeight
+  return totalHeight <= scrollHeight
+}
+
+// Height of the scrollable container. The dynamic height is needed to ensure the mobile browser panel doesn't overlap or hide the posting form.
+export const scrollableContainerHeight = (inner, header, footer) => {
+  const height = parseFloat(getComputedStyle(inner, null).height.replace('px', ''))
+  return height - header.clientHeight - footer.clientHeight
+}
diff --git a/src/components/chat_avatar/chat_avatar.js b/src/components/chat_avatar/chat_avatar.js
new file mode 100644
index 00000000..7b26e07c
--- /dev/null
+++ b/src/components/chat_avatar/chat_avatar.js
@@ -0,0 +1,23 @@
+import StillImage from '../still-image/still-image.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { mapState } from 'vuex'
+
+const ChatAvatar = {
+  props: ['user', 'width', 'height'],
+  components: {
+    StillImage
+  },
+  methods: {
+    getUserProfileLink (user) {
+      if (!user) { return }
+      return generateProfileLink(user.id, user.screen_name)
+    }
+  },
+  computed: {
+    ...mapState({
+      betterShadow: state => state.interface.browserSupport.cssFilter
+    })
+  }
+}
+
+export default ChatAvatar
diff --git a/src/components/chat_avatar/chat_avatar.vue b/src/components/chat_avatar/chat_avatar.vue
new file mode 100644
index 00000000..f54a7151
--- /dev/null
+++ b/src/components/chat_avatar/chat_avatar.vue
@@ -0,0 +1,53 @@
+<template>
+  <router-link
+    :to="getUserProfileLink(user) || ''"
+  >
+    <StillImage
+      v-if="user"
+      :style="{ 'width': width, 'height': height }"
+      class="avatar chat-avatar single-user"
+      :alt="user.screen_name"
+      :title="user.screen_name"
+      :src="user.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+    />
+    <div
+      v-else
+      class="avatar chat-avatar single-user"
+      :style="{ 'width': width, 'height': height }"
+    />
+  </router-link>
+</template>
+
+<script src="./chat_avatar.js"></script>
+<style lang="scss">
+@import '../../_variables.scss';
+
+.chat-avatar {
+  display: inline-block;
+  vertical-align: middle;
+
+  &.single-user {
+    border-radius: $fallback--avatarAltRadius;
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+  }
+
+  .avatar.still-image {
+    width: 48px;
+    height: 48px;
+
+    box-shadow: var(--avatarStatusShadow);
+    border-radius: 0;
+
+    &.better-shadow {
+      box-shadow: var(--avatarStatusShadowInset);
+      filter: var(--avatarStatusShadowFilter)
+    }
+
+    &.animated::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/components/chat_list/chat_list.js b/src/components/chat_list/chat_list.js
new file mode 100644
index 00000000..95708d1d
--- /dev/null
+++ b/src/components/chat_list/chat_list.js
@@ -0,0 +1,37 @@
+import { mapState, mapGetters } from 'vuex'
+import ChatListItem from '../chat_list_item/chat_list_item.vue'
+import ChatNew from '../chat_new/chat_new.vue'
+import List from '../list/list.vue'
+
+const ChatList = {
+  components: {
+    ChatListItem,
+    List,
+    ChatNew
+  },
+  computed: {
+    ...mapState({
+      currentUser: state => state.users.currentUser
+    }),
+    ...mapGetters(['sortedChatList'])
+  },
+  data () {
+    return {
+      isNew: false
+    }
+  },
+  created () {
+    this.$store.dispatch('fetchChats', { latest: true })
+  },
+  methods: {
+    cancelNewChat () {
+      this.isNew = false
+      this.$store.dispatch('fetchChats', { latest: true })
+    },
+    newChat () {
+      this.isNew = true
+    }
+  }
+}
+
+export default ChatList
diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue
new file mode 100644
index 00000000..e62f58e5
--- /dev/null
+++ b/src/components/chat_list/chat_list.vue
@@ -0,0 +1,48 @@
+<template>
+  <div v-if="isNew">
+    <ChatNew @cancel="cancelNewChat" />
+  </div>
+  <div
+    v-else
+    class="chat-list panel panel-default"
+  >
+    <div class="panel-heading">
+      <span class="title">
+        {{ $t("chats.chats") }}
+      </span>
+      <button @click="newChat">
+        {{ $t("chats.new") }}
+      </button>
+    </div>
+    <div class="panel-body">
+      <div class="timeline">
+        <List :items="sortedChatList">
+          <template
+            slot="item"
+            slot-scope="{item}"
+          >
+            <ChatListItem
+              :key="item.id"
+              :compact="false"
+              :chat="item"
+            />
+          </template>
+        </List>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./chat_list.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.chat-list {
+  min-height: calc(100vh - 67px);
+  margin-bottom: 0;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+</style>
diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
new file mode 100644
index 00000000..1c27088c
--- /dev/null
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -0,0 +1,65 @@
+import { mapState } from 'vuex'
+import StatusContent from '../status_content/status_content.vue'
+import fileType from 'src/services/file_type/file_type.service'
+import ChatAvatar from '../chat_avatar/chat_avatar.vue'
+import AvatarList from '../avatar_list/avatar_list.vue'
+import Timeago from '../timeago/timeago.vue'
+import ChatTitle from '../chat_title/chat_title.vue'
+
+const ChatListItem = {
+  name: 'ChatListItem',
+  props: [
+    'chat'
+  ],
+  components: {
+    ChatAvatar,
+    AvatarList,
+    Timeago,
+    ChatTitle,
+    StatusContent
+  },
+  computed: {
+    ...mapState({
+      currentUser: state => state.users.currentUser
+    }),
+    attachmentInfo () {
+      if (this.chat.lastMessage.attachments.length === 0) { return }
+
+      const types = this.chat.lastMessage.attachments.map(file => fileType.fileType(file.mimetype))
+      if (types.includes('video')) {
+        return this.$t('file_type.video')
+      } else if (types.includes('audio')) {
+        return this.$t('file_type.audio')
+      } else if (types.includes('image')) {
+        return this.$t('file_type.image')
+      } else {
+        return this.$t('file_type.file')
+      }
+    },
+    messageForStatusContent () {
+      const content = this.chat.lastMessage ? (this.attachmentInfo || this.chat.lastMessage.content) : ''
+
+      return {
+        summary: '',
+        statusnet_html: content,
+        text: content,
+        attachments: []
+      }
+    }
+  },
+  methods: {
+    openChat (_e) {
+      if (this.chat.id) {
+        this.$router.push({
+          name: 'chat',
+          params: {
+            username: this.currentUser.screen_name,
+            recipient_id: this.chat.account.id
+          }
+        })
+      }
+    }
+  }
+}
+
+export default ChatListItem
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
new file mode 100644
index 00000000..12269f89
--- /dev/null
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -0,0 +1,94 @@
+.chat-list-item {
+  &:hover .animated.avatar {
+    canvas {
+      display: none;
+    }
+    img {
+      visibility: visible;
+    }
+  }
+
+  display: flex;
+  flex-direction: row;
+  padding: 0.75em;
+  height: 4.85em;
+  overflow: hidden;
+  box-sizing: border-box;
+  cursor: pointer;
+
+  :focus {
+    outline: none;
+  }
+
+  &:hover {
+    background-color: var(--selectedPost, $fallback--lightBg);
+    box-shadow: 0 0px 3px 1px rgba(0, 0, 0, 0.1);
+  }
+
+  .chat-list-item-left {
+    margin-right: 1em;
+  }
+
+  .chat-list-item-center {
+    width: 100%;
+    box-sizing: border-box;
+    overflow: hidden;
+    word-wrap: break-word;
+  }
+
+  .heading {
+    width: 100%;
+    display: inline-flex;
+    justify-content: space-between;
+    line-height: 1em;
+  }
+
+  .heading-right {
+    white-space: nowrap;
+  }
+
+  .member-count {
+    color: $fallback--text;
+    color: var(--faintText, $fallback--text);
+    margin-right: 2px;
+  }
+
+  .name-and-account-name {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    flex-shrink: 1;
+  }
+
+  .chat-preview {
+    display: inline-flex;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    margin: 0.35rem 0;
+    height: 1.2em;
+    line-height: 1.2em;
+    color: $fallback--text;
+    color: var(--faint, $fallback--text);
+  }
+
+  a {
+    color: var(--faintLink, $fallback--link);
+    text-decoration: none;
+    pointer-events: none;
+  }
+
+  .unread-indicator-wrapper {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+  }
+
+  .unread-indicator {
+    border-radius: 100%;
+    height: 8px;
+    width: 8px;
+    background-color: $fallback--link;
+    background-color: var(--link, $fallback--link);
+  }
+}
diff --git a/src/components/chat_list_item/chat_list_item.vue b/src/components/chat_list_item/chat_list_item.vue
new file mode 100644
index 00000000..26ad581b
--- /dev/null
+++ b/src/components/chat_list_item/chat_list_item.vue
@@ -0,0 +1,49 @@
+<template>
+  <div
+    class="chat-list-item"
+    @click.capture.prevent="openChat"
+  >
+    <div class="chat-list-item-left">
+      <ChatAvatar
+        :user="chat.account"
+        height="48px"
+        width="48px"
+      />
+    </div>
+    <div class="chat-list-item-center">
+      <div class="heading">
+        <span
+          v-if="chat.account"
+          class="name-and-account-name"
+        >
+          <ChatTitle
+            :user="chat.account"
+          />
+        </span>
+        <span class="heading-right" />
+      </div>
+      <div class="chat-preview">
+        <StatusContent :status="messageForStatusContent" />
+        <div
+          v-if="chat.unread > 0"
+          class="badge badge-notification unread-chat-count"
+        >
+          {{ chat.unread }}
+        </div>
+      </div>
+    </div>
+    <div>
+      <Timeago
+        :time="chat.updated_at"
+        :auto-update="60"
+      />
+    </div>
+  </div>
+</template>
+
+<script src="./chat_list_item.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+@import './chat_list_item.scss';
+</style>
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
new file mode 100644
index 00000000..aba95074
--- /dev/null
+++ b/src/components/chat_message/chat_message.js
@@ -0,0 +1,109 @@
+import { mapState, mapGetters } from 'vuex'
+import Popover from '../popover/popover.vue'
+import Attachment from '../attachment/attachment.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
+import Gallery from '../gallery/gallery.vue'
+import LinkPreview from '../link-preview/link-preview.vue'
+import StatusContent from '../status_content/status_content.vue'
+import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
+const ChatMessage = {
+  name: 'ChatMessage',
+  props: [
+    'author',
+    'edited',
+    'noHeading',
+    'chatViewItem',
+    'hoveredMessageChain'
+  ],
+  components: {
+    Popover,
+    Attachment,
+    StatusContent,
+    UserAvatar,
+    Gallery,
+    LinkPreview,
+    ChatMessageDate
+  },
+  computed: {
+    // Returns HH:MM (hours and minutes) in local time.
+    createdAt () {
+      const time = this.chatViewItem.data.created_at
+      return time.toLocaleTimeString('en', { hour: '2-digit', minute: '2-digit', hour12: false })
+    },
+    isCurrentUser () {
+      return this.message.account_id === this.currentUser.id
+    },
+    message () {
+      return this.chatViewItem.data
+    },
+    userProfileLink () {
+      return generateProfileLink(this.author.id, this.author.screen_name, this.$store.state.instance.restrictedNicknames)
+    },
+    isMessage () {
+      return this.chatViewItem.type === 'message'
+    },
+    messageForStatusContent () {
+      return {
+        summary: '',
+        statusnet_html: this.message.content,
+        text: this.message.content,
+        attachments: this.message.attachments
+      }
+    },
+    hasAttachment () {
+      return this.message.attachments.length > 0
+    },
+    ...mapState({
+      betterShadow: state => state.interface.browserSupport.cssFilter,
+      currentUser: state => state.users.currentUser,
+      restrictedNicknames: state => state.instance.restrictedNicknames
+    }),
+    ellipsisButtonWrapperStyle () {
+      let res = {
+        'opacity': this.hovered || this.menuOpened ? '1' : '0'
+      }
+
+      if (this.isCurrentUser) {
+        res.right = '5px'
+      } else {
+        res.left = '5px'
+      }
+
+      return res
+    },
+    popoverMarginStyle () {
+      if (this.isCurrentUser) {
+        return {}
+      } else {
+        return { left: 50 }
+      }
+    },
+    ...mapGetters(['mergedConfig', 'findUser'])
+  },
+  data () {
+    return {
+      hovered: false,
+      menuOpened: false
+    }
+  },
+  methods: {
+    onHover (bool) {
+      this.$emit('hover', { isHovered: bool, messageChainId: this.chatViewItem.messageChainId })
+    },
+    async deleteMessage () {
+      const confirmed = window.confirm(this.$t('chats.delete_confirm'))
+      if (confirmed) {
+        await this.$store.dispatch('deleteChatMessage', {
+          messageId: this.chatViewItem.data.id,
+          chatId: this.chatViewItem.data.chat_id
+        })
+      }
+      this.hovered = false
+      this.menuOpened = false
+    }
+  }
+}
+
+export default ChatMessage
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
new file mode 100644
index 00000000..e4028537
--- /dev/null
+++ b/src/components/chat_message/chat_message.scss
@@ -0,0 +1,157 @@
+@import '../../_variables.scss';
+
+.chat-message-wrapper {
+  &.hovered-message-chain {
+    .animated.avatar {
+      canvas {
+        display: none;
+      }
+      img {
+        visibility: visible;
+      }
+    }
+  }
+
+  &:last-child {
+    margin-bottom: 16px;
+  }
+
+  .chat-message-menu {
+    transition: opacity 0.1s;
+    opacity: 0;
+    position: absolute;
+    top: -10px;
+
+    button {
+      padding-top: 3px;
+      padding-bottom: 3px;
+    }
+  }
+
+  .icon-ellipsis {
+    cursor: pointer;
+
+    &:hover, .extra-button-popover.open & {
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
+    }
+
+    border-radius: $fallback--chatMessageRadius;
+    border-radius: var(--chatMessageRadius, $fallback--chatMessageRadius);
+  }
+
+  .popover {
+    width: 12rem;
+  }
+
+  .chat-message {
+    display: flex;
+    padding-bottom: 7px;
+  }
+
+  .avatar-wrapper {
+    margin-right: 10px;
+    width: 32px;
+  }
+
+  .link-preview, .attachments {
+    margin-bottom: 0.9em;
+  }
+
+  .chat-message-inner {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    max-width: 80%;
+    min-width: 10rem;
+    width: 100%;
+
+    &.with-media {
+      width: 100%;
+
+      .gallery-row {
+        overflow: hidden;
+      }
+
+      .status {
+        width: 100%;
+      }
+    }
+  }
+
+  .status {
+    border-radius: $fallback--chatMessageRadius;
+    border-radius: var(--chatMessageRadius, $fallback--chatMessageRadius);
+    display: flex;
+    padding: 0.75em;
+  }
+
+  .created-at {
+    float: right;
+    font-size: 0.8em;
+    margin: -10px 0 -5px 4px;
+    font-style: italic;
+    opacity: 0.8;
+  }
+
+  .without-attachment {
+    .status-content {
+      white-space: normal;
+
+      &::after {
+        margin-right: 75px;
+        content: " ";
+        display: inline-block;
+      }
+    }
+  }
+
+  .incoming {
+    a {
+      color: var(--chatMessageIncomingLink, $fallback--link);
+    }
+
+    .status {
+      color: var(--chatMessageIncomingText, $fallback--text);
+      background-color: var(--chatMessageIncomingBg, $fallback--bg);
+      border: 1px solid var(--chatMessageIncomingBorder, --border);
+    }
+
+    .created-at {
+      a {
+        color: var(--chatMessageIncomingText, $fallback--text);
+      }
+    }
+  }
+
+  .outgoing {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-content: end;
+    justify-content: flex-end;
+
+    a {
+      color: var(--chatMessageOutgoingLink, $fallback--link);
+    }
+
+    .status {
+      color: var(--chatMessageOutgoingText, $fallback--text);
+      background-color: var(--chatMessageOutgoingBg, $fallback--lightBg);
+      border: 1px solid var(--chatMessageOutgoingBorder, --lightBg);
+    }
+
+    .chat-message-inner {
+      align-items: flex-end;
+    }
+  }
+}
+
+.chat-message-date-separator {
+  text-align: center;
+  margin: 1.4em 0;
+  font-size: 0.9em;
+  user-select: none;
+  color: $fallback--text;
+  color: var(--faintedText, $fallback--text);
+}
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
new file mode 100644
index 00000000..872ddf70
--- /dev/null
+++ b/src/components/chat_message/chat_message.vue
@@ -0,0 +1,99 @@
+<template>
+  <div
+    v-if="isMessage"
+    class="chat-message-wrapper"
+    :class="{ 'hovered-message-chain': hoveredMessageChain }"
+    @mouseover="onHover(true)"
+    @mouseleave="onHover(false)"
+  >
+    <div
+      class="chat-message"
+      :class="[{ 'outgoing': isCurrentUser, 'incoming': !isCurrentUser }]"
+    >
+      <div
+        v-if="!isCurrentUser"
+        class="avatar-wrapper"
+      >
+        <router-link
+          v-if="chatViewItem.isHead"
+          :to="userProfileLink"
+        >
+          <UserAvatar
+            :compact="true"
+            :better-shadow="betterShadow"
+            :user="author"
+          />
+        </router-link>
+      </div>
+      <div class="chat-message-inner">
+        <div
+          class="status-body"
+          :style="{ 'min-width': message.attachment ? '80%' : '' }"
+        >
+          <div
+            class="media status"
+            :class="{ 'without-attachment': !hasAttachment }"
+            style="position: relative"
+            @mouseenter="hovered = true"
+            @mouseleave="hovered = false"
+          >
+            <div
+              class="chat-message-menu"
+              :style="ellipsisButtonWrapperStyle"
+            >
+              <Popover
+                trigger="click"
+                placement="top"
+                :bound-to-selector="isCurrentUser ? '' : '.scrollable-message-list'"
+                :bound-to="{ x: 'container' }"
+                :margin="popoverMarginStyle"
+                @show="menuOpened = true"
+                @close="menuOpened = false"
+              >
+                <div slot="content">
+                  <div class="dropdown-menu">
+                    <button
+                      class="dropdown-item dropdown-item-icon"
+                      @click="deleteMessage"
+                    >
+                      <i class="icon-cancel" /> {{ $t("chats.delete") }}
+                    </button>
+                  </div>
+                </div>
+                <button
+                  slot="trigger"
+                  :title="$t('chats.more')"
+                >
+                  <i class="icon-ellipsis" />
+                </button>
+              </Popover>
+            </div>
+            <StatusContent
+              :status="messageForStatusContent"
+              :full-content="true"
+            >
+              <span
+                slot="footer"
+                class="created-at"
+              >
+                {{ createdAt }}
+              </span>
+            </StatusContent>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    v-else
+    class="chat-message-date-separator"
+  >
+    <ChatMessageDate :date="chatViewItem.date" />
+  </div>
+</template>
+
+<script src="./chat_message.js" ></script>
+<style lang="scss">
+@import './chat_message.scss';
+
+</style>
diff --git a/src/components/chat_message_date/chat_message_date.vue b/src/components/chat_message_date/chat_message_date.vue
new file mode 100644
index 00000000..79c346b6
--- /dev/null
+++ b/src/components/chat_message_date/chat_message_date.vue
@@ -0,0 +1,24 @@
+<template>
+  <time>
+    {{ displayDate }}
+  </time>
+</template>
+
+<script>
+export default {
+  name: 'Timeago',
+  props: ['date'],
+  computed: {
+    displayDate () {
+      const today = new Date()
+      today.setHours(0, 0, 0, 0)
+
+      if (this.date.getTime() === today.getTime()) {
+        return this.$t('display_date.today')
+      } else {
+        return this.date.toLocaleDateString('en', { day: 'numeric', month: 'long' })
+      }
+    }
+  }
+}
+</script>
diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js
new file mode 100644
index 00000000..0da681f7
--- /dev/null
+++ b/src/components/chat_new/chat_new.js
@@ -0,0 +1,74 @@
+import { throttle } from 'lodash'
+import { mapState, mapGetters } from 'vuex'
+import BasicUserCard from '../basic_user_card/basic_user_card.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
+
+const chatNew = {
+  components: {
+    BasicUserCard,
+    UserAvatar
+  },
+  data () {
+    return {
+      suggestions: [],
+      userIds: [],
+      loading: false,
+      query: ''
+    }
+  },
+  async created () {
+    const { chats } = await this.backendInteractor.chats()
+    chats.forEach(chat => this.suggestions.push(chat.account))
+  },
+  computed: {
+    users () {
+      return this.userIds.map(userId => this.findUser(userId))
+    },
+    availableUsers () {
+      if (this.query.length !== 0) {
+        return this.users
+      } else {
+        return this.suggestions
+      }
+    },
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      backendInteractor: state => state.api.backendInteractor
+    }),
+    ...mapGetters(['findUser'])
+  },
+  methods: {
+    goBack () {
+      this.$emit('cancel')
+    },
+    goToChat (user) {
+      this.$router.push({ name: 'chat', params: { recipient_id: user.id } })
+    },
+    onInput () {
+      this.search(this.query)
+    },
+    addUser (user) {
+      this.selectedUserIds.push(user.id)
+      this.query = ''
+    },
+    removeUser (userId) {
+      this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId)
+    },
+    search: throttle(function (query) {
+      if (!query) {
+        this.loading = false
+        return
+      }
+
+      this.loading = true
+      this.userIds = []
+      this.$store.dispatch('search', { q: query, resolve: true, type: 'accounts' })
+        .then(data => {
+          this.loading = false
+          this.userIds = data.accounts.map(a => a.id)
+        })
+    })
+  }
+}
+
+export default chatNew
diff --git a/src/components/chat_new/chat_new.scss b/src/components/chat_new/chat_new.scss
new file mode 100644
index 00000000..39216677
--- /dev/null
+++ b/src/components/chat_new/chat_new.scss
@@ -0,0 +1,29 @@
+.chat-new {
+  .input-wrap {
+    display: flex;
+    margin: 0.7em 0.5em 0.7em 0.5em;
+
+    input {
+      width: 100%;
+    }
+  }
+
+  .icon-search {
+    font-size: 1.5em;
+    float: right;
+    margin-right: 0.3em;
+  }
+
+  .member-list {
+    padding-bottom: 0.67rem;
+  }
+
+  .basic-user-card:hover {
+    cursor: pointer;
+    background-color: var(--selectedPost, $fallback--lightBg);
+  }
+
+  .go-back-button {
+    cursor: pointer;
+  }
+}
diff --git a/src/components/chat_new/chat_new.vue b/src/components/chat_new/chat_new.vue
new file mode 100644
index 00000000..3333dbf9
--- /dev/null
+++ b/src/components/chat_new/chat_new.vue
@@ -0,0 +1,46 @@
+<template>
+  <div
+    id="nav"
+    class="panel-default panel chat-new"
+  >
+    <div
+      ref="header"
+      class="panel-heading"
+    >
+      <a
+        class="go-back-button"
+        @click="goBack"
+      >
+        <i class="button-icon icon-left-open" />
+      </a>
+    </div>
+    <div class="input-wrap">
+      <div class="input-search">
+        <i class="button-icon icon-search" />
+      </div>
+      <input
+        ref="search"
+        v-model="query"
+        placeholder="Search people"
+        @input="onInput"
+      >
+    </div>
+    <div class="member-list">
+      <div
+        v-for="user in availableUsers"
+        :key="user.id"
+        class="member"
+      >
+        <div @click.capture.prevent="goToChat(user)">
+          <BasicUserCard :user="user" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./chat_new.js"></script>
+<style lang="scss">
+@import '../../_variables.scss';
+@import './chat_new.scss';
+</style>
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 3677722f..12968cfb 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -84,54 +84,56 @@
   max-width: 25em;
 }
 
-.chat-heading {
-  cursor: pointer;
-  .icon-comment-empty {
-    color: $fallback--text;
-    color: var(--text, $fallback--text);
-  }
-}
-
-.chat-window {
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-height: 20em;
-}
-
-.chat-window-container {
-  height: 100%;
-}
-
-.chat-message {
-  display: flex;
-  padding: 0.2em 0.5em
-}
-
-.chat-avatar {
-  img {
-    height: 24px;
-    width: 24px;
-    border-radius: $fallback--avatarRadius;
-    border-radius: var(--avatarRadius, $fallback--avatarRadius);
-    margin-right: 0.5em;
-    margin-top: 0.25em;
-  }
-}
-
-.chat-input {
-  display: flex;
-  textarea {
-    flex: 1;
-    margin: 0.6em;
-    min-height: 3.5em;
-    resize: none;
-  }
-}
-
 .chat-panel {
-  .title {
+  .chat-heading {
+    cursor: pointer;
+    .icon-comment-empty {
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
+    }
+  }
+
+  .chat-window {
+    overflow-y: auto;
+    overflow-x: hidden;
+    max-height: 20em;
+  }
+
+  .chat-window-container {
+    height: 100%;
+  }
+
+  .chat-message {
     display: flex;
-    justify-content: space-between;
+    padding: 0.2em 0.5em
+  }
+
+  .chat-avatar {
+    img {
+      height: 24px;
+      width: 24px;
+      border-radius: $fallback--avatarRadius;
+      border-radius: var(--avatarRadius, $fallback--avatarRadius);
+      margin-right: 0.5em;
+      margin-top: 0.25em;
+    }
+  }
+
+  .chat-input {
+    display: flex;
+    textarea {
+      flex: 1;
+      margin: 0.6em;
+      min-height: 3.5em;
+      resize: none;
+    }
+  }
+
+  .chat-panel {
+    .title {
+      display: flex;
+      justify-content: space-between;
+    }
   }
 }
 </style>
diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js
new file mode 100644
index 00000000..2723d5f5
--- /dev/null
+++ b/src/components/chat_title/chat_title.js
@@ -0,0 +1,20 @@
+import Vue from 'vue'
+import ChatAvatar from '../chat_avatar/chat_avatar.vue'
+
+export default Vue.component('chat-title', {
+  name: 'ChatTitle',
+  components: {
+    ChatAvatar
+  },
+  props: [
+    'user', 'withAvatar'
+  ],
+  computed: {
+    title () {
+      return this.user ? this.user.screen_name : ''
+    },
+    htmlTitle () {
+      return this.user ? this.user.name_html : ''
+    }
+  }
+})
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
new file mode 100644
index 00000000..fd42d125
--- /dev/null
+++ b/src/components/chat_title/chat_title.vue
@@ -0,0 +1,56 @@
+<template>
+  <!-- eslint-disable vue/no-v-html -->
+  <div
+    class="chat-title"
+    :title="title"
+  >
+    <ChatAvatar
+      v-if="withAvatar"
+      :user="user"
+      width="23px"
+      height="23px"
+    />
+    <span
+      v-if="withAvatar"
+      style="margin-right: 0.5em"
+    />
+    <span
+      class="username"
+      v-html="htmlTitle"
+    />
+  </div>
+  <!-- eslint-enable vue/no-v-html -->
+</template>
+
+<script src="./chat_title.js"></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.chat-title {
+  display: flex;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  a {
+    display: flex;
+    align-items: center;
+  }
+
+  .username {
+    max-width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    display: inline;
+    word-wrap: break-word;
+
+    .emoji {
+      width: 14px;
+      height: 14px;
+      vertical-align: middle;
+      object-fit: contain
+    }
+  }
+}
+</style>
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 7974a66d..a27da090 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -79,6 +79,15 @@ const EmojiInput = {
       required: false,
       type: Boolean,
       default: false
+    },
+    placement: {
+      /**
+       * Forces the panel to take a specific position relative to the input element.
+       * The 'auto' placement chooses either bottom or top depending on which has the available space (when both have available space, bottom is preferred).
+       */
+      required: false,
+      type: String, // 'auto', 'top', 'bottom'
+      default: 'auto'
     }
   },
   data () {
@@ -162,6 +171,11 @@ const EmojiInput = {
       input.elm.removeEventListener('input', this.onInput)
     }
   },
+  watch: {
+    showSuggestions: function (newValue) {
+      this.$emit('shown', newValue)
+    }
+  },
   methods: {
     triggerShowPicker () {
       this.showPicker = true
@@ -425,15 +439,29 @@ const EmojiInput = {
       this.caret = selectionStart
     },
     resize () {
-      const { panel, picker } = this.$refs
+      const panel = this.$refs.panel
       if (!panel) return
+      const picker = this.$refs.picker.$el
+      const panelBody = this.$refs['panel-body']
       const { offsetHeight, offsetTop } = this.input.elm
       const offsetBottom = offsetTop + offsetHeight
 
-      panel.style.top = offsetBottom + 'px'
-      if (!picker) return
-      picker.$el.style.top = offsetBottom + 'px'
-      picker.$el.style.bottom = 'auto'
+      this.setPlacement(panelBody, panel, offsetBottom)
+      this.setPlacement(picker, picker, offsetBottom)
+    },
+    setPlacement (container, target, offsetBottom) {
+      if (!container || !target) return
+
+      target.style.top = offsetBottom + 'px'
+      target.style.bottom = 'auto'
+
+      if (this.placement === 'top' || (this.placement === 'auto' && this.overflowsBottom(container))) {
+        target.style.top = 'auto'
+        target.style.bottom = this.input.elm.offsetHeight + 'px'
+      }
+    },
+    overflowsBottom (el) {
+      return el.getBoundingClientRect().bottom > window.innerHeight
     }
   }
 }
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index e9ac09c3..b9a74572 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -29,7 +29,10 @@
       class="autocomplete-panel"
       :class="{ hide: !showSuggestions }"
     >
-      <div class="autocomplete-panel-body">
+      <div
+        ref="panel-body"
+        class="autocomplete-panel-body"
+      >
         <div
           v-for="(suggestion, index) in suggestions"
           :key="index"
diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
index 5f80a079..620a85ea 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -1,6 +1,7 @@
 const FeaturesPanel = {
   computed: {
     chat: function () { return this.$store.state.instance.chatAvailable },
+    pleromaChatMessages: function () { return this.$store.state.instance.pleromaChatMessagesAvailable },
     gopher: function () { return this.$store.state.instance.gopherAvailable },
     whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
     mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
index 3e5939a6..608b11c8 100644
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@@ -11,6 +11,9 @@
           <li v-if="chat">
             {{ $t('features_panel.chat') }}
           </li>
+          <li v-if="pleromaChatMessages">
+            {{ $t('features_panel.pleroma_chat_messages') }}
+          </li>
           <li v-if="gopher">
             {{ $t('features_panel.gopher') }}
           </li>
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index fbb2d03d..7b8a76cc 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -61,7 +61,8 @@ const mediaUpload = {
     }
   },
   props: [
-    'dropFiles'
+    'dropFiles',
+    'disabled'
   ],
   watch: {
     'dropFiles': function (fileInfos) {
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 5e31730b..d719eae1 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="media-upload">
+  <div
+    class="media-upload"
+    :class="{ disabled: disabled }"
+  >
     <label
       class="label"
       :title="$t('tool_tip.media_upload')"
@@ -14,6 +17,7 @@
       />
       <input
         v-if="uploadReady"
+        :disabled="disabled"
         type="file"
         style="position: fixed; top: -100em"
         multiple="true"
@@ -26,7 +30,22 @@
 <script src="./media_upload.js" ></script>
 
 <style lang="scss">
+@import '../../_variables.scss';
+
 .media-upload {
+  &.disabled {
+    .new-icon {
+      cursor: not-allowed;
+    }
+
+    &:hover {
+      i, label {
+        color: $fallback--faint;
+        color: var(--faint, $fallback--faint);
+      }
+    }
+  }
+
   .label {
     display: inline-block;
   }
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index c1166a0c..b27ca6f4 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -30,7 +30,10 @@ const MobileNav = {
       return this.unseenNotifications.length
     },
     hideSitename () { return this.$store.state.instance.hideSitename },
-    sitename () { return this.$store.state.instance.name }
+    sitename () { return this.$store.state.instance.name },
+    navBarStyle () {
+      return { 'visibility': this.$route.name === 'chat' ? 'hidden' : 'visible' }
+    }
   },
   methods: {
     toggleMobileSidebar () {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 51f1d636..05568b90 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -3,6 +3,7 @@
     <nav
       id="nav"
       class="nav-bar container"
+      :style="navBarStyle"
     >
       <div
         class="mobile-inner-nav"
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index 0ad12bb1..6348277b 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -1,5 +1,10 @@
 import { debounce } from 'lodash'
 
+const HIDDEN_FOR_PAGES = new Set([
+  'chats',
+  'chat'
+])
+
 const MobilePostStatusButton = {
   data () {
     return {
@@ -27,6 +32,8 @@ const MobilePostStatusButton = {
       return !!this.$store.state.users.currentUser
     },
     isHidden () {
+      if (HIDDEN_FOR_PAGES.has(this.$route.name)) { return true }
+
       return this.autohideFloatingPostButton && (this.hidden || this.inputActive)
     },
     autohideFloatingPostButton () {
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 8f7edb7f..b142ffe0 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,4 +1,4 @@
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 
 const NavPanel = {
   created () {
@@ -6,13 +6,17 @@ const NavPanel = {
       this.$store.dispatch('startFetchingFollowRequests')
     }
   },
-  computed: mapState({
-    currentUser: state => state.users.currentUser,
-    chat: state => state.chat.channel,
-    followRequestCount: state => state.api.followRequests.length,
-    privateMode: state => state.instance.private,
-    federating: state => state.instance.federating
-  })
+  computed: {
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      chat: state => state.chat.channel,
+      followRequestCount: state => state.api.followRequests.length,
+      privateMode: state => state.instance.private,
+      federating: state => state.instance.federating,
+      pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
+    }),
+    ...mapGetters(['unreadChatCount'])
+  }
 }
 
 export default NavPanel
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index f164b2b0..8a213d7e 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -22,6 +22,17 @@
             <i class="button-icon icon-bookmark" /> {{ $t("nav.bookmarks") }}
           </router-link>
         </li>
+        <li v-if="currentUser && pleromaChatMessagesAvailable">
+          <router-link :to="{ name: 'chats', params: { username: currentUser.screen_name } }">
+            <div
+              v-if="unreadChatCount"
+              class="badge badge-notification unread-chat-count"
+            >
+              {{ unreadChatCount }}
+            </div>
+            <i class="button-icon icon-chat" /> {{ $t("nav.chats") }}
+          </router-link>
+        </li>
         <li v-if="currentUser && currentUser.locked">
           <router-link :to="{ name: 'friend-requests' }">
             <i class="button-icon icon-user-plus" /> {{ $t("nav.friend_requests") }}
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 5aa40e98..bb906b50 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,4 +1,5 @@
 import StatusContent from '../status_content/status_content.vue'
+import { mapState } from 'vuex'
 import Status from '../status/status.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
@@ -81,7 +82,10 @@ const Notification = {
     },
     isStatusNotification () {
       return isStatusNotification(this.notification.type)
-    }
+    },
+    ...mapState({
+      currentUser: state => state.users.currentUser
+    })
   }
 }
 
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index d8a327b0..d951e2a8 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,3 +1,4 @@
+import { mapGetters } from 'vuex'
 import Notification from '../notification/notification.vue'
 import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js'
 import {
@@ -51,18 +52,22 @@ const Notifications = {
     unseenCount () {
       return this.unseenNotifications.length
     },
+    unseenCountTitle () {
+      return this.unseenCount + (this.unreadChatCount)
+    },
     loading () {
       return this.$store.state.statuses.notifications.loading
     },
     notificationsToDisplay () {
       return this.filteredNotifications.slice(0, this.unseenCount + this.seenToDisplayCount)
-    }
+    },
+    ...mapGetters(['unreadChatCount'])
   },
   components: {
     Notification
   },
   watch: {
-    unseenCount (count) {
+    unseenCountTitle (count) {
       if (count > 0) {
         this.$store.dispatch('setPageTitle', `(${count})`)
       } else {
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 18f02eba..90d0fa81 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -9,7 +9,7 @@ import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 import { reject, map, uniqBy, debounce } from 'lodash'
 import suggestor from '../emoji_input/suggestor.js'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
 
 const buildMentionsString = ({ user, attentions = [] }, currentUser) => {
@@ -33,7 +33,22 @@ const PostStatusForm = {
     'repliedUser',
     'attentions',
     'copyMessageScope',
-    'subject'
+    'subject',
+    'disableSubject',
+    'disableScopeSelector',
+    'disableNotice',
+    'disableLockWarning',
+    'disablePolls',
+    'disableSensitivityCheckbox',
+    'disableSubmit',
+    'placeholder',
+    'maxHeight',
+    'request',
+    'preserveFocus',
+    'autoFocus',
+    'fileLimit',
+    'submitOnEnter',
+    'emojiPickerPlacement'
   ],
   components: {
     MediaUpload,
@@ -46,10 +61,13 @@ const PostStatusForm = {
   },
   mounted () {
     this.resize(this.$refs.textarea)
-    const textLength = this.$refs.textarea.value.length
-    this.$refs.textarea.setSelectionRange(textLength, textLength)
 
     if (this.replyTo) {
+      const textLength = this.$refs.textarea.value.length
+      this.$refs.textarea.setSelectionRange(textLength, textLength)
+    }
+
+    if (this.replyTo || this.autoFocus) {
       this.$refs.textarea.focus()
     }
   },
@@ -72,7 +90,7 @@ const PostStatusForm = {
 
     return {
       dropFiles: [],
-      submitDisabled: false,
+      uploadingFiles: false,
       error: null,
       posting: false,
       highlighted: 0,
@@ -91,7 +109,8 @@ const PostStatusForm = {
       showDropIcon: 'hide',
       dropStopTimeout: null,
       preview: null,
-      previewLoading: false
+      previewLoading: false,
+      emojiInputShown: false
     }
   },
   computed: {
@@ -160,10 +179,11 @@ const PostStatusForm = {
     },
     pollsAvailable () {
       return this.$store.state.instance.pollsAvailable &&
-        this.$store.state.instance.pollLimits.max_options >= 2
+        this.$store.state.instance.pollLimits.max_options >= 2 &&
+        this.disablePolls !== true
     },
     hideScopeNotice () {
-      return this.$store.getters.mergedConfig.hideScopeNotice
+      return this.disableNotice || this.$store.getters.mergedConfig.hideScopeNotice
     },
     pollContentError () {
       return this.pollFormVisible &&
@@ -176,7 +196,13 @@ const PostStatusForm = {
     emptyStatus () {
       return this.newStatus.status.trim() === '' && this.newStatus.files.length === 0
     },
-    ...mapGetters(['mergedConfig'])
+    uploadFileLimitReached () {
+      return this.newStatus.files.length >= this.fileLimit
+    },
+    ...mapGetters(['mergedConfig']),
+    ...mapState({
+      mobileLayout: state => state.interface.mobileLayout
+    })
   },
   watch: {
     'newStatus.contentType': function () {
@@ -187,9 +213,19 @@ const PostStatusForm = {
     }
   },
   methods: {
-    async postStatus (newStatus) {
+    async postStatus (event, newStatus, opts = {}) {
       if (this.posting) { return }
       if (this.submitDisabled) { return }
+      if (this.emojiInputShown) { return }
+      if (this.submitOnEnter) {
+        event.stopPropagation()
+        event.preventDefault()
+      }
+      if (opts.control && this.submitOnEnter) {
+        newStatus.status = `${newStatus.status}\n`
+        return
+      }
+
       if (this.emptyStatus) {
         this.error = this.$t('post_status.empty_status_error')
         return
@@ -211,7 +247,7 @@ const PostStatusForm = {
         return
       }
 
-      const data = await statusPoster.postStatus({
+      const postingOptions = {
         status: newStatus.status,
         spoilerText: newStatus.spoilerText || null,
         visibility: newStatus.visibility,
@@ -221,32 +257,40 @@ const PostStatusForm = {
         inReplyToStatusId: this.replyTo,
         contentType: newStatus.contentType,
         poll
-      })
-
-      if (!data.error) {
-        this.newStatus = {
-          status: '',
-          spoilerText: '',
-          files: [],
-          visibility: newStatus.visibility,
-          contentType: newStatus.contentType,
-          poll: {},
-          mediaDescriptions: {}
-        }
-        this.pollFormVisible = false
-        this.$refs.mediaUpload.clearFile()
-        this.clearPollForm()
-        this.$emit('posted')
-        let el = this.$el.querySelector('textarea')
-        el.style.height = 'auto'
-        el.style.height = undefined
-        this.error = null
-        if (this.preview) this.previewStatus()
-      } else {
-        this.error = data.error
       }
 
-      this.posting = false
+      const request = this.request ? this.request : statusPoster.postStatus
+
+      request(postingOptions).then((data) => {
+        if (!data.error) {
+          this.newStatus = {
+            status: '',
+            spoilerText: '',
+            files: [],
+            visibility: newStatus.visibility,
+            contentType: newStatus.contentType,
+            poll: {},
+            mediaDescriptions: {}
+          }
+          this.pollFormVisible = false
+          this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
+          this.clearPollForm()
+          this.$emit('posted', data)
+          if (this.preserveFocus) {
+            this.$nextTick(() => {
+              this.$refs.textarea.focus()
+            })
+          }
+          let el = this.$el.querySelector('textarea')
+          el.style.height = 'auto'
+          el.style.height = undefined
+          this.error = null
+          if (this.preview) this.previewStatus()
+        } else {
+          this.error = data.error
+        }
+        this.posting = false
+      })
     },
     previewStatus () {
       if (this.emptyStatus && this.newStatus.spoilerText.trim() === '') {
@@ -301,20 +345,26 @@ const PostStatusForm = {
     },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
+
+      // TODO: use fixed dimensions instead so relying on timeout
+      setTimeout(() => {
+        this.$emit('resize')
+      }, 150)
     },
     removeMediaFile (fileInfo) {
       let index = this.newStatus.files.indexOf(fileInfo)
       this.newStatus.files.splice(index, 1)
+      this.$emit('resize')
     },
     uploadFailed (errString, templateArgs) {
       templateArgs = templateArgs || {}
       this.error = this.$t('upload.error.base') + ' ' + this.$t('upload.error.' + errString, templateArgs)
     },
-    disableSubmit () {
-      this.submitDisabled = true
+    startedUploadingFiles () {
+      this.uploadingFiles = true
     },
-    enableSubmit () {
-      this.submitDisabled = false
+    finishedUploadingFiles () {
+      this.uploadingFiles = false
     },
     type (fileInfo) {
       return fileTypeService.fileType(fileInfo.mimetype)
@@ -348,7 +398,7 @@ const PostStatusForm = {
       this.dropStopTimeout = setTimeout(() => (this.showDropIcon = 'hide'), 500)
     },
     fileDrag (e) {
-      e.dataTransfer.dropEffect = 'copy'
+      e.dataTransfer.dropEffect = this.uploadFileLimitReached ? 'none' : 'copy'
       if (e.dataTransfer && e.dataTransfer.types.includes('Files')) {
         clearTimeout(this.dropStopTimeout)
         this.showDropIcon = 'show'
@@ -367,6 +417,7 @@ const PostStatusForm = {
       // Reset to default height for empty form, nothing else to do here.
       if (target.value === '') {
         target.style.height = null
+        this.$emit('resize', null)
         this.$refs['emoji-input'].resize()
         return
       }
@@ -419,8 +470,10 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const newHeight = target.scrollHeight - vertPadding
+      const heightWithoutPadding = target.scrollHeight - vertPadding
+      const newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
       target.style.height = `${newHeight}px`
+      this.$emit('resize', newHeight)
       // END content size update
 
       // We check where the bottom border of form-bottom element is, this uses findOffset
@@ -480,6 +533,9 @@ const PostStatusForm = {
     setAllMediaDescriptions () {
       const ids = this.newStatus.files.map(file => file.id)
       return Promise.all(ids.map(id => this.setMediaDescription(id)))
+    },
+    handleEmojiInputShow (value) {
+      this.emojiInputShown = value
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 626584ed..d8df68d6 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -5,19 +5,20 @@
   >
     <form
       autocomplete="off"
-      @submit.prevent="postStatus(newStatus)"
+      @submit.prevent
       @dragover.prevent="fileDrag"
     >
       <div
         v-show="showDropIcon !== 'hide'"
         :style="{ animation: showDropIcon === 'show' ? 'fade-in 0.25s' : 'fade-out 0.5s' }"
-        class="drop-indicator icon-upload"
+        class="drop-indicator"
+        :class="[uploadFileLimitReached ? 'icon-block' : 'icon-upload']"
         @dragleave="fileDragStop"
         @drop.stop="fileDrop"
       />
       <div class="form-group">
         <i18n
-          v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private'"
+          v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
           path="post_status.account_not_locked_warning"
           tag="p"
           class="visibility-notice"
@@ -108,7 +109,7 @@
           />
         </div>
         <EmojiInput
-          v-if="newStatus.spoilerText || alwaysShowSubject"
+          v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
           v-model="newStatus.spoilerText"
           enable-emoji-picker
           :suggest="emojiSuggestor"
@@ -126,6 +127,7 @@
           ref="emoji-input"
           v-model="newStatus.status"
           :suggest="emojiUserSuggestor"
+          :placement="emojiPickerPlacement"
           class="form-control main-input"
           enable-emoji-picker
           hide-emoji-button
@@ -133,16 +135,19 @@
           @input="onEmojiInputInput"
           @sticker-uploaded="addMediaFile"
           @sticker-upload-failed="uploadFailed"
+          @shown="handleEmojiInputShow"
         >
           <textarea
             ref="textarea"
             v-model="newStatus.status"
-            :placeholder="$t('post_status.default')"
+            :placeholder="placeholder || $t('post_status.default')"
             rows="1"
             :disabled="posting"
             class="form-post-body"
-            @keydown.meta.enter="postStatus(newStatus)"
-            @keydown.ctrl.enter="postStatus(newStatus)"
+            :class="{ 'scrollable-form': !!maxHeight }"
+            @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
+            @keydown.meta.enter="postStatus($event, newStatus, { control: true })"
+            @keydown.ctrl.enter="postStatus($event, newStatus)"
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
@@ -155,7 +160,10 @@
             {{ charactersLeft }}
           </p>
         </EmojiInput>
-        <div class="visibility-tray">
+        <div
+          v-if="!disableScopeSelector"
+          class="visibility-tray"
+        >
           <scope-selector
             :show-all="showAllScopes"
             :user-default="userDefaultScope"
@@ -213,10 +221,11 @@
             ref="mediaUpload"
             class="media-upload-icon"
             :drop-files="dropFiles"
-            @uploading="disableSubmit"
+            :disabled="uploadFileLimitReached"
+            @uploading="startedUploadingFiles"
             @uploaded="addMediaFile"
             @upload-failed="uploadFailed"
-            @all-uploaded="enableSubmit"
+            @all-uploaded="finishedUploadingFiles"
           />
           <div
             class="emoji-icon"
@@ -253,11 +262,13 @@
         >
           {{ $t('general.submit') }}
         </button>
+        <!-- touchstart is used to keep the OSK at the same position after a message send -->
         <button
           v-else
-          :disabled="submitDisabled"
-          type="submit"
+          :disabled="uploadingFiles || disableSubmit"
           class="btn btn-default"
+          @touchstart.stop.prevent="postStatus($event, newStatus)"
+          @click.stop.prevent="postStatus($event, newStatus)"
         >
           {{ $t('general.submit') }}
         </button>
@@ -297,7 +308,7 @@
         </div>
       </div>
       <div
-        v-if="newStatus.files.length > 0"
+        v-if="newStatus.files.length > 0 && !disableSensitivityCheckbox"
         class="upload_settings"
       >
         <Checkbox v-model="newStatus.nsfw">
@@ -331,6 +342,8 @@
 }
 
 .post-status-form {
+  position: relative;
+
   .form-bottom {
     display: flex;
     justify-content: space-between;
@@ -547,6 +560,10 @@
     padding-bottom: 1.75em;
     min-height: 1px;
     box-sizing: content-box;
+
+    &.scrollable-form {
+      overflow-y: auto;
+    }
   }
 
   .main-input {
@@ -609,4 +626,11 @@
     border: 2px dashed var(--text, $fallback--text);
   }
 }
+
+// todo: unify with attachment.vue (otherwise the uploaded images are not minified unless a status with an attachment was displayed before)
+img.media-upload {
+  line-height: 0;
+  max-height: 200px;
+  max-width: 100%;
+}
 </style>
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.js b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
index 9d61b0c4..e3c5e80a 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.js
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
@@ -99,7 +99,8 @@ export default {
       avatarRadiusLocal: '',
       avatarAltRadiusLocal: '',
       attachmentRadiusLocal: '',
-      tooltipRadiusLocal: ''
+      tooltipRadiusLocal: '',
+      chatMessageRadiusLocal: ''
     }
   },
   created () {
@@ -214,7 +215,8 @@ export default {
         avatar: this.avatarRadiusLocal,
         avatarAlt: this.avatarAltRadiusLocal,
         tooltip: this.tooltipRadiusLocal,
-        attachment: this.attachmentRadiusLocal
+        attachment: this.attachmentRadiusLocal,
+        chatMessage: this.chatMessageRadiusLocal
       }
     },
     preview () {
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index d14f854c..d57894de 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -735,6 +735,65 @@
             />
             <ContrastRatio :contrast="previewContrast.selectedMenuLink" />
           </div>
+          <div class="color-item">
+            <h4>{{ $t('chats.chats') }}</h4>
+            <ColorInput
+              v-model="chatBgColorLocal"
+              name="chatBgColor"
+              :fallback="previewTheme.colors.bg || 1"
+              :label="$t('settings.background')"
+            />
+            <h5>{{ $t('settings.style.advanced_colors.chat.incoming') }}</h5>
+            <ColorInput
+              v-model="chatMessageIncomingBgColorLocal"
+              name="chatMessageIncomingBgColor"
+              :fallback="previewTheme.colors.bg || 1"
+              :label="$t('settings.background')"
+            />
+            <ColorInput
+              v-model="chatMessageIncomingTextColorLocal"
+              name="chatMessageIncomingTextColor"
+              :fallback="previewTheme.colors.text || 1"
+              :label="$t('settings.text')"
+            />
+            <ColorInput
+              v-model="chatMessageIncomingLinkColorLocal"
+              name="chatMessageIncomingLinkColor"
+              :fallback="previewTheme.colors.link || 1"
+              :label="$t('settings.links')"
+            />
+            <ColorInput
+              v-model="chatMessageIncomingBorderColorLocal"
+              name="chatMessageIncomingBorderLinkColor"
+              :fallback="previewTheme.colors.fg || 1"
+              :label="$t('settings.style.advanced_colors.chat.border')"
+            />
+            <h5>{{ $t('settings.style.advanced_colors.chat.outgoing') }}</h5>
+            <ColorInput
+              v-model="chatMessageOutgoingBgColorLocal"
+              name="chatMessageOutgoingBgColor"
+              :fallback="previewTheme.colors.bg || 1"
+              :label="$t('settings.background')"
+            />
+            <ColorInput
+              v-model="chatMessageOutgoingTextColorLocal"
+              name="chatMessageOutgoingTextColor"
+              :fallback="previewTheme.colors.text || 1"
+              :label="$t('settings.text')"
+            />
+            <ColorInput
+              v-model="chatMessageOutgoingLinkColorLocal"
+              name="chatMessageOutgoingLinkColor"
+              :fallback="previewTheme.colors.link || 1"
+              :label="$t('settings.links')"
+            />
+            <ColorInput
+              v-model="chatMessageOutgoingBorderColorLocal"
+              name="chatMessageOutgoingBorderLinkColor"
+              :fallback="previewTheme.colors.bg || 1"
+              :label="$t('settings.style.advanced_colors.chat.border')"
+            />
+          </div>
         </div>
 
         <div
@@ -814,6 +873,14 @@
             max="50"
             hard-min="0"
           />
+          <RangeInput
+            v-model="chatMessageRadiusLocal"
+            name="chatMessageRadius"
+            :label="$t('settings.chatMessageRadius')"
+            :fallback="previewTheme.radii.chatMessage || 2"
+            max="50"
+            hard-min="0"
+          />
         </div>
 
         <div
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index d1f044f6..3a9e9e8f 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -1,3 +1,4 @@
+import { mapState, mapGetters } from 'vuex'
 import UserCard from '../user_card/user_card.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
@@ -47,7 +48,11 @@ const SideDrawer = {
     },
     federating () {
       return this.$store.state.instance.federating
-    }
+    },
+    ...mapState({
+      pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
+    }),
+    ...mapGetters(['unreadChatCount'])
   },
   methods: {
     toggleDrawer () {
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 0ac53b34..4fdb3d13 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -40,12 +40,24 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser"
+          v-if="currentUser && pleromaChatMessagesAvailable"
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
             <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
           </router-link>
+          <router-link
+            :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
+            style="position: relative"
+          >
+            <i class="button-icon icon-chat" /> {{ $t("nav.chats") }}
+            <span
+              v-if="unreadChatCount"
+              class="badge badge-notification unread-chat-count"
+            >
+              {{ unreadChatCount }}
+            </span>
+          </router-link>
         </li>
         <li
           v-if="currentUser"
@@ -103,14 +115,6 @@
             <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
           </router-link>
         </li>
-        <li
-          v-if="currentUser && chat"
-          @click="toggleDrawer"
-        >
-          <router-link :to="{ name: 'chat' }">
-            <i class="button-icon icon-chat" /> {{ $t("nav.chat") }}
-          </router-link>
-        </li>
       </ul>
       <ul>
         <li
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 67d9bd3c..dc83d8cb 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -18,7 +18,7 @@ const StatusContent = {
   ],
   data () {
     return {
-      showingTall: this.inConversation && this.focused,
+      showingTall: this.fullContent || (this.inConversation && this.focused),
       showingLongSubject: false,
       // not as computed because it sets the initial state which will be changed later
       expandingSubject: !this.$store.getters.mergedConfig.collapseMessageWithSubject
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 8068d8d2..9ca2cf6d 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -76,7 +76,7 @@
         />
       </a>
       <a
-        v-if="showingMore"
+        v-if="showingMore && !fullContent"
         href="#"
         class="status-unhider"
         @click.prevent="toggleShowMore"
diff --git a/src/hocs/with_load_more/with_load_more.scss b/src/hocs/with_load_more/with_load_more.scss
index 4cefe2be..1a26eb8d 100644
--- a/src/hocs/with_load_more/with_load_more.scss
+++ b/src/hocs/with_load_more/with_load_more.scss
@@ -12,5 +12,9 @@
     .error {
       font-size: 14px;
     }
+
+    a {
+      cursor: pointer;
+    }
   }
 }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 72c3b1f7..c9a34556 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -44,6 +44,7 @@
   },
   "features_panel": {
     "chat": "Chat",
+    "pleroma_chat_messages": "Pleroma Chat",
     "gopher": "Gopher",
     "media_proxy": "Media proxy",
     "scope_options": "Scope options",
@@ -124,7 +125,8 @@
     "user_search": "User Search",
     "search": "Search",
     "who_to_follow": "Who to follow",
-    "preferences": "Preferences"
+    "preferences": "Preferences",
+    "chats": "Chats"
   },
   "notifications": {
     "broken_favorite": "Unknown status, searching for it…",
@@ -287,6 +289,7 @@
     "change_password": "Change Password",
     "change_password_error": "There was an issue changing your password.",
     "changed_password": "Password changed successfully!",
+    "chatMessageRadius": "Chat message",
     "collapse_subject": "Collapse posts with subjects",
     "composing": "Composing",
     "confirm_new_password": "Confirm new password",
@@ -518,7 +521,12 @@
         "selectedMenu": "Selected menu item",
         "disabled": "Disabled",
         "toggled": "Toggled",
-        "tabs": "Tabs"
+        "tabs": "Tabs",
+        "chat": {
+          "incoming": "Incoming",
+          "outgoing": "Outgoing",
+          "border": "Border"
+        }
       },
       "radii": {
         "_tab_label": "Roundness"
@@ -677,6 +685,7 @@
     "its_you": "It's you!",
     "media": "Media",
     "mention": "Mention",
+    "message": "Message",
     "mute": "Mute",
     "muted": "Muted",
     "per_day": "per day",
@@ -775,5 +784,25 @@
     "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
     "password_reset_required": "You must reset your password to log in.",
     "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
+  },
+  "chats": {
+    "message_user": "Message {nickname}",
+    "delete": "Delete",
+    "chats": "Chats",
+    "new": "New Chat",
+    "empty_message_error": "Cannot post empty message",
+    "more": "More",
+    "delete_confirm": "Do you really want to delete this message?",
+    "error_loading_chat": "Something went wrong when loading the chat.",
+    "error_sending_message": "Something went wrong when sending the message."
+  },
+  "file_type": {
+    "audio": "Audio",
+    "video": "Video",
+    "image": "Image",
+    "file": "File"
+  },
+  "display_date": {
+    "today": "Today"
   }
 }
diff --git a/src/main.js b/src/main.js
index 5bddc76e..0a898022 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,7 @@ import oauthTokensModule from './modules/oauth_tokens.js'
 import reportsModule from './modules/reports.js'
 import pollsModule from './modules/polls.js'
 import postStatusModule from './modules/postStatus.js'
+import chatsModule from './modules/chats.js'
 
 import VueI18n from 'vue-i18n'
 
@@ -91,7 +92,8 @@ const persistedStateOptions = {
       oauthTokens: oauthTokensModule,
       reports: reportsModule,
       polls: pollsModule,
-      postStatus: postStatusModule
+      postStatus: postStatusModule,
+      chats: chatsModule
     },
     plugins,
     strict: false // Socket modifies itself, let's ignore this for now.
diff --git a/src/modules/api.js b/src/modules/api.js
index 04ef6ab4..68402602 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,4 +1,5 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
+import { WSConnectionStatus } from '../services/api/api.service.js'
 import { Socket } from 'phoenix'
 
 const api = {
@@ -7,6 +8,7 @@ const api = {
     fetchers: {},
     socket: null,
     mastoUserSocket: null,
+    mastoUserSocketStatus: null,
     followRequests: []
   },
   mutations: {
@@ -28,6 +30,9 @@ const api = {
     },
     setFollowRequests (state, value) {
       state.followRequests = value
+    },
+    setMastoUserSocketStatus (state, value) {
+      state.mastoUserSocketStatus = value
     }
   },
   actions: {
@@ -47,7 +52,7 @@ const api = {
     startMastoUserSocket (store) {
       return new Promise((resolve, reject) => {
         try {
-          const { state, dispatch, rootState } = store
+          const { state, commit, dispatch, rootState } = store
           const timelineData = rootState.statuses.timelines.friends
           state.mastoUserSocket = state.backendInteractor.startUserSocket({ store })
           state.mastoUserSocket.addEventListener(
@@ -66,11 +71,22 @@ const api = {
                   showImmediately: timelineData.visibleStatuses.length === 0,
                   timeline: 'friends'
                 })
+              } else if (message.event === 'pleroma:chat_update') {
+                dispatch('addChatMessages', {
+                  chatId: message.chatUpdate.id,
+                  messages: [message.chatUpdate.lastMessage]
+                })
+                dispatch('updateChat', { chat: message.chatUpdate })
               }
             }
           )
+          state.mastoUserSocket.addEventListener('open', () => {
+            commit('setMastoUserSocketStatus', WSConnectionStatus.JOINED)
+          })
           state.mastoUserSocket.addEventListener('error', ({ detail: error }) => {
             console.error('Error in MastoAPI websocket:', error)
+            commit('setMastoUserSocketStatus', WSConnectionStatus.ERROR)
+            dispatch('clearOpenedChats')
           })
           state.mastoUserSocket.addEventListener('close', ({ detail: closeEvent }) => {
             const ignoreCodes = new Set([
@@ -84,8 +100,11 @@ const api = {
               console.warn(`MastoAPI websocket disconnected, restarting. CloseEvent code: ${code}`)
               dispatch('startFetchingTimeline', { timeline: 'friends' })
               dispatch('startFetchingNotifications')
+              dispatch('startFetchingChats')
               dispatch('restartMastoUserSocket')
             }
+            commit('setMastoUserSocketStatus', WSConnectionStatus.CLOSED)
+            dispatch('clearOpenedChats')
           })
           resolve()
         } catch (e) {
@@ -99,12 +118,13 @@ const api = {
       return dispatch('startMastoUserSocket').then(() => {
         dispatch('stopFetchingTimeline', { timeline: 'friends' })
         dispatch('stopFetchingNotifications')
+        dispatch('stopFetchingChats')
       })
     },
     stopMastoUserSocket ({ state, dispatch }) {
       dispatch('startFetchingTimeline', { timeline: 'friends' })
       dispatch('startFetchingNotifications')
-      console.log(state.mastoUserSocket)
+      dispatch('startFetchingChats')
       state.mastoUserSocket.close()
     },
 
diff --git a/src/modules/chats.js b/src/modules/chats.js
new file mode 100644
index 00000000..f868ca0c
--- /dev/null
+++ b/src/modules/chats.js
@@ -0,0 +1,228 @@
+import Vue from 'vue'
+import { find, omitBy, orderBy, sumBy } from 'lodash'
+import chatService from '../services/chat_service/chat_service.js'
+import { parseChat, parseChatMessage } from '../services/entity_normalizer/entity_normalizer.service.js'
+
+const emptyChatList = () => ({
+  data: [],
+  idStore: {}
+})
+
+const defaultState = {
+  chatList: emptyChatList(),
+  chatListFetcher: null,
+  openedChats: {},
+  openedChatMessageServices: {},
+  fetcher: undefined,
+  currentChatId: null
+}
+
+const getChatById = (state, id) => {
+  return find(state.chatList.data, { id })
+}
+
+const sortedChatList = (state) => {
+  return orderBy(state.chatList.data, ['updated_at'], ['desc'])
+}
+
+const unreadChatCount = (state) => {
+  return sumBy(state.chatList.data, 'unread')
+}
+
+const chats = {
+  state: { ...defaultState },
+  getters: {
+    currentChat: state => state.openedChats[state.currentChatId],
+    currentChatMessageService: state => state.openedChatMessageServices[state.currentChatId],
+    findOpenedChatByRecipientId: state => recipientId => find(state.openedChats, c => c.account.id === recipientId),
+    sortedChatList,
+    unreadChatCount
+  },
+  actions: {
+    // Chat list
+    startFetchingChats ({ dispatch, commit }) {
+      const fetcher = () => {
+        dispatch('fetchChats', { latest: true })
+      }
+      fetcher()
+      commit('setChatListFetcher', {
+        fetcher: () => setInterval(() => { fetcher() }, 5000)
+      })
+    },
+    stopFetchingChats ({ commit }) {
+      commit('setChatListFetcher', { fetcher: undefined })
+    },
+    fetchChats ({ dispatch, rootState, commit }, params = {}) {
+      return rootState.api.backendInteractor.chats()
+        .then(({ chats }) => {
+          dispatch('addNewChats', { chats })
+          return chats
+        })
+    },
+    addNewChats ({ rootState, commit, dispatch, rootGetters }, { chats }) {
+      commit('addNewChats', { dispatch, chats, rootGetters })
+    },
+    updateChat ({ commit }, { chat }) {
+      commit('updateChat', { chat })
+    },
+
+    // Opened Chats
+    startFetchingCurrentChat ({ commit, dispatch }, { fetcher }) {
+      dispatch('setCurrentChatFetcher', { fetcher })
+    },
+    setCurrentChatFetcher ({ rootState, commit }, { fetcher }) {
+      commit('setCurrentChatFetcher', { fetcher })
+    },
+    addOpenedChat ({ rootState, commit, dispatch }, { chat }) {
+      commit('addOpenedChat', { dispatch, chat: parseChat(chat) })
+      dispatch('addNewUsers', [chat.account])
+    },
+    addChatMessages ({ commit }, value) {
+      commit('addChatMessages', { commit, ...value })
+    },
+    resetChatNewMessageCount ({ commit }, value) {
+      commit('resetChatNewMessageCount', value)
+    },
+    removeFromCurrentChatStatuses ({ commit }, { id }) {
+      commit('removeFromCurrentChatStatuses', id)
+    },
+    clearCurrentChat ({ rootState, commit, dispatch }, value) {
+      commit('setCurrentChatId', { chatId: undefined })
+      commit('setCurrentChatFetcher', { fetcher: undefined })
+    },
+    readChat ({ rootState, commit, dispatch }, { id, lastReadId }) {
+      dispatch('resetChatNewMessageCount')
+      commit('readChat', { id })
+      rootState.api.backendInteractor.readChat({ id, lastReadId })
+    },
+    deleteChatMessage ({ rootState, commit }, value) {
+      rootState.api.backendInteractor.deleteChatMessage(value)
+      commit('deleteChatMessage', { commit, ...value })
+    },
+    resetChats ({ commit, dispatch }) {
+      dispatch('clearCurrentChat')
+      commit('resetChats', { commit })
+    },
+    clearOpenedChats ({ rootState, commit, dispatch, rootGetters }) {
+      commit('clearOpenedChats', { commit })
+    }
+  },
+  mutations: {
+    setChatListFetcher (state, { commit, fetcher }) {
+      const prevFetcher = state.chatListFetcher
+      if (prevFetcher) {
+        clearInterval(prevFetcher)
+      }
+      state.chatListFetcher = fetcher && fetcher()
+    },
+    setCurrentChatFetcher (state, { fetcher }) {
+      const prevFetcher = state.fetcher
+      if (prevFetcher) {
+        clearInterval(prevFetcher)
+      }
+      state.fetcher = fetcher && fetcher()
+    },
+    addOpenedChat (state, { _dispatch, chat }) {
+      state.currentChatId = chat.id
+      Vue.set(state.openedChats, chat.id, chat)
+
+      if (!state.openedChatMessageServices[chat.id]) {
+        Vue.set(state.openedChatMessageServices, chat.id, chatService.empty(chat.id))
+      }
+    },
+    setCurrentChatId (state, { chatId }) {
+      state.currentChatId = chatId
+    },
+    addNewChats (state, { _dispatch, chats, _rootGetters }) {
+      chats.forEach((updatedChat) => {
+        const chat = getChatById(state, updatedChat.id)
+
+        if (chat) {
+          chat.lastMessage = updatedChat.lastMessage
+          chat.unread = updatedChat.unread
+        } else {
+          state.chatList.data.push(updatedChat)
+          Vue.set(state.chatList.idStore, updatedChat.id, updatedChat)
+        }
+      })
+    },
+    updateChat (state, { _dispatch, chat: updatedChat, _rootGetters }) {
+      const chat = getChatById(state, updatedChat.id)
+      if (chat) {
+        chat.lastMessage = updatedChat.lastMessage
+        chat.unread = updatedChat.unread
+        chat.updated_at = updatedChat.updated_at
+      }
+      if (!chat) { state.chatList.data.unshift(updatedChat) }
+      Vue.set(state.chatList.idStore, updatedChat.id, updatedChat)
+    },
+    deleteChat (state, { _dispatch, id, _rootGetters }) {
+      state.chats.data = state.chats.data.filter(conversation =>
+        conversation.last_status.id !== id
+      )
+      state.chats.idStore = omitBy(state.chats.idStore, conversation => conversation.last_status.id === id)
+    },
+    resetChats (state, { commit }) {
+      state.chatList = emptyChatList()
+      state.currentChatId = null
+      commit('setChatListFetcher', { fetcher: undefined })
+      for (const chatId in state.openedChats) {
+        chatService.clear(state.openedChatMessageServices[chatId])
+        Vue.delete(state.openedChats, chatId)
+        Vue.delete(state.openedChatMessageServices, chatId)
+      }
+    },
+    setChatsLoading (state, { value }) {
+      state.chats.loading = value
+    },
+    addChatMessages (state, { commit, chatId, messages }) {
+      const chatMessageService = state.openedChatMessageServices[chatId]
+      if (chatMessageService) {
+        chatService.add(chatMessageService, { messages: messages.map(parseChatMessage) })
+        commit('refreshLastMessage', { chatId })
+      }
+    },
+    refreshLastMessage (state, { chatId }) {
+      const chatMessageService = state.openedChatMessageServices[chatId]
+      if (chatMessageService) {
+        const chat = getChatById(state, chatId)
+        if (chat) {
+          chat.lastMessage = chatMessageService.lastMessage
+          if (chatMessageService.lastMessage) {
+            chat.updated_at = chatMessageService.lastMessage.created_at
+          }
+        }
+      }
+    },
+    deleteChatMessage (state, { commit, chatId, messageId }) {
+      const chatMessageService = state.openedChatMessageServices[chatId]
+      if (chatMessageService) {
+        chatService.deleteMessage(chatMessageService, messageId)
+        commit('refreshLastMessage', { chatId })
+      }
+    },
+    resetChatNewMessageCount (state, _value) {
+      const chatMessageService = state.openedChatMessageServices[state.currentChatId]
+      chatService.resetNewMessageCount(chatMessageService)
+    },
+    // Used when a connection loss occurs
+    clearOpenedChats (state) {
+      const currentChatId = state.currentChatId
+      for (const chatId in state.openedChats) {
+        if (currentChatId !== chatId) {
+          chatService.clear(state.openedChatMessageServices[chatId])
+          Vue.delete(state.openedChats, chatId)
+          Vue.delete(state.openedChatMessageServices, chatId)
+        }
+      }
+    },
+    readChat (state, { id }) {
+      const chat = getChatById(state, id)
+      if (chat) {
+        chat.unread = 0
+      }
+    }
+  }
+}
+
+export default chats
diff --git a/src/modules/config.js b/src/modules/config.js
index 47b24d77..e0fe72df 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -46,7 +46,8 @@ export const defaultState = {
     repeats: true,
     moves: true,
     emojiReactions: false,
-    followRequest: true
+    followRequest: true,
+    chatMention: true
   },
   webPushNotifications: false,
   muteWords: [],
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 45a8eeca..3fe3bbf3 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -55,6 +55,7 @@ const defaultState = {
 
   // Feature-set, apparently, not everything here is reported...
   chatAvailable: false,
+  pleromaChatMessagesAvailable: false,
   gopherAvailable: false,
   mediaProxyAvailable: false,
   suggestionsEnabled: false,
diff --git a/src/modules/interface.js b/src/modules/interface.js
index e31630fc..ec08ac0a 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -15,7 +15,8 @@ const defaultState = {
     )
   },
   mobileLayout: false,
-  globalNotices: []
+  globalNotices: [],
+  layoutHeight: 0
 }
 
 const interfaceMod = {
@@ -65,6 +66,9 @@ const interfaceMod = {
     },
     removeGlobalNotice (state, notice) {
       state.globalNotices = state.globalNotices.filter(n => n !== notice)
+    },
+    setLayoutHeight (state, value) {
+      state.layoutHeight = value
     }
   },
   actions: {
@@ -110,6 +114,9 @@ const interfaceMod = {
     },
     removeGlobalNotice ({ commit }, notice) {
       commit('removeGlobalNotice', notice)
+    },
+    setLayoutHeight ({ commit }, value) {
+      commit('setLayoutHeight', value)
     }
   }
 }
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 7fbf685c..64f5b587 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -478,7 +478,7 @@ export const mutations = {
   },
   setDeleted (state, { status }) {
     const newStatus = state.allStatusesObject[status.id]
-    newStatus.deleted = true
+    if (newStatus) newStatus.deleted = true
   },
   setManyDeleted (state, condition) {
     Object.values(state.allStatusesObject).forEach(status => {
@@ -521,6 +521,9 @@ export const mutations = {
   dismissNotification (state, { id }) {
     state.notifications.data = state.notifications.data.filter(n => n.id !== id)
   },
+  dismissNotifications (state, { finder }) {
+    state.notifications.data = state.notifications.data.filter(n => finder)
+  },
   updateNotification (state, { id, updater }) {
     const notification = find(state.notifications.data, n => n.id === id)
     notification && updater(notification)
diff --git a/src/modules/users.js b/src/modules/users.js
index 7e136c61..16c1e566 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -498,6 +498,7 @@ const users = {
           store.dispatch('stopFetchingFollowRequests')
           store.commit('clearNotifications')
           store.commit('resetStatuses')
+          store.dispatch('resetChats')
         })
     },
     loginUser (store, accessToken) {
@@ -537,6 +538,9 @@ const users = {
 
                 // Start fetching notifications
                 store.dispatch('startFetchingNotifications')
+
+                // Start fetching chats
+                store.dispatch('startFetchingChats')
               }
 
               if (store.getters.mergedConfig.useStreamingApi) {
@@ -544,6 +548,7 @@ const users = {
                   console.error('Failed initializing MastoAPI Streaming socket', error)
                   startPolling()
                 }).then(() => {
+                  store.dispatch('fetchChats', { latest: true })
                   setTimeout(() => store.dispatch('setNotificationsSilence', false), 10000)
                 })
               } else {
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 14e63e4f..5428cc2a 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,5 +1,5 @@
 import { each, map, concat, last, get } from 'lodash'
-import { parseStatus, parseUser, parseNotification, parseAttachment, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js'
+import { parseStatus, parseUser, parseNotification, parseAttachment, parseChat, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js'
 import { RegistrationError, StatusCodeError } from '../errors/errors'
 
 /* eslint-env browser */
@@ -81,6 +81,11 @@ const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
 const PLEROMA_EMOJI_REACTIONS_URL = id => `/api/v1/pleroma/statuses/${id}/reactions`
 const PLEROMA_EMOJI_REACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
 const PLEROMA_EMOJI_UNREACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
+const PLEROMA_CHATS_URL = `/api/v1/pleroma/chats`
+const PLEROMA_CHAT_URL = id => `/api/v1/pleroma/chats/by-account-id/${id}`
+const PLEROMA_CHAT_MESSAGES_URL = id => `/api/v1/pleroma/chats/${id}/messages`
+const PLEROMA_CHAT_READ_URL = id => `/api/v1/pleroma/chats/${id}/read`
+const PLEROMA_DELETE_CHAT_MESSAGE_URL = (chatId, messageId) => `/api/v1/pleroma/chats/${chatId}/messages/${messageId}`
 
 const oldfetch = window.fetch
 
@@ -117,13 +122,18 @@ const promisedRequest = ({ method, url, params, payload, credentials, headers =
   }
   return fetch(url, options)
     .then((response) => {
-      return new Promise((resolve, reject) => response.json()
-        .then((json) => {
-          if (!response.ok) {
-            return reject(new StatusCodeError(response.status, json, { url, options }, response))
-          }
-          return resolve(json)
-        }))
+      return new Promise((resolve, reject) => {
+        response.json()
+          .then((json) => {
+            if (!response.ok) {
+              return reject(new StatusCodeError(response.status, json, { url, options }, response))
+            }
+            return resolve(json)
+          })
+          .catch((error) => {
+            return reject(new StatusCodeError(response.status, error.message, { url, options }, response))
+          })
+      })
     })
 }
 
@@ -1067,6 +1077,10 @@ const MASTODON_STREAMING_EVENTS = new Set([
   'filters_changed'
 ])
 
+const PLEROMA_STREAMING_EVENTS = new Set([
+  'pleroma:chat_update'
+])
+
 // A thin wrapper around WebSocket API that allows adding a pre-processor to it
 // Uses EventTarget and a CustomEvent to proxy events
 export const ProcessedWS = ({
@@ -1123,7 +1137,7 @@ export const handleMastoWS = (wsEvent) => {
   if (!data) return
   const parsedEvent = JSON.parse(data)
   const { event, payload } = parsedEvent
-  if (MASTODON_STREAMING_EVENTS.has(event)) {
+  if (MASTODON_STREAMING_EVENTS.has(event) || PLEROMA_STREAMING_EVENTS.has(event)) {
     // MastoBE and PleromaBE both send payload for delete as a PLAIN string
     if (event === 'delete') {
       return { event, id: payload }
@@ -1133,6 +1147,8 @@ export const handleMastoWS = (wsEvent) => {
       return { event, status: parseStatus(data) }
     } else if (event === 'notification') {
       return { event, notification: parseNotification(data) }
+    } else if (event === 'pleroma:chat_update') {
+      return { event, chatUpdate: parseChat(data) }
     }
   } else {
     console.warn('Unknown event', wsEvent)
@@ -1140,6 +1156,81 @@ export const handleMastoWS = (wsEvent) => {
   }
 }
 
+export const WSConnectionStatus = Object.freeze({
+  'JOINED': 1,
+  'CLOSED': 2,
+  'ERROR': 3
+})
+
+const chats = ({ credentials }) => {
+  return fetch(PLEROMA_CHATS_URL, { headers: authHeaders(credentials) })
+    .then((data) => data.json())
+    .then((data) => {
+      return { chats: data.map(parseChat).filter(c => c) }
+    })
+}
+
+const getOrCreateChat = ({ accountId, credentials }) => {
+  return promisedRequest({
+    url: PLEROMA_CHAT_URL(accountId),
+    method: 'POST',
+    credentials
+  })
+}
+
+const chatMessages = ({ id, credentials, maxId, sinceId, limit = 20 }) => {
+  let url = PLEROMA_CHAT_MESSAGES_URL(id)
+  const args = [
+    maxId && `max_id=${maxId}`,
+    sinceId && `since_id=${sinceId}`,
+    limit && `limit=${limit}`
+  ].filter(_ => _).join('&')
+
+  url = url + (args ? '?' + args : '')
+
+  return promisedRequest({
+    url,
+    method: 'GET',
+    credentials
+  })
+}
+
+const sendChatMessage = ({ id, content, mediaId = null, credentials }) => {
+  const payload = {
+    'content': content
+  }
+
+  if (mediaId) {
+    payload['media_id'] = mediaId
+  }
+
+  return promisedRequest({
+    url: PLEROMA_CHAT_MESSAGES_URL(id),
+    method: 'POST',
+    payload: payload,
+    credentials
+  })
+}
+
+const readChat = ({ id, lastReadId, credentials }) => {
+  return promisedRequest({
+    url: PLEROMA_CHAT_READ_URL(id),
+    method: 'POST',
+    payload: {
+      'last_read_id': lastReadId
+    },
+    credentials
+  })
+}
+
+const deleteChatMessage = ({ chatId, messageId, credentials }) => {
+  return promisedRequest({
+    url: PLEROMA_DELETE_CHAT_MESSAGE_URL(chatId, messageId),
+    method: 'DELETE',
+    credentials
+  })
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -1218,7 +1309,13 @@ const apiService = {
   fetchKnownDomains,
   fetchDomainMutes,
   muteDomain,
-  unmuteDomain
+  unmuteDomain,
+  chats,
+  getOrCreateChat,
+  chatMessages,
+  sendChatMessage,
+  readChat,
+  deleteChatMessage
 }
 
 export default apiService
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
new file mode 100644
index 00000000..763a7607
--- /dev/null
+++ b/src/services/chat_service/chat_service.js
@@ -0,0 +1,150 @@
+import _ from 'lodash'
+
+const empty = (chatId) => {
+  return {
+    idIndex: {},
+    messages: [],
+    newMessageCount: 0,
+    lastSeenTimestamp: 0,
+    chatId: chatId,
+    minId: undefined,
+    lastMessage: undefined
+  }
+}
+
+const clear = (storage) => {
+  storage.idIndex = {}
+  storage.messages.splice(0, storage.messages.length)
+  storage.newMessageCount = 0
+  storage.lastSeenTimestamp = 0
+  storage.minId = undefined
+  storage.lastMessage = undefined
+}
+
+const deleteMessage = (storage, messageId) => {
+  if (!storage) { return }
+  storage.messages = storage.messages.filter(m => m.id !== messageId)
+  delete storage.idIndex[messageId]
+
+  if (storage.lastMessage && (storage.lastMessage.id === messageId)) {
+    storage.lastMessage = _.maxBy(storage.messages, 'id')
+  }
+
+  if (storage.minId === messageId) {
+    storage.minId = _.minBy(storage.messages, 'id')
+  }
+}
+
+const add = (storage, { messages: newMessages }) => {
+  if (!storage) { return }
+  for (let i = 0; i < newMessages.length; i++) {
+    const message = newMessages[i]
+
+    // sanity check
+    if (message.chat_id !== storage.chatId) { return }
+
+    if (!storage.minId || message.id < storage.minId) {
+      storage.minId = message.id
+    }
+
+    if (!storage.lastMessage || message.id > storage.lastMessage.id) {
+      storage.lastMessage = message
+    }
+
+    if (!storage.idIndex[message.id]) {
+      if (storage.lastSeenTimestamp < message.created_at) {
+        storage.newMessageCount++
+      }
+      storage.messages.push(message)
+      storage.idIndex[message.id] = message
+    }
+  }
+}
+
+const resetNewMessageCount = (storage) => {
+  if (!storage) { return }
+  storage.newMessageCount = 0
+  storage.lastSeenTimestamp = new Date()
+}
+
+// Inserts date separators and marks the head and tail if it's the chain of messages made by the same user
+const getView = (storage) => {
+  if (!storage) { return [] }
+
+  const result = []
+  const messages = _.sortBy(storage.messages, ['id', 'desc'])
+  const firstMessages = messages[0]
+  let prev = messages[messages.length - 1]
+  let currentMessageChainId
+
+  if (firstMessages) {
+    const date = new Date(firstMessages.created_at)
+    date.setHours(0, 0, 0, 0)
+    result.push({
+      type: 'date',
+      date,
+      id: date.getTime().toString()
+    })
+  }
+
+  let afterDate = false
+
+  for (let i = 0; i < messages.length; i++) {
+    const message = messages[i]
+    const nextMessage = messages[i + 1]
+
+    const date = new Date(message.created_at)
+    date.setHours(0, 0, 0, 0)
+
+    // insert date separator and start a new message chain
+    if (prev && prev.date < date) {
+      result.push({
+        type: 'date',
+        date,
+        id: date.getTime().toString()
+      })
+
+      prev['isTail'] = true
+      currentMessageChainId = undefined
+      afterDate = true
+    }
+
+    const object = {
+      type: 'message',
+      data: message,
+      date,
+      id: message.id,
+      messageChainId: currentMessageChainId
+    }
+
+    // end a message chian
+    if ((nextMessage && nextMessage.account_id) !== message.account_id) {
+      object['isTail'] = true
+      currentMessageChainId = undefined
+    }
+
+    // start a new message chain
+    if ((prev && prev.data && prev.data.account_id) !== message.account_id || afterDate) {
+      currentMessageChainId = _.uniqueId()
+      object['isHead'] = true
+      object['messageChainId'] = currentMessageChainId
+    }
+
+    result.push(object)
+    prev = object
+    afterDate = false
+  }
+
+  return result
+}
+
+const ChatService = {
+  add,
+  empty,
+  getView,
+  deleteMessage,
+  resetNewMessageCount,
+  clear
+}
+
+export default ChatService
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ec83c02a..7ea8a16c 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -183,6 +183,7 @@ export const parseUser = (data) => {
     output.deactivated = data.pleroma.deactivated
 
     output.notification_settings = data.pleroma.notification_settings
+    output.unread_chat_count = data.pleroma.unread_chat_count
   }
 
   output.tags = output.tags || []
@@ -372,7 +373,7 @@ export const parseNotification = (data) => {
       ? parseStatus(data.notice.favorited_status)
       : parsedNotice
     output.action = parsedNotice
-    output.from_profile = parseUser(data.from_profile)
+    output.from_profile = output.type === 'pleroma:chat_mention' ? parseUser(data.account) : parseUser(data.from_profile)
   }
 
   output.created_at = new Date(data.created_at)
@@ -398,3 +399,34 @@ export const parseLinkHeaderPagination = (linkHeader, opts = {}) => {
     minId: flakeId ? minId : parseInt(minId, 10)
   }
 }
+
+export const parseChat = (chat) => {
+  const output = {}
+  output.id = chat.id
+  output.account = parseUser(chat.account)
+  output.unread = chat.unread
+  output.lastMessage = parseChatMessage(chat.last_message)
+  output.updated_at = new Date(chat.updated_at)
+  return output
+}
+
+export const parseChatMessage = (message) => {
+  if (!message) { return }
+  if (message.isNormalized) { return message }
+  const output = message
+  output.id = message.id
+  output.created_at = new Date(message.created_at)
+  output.chat_id = message.chat_id
+  if (message.content) {
+    output.content = addEmojis(message.content, message.emojis)
+  } else {
+    output.content = ''
+  }
+  if (message.attachment) {
+    output.attachments = [parseAttachment(message.attachment)]
+  } else {
+    output.attachments = []
+  }
+  output.isNormalized = true
+  return output
+}
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index fbdcf562..07425abd 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -106,7 +106,8 @@ export const generateRadii = (input) => {
     avatar: 5,
     avatarAlt: 50,
     tooltip: 2,
-    attachment: 5
+    attachment: 5,
+    chatMessage: inputRadii.panel
   })
 
   return {
diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index 6b25cd6f..b58ca9be 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -23,7 +23,9 @@ export const LAYERS = {
   inputTopBar: 'topBar',
   alert: 'bg',
   alertPanel: 'panel',
-  poll: 'bg'
+  poll: 'bg',
+  chatBg: 'underlay',
+  chatMessage: 'chatBg'
 }
 
 /* By default opacity slots have 1 as default opacity
@@ -667,5 +669,54 @@ export const SLOT_INHERITANCE = {
     layer: 'badge',
     variant: 'badgeNotification',
     textColor: 'bw'
+  },
+
+  chatBg: {
+    depends: ['bg']
+  },
+
+  chatMessage: {
+    depends: ['chatBg']
+  },
+
+  chatMessageIncomingBg: {
+    depends: ['chatMessage'],
+    layer: 'chatMessage'
+  },
+
+  chatMessageIncomingText: {
+    depends: ['text'],
+    layer: 'text'
+  },
+
+  chatMessageIncomingLink: {
+    depends: ['link'],
+    layer: 'link'
+  },
+
+  chatMessageIncomingBorder: {
+    depends: ['border'],
+    opacity: 'border',
+    color: (mod, border) => brightness(2 * mod, border).rgb
+  },
+
+  chatMessageOutgoingBg: {
+    depends: ['chatMessage'],
+    color: (mod, chatMessage) => brightness(5 * mod, chatMessage).rgb
+  },
+
+  chatMessageOutgoingText: {
+    depends: ['text'],
+    layer: 'text'
+  },
+
+  chatMessageOutgoingLink: {
+    depends: ['link'],
+    layer: 'link'
+  },
+
+  chatMessageOutgoingBorder: {
+    depends: ['chatMessage'],
+    opacity: 'chatMessage'
   }
 }
diff --git a/src/services/window_utils/window_utils.js b/src/services/window_utils/window_utils.js
index faff6cb9..909088db 100644
--- a/src/services/window_utils/window_utils.js
+++ b/src/services/window_utils/window_utils.js
@@ -3,3 +3,8 @@ export const windowWidth = () =>
   window.innerWidth ||
   document.documentElement.clientWidth ||
   document.body.clientWidth
+
+export const windowHeight = () =>
+  window.innerHeight ||
+  document.documentElement.clientHeight ||
+  document.body.clientHeight
diff --git a/static/fontello.json b/static/fontello.json
index 5ef8544e..706800cd 100644
--- a/static/fontello.json
+++ b/static/fontello.json
@@ -399,6 +399,12 @@
       "css": "doc",
       "code": 59433,
       "src": "fontawesome"
+    },
+    {
+      "uid": "98d9c83c1ee7c2c25af784b518c522c5",
+      "css": "block",
+      "code": 59434,
+      "src": "fontawesome"
     }
   ]
 }
\ No newline at end of file
diff --git a/test/unit/specs/boot/routes.spec.js b/test/unit/specs/boot/routes.spec.js
index a415aeaf..3673256f 100644
--- a/test/unit/specs/boot/routes.spec.js
+++ b/test/unit/specs/boot/routes.spec.js
@@ -1,14 +1,22 @@
+import Vuex from 'vuex'
 import routes from 'src/boot/routes'
 import { createLocalVue } from '@vue/test-utils'
 import VueRouter from 'vue-router'
 
 const localVue = createLocalVue()
+localVue.use(Vuex)
 localVue.use(VueRouter)
 
+const store = new Vuex.Store({
+  state: {
+    instance: {}
+  }
+})
+
 describe('routes', () => {
   const router = new VueRouter({
     mode: 'abstract',
-    routes: routes({})
+    routes: routes(store)
   })
 
   it('root path', () => {

From f05f832bff58034d78de9478ae2dbb06284dea75 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Sun, 21 Jun 2020 17:13:29 +0300
Subject: [PATCH 302/415] Address feedback

Use more specific css rules for the emoji dimensions in the chat list status preview.

Use more round em value for chat list item height.
Add global html overflow and height for smoother chat navigation in
the desktop Safari.

Use offsetHeight instad of a computed style when setting the window height on resize.

Remove margin-bottom from the last message to avoid occasional layout shift in the desktop Safari

Use break-word to prevent chat message text overflow

Resize and scroll the textarea when inserting a new line on ctrl+enter

Remove fade transition on route change

Ensure proper border radius at the bottom of the chat, remove unused border-radius

Prevent the chat header "jumping" on the avatar load.
---
 src/App.js                                    |  12 +--
 src/App.scss                                  |  39 ++++++-
 src/App.vue                                   |   4 +-
 src/components/chat/chat.js                   |  63 ++++++++---
 src/components/chat/chat.scss                 |  32 +++---
 src/components/chat/chat.vue                  |   2 +-
 src/components/chat/chat_layout.js            | 100 ------------------
 src/components/chat/chat_layout_utils.js      |   3 +-
 src/components/chat_avatar/chat_avatar.js     |  23 ----
 src/components/chat_avatar/chat_avatar.vue    |  53 ----------
 .../chat_list_item/chat_list_item.js          |   4 +-
 .../chat_list_item/chat_list_item.scss        |  48 ++++-----
 .../chat_list_item/chat_list_item.vue         |   2 +-
 src/components/chat_message/chat_message.js   |   4 +-
 src/components/chat_message/chat_message.scss |  27 ++---
 src/components/chat_new/chat_new.js           |   5 +-
 src/components/chat_new/chat_new.scss         |   2 +-
 src/components/chat_title/chat_title.js       |  10 +-
 src/components/chat_title/chat_title.vue      |  39 ++++---
 src/components/emoji_input/emoji_input.js     |  23 +++-
 src/components/media_upload/media_upload.vue  |  13 ---
 .../post_status_form/post_status_form.js      |  19 ++--
 .../post_status_form/post_status_form.vue     |  20 +++-
 src/services/chat_service/chat_service.js     |  19 ++--
 .../chat_service/chat_service.spec.js         |  89 ++++++++++++++++
 25 files changed, 317 insertions(+), 338 deletions(-)
 delete mode 100644 src/components/chat/chat_layout.js
 delete mode 100644 src/components/chat_avatar/chat_avatar.js
 delete mode 100644 src/components/chat_avatar/chat_avatar.vue
 create mode 100644 test/unit/specs/services/chat_service/chat_service.spec.js

diff --git a/src/App.js b/src/App.js
index 84300e00..ded772fa 100644
--- a/src/App.js
+++ b/src/App.js
@@ -45,8 +45,7 @@ export default {
         window.CSS.supports('-moz-mask-size', 'contain') ||
         window.CSS.supports('-ms-mask-size', 'contain') ||
         window.CSS.supports('-o-mask-size', 'contain')
-    ),
-    transitionName: 'fade'
+    )
   }),
   created () {
     // Load the locale from the storage
@@ -135,14 +134,5 @@ export default {
       }
       this.$store.dispatch('setLayoutHeight', layoutHeight)
     }
-  },
-  watch: {
-    '$route' (to, from) {
-      if ((to.name === 'chat' && from.name === 'chats') || (to.name === 'chats' && from.name === 'chat')) {
-        this.transitionName = 'none'
-      } else {
-        this.transitionName = 'fade'
-      }
-    }
   }
 }
diff --git a/src/App.scss b/src/App.scss
index 29ce73a8..e2e2d079 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -47,6 +47,7 @@ html {
 }
 
 body {
+  overscroll-behavior-y: none;
   font-family: sans-serif;
   font-family: var(--interfaceFont, sans-serif);
   margin: 0;
@@ -56,7 +57,6 @@ body {
   overflow-x: hidden;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  overscroll-behavior: none;
 
   &.hidden {
     display: none;
@@ -320,7 +320,7 @@ option {
 
 i[class*=icon-] {
   color: $fallback--icon;
-  color: var(--icon, $fallback--icon)
+  color: var(--icon, $fallback--icon);
 }
 
 .btn-block {
@@ -942,3 +942,38 @@ nav {
   max-height: 1.3rem;
   line-height: 1.3rem;
 }
+
+.chat-layout {
+  // Needed for smoother chat navigation in the desktop Safari (otherwise the chat layout "jumps" as the chat opens).
+  overflow: hidden;
+  height: 100%;
+
+  // 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) {
+    body {
+      height: 100%;
+    }
+
+    #app {
+      height: 100%;
+      overflow: hidden;
+      min-height: auto;
+    }
+
+    #app_bg_wrapper {
+      overflow: hidden;
+    }
+
+    .main {
+      overflow: hidden;
+      height: 100%;
+    }
+
+    #content {
+      padding-top: 0;
+      height: 100%;
+      overflow: visible;
+    }
+  }
+}
diff --git a/src/App.vue b/src/App.vue
index 5d429934..0276c6a6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -113,9 +113,7 @@
             {{ $t("login.hint") }}
           </router-link>
         </div>
-        <transition :name="transitionName">
-          <router-view />
-        </transition>
+        <router-view />
       </div>
       <media-modal />
     </div>
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 6e23c20c..9c4e5b05 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -2,29 +2,26 @@ import _ from 'lodash'
 import { WSConnectionStatus } from '../../services/api/api.service.js'
 import { mapGetters, mapState } from 'vuex'
 import ChatMessage from '../chat_message/chat_message.vue'
-import ChatAvatar from '../chat_avatar/chat_avatar.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 import ChatTitle from '../chat_title/chat_title.vue'
 import chatService from '../../services/chat_service/chat_service.js'
-import ChatLayout from './chat_layout.js'
 import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContainerHeight } from './chat_layout_utils.js'
 
 const BOTTOMED_OUT_OFFSET = 10
 const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 150
+const SAFE_RESIZE_TIME_OFFSET = 100
 
 const Chat = {
   components: {
     ChatMessage,
     ChatTitle,
-    ChatAvatar,
     PostStatusForm
   },
-  mixins: [ChatLayout],
   data () {
     return {
       jumpToBottomButtonVisible: false,
       hoveredMessageChainId: undefined,
-      scrollPositionBeforeResize: {},
+      lastScrollPosition: {},
       scrollableContainerHeight: '100%',
       errorLoadingChat: false
     }
@@ -119,6 +116,7 @@ const Chat = {
     },
     onFilesDropped () {
       this.$nextTick(() => {
+        this.handleResize()
         this.updateScrollableContainerHeight()
       })
     },
@@ -129,13 +127,30 @@ const Chat = {
         }
       })
     },
-    handleLayoutChange () {
-      this.updateScrollableContainerHeight()
-      if (this.mobileLayout) {
-        this.setMobileChatLayout()
-      } else {
-        this.unsetMobileChatLayout()
+    setChatLayout () {
+      //   This is a hacky way to adjust the global layout to the mobile chat (without modifying the rest of the app).
+      //   This layout prevents empty spaces from being visible at the bottom
+      //   of the chat on iOS Safari (`safe-area-inset`) when
+      //   - the on-screen keyboard appears and the user starts typing
+      //   - the user selects the text inside the input area
+      //   - the user selects and deletes the text that is multiple lines long
+      //   TODO: unify the chat layout with the global layout.
+      let html = document.querySelector('html')
+      if (html) {
+        html.classList.add('chat-layout')
       }
+
+      this.$nextTick(() => {
+        this.updateScrollableContainerHeight()
+      })
+    },
+    unsetChatLayout () {
+      let html = document.querySelector('html')
+      if (html) {
+        html.classList.remove('chat-layout')
+      }
+    },
+    handleLayoutChange () {
       this.$nextTick(() => {
         this.updateScrollableContainerHeight()
         this.scrollDown()
@@ -149,15 +164,24 @@ const Chat = {
       this.scrollableContainerHeight = scrollableContainerHeight(inner, header, footer) + 'px'
     },
     // Preserves the scroll position when OSK appears or the posting form changes its height.
-    handleResize (opts) {
+    handleResize (opts = {}) {
+      const { expand = false, delayed = false } = opts
+
+      if (delayed) {
+        setTimeout(() => {
+          this.handleResize({ ...opts, delayed: false })
+        }, SAFE_RESIZE_TIME_OFFSET)
+        return
+      }
+
       this.$nextTick(() => {
         this.updateScrollableContainerHeight()
 
-        const { offsetHeight = undefined } = this.scrollPositionBeforeResize
-        this.scrollPositionBeforeResize = getScrollPosition(this.$refs.scrollable)
+        const { offsetHeight = undefined } = this.lastScrollPosition
+        this.lastScrollPosition = getScrollPosition(this.$refs.scrollable)
 
-        const diff = this.scrollPositionBeforeResize.offsetHeight - offsetHeight
-        if (diff < 0 || (!this.bottomedOut() && opts && opts.expand)) {
+        const diff = this.lastScrollPosition.offsetHeight - offsetHeight
+        if (diff < 0 || (!this.bottomedOut() && expand)) {
           this.$nextTick(() => {
             this.updateScrollableContainerHeight()
             this.$refs.scrollable.scrollTo({
@@ -281,7 +305,12 @@ const Chat = {
         .then(data => {
           this.$store.dispatch('addChatMessages', { chatId: this.currentChat.id, messages: [data] }).then(() => {
             this.$nextTick(() => {
-              this.updateScrollableContainerHeight()
+              this.handleResize()
+              // When the posting form size changes because of a media attachment, we need an extra resize
+              // to account for the potential delay in the DOM update.
+              setTimeout(() => {
+                this.updateScrollableContainerHeight()
+              }, SAFE_RESIZE_TIME_OFFSET)
               this.scrollDown({ forceRead: true })
             })
           })
diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 13c52ea3..6ae7ebc9 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -3,14 +3,17 @@
   height: calc(100vh - 60px);
   width: 100%;
 
+  .chat-title {
+    // prevents chat header jumping on when the user avatar loads
+    height: 28px;
+  }
+
   .chat-view-inner {
     height: auto;
     width: 100%;
     overflow: visible;
     display: flex;
-    margin-top: 0.5em;
-    margin-left: 0.5em;
-    margin-right: 0.5em;
+    margin: 0.5em 0.5em 0 0.5em;
   }
 
   .chat-view-body {
@@ -19,23 +22,18 @@
     flex-direction: column;
     width: 100%;
     overflow: visible;
-    border-radius: none;
     min-height: 100%;
-    margin-left: 0;
-    margin-right: 0;
-    margin-bottom: 0em;
-    margin-top: 0em;
+    margin: 0 0 0 0;
     border-radius: 10px 10px 0 0;
     border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0 ;
 
     &::after {
-      border-radius: none;
-      box-shadow: none;
+      border-radius: 0;
     }
   }
 
   .scrollable-message-list {
-    padding: 0 10px;
+    padding: 0 0.8em;
     height: 100%;
     overflow-y: scroll;
     overflow-x: hidden;
@@ -45,7 +43,7 @@
 
   .footer {
     position: sticky;
-    bottom: 0px;
+    bottom: 0;
   }
 
   .chat-view-heading {
@@ -54,15 +52,19 @@
     top: 50px;
     display: flex;
     z-index: 2;
-    border-radius: none;
     position: sticky;
     display: flex;
     overflow: hidden;
   }
 
   .go-back-button {
-    margin-right: 1.2em;
     cursor: pointer;
+    margin-right: 1.4em;
+
+    i {
+      display: flex;
+      align-items: center;
+    }
   }
 
   .jump-to-bottom-button {
@@ -135,7 +137,7 @@
       overflow: hidden;
       height: 100%;
       margin: 0;
-      border-radius: 0 !important;
+      border-radius: 0;
     }
 
     .chat-view-heading {
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index d8c91dbe..62b72e14 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -75,7 +75,7 @@
               :disable-polls="true"
               :disable-sensitivity-checkbox="true"
               :disable-submit="errorLoadingChat || !currentChat"
-              :request="sendMessage"
+              :post-handler="sendMessage"
               :submit-on-enter="!mobileLayout"
               :preserve-focus="!mobileLayout"
               :auto-focus="!mobileLayout"
diff --git a/src/components/chat/chat_layout.js b/src/components/chat/chat_layout.js
deleted file mode 100644
index 07ae3abf..00000000
--- a/src/components/chat/chat_layout.js
+++ /dev/null
@@ -1,100 +0,0 @@
-const ChatLayout = {
-  methods: {
-    setChatLayout () {
-      if (this.mobileLayout) {
-        this.setMobileChatLayout()
-      }
-    },
-    unsetChatLayout () {
-      this.unsetMobileChatLayout()
-    },
-    setMobileChatLayout () {
-      // This is a hacky way to adjust the global layout to the mobile chat (without modifying the rest of the app).
-      // This layout prevents empty spaces from being visible at the bottom
-      // of the chat on iOS Safari (`safe-area-inset`) when
-      // - the on-screen keyboard appears and the user starts typing
-      // - the user selects the text inside the input area
-      // - the user selects and deletes the text that is multiple lines long
-      // TODO: unify the chat layout with the global layout.
-
-      let html = document.querySelector('html')
-      if (html) {
-        html.style.overflow = 'hidden'
-        html.style.height = '100%'
-      }
-
-      let body = document.querySelector('body')
-      if (body) {
-        body.style.height = '100%'
-      }
-
-      let app = document.getElementById('app')
-      if (app) {
-        app.style.height = '100%'
-        app.style.overflow = 'hidden'
-        app.style.minHeight = 'auto'
-      }
-
-      let appBgWrapper = window.document.getElementById('app_bg_wrapper')
-      if (appBgWrapper) {
-        appBgWrapper.style.overflow = 'hidden'
-      }
-
-      let main = document.getElementsByClassName('main')[0]
-      if (main) {
-        main.style.overflow = 'hidden'
-        main.style.height = '100%'
-      }
-
-      let content = document.getElementById('content')
-      if (content) {
-        content.style.paddingTop = '0'
-        content.style.height = '100%'
-        content.style.overflow = 'visible'
-      }
-
-      this.$nextTick(() => {
-        this.updateScrollableContainerHeight()
-      })
-    },
-    unsetMobileChatLayout () {
-      let html = document.querySelector('html')
-      if (html) {
-        html.style.overflow = 'visible'
-        html.style.height = 'unset'
-      }
-
-      let body = document.querySelector('body')
-      if (body) {
-        body.style.height = 'unset'
-      }
-
-      let app = document.getElementById('app')
-      if (app) {
-        app.style.height = '100%'
-        app.style.overflow = 'visible'
-        app.style.minHeight = '100vh'
-      }
-
-      let appBgWrapper = document.getElementById('app_bg_wrapper')
-      if (appBgWrapper) {
-        appBgWrapper.style.overflow = 'visible'
-      }
-
-      let main = document.getElementsByClassName('main')[0]
-      if (main) {
-        main.style.overflow = 'visible'
-        main.style.height = 'unset'
-      }
-
-      let content = document.getElementById('content')
-      if (content) {
-        content.style.paddingTop = '60px'
-        content.style.height = 'unset'
-        content.style.overflow = 'unset'
-      }
-    }
-  }
-}
-
-export default ChatLayout
diff --git a/src/components/chat/chat_layout_utils.js b/src/components/chat/chat_layout_utils.js
index f07ba2a1..609dc0c9 100644
--- a/src/components/chat/chat_layout_utils.js
+++ b/src/components/chat/chat_layout_utils.js
@@ -22,6 +22,5 @@ export const isBottomedOut = (el, offset = 0) => {
 
 // Height of the scrollable container. The dynamic height is needed to ensure the mobile browser panel doesn't overlap or hide the posting form.
 export const scrollableContainerHeight = (inner, header, footer) => {
-  const height = parseFloat(getComputedStyle(inner, null).height.replace('px', ''))
-  return height - header.clientHeight - footer.clientHeight
+  return inner.offsetHeight - header.clientHeight - footer.clientHeight
 }
diff --git a/src/components/chat_avatar/chat_avatar.js b/src/components/chat_avatar/chat_avatar.js
deleted file mode 100644
index 7b26e07c..00000000
--- a/src/components/chat_avatar/chat_avatar.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import StillImage from '../still-image/still-image.vue'
-import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import { mapState } from 'vuex'
-
-const ChatAvatar = {
-  props: ['user', 'width', 'height'],
-  components: {
-    StillImage
-  },
-  methods: {
-    getUserProfileLink (user) {
-      if (!user) { return }
-      return generateProfileLink(user.id, user.screen_name)
-    }
-  },
-  computed: {
-    ...mapState({
-      betterShadow: state => state.interface.browserSupport.cssFilter
-    })
-  }
-}
-
-export default ChatAvatar
diff --git a/src/components/chat_avatar/chat_avatar.vue b/src/components/chat_avatar/chat_avatar.vue
deleted file mode 100644
index f54a7151..00000000
--- a/src/components/chat_avatar/chat_avatar.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<template>
-  <router-link
-    :to="getUserProfileLink(user) || ''"
-  >
-    <StillImage
-      v-if="user"
-      :style="{ 'width': width, 'height': height }"
-      class="avatar chat-avatar single-user"
-      :alt="user.screen_name"
-      :title="user.screen_name"
-      :src="user.profile_image_url_original"
-      error-src="/images/avi.png"
-      :class="{ 'better-shadow': betterShadow }"
-    />
-    <div
-      v-else
-      class="avatar chat-avatar single-user"
-      :style="{ 'width': width, 'height': height }"
-    />
-  </router-link>
-</template>
-
-<script src="./chat_avatar.js"></script>
-<style lang="scss">
-@import '../../_variables.scss';
-
-.chat-avatar {
-  display: inline-block;
-  vertical-align: middle;
-
-  &.single-user {
-    border-radius: $fallback--avatarAltRadius;
-    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
-  }
-
-  .avatar.still-image {
-    width: 48px;
-    height: 48px;
-
-    box-shadow: var(--avatarStatusShadow);
-    border-radius: 0;
-
-    &.better-shadow {
-      box-shadow: var(--avatarStatusShadowInset);
-      filter: var(--avatarStatusShadowFilter)
-    }
-
-    &.animated::before {
-      display: none;
-    }
-  }
-}
-</style>
diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index 1c27088c..b6b0519a 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -1,7 +1,7 @@
 import { mapState } from 'vuex'
 import StatusContent from '../status_content/status_content.vue'
 import fileType from 'src/services/file_type/file_type.service'
-import ChatAvatar from '../chat_avatar/chat_avatar.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 import AvatarList from '../avatar_list/avatar_list.vue'
 import Timeago from '../timeago/timeago.vue'
 import ChatTitle from '../chat_title/chat_title.vue'
@@ -12,7 +12,7 @@ const ChatListItem = {
     'chat'
   ],
   components: {
-    ChatAvatar,
+    UserAvatar,
     AvatarList,
     Timeago,
     ChatTitle,
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index 12269f89..3ec59ea2 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -1,17 +1,8 @@
 .chat-list-item {
-  &:hover .animated.avatar {
-    canvas {
-      display: none;
-    }
-    img {
-      visibility: visible;
-    }
-  }
-
   display: flex;
   flex-direction: row;
   padding: 0.75em;
-  height: 4.85em;
+  height: 5em;
   overflow: hidden;
   box-sizing: border-box;
   cursor: pointer;
@@ -22,7 +13,7 @@
 
   &:hover {
     background-color: var(--selectedPost, $fallback--lightBg);
-    box-shadow: 0 0px 3px 1px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 0 3px 1px rgba(0, 0, 0, 0.1);
   }
 
   .chat-list-item-left {
@@ -47,12 +38,6 @@
     white-space: nowrap;
   }
 
-  .member-count {
-    color: $fallback--text;
-    color: var(--faintText, $fallback--text);
-    margin-right: 2px;
-  }
-
   .name-and-account-name {
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -65,7 +50,7 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    margin: 0.35rem 0;
+    margin: 0.35em 0;
     height: 1.2em;
     line-height: 1.2em;
     color: $fallback--text;
@@ -78,17 +63,24 @@
     pointer-events: none;
   }
 
-  .unread-indicator-wrapper {
-    display: flex;
-    align-items: center;
-    margin-left: 10px;
+  &:hover .animated.avatar {
+    canvas {
+      display: none;
+    }
+    img {
+      visibility: visible;
+    }
   }
 
-  .unread-indicator {
-    border-radius: 100%;
-    height: 8px;
-    width: 8px;
-    background-color: $fallback--link;
-    background-color: var(--link, $fallback--link);
+  .avatar.still-image {
+    border-radius: $fallback--avatarAltRadius;
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+  }
+
+  .status-body {
+    img.emoji {
+      width: 1.4em;
+      height: 1.4em;
+    }
   }
 }
diff --git a/src/components/chat_list_item/chat_list_item.vue b/src/components/chat_list_item/chat_list_item.vue
index 26ad581b..640426b8 100644
--- a/src/components/chat_list_item/chat_list_item.vue
+++ b/src/components/chat_list_item/chat_list_item.vue
@@ -4,7 +4,7 @@
     @click.capture.prevent="openChat"
   >
     <div class="chat-list-item-left">
-      <ChatAvatar
+      <UserAvatar
         :user="chat.account"
         height="48px"
         width="48px"
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index aba95074..4d737e42 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -66,9 +66,9 @@ const ChatMessage = {
       }
 
       if (this.isCurrentUser) {
-        res.right = '5px'
+        res.right = '0.4rem'
       } else {
-        res.left = '5px'
+        res.left = '0.4rem'
       }
 
       return res
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index e4028537..9d7b7936 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -12,19 +12,15 @@
     }
   }
 
-  &:last-child {
-    margin-bottom: 16px;
-  }
-
   .chat-message-menu {
     transition: opacity 0.1s;
     opacity: 0;
     position: absolute;
-    top: -10px;
+    top: -0.8em;
 
     button {
-      padding-top: 3px;
-      padding-bottom: 3px;
+      padding-top: 0.2em;
+      padding-bottom: 0.2em;
     }
   }
 
@@ -41,21 +37,21 @@
   }
 
   .popover {
-    width: 12rem;
+    width: 12em;
   }
 
   .chat-message {
     display: flex;
-    padding-bottom: 7px;
+    padding-bottom: 0.5em;
   }
 
   .avatar-wrapper {
-    margin-right: 10px;
+    margin-right: 0.72em;
     width: 32px;
   }
 
   .link-preview, .attachments {
-    margin-bottom: 0.9em;
+    margin-bottom: 1em;
   }
 
   .chat-message-inner {
@@ -63,7 +59,7 @@
     flex-direction: column;
     align-items: flex-start;
     max-width: 80%;
-    min-width: 10rem;
+    min-width: 10em;
     width: 100%;
 
     &.with-media {
@@ -87,19 +83,18 @@
   }
 
   .created-at {
+    position: relative;
     float: right;
     font-size: 0.8em;
-    margin: -10px 0 -5px 4px;
+    margin: -1em 0 -0.5em 0;
     font-style: italic;
     opacity: 0.8;
   }
 
   .without-attachment {
     .status-content {
-      white-space: normal;
-
       &::after {
-        margin-right: 75px;
+        margin-right: 5.4em;
         content: " ";
         display: inline-block;
       }
diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js
index 0da681f7..d023efc0 100644
--- a/src/components/chat_new/chat_new.js
+++ b/src/components/chat_new/chat_new.js
@@ -1,4 +1,3 @@
-import { throttle } from 'lodash'
 import { mapState, mapGetters } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
@@ -54,7 +53,7 @@ const chatNew = {
     removeUser (userId) {
       this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId)
     },
-    search: throttle(function (query) {
+    search (query) {
       if (!query) {
         this.loading = false
         return
@@ -67,7 +66,7 @@ const chatNew = {
           this.loading = false
           this.userIds = data.accounts.map(a => a.id)
         })
-    })
+    }
   }
 }
 
diff --git a/src/components/chat_new/chat_new.scss b/src/components/chat_new/chat_new.scss
index 39216677..11305444 100644
--- a/src/components/chat_new/chat_new.scss
+++ b/src/components/chat_new/chat_new.scss
@@ -15,7 +15,7 @@
   }
 
   .member-list {
-    padding-bottom: 0.67rem;
+    padding-bottom: 0.7rem;
   }
 
   .basic-user-card:hover {
diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js
index 2723d5f5..e424bb1f 100644
--- a/src/components/chat_title/chat_title.js
+++ b/src/components/chat_title/chat_title.js
@@ -1,10 +1,11 @@
 import Vue from 'vue'
-import ChatAvatar from '../chat_avatar/chat_avatar.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 
 export default Vue.component('chat-title', {
   name: 'ChatTitle',
   components: {
-    ChatAvatar
+    UserAvatar
   },
   props: [
     'user', 'withAvatar'
@@ -16,5 +17,10 @@ export default Vue.component('chat-title', {
     htmlTitle () {
       return this.user ? this.user.name_html : ''
     }
+  },
+  methods: {
+    getUserProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name)
+    }
   }
 })
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index fd42d125..cfd1e6d1 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -4,16 +4,16 @@
     class="chat-title"
     :title="title"
   >
-    <ChatAvatar
-      v-if="withAvatar"
-      :user="user"
-      width="23px"
-      height="23px"
-    />
-    <span
-      v-if="withAvatar"
-      style="margin-right: 0.5em"
-    />
+    <router-link
+      v-if="withAvatar && user"
+      :to="getUserProfileLink(user)"
+    >
+      <UserAvatar
+        :user="user"
+        width="23px"
+        height="23px"
+      />
+    </router-link>
     <span
       class="username"
       v-html="htmlTitle"
@@ -32,11 +32,7 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-
-  a {
-    display: flex;
-    align-items: center;
-  }
+  align-items: center;
 
   .username {
     max-width: 100%;
@@ -52,5 +48,18 @@
       object-fit: contain
     }
   }
+
+  .still-image.avatar {
+    width: 23px;
+    height: 23px;
+    margin-right: 0.5em;
+
+    border-radius: $fallback--avatarAltRadius;
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+
+    &.animated::before {
+      display: none;
+    }
+  }
 }
 </style>
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index a27da090..f0123447 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -88,6 +88,11 @@ const EmojiInput = {
       required: false,
       type: String, // 'auto', 'top', 'bottom'
       default: 'auto'
+    },
+    newlineOnCtrlEnter: {
+      required: false,
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -204,7 +209,7 @@ const EmojiInput = {
       this.$emit('input', newValue)
       this.caret = 0
     },
-    insert ({ insertion, keepOpen }) {
+    insert ({ insertion, keepOpen, surroundingSpace = true }) {
       const before = this.value.substring(0, this.caret) || ''
       const after = this.value.substring(this.caret) || ''
 
@@ -223,8 +228,8 @@ const EmojiInput = {
        * them, masto seem to be rendering :emoji::emoji: correctly now so why not
        */
       const isSpaceRegex = /\s/
-      const spaceBefore = !isSpaceRegex.exec(before.slice(-1)) && before.length && this.padEmoji > 0 ? ' ' : ''
-      const spaceAfter = !isSpaceRegex.exec(after[0]) && this.padEmoji ? ' ' : ''
+      const spaceBefore = (surroundingSpace && !isSpaceRegex.exec(before.slice(-1)) && before.length && this.padEmoji > 0) ? ' ' : ''
+      const spaceAfter = (surroundingSpace && !isSpaceRegex.exec(after[0]) && this.padEmoji) ? ' ' : ''
 
       const newValue = [
         before,
@@ -381,6 +386,18 @@ const EmojiInput = {
     },
     onKeyDown (e) {
       const { ctrlKey, shiftKey, key } = e
+      if (this.newlineOnCtrlEnter && ctrlKey && key === 'Enter') {
+        this.insert({ insertion: '\n', surroundingSpace: false })
+        // Ensure only one new line is added on macos
+        e.stopPropagation()
+        e.preventDefault()
+
+        // Scroll the input element to the position of the cursor
+        this.$nextTick(() => {
+          this.input.elm.blur()
+          this.input.elm.focus()
+        })
+      }
       // Disable suggestions hotkeys if suggestions are hidden
       if (!this.temporarilyHideSuggestions) {
         if (key === 'Tab') {
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index d719eae1..c8865d77 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -33,19 +33,6 @@
 @import '../../_variables.scss';
 
 .media-upload {
-  &.disabled {
-    .new-icon {
-      cursor: not-allowed;
-    }
-
-    &:hover {
-      i, label {
-        color: $fallback--faint;
-        color: var(--faint, $fallback--faint);
-      }
-    }
-  }
-
   .label {
     display: inline-block;
   }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 90d0fa81..59e4dc26 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -43,7 +43,7 @@ const PostStatusForm = {
     'disableSubmit',
     'placeholder',
     'maxHeight',
-    'request',
+    'postHandler',
     'preserveFocus',
     'autoFocus',
     'fileLimit',
@@ -221,10 +221,6 @@ const PostStatusForm = {
         event.stopPropagation()
         event.preventDefault()
       }
-      if (opts.control && this.submitOnEnter) {
-        newStatus.status = `${newStatus.status}\n`
-        return
-      }
 
       if (this.emptyStatus) {
         this.error = this.$t('post_status.empty_status_error')
@@ -259,9 +255,9 @@ const PostStatusForm = {
         poll
       }
 
-      const request = this.request ? this.request : statusPoster.postStatus
+      const postHandler = this.postHandler ? this.postHandler : statusPoster.postStatus
 
-      request(postingOptions).then((data) => {
+      postHandler(postingOptions).then((data) => {
         if (!data.error) {
           this.newStatus = {
             status: '',
@@ -345,11 +341,7 @@ const PostStatusForm = {
     },
     addMediaFile (fileInfo) {
       this.newStatus.files.push(fileInfo)
-
-      // TODO: use fixed dimensions instead so relying on timeout
-      setTimeout(() => {
-        this.$emit('resize')
-      }, 150)
+      this.$emit('resize', { delayed: true })
     },
     removeMediaFile (fileInfo) {
       let index = this.newStatus.files.indexOf(fileInfo)
@@ -364,6 +356,7 @@ const PostStatusForm = {
       this.uploadingFiles = true
     },
     finishedUploadingFiles () {
+      this.$emit('resize')
       this.uploadingFiles = false
     },
     type (fileInfo) {
@@ -417,7 +410,7 @@ const PostStatusForm = {
       // Reset to default height for empty form, nothing else to do here.
       if (target.value === '') {
         target.style.height = null
-        this.$emit('resize', null)
+        this.$emit('resize')
         this.$refs['emoji-input'].resize()
         return
       }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index d8df68d6..7454958b 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -131,6 +131,7 @@
           class="form-control main-input"
           enable-emoji-picker
           hide-emoji-button
+          :newline-on-ctrl-enter="submitOnEnter"
           enable-sticker-picker
           @input="onEmojiInputInput"
           @sticker-uploaded="addMediaFile"
@@ -146,8 +147,8 @@
             class="form-post-body"
             :class="{ 'scrollable-form': !!maxHeight }"
             @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
-            @keydown.meta.enter="postStatus($event, newStatus, { control: true })"
-            @keydown.ctrl.enter="postStatus($event, newStatus)"
+            @keydown.meta.enter="postStatus($event, newStatus)"
+            @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
@@ -435,6 +436,19 @@
         color: var(--lightText, $fallback--lightText);
       }
     }
+
+    &.disabled {
+      i {
+        cursor: not-allowed;
+        color: $fallback--icon;
+        color: var(--btnDisabledText, $fallback--icon);
+
+        &:hover {
+          color: $fallback--icon;
+          color: var(--btnDisabledText, $fallback--icon);
+        }
+      }
+    }
   }
 
   // Order is not necessary but a good indicator
@@ -628,7 +642,7 @@
 }
 
 // todo: unify with attachment.vue (otherwise the uploaded images are not minified unless a status with an attachment was displayed before)
-img.media-upload {
+img.media-upload, .media-upload-container > video {
   line-height: 0;
   max-height: 200px;
   max-width: 100%;
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
index 763a7607..b60a889b 100644
--- a/src/services/chat_service/chat_service.js
+++ b/src/services/chat_service/chat_service.js
@@ -31,7 +31,8 @@ const deleteMessage = (storage, messageId) => {
   }
 
   if (storage.minId === messageId) {
-    storage.minId = _.minBy(storage.messages, 'id')
+    const firstMessage = _.minBy(storage.messages, 'id')
+    storage.minId = firstMessage.id
   }
 }
 
@@ -73,12 +74,12 @@ const getView = (storage) => {
 
   const result = []
   const messages = _.sortBy(storage.messages, ['id', 'desc'])
-  const firstMessages = messages[0]
-  let prev = messages[messages.length - 1]
+  const firstMessage = messages[0]
+  let previousMessage = messages[messages.length - 1]
   let currentMessageChainId
 
-  if (firstMessages) {
-    const date = new Date(firstMessages.created_at)
+  if (firstMessage) {
+    const date = new Date(firstMessage.created_at)
     date.setHours(0, 0, 0, 0)
     result.push({
       type: 'date',
@@ -97,14 +98,14 @@ const getView = (storage) => {
     date.setHours(0, 0, 0, 0)
 
     // insert date separator and start a new message chain
-    if (prev && prev.date < date) {
+    if (previousMessage && previousMessage.date < date) {
       result.push({
         type: 'date',
         date,
         id: date.getTime().toString()
       })
 
-      prev['isTail'] = true
+      previousMessage['isTail'] = true
       currentMessageChainId = undefined
       afterDate = true
     }
@@ -124,14 +125,14 @@ const getView = (storage) => {
     }
 
     // start a new message chain
-    if ((prev && prev.data && prev.data.account_id) !== message.account_id || afterDate) {
+    if ((previousMessage && previousMessage.data && previousMessage.data.account_id) !== message.account_id || afterDate) {
       currentMessageChainId = _.uniqueId()
       object['isHead'] = true
       object['messageChainId'] = currentMessageChainId
     }
 
     result.push(object)
-    prev = object
+    previousMessage = object
     afterDate = false
   }
 
diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js
new file mode 100644
index 00000000..4e8e566b
--- /dev/null
+++ b/test/unit/specs/services/chat_service/chat_service.spec.js
@@ -0,0 +1,89 @@
+import chatService from '../../../../../src/services/chat_service/chat_service.js'
+
+const message1 = {
+  id: '9wLkdcmQXD21Oy8lEX',
+  created_at: (new Date('2020-06-22T18:45:53.000Z'))
+}
+
+const message2 = {
+  id: '9wLkdp6ihaOVdNj8Wu',
+  account_id: '9vmRb29zLQReckr5ay',
+  created_at: (new Date('2020-06-22T18:45:56.000Z'))
+}
+
+const message3 = {
+  id: '9wLke9zL4Dy4OZR2RM',
+  account_id: '9vmRb29zLQReckr5ay',
+  created_at: (new Date('2020-07-22T18:45:59.000Z'))
+}
+
+// TODO: only
+describe.only('chatService', () => {
+  describe('.add', () => {
+    it("Doesn't add duplicates", () => {
+      const chat = chatService.empty()
+      chatService.add(chat, { messages: [ message1 ] })
+      chatService.add(chat, { messages: [ message1 ] })
+      expect(chat.messages.length).to.eql(1)
+
+      chatService.add(chat, { messages: [ message2 ] })
+      expect(chat.messages.length).to.eql(2)
+    })
+
+    it('Updates minId and lastMessage and newMessageCount', () => {
+      const chat = chatService.empty()
+
+      chatService.add(chat, { messages: [ message1 ] })
+      expect(chat.lastMessage.id).to.eql(message1.id)
+      expect(chat.minId).to.eql(message1.id)
+      expect(chat.newMessageCount).to.eql(1)
+
+      chatService.add(chat, { messages: [ message2 ] })
+      expect(chat.lastMessage.id).to.eql(message2.id)
+      expect(chat.minId).to.eql(message1.id)
+      expect(chat.newMessageCount).to.eql(2)
+
+      chatService.resetNewMessageCount(chat)
+      expect(chat.newMessageCount).to.eql(0)
+
+      const createdAt = new Date()
+      createdAt.setSeconds(createdAt.getSeconds() + 10)
+      chatService.add(chat, { messages: [ { message3, created_at: createdAt } ] })
+      expect(chat.newMessageCount).to.eql(1)
+    })
+  })
+
+  describe('.delete', () => {
+    it('Updates minId and lastMessage', () => {
+      const chat = chatService.empty()
+
+      chatService.add(chat, { messages: [ message1 ] })
+      chatService.add(chat, { messages: [ message2 ] })
+      chatService.add(chat, { messages: [ message3 ] })
+
+      expect(chat.lastMessage.id).to.eql(message3.id)
+      expect(chat.minId).to.eql(message1.id)
+
+      chatService.deleteMessage(chat, message3.id)
+      expect(chat.lastMessage.id).to.eql(message2.id)
+      expect(chat.minId).to.eql(message1.id)
+
+      chatService.deleteMessage(chat, message1.id)
+      expect(chat.lastMessage.id).to.eql(message2.id)
+      expect(chat.minId).to.eql(message2.id)
+    })
+  })
+
+  describe('.getView', () => {
+    it('Inserts date separators', () => {
+      const chat = chatService.empty()
+
+      chatService.add(chat, { messages: [ message1 ] })
+      chatService.add(chat, { messages: [ message2 ] })
+      chatService.add(chat, { messages: [ message3 ] })
+
+      const view = chatService.getView(chat)
+      expect(view.map(i => i.type)).to.eql(['date', 'message', 'message', 'date', 'message'])
+    })
+  })
+})

From 45901c8da654bbeaae71cc484ea08f39a332baa7 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Mon, 6 Jul 2020 16:55:29 +0300
Subject: [PATCH 303/415] Disable status preview in the chat posting form

---
 src/components/chat/chat.vue                         | 1 +
 src/components/post_status_form/post_status_form.js  | 1 +
 src/components/post_status_form/post_status_form.vue | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index 62b72e14..2e4538c8 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -75,6 +75,7 @@
               :disable-polls="true"
               :disable-sensitivity-checkbox="true"
               :disable-submit="errorLoadingChat || !currentChat"
+              :disable-preview="true"
               :post-handler="sendMessage"
               :submit-on-enter="!mobileLayout"
               :preserve-focus="!mobileLayout"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 59e4dc26..9e7cce0f 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -41,6 +41,7 @@ const PostStatusForm = {
     'disablePolls',
     'disableSensitivityCheckbox',
     'disableSubmit',
+    'disablePreview',
     'placeholder',
     'maxHeight',
     'postHandler',
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 7454958b..3dcf1f79 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -70,7 +70,10 @@
           <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
           <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
         </p>
-        <div class="preview-heading faint">
+        <div
+          v-if="!disablePreview"
+          class="preview-heading faint"
+        >
           <a
             class="preview-toggle faint"
             @click.stop.prevent="togglePreview"

From 18a1f5d62a72da45d62672043397a7471ab2c090 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 7 Jul 2020 18:30:05 +0300
Subject: [PATCH 304/415] Add the empty chat list placeholder.

Do not use full height when displaying the chat list.
Remove an unsued chat action.
---
 src/components/chat_list/chat_list.vue        | 27 +++++++++++++++++--
 .../post_status_form/post_status_form.js      |  2 +-
 src/i18n/en.json                              |  3 ++-
 src/modules/chats.js                          |  3 ---
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue
index e62f58e5..fa138f16 100644
--- a/src/components/chat_list/chat_list.vue
+++ b/src/components/chat_list/chat_list.vue
@@ -15,7 +15,10 @@
       </button>
     </div>
     <div class="panel-body">
-      <div class="timeline">
+      <div
+        v-if="sortedChatList.length > 0"
+        class="timeline"
+      >
         <List :items="sortedChatList">
           <template
             slot="item"
@@ -29,6 +32,12 @@
           </template>
         </List>
       </div>
+      <div
+        v-else
+        class="emtpy-chat-list-alert"
+      >
+        <span>{{ $t('chats.empty_chat_list_placeholder') }}</span>
+      </div>
     </div>
   </div>
 </template>
@@ -39,10 +48,24 @@
 @import '../../_variables.scss';
 
 .chat-list {
-  min-height: calc(100vh - 67px);
+  min-height: 25em;
   margin-bottom: 0;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
+
+  &::after {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+}
+
+.emtpy-chat-list-alert {
+  padding: 3em;
+  font-size: 1.2em;
+  display: flex;
+  justify-content: center;
+  color: $fallback--text;
+  color: var(--faint, $fallback--text);
 }
 
 </style>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 9e7cce0f..b0d94555 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -192,7 +192,7 @@ const PostStatusForm = {
         this.newStatus.poll.error
     },
     showPreview () {
-      return !!this.preview || this.previewLoading
+      return !this.disablePreview && (!!this.preview || this.previewLoading)
     },
     emptyStatus () {
       return this.newStatus.status.trim() === '' && this.newStatus.files.length === 0
diff --git a/src/i18n/en.json b/src/i18n/en.json
index c9a34556..5cc75460 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -794,7 +794,8 @@
     "more": "More",
     "delete_confirm": "Do you really want to delete this message?",
     "error_loading_chat": "Something went wrong when loading the chat.",
-    "error_sending_message": "Something went wrong when sending the message."
+    "error_sending_message": "Something went wrong when sending the message.",
+    "empty_chat_list_placeholder": "You don't have any chats yet. Start a new chat!"
   },
   "file_type": {
     "audio": "Audio",
diff --git a/src/modules/chats.js b/src/modules/chats.js
index f868ca0c..228d6256 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -83,9 +83,6 @@ const chats = {
     resetChatNewMessageCount ({ commit }, value) {
       commit('resetChatNewMessageCount', value)
     },
-    removeFromCurrentChatStatuses ({ commit }, { id }) {
-      commit('removeFromCurrentChatStatuses', id)
-    },
     clearCurrentChat ({ rootState, commit, dispatch }, value) {
       commit('setCurrentChatId', { chatId: undefined })
       commit('setCurrentChatFetcher', { fetcher: undefined })

From ed7310c04b3e36f1256db296784b6240023786a1 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 7 Jul 2020 21:28:10 +0300
Subject: [PATCH 305/415] Undo the promise rejection on the json parser error
 in promisedRequest

to keep the existing behavior in case some parts of the code rely on it
and to limit the overall scope of the changes.
---
 src/services/api/api.service.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 5428cc2a..40ea5bd9 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -122,18 +122,13 @@ const promisedRequest = ({ method, url, params, payload, credentials, headers =
   }
   return fetch(url, options)
     .then((response) => {
-      return new Promise((resolve, reject) => {
-        response.json()
-          .then((json) => {
-            if (!response.ok) {
-              return reject(new StatusCodeError(response.status, json, { url, options }, response))
-            }
-            return resolve(json)
-          })
-          .catch((error) => {
-            return reject(new StatusCodeError(response.status, error.message, { url, options }, response))
-          })
-      })
+      return new Promise((resolve, reject) => response.json()
+        .then((json) => {
+          if (!response.ok) {
+            return reject(new StatusCodeError(response.status, json, { url, options }, response))
+          }
+          return resolve(json)
+        }))
     })
 }
 

From fc865d3a129a7d5eabf1490a82eefbdea07e3b47 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 7 Jul 2020 21:43:46 +0300
Subject: [PATCH 306/415] Remove direct style manipulations in favor of classes

---
 src/components/chat_message/chat_message.js   | 13 -------------
 src/components/chat_message/chat_message.scss | 12 ++++++++++++
 src/components/chat_message/chat_message.vue  |  2 +-
 src/components/mobile_nav/mobile_nav.js       |  4 ++--
 src/components/mobile_nav/mobile_nav.vue      |  2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 4d737e42..be4a7c89 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -60,19 +60,6 @@ const ChatMessage = {
       currentUser: state => state.users.currentUser,
       restrictedNicknames: state => state.instance.restrictedNicknames
     }),
-    ellipsisButtonWrapperStyle () {
-      let res = {
-        'opacity': this.hovered || this.menuOpened ? '1' : '0'
-      }
-
-      if (this.isCurrentUser) {
-        res.right = '0.4rem'
-      } else {
-        res.left = '0.4rem'
-      }
-
-      return res
-    },
     popoverMarginStyle () {
       if (this.isCurrentUser) {
         return {}
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index 9d7b7936..240beea4 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -117,6 +117,10 @@
         color: var(--chatMessageIncomingText, $fallback--text);
       }
     }
+
+    .chat-message-menu {
+      left: 0.4rem;
+    }
   }
 
   .outgoing {
@@ -139,6 +143,14 @@
     .chat-message-inner {
       align-items: flex-end;
     }
+
+    .chat-message-menu {
+      right: 0.4rem;
+    }
+  }
+
+  .visible {
+    opacity: 1;
   }
 }
 
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index 872ddf70..e923d694 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -39,7 +39,7 @@
           >
             <div
               class="chat-message-menu"
-              :style="ellipsisButtonWrapperStyle"
+              :class="{ 'visible': hovered || menuOpened }"
             >
               <Popover
                 trigger="click"
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index b27ca6f4..cc4d7e38 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -31,8 +31,8 @@ const MobileNav = {
     },
     hideSitename () { return this.$store.state.instance.hideSitename },
     sitename () { return this.$store.state.instance.name },
-    navBarStyle () {
-      return { 'visibility': this.$route.name === 'chat' ? 'hidden' : 'visible' }
+    isChat () {
+      return this.$route.name === 'chat'
     }
   },
   methods: {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 05568b90..e0620fce 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -3,7 +3,7 @@
     <nav
       id="nav"
       class="nav-bar container"
-      :style="navBarStyle"
+      :class="{ 'mobile-hidden': isChat }"
     >
       <div
         class="mobile-inner-nav"

From 3b2dfcaf5c402743a44eb315c519f1100d3f1006 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 7 Jul 2020 23:33:08 +0300
Subject: [PATCH 307/415] Add the single-line prop to StatusContent and use it
 for chat list items

---
 src/components/chat/chat.scss                     |  1 -
 src/components/chat_list_item/chat_list_item.scss | 12 ++++++++++--
 src/components/chat_list_item/chat_list_item.vue  |  7 +++++--
 src/components/chat_title/chat_title.vue          |  2 ++
 src/components/status_content/status_content.js   |  3 ++-
 src/components/status_content/status_content.vue  |  7 +++++++
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index 6ae7ebc9..012a1b1d 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -53,7 +53,6 @@
     display: flex;
     z-index: 2;
     position: sticky;
-    display: flex;
     overflow: hidden;
   }
 
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index 3ec59ea2..617054ec 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -43,6 +43,7 @@
     white-space: nowrap;
     overflow: hidden;
     flex-shrink: 1;
+    line-height: 1.4em;
   }
 
   .chat-preview {
@@ -51,10 +52,9 @@
     white-space: nowrap;
     text-overflow: ellipsis;
     margin: 0.35em 0;
-    height: 1.2em;
-    line-height: 1.2em;
     color: $fallback--text;
     color: var(--faint, $fallback--text);
+    width: 100%;
   }
 
   a {
@@ -83,4 +83,12 @@
       height: 1.4em;
     }
   }
+
+  .time-wrapper {
+    line-height: 1.4em;
+  }
+
+  .single-line {
+    padding-right: 1em;
+  }
 }
diff --git a/src/components/chat_list_item/chat_list_item.vue b/src/components/chat_list_item/chat_list_item.vue
index 640426b8..1f8ecdf6 100644
--- a/src/components/chat_list_item/chat_list_item.vue
+++ b/src/components/chat_list_item/chat_list_item.vue
@@ -23,7 +23,10 @@
         <span class="heading-right" />
       </div>
       <div class="chat-preview">
-        <StatusContent :status="messageForStatusContent" />
+        <StatusContent
+          :status="messageForStatusContent"
+          :single-line="true"
+        />
         <div
           v-if="chat.unread > 0"
           class="badge badge-notification unread-chat-count"
@@ -32,7 +35,7 @@
         </div>
       </div>
     </div>
-    <div>
+    <div class="time-wrapper">
       <Timeago
         :time="chat.updated_at"
         :auto-update="60"
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index cfd1e6d1..c375b10b 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -40,6 +40,8 @@
     white-space: nowrap;
     display: inline;
     word-wrap: break-word;
+    overflow: hidden;
+    text-overflow: ellipsis;
 
     .emoji {
       width: 14px;
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index dc83d8cb..df095de3 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -14,7 +14,8 @@ const StatusContent = {
     'status',
     'focused',
     'noHeading',
-    'fullContent'
+    'fullContent',
+    'singleLine'
   ],
   data () {
     return {
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 9ca2cf6d..bf8d376e 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -43,6 +43,7 @@
       </a>
       <div
         v-if="!hideSubjectStatus"
+        :class="{ 'single-line': singleLine }"
         class="status-content media-body"
         @click.prevent="linkClicked"
         v-html="postBodyHtml"
@@ -269,6 +270,12 @@ $status-margin: 0.75em;
     h4 {
       margin: 1.1em 0;
     }
+
+    &.single-line {
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
   }
 }
 

From b756c83e8d275c0f9d210c15a319d36dca56d3c8 Mon Sep 17 00:00:00 2001
From: Eugenij <eugenijm@protonmail.com>
Date: Wed, 8 Jul 2020 11:13:42 +0000
Subject: [PATCH 308/415] Apply suggestion to
 src/components/chat_list/chat_list.vue

---
 src/components/chat_list/chat_list.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue
index fa138f16..17e2f795 100644
--- a/src/components/chat_list/chat_list.vue
+++ b/src/components/chat_list/chat_list.vue
@@ -50,13 +50,6 @@
 .chat-list {
   min-height: 25em;
   margin-bottom: 0;
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-
-  &::after {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
 }
 
 .emtpy-chat-list-alert {

From 905de12980ceda8982fb24b4f715677065974528 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 9 Jul 2020 11:20:07 +0200
Subject: [PATCH 309/415] After Store: Correctly decode UTF-8 encoded base64
 strings.

---
 src/boot/after_store.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 302b278c..8b722c5c 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -20,12 +20,20 @@ const parsedInitialResults = () => {
   return staticInitialResults
 }
 
+const decodeUTF8Base64 = (data) => {
+  const rawData = atob(data)
+  const array = Uint8Array.from([...rawData].map((char) => char.charCodeAt(0)))
+  const text = new TextDecoder().decode(array)
+  return text
+}
+
 const preloadFetch = async (request) => {
   const data = parsedInitialResults()
   if (!data || !data[request]) {
     return window.fetch(request)
   }
-  const requestData = JSON.parse(atob(data[request]))
+  const decoded = decodeUTF8Base64(data[request])
+  const requestData = JSON.parse(decoded)
   return {
     ok: true,
     json: () => requestData,

From 78ec84477e978a654ecfd482157dbf04a69f32e2 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 9 Jul 2020 12:49:16 +0300
Subject: [PATCH 310/415] fix pixel offset hack in panel heading

---
 src/components/timeline/timeline.vue           | 1 +
 src/components/timeline_menu/timeline_menu.vue | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index caac5538..c637dbd4 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -113,6 +113,7 @@
   }
   .loadmore-text {
     flex-shrink: 0;
+    line-height: 1em;
   }
 }
 </style>
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index 9a3719f7..add8a6eb 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -63,11 +63,8 @@
   width: 24rem;
   .timeline-menu-popover-wrap {
     overflow: hidden;
-    // Hack: timeline heading padding is 0.6em with 14px font font-size
-    // in theory 0.6rem should match that exactly, but in reality it doesn't
-    // for seemingly rounding errors in both major browsers. This looks
-    // correct in firefox in chromium.
-    margin-top: calc(0.6rem + 1.5px);
+    // Match panel heading padding to line up menu with bottom of heading
+    margin-top: 0.6rem;
     padding: 0 15px 15px 15px;
   }
   .timeline-menu-popover {

From 0038a9794b4f12f9f57a6739c43910b289d18fe4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 10 Jul 2020 13:21:42 +0300
Subject: [PATCH 311/415] add simple red dot for chat notifs

---
 src/components/mobile_nav/mobile_nav.js  | 4 +++-
 src/components/mobile_nav/mobile_nav.vue | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index cc4d7e38..4613d090 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -2,6 +2,7 @@ import SideDrawer from '../side_drawer/side_drawer.vue'
 import Notifications from '../notifications/notifications.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
+import { mapGetters } from 'vuex'
 
 const MobileNav = {
   components: {
@@ -33,7 +34,8 @@ const MobileNav = {
     sitename () { return this.$store.state.instance.name },
     isChat () {
       return this.$route.name === 'chat'
-    }
+    },
+    ...mapGetters(['unreadChatCount'])
   },
   methods: {
     toggleMobileSidebar () {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index e0620fce..abd95f09 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -16,6 +16,10 @@
             @click.stop.prevent="toggleMobileSidebar()"
           >
             <i class="button-icon icon-menu" />
+            <div
+              v-if="unreadChatCount"
+              class="alert-dot"
+            />
           </a>
           <router-link
             v-if="!hideSitename"

From 5734dd05a0b1c8a266252d46371933102780c5e9 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 10 Jul 2020 13:48:37 +0300
Subject: [PATCH 312/415] change misnamed member field check to actually
 disable sending

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index b0d94555..1c0accac 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -216,7 +216,7 @@ const PostStatusForm = {
   methods: {
     async postStatus (event, newStatus, opts = {}) {
       if (this.posting) { return }
-      if (this.submitDisabled) { return }
+      if (this.disableSubmit) { return }
       if (this.emojiInputShown) { return }
       if (this.submitOnEnter) {
         event.stopPropagation()

From 8606cedfb55f25cbdfc66e831fad49f3179dac44 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Tue, 7 Jul 2020 21:30:18 +0000
Subject: [PATCH 313/415] Translated using Weblate (Italian)

Currently translated at 93.9% (602 of 641 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index ed78e656..7279147a 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -427,7 +427,46 @@
     "block": "Blocca",
     "blocked": "Bloccato!",
     "deny": "Nega",
-    "remote_follow": "Segui da remoto"
+    "remote_follow": "Segui da remoto",
+    "admin_menu": {
+      "delete_user_confirmation": "Ne sei completamente sicuro? Quest'azione non può essere annullata.",
+      "delete_user": "Elimina utente",
+      "quarantine": "I messaggi non arriveranno alle altre stanze",
+      "disable_any_subscription": "Rendi utente non seguibile",
+      "disable_remote_subscription": "Blocca i tentativi di seguirlo da altre stanze",
+      "sandbox": "Rendi tutti i messaggi solo per seguaci",
+      "force_unlisted": "Rendi tutti i messaggi invisibili",
+      "strip_media": "Rimuovi ogni allegato ai messaggi",
+      "force_nsfw": "Oscura tutti i messaggi",
+      "delete_account": "Elimina profilo",
+      "deactivate_account": "Disattiva profilo",
+      "activate_account": "Attiva profilo",
+      "revoke_moderator": "Divesti Moderatore",
+      "grant_moderator": "Crea Moderatore",
+      "revoke_admin": "Divesti Amministratore",
+      "grant_admin": "Crea Amministratore",
+      "moderation": "Moderazione"
+    },
+    "show_repeats": "Mostra condivisioni",
+    "hide_repeats": "Nascondi condivisioni",
+    "mute_progress": "Zittisco…",
+    "unmute_progress": "Riabilito…",
+    "unmute": "Riabilita",
+    "block_progress": "Blocco…",
+    "unblock_progress": "Sblocco…",
+    "unblock": "Sblocca",
+    "unsubscribe": "Disdici",
+    "subscribe": "Abbònati",
+    "report": "Segnala",
+    "mention": "Menzioni",
+    "media": "Media",
+    "its_you": "Sei tu!",
+    "hidden": "Nascosto",
+    "follow_unfollow": "Disconosci",
+    "follow_again": "Reinvio richiesta?",
+    "follow_progress": "Richiedo…",
+    "follow_sent": "Richiesta inviata!",
+    "favorites": "Preferiti"
   },
   "chat": {
     "title": "Chat"
@@ -493,7 +532,9 @@
     "new_status": "Nuovo messaggio",
     "empty_status_error": "Non puoi pubblicare messaggi vuoti senza allegati",
     "preview_empty": "Vuoto",
-    "preview": "Anteprima"
+    "preview": "Anteprima",
+    "media_description_error": "Allegati non caricati, riprova",
+    "media_description": "Descrizione allegati"
   },
   "registration": {
     "bio": "Introduzione",
@@ -517,7 +558,9 @@
     "captcha": "CAPTCHA"
   },
   "user_profile": {
-    "timeline_title": "Sequenza dell'Utente"
+    "timeline_title": "Sequenza dell'Utente",
+    "profile_loading_error": "Spiacente, c'è stato un errore nel caricamento del profilo.",
+    "profile_does_not_exist": "Spiacente, questo profilo non esiste."
   },
   "who_to_follow": {
     "more": "Altro",
@@ -626,7 +669,22 @@
     "pin": "Intesta al profilo",
     "delete": "Elimina messaggio",
     "repeats": "Condivisi",
-    "favorites": "Preferiti"
+    "favorites": "Preferiti",
+    "hide_content": "Nascondi contenuti",
+    "show_content": "Mostra contenuti",
+    "hide_full_subject": "Nascondi intero oggetto",
+    "show_full_subject": "Mostra intero oggetto",
+    "thread_muted_and_words": ", contiene:",
+    "thread_muted": "Discussione zittita",
+    "copy_link": "Copia collegamento",
+    "status_unavailable": "Messaggio non disponibile",
+    "unmute_conversation": "Riabilita conversazione",
+    "mute_conversation": "Zittisci conversazione",
+    "replies_list": "Risposte:",
+    "reply_to": "Rispondi a",
+    "delete_confirm": "Vuoi veramente eliminare questo messaggio?",
+    "unbookmark": "Rimuovi segnalibro",
+    "bookmark": "Aggiungi segnalibro"
   },
   "time": {
     "years_short": "{0}a",
@@ -661,5 +719,8 @@
     "day_short": "{0}g",
     "days": "{0} giorni",
     "day": "{0} giorno"
+  },
+  "user_reporting": {
+    "title": "Segnalo {0}"
   }
 }

From 053af7b38507e05a38254cbfd4cafbf87eb1a9d0 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Tue, 7 Jul 2020 23:14:55 +0000
Subject: [PATCH 314/415] Translated using Weblate (Italian)

Currently translated at 100.0% (641 of 641 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 7279147a..6229e567 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -721,6 +721,57 @@
     "day": "{0} giorno"
   },
   "user_reporting": {
-    "title": "Segnalo {0}"
+    "title": "Segnalo {0}",
+    "additional_comments": "Osservazioni accessorie",
+    "generic_error": "C'è stato un errore nell'elaborazione della tua richiesta.",
+    "submit": "Invia",
+    "forward_to": "Inoltra a {0}",
+    "forward_description": "Il profilo appartiene ad un'altra stanza. Inviare la segnalazione anche a quella?",
+    "add_comment_description": "La segnalazione sarà inviata ai moderatori della tua stanza. Puoi motivarla qui sotto:"
+  },
+  "password_reset": {
+    "password_reset_required_but_mailer_is_disabled": "Devi reimpostare la tua parola d'ordine, ma non puoi farlo. Contatta il tuo amministratore.",
+    "password_reset_required": "Devi reimpostare la tua parola d'ordine per poter continuare.",
+    "password_reset_disabled": "Non puoi azzerare la tua parola d'ordine. Contatta il tuo amministratore.",
+    "too_many_requests": "Hai raggiunto il numero massimo di tentativi, riprova più tardi.",
+    "not_found": "Non ho trovato questa email o nome utente.",
+    "return_home": "Torna alla pagina principale",
+    "check_email": "Controlla la tua posta elettronica.",
+    "placeholder": "La tua email o nome utente",
+    "instruction": "Inserisci il tuo indirizzo email o il tuo nome utente. Ti invieremo un collegamento per reimpostare la tua parola d'ordine.",
+    "password_reset": "Azzera parola d'ordine",
+    "forgot_password": "Parola d'ordine dimenticata?"
+  },
+  "search": {
+    "no_results": "Nessun risultato",
+    "people_talking": "{count} partecipanti",
+    "person_talking": "{count} partecipante",
+    "hashtags": "Etichette",
+    "people": "Utenti"
+  },
+  "upload": {
+    "file_size_units": {
+      "TiB": "TiB",
+      "GiB": "GiB",
+      "MiB": "MiB",
+      "KiB": "KiB",
+      "B": "B"
+    },
+    "error": {
+      "default": "Riprova in seguito",
+      "file_too_big": "File troppo pesante [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "base": "Caricamento fallito."
+    }
+  },
+  "tool_tip": {
+    "bookmark": "Aggiungi segnalibro",
+    "reject_follow_request": "Rifiuta seguace",
+    "accept_follow_request": "Accetta seguace",
+    "user_settings": "Impostazioni utente",
+    "add_reaction": "Reagisci",
+    "favorite": "Gradisci",
+    "reply": "Rispondi",
+    "repeat": "Ripeti",
+    "media_upload": "Carica allegati"
   }
 }

From dca13d9a3b6979020c83c173194343cc1c694c55 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 8 Jul 2020 15:42:51 +0000
Subject: [PATCH 315/415] Translated using Weblate (Finnish)

Currently translated at 100.0% (645 of 645 strings)

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

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index c4ad4399..3e63377f 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -28,7 +28,12 @@
     "disable": "Poista käytöstä",
     "confirm": "Hyväksy",
     "verify": "Varmenna",
-    "enable": "Ota käyttöön"
+    "enable": "Ota käyttöön",
+    "loading": "Ladataan…",
+    "error_retry": "Yritä uudelleen",
+    "retry": "Yritä uudelleen",
+    "close": "Sulje",
+    "peek": "Kurkkaa"
   },
   "login": {
     "login": "Kirjaudu sisään",
@@ -63,7 +68,8 @@
     "who_to_follow": "Seurausehdotukset",
     "preferences": "Asetukset",
     "administration": "Ylläpito",
-    "search": "Haku"
+    "search": "Haku",
+    "bookmarks": "Kirjanmerkit"
   },
   "notifications": {
     "broken_favorite": "Viestiä ei löydetty…",
@@ -126,7 +132,12 @@
       "public": "Tämä viesti näkyy kaikille",
       "private": "Tämä viesti näkyy vain sinun seuraajillesi",
       "unlisted": "Tämä viesti ei näy Julkisella Aikajanalla tai Koko Tunnettu Verkosto -aikajanalla"
-    }
+    },
+    "preview": "Esikatselu",
+    "preview_empty": "Tyhjä",
+    "empty_status_error": "Tyhjää viestiä ilman tiedostoja ei voi lähettää",
+    "media_description": "Tiedoston kuvaus",
+    "media_description_error": "Tiedostojen päivitys epäonnistui, yritä uudelleen"
   },
   "registration": {
     "bio": "Kuvaus",
@@ -175,7 +186,7 @@
     "data_import_export_tab": "Tietojen tuonti / vienti",
     "default_vis": "Oletusnäkyvyysrajaus",
     "delete_account": "Poista tili",
-    "delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
+    "delete_account_description": "Poista tietosi ja lukitse tili pysyvästi.",
     "delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
     "delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
     "emoji_reactions_on_timeline": "Näytä emojireaktiot aikajanalla",
@@ -329,7 +340,7 @@
     "post_status_content_type": "Uuden viestin sisällön muoto",
     "user_mutes": "Käyttäjät",
     "useStreamingApiWarning": "(Kokeellinen)",
-    "type_domains_to_mute": "Syötä mykistettäviä sivustoja",
+    "type_domains_to_mute": "Etsi mykistettäviä sivustoja",
     "upload_a_photo": "Lataa kuva",
     "fun": "Hupi",
     "greentext": "Meeminuolet",
@@ -490,7 +501,21 @@
       "title": "Versio",
       "backend_version": "Palvelimen versio",
       "frontend_version": "Käyttöliittymän versio"
-    }
+    },
+    "reset_profile_background": "Nollaa taustakuva",
+    "reset_background_confirm": "Haluatko todella nollata taustakuvan?",
+    "mutes_and_blocks": "Mykistykset ja Estot",
+    "bot": "Tämä on bottitili",
+    "profile_fields": {
+      "label": "Profiilin metatiedot",
+      "add_field": "Lisää kenttä",
+      "name": "Nimi",
+      "value": "Sisältö"
+    },
+    "reset_avatar": "Nollaa profiilikuva",
+    "reset_profile_banner": "Nollaa profiilin tausta",
+    "reset_avatar_confirm": "Haluatko todella nollata profiilikuvan?",
+    "reset_banner_confirm": "Haluatko todella nollata profiilin taustan?"
   },
   "time": {
     "day": "{0} päivä",
@@ -536,7 +561,8 @@
     "show_new": "Näytä uudet",
     "up_to_date": "Ajantasalla",
     "no_more_statuses": "Ei enempää viestejä",
-    "no_statuses": "Ei viestejä"
+    "no_statuses": "Ei viestejä",
+    "reload": "Päivitä"
   },
   "status": {
     "favorites": "Tykkäykset",
@@ -551,7 +577,15 @@
     "mute_conversation": "Mykistä keskustelu",
     "unmute_conversation": "Poista mykistys",
     "status_unavailable": "Viesti ei saatavissa",
-    "copy_link": "Kopioi linkki"
+    "copy_link": "Kopioi linkki",
+    "bookmark": "Lisää kirjanmerkkeihin",
+    "unbookmark": "Poista kirjanmerkeistä",
+    "thread_muted": "Keskustelu mykistetty",
+    "thread_muted_and_words": ", sisältää sanat:",
+    "show_full_subject": "Näytä koko otsikko",
+    "hide_full_subject": "Piilota koko otsikko",
+    "show_content": "Näytä sisältö",
+    "hide_content": "Piilota sisältö"
   },
   "user_card": {
     "approve": "Hyväksy",
@@ -561,7 +595,7 @@
     "follow": "Seuraa",
     "follow_sent": "Pyyntö lähetetty!",
     "follow_progress": "Pyydetään…",
-    "follow_again": "Lähetä pyyntö uudestaan",
+    "follow_again": "Lähetä pyyntö uudestaan?",
     "follow_unfollow": "Älä seuraa",
     "followees": "Seuraa",
     "followers": "Seuraajat",
@@ -601,7 +635,7 @@
     "subscribe": "Tilaa",
     "unsubscribe": "Poista tilaus",
     "unblock": "Poista esto",
-    "unblock_progress": "Postetaan estoa…",
+    "unblock_progress": "Poistetaan estoa…",
     "unmute": "Poista mykistys",
     "unmute_progress": "Poistetaan mykistystä…",
     "mute_progress": "Mykistetään…",
@@ -625,7 +659,8 @@
     "user_settings": "Käyttäjäasetukset",
     "add_reaction": "Lisää Reaktio",
     "accept_follow_request": "Hyväksy seurauspyyntö",
-    "reject_follow_request": "Hylkää seurauspyyntö"
+    "reject_follow_request": "Hylkää seurauspyyntö",
+    "bookmark": "Kirjanmerkki"
   },
   "upload": {
     "error": {
@@ -675,7 +710,7 @@
     "mute": "Mykistä",
     "unmute": "Poista mykistys",
     "mute_progress": "Mykistetään…",
-    "unmute_progress": "Poistetaan mykistyst…"
+    "unmute_progress": "Poistetaan mykistystä…"
   },
   "exporter": {
     "export": "Vie",
@@ -743,5 +778,8 @@
     "people_talking": "{0} käyttäjää puhuvat",
     "person_talking": "{0} käyttäjä puhuu",
     "no_results": "Ei tuloksia"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma ei voinut käyttää selaimen muistia. Kirjautumisesi ja paikalliset asetukset eivät tallennu ja saatat kohdata odottamattomia ongelmia. Yritä sallia evästeet."
   }
 }

From b32394c2ef6145224a27f9eb0e0bc3f3bd31ce1b Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Wed, 8 Jul 2020 20:22:04 +0000
Subject: [PATCH 316/415] Translated using Weblate (Italian)

Currently translated at 100.0% (645 of 645 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 6229e567..2e1028c8 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -398,7 +398,13 @@
       "frontend_version": "Versione interfaccia",
       "backend_version": "Versione backend",
       "title": "Versione"
-    }
+    },
+    "reset_avatar": "Azzera icona",
+    "reset_profile_background": "Azzera sfondo profilo",
+    "reset_profile_banner": "Azzera stendardo profilo",
+    "reset_avatar_confirm": "Vuoi veramente azzerare l'icona?",
+    "reset_banner_confirm": "Vuoi veramente azzerare lo stendardo?",
+    "reset_background_confirm": "Vuoi veramente azzerare lo sfondo?"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",

From a754e89eed8623e943666e69d233b252c3e1a006 Mon Sep 17 00:00:00 2001
From: Dym Sohin <pleroma-git@dym.sh>
Date: Sat, 11 Jul 2020 06:39:44 +0000
Subject: [PATCH 317/415] fixed checkbox using emoji instead of dingbat

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

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 03375b2f..d28c2cfd 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -52,7 +52,7 @@ export default {
     right: 0;
     top: 0;
     display: block;
-    content: '✔';
+    content: '✓';
     transition: color 200ms;
     width: 1.1em;
     height: 1.1em;

From 4a6300bbeea97432afe5729c081a6b2a5e071883 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sun, 12 Jul 2020 11:11:12 +0300
Subject: [PATCH 318/415] add simple You: to chat list last message

---
 src/components/chat_list_item/chat_list_item.js | 10 ++++++----
 src/i18n/en.json                                |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index b6b0519a..bee1ad53 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -37,12 +37,14 @@ const ChatListItem = {
       }
     },
     messageForStatusContent () {
-      const content = this.chat.lastMessage ? (this.attachmentInfo || this.chat.lastMessage.content) : ''
-
+      const message = this.chat.lastMessage
+      const isYou = message && message.account_id === this.currentUser.id
+      const content = message ? (this.attachmentInfo || message.content) : ''
+      const messagePreview = isYou ? `<i>${this.$t('chats.you')}</i> ${content}` : content
       return {
         summary: '',
-        statusnet_html: content,
-        text: content,
+        statusnet_html: messagePreview,
+        text: messagePreview,
         attachments: []
       }
     }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 5cc75460..796a527c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -786,6 +786,7 @@
     "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
   },
   "chats": {
+    "you": "You:",
     "message_user": "Message {nickname}",
     "delete": "Delete",
     "chats": "Chats",

From cf0ee518214fbc709e6ae406d16bb00e9b2eec72 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sun, 12 Jul 2020 08:57:04 +0000
Subject: [PATCH 319/415] Translated using Weblate (Italian)

Currently translated at 100.0% (667 of 667 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 2e1028c8..24520c09 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -35,7 +35,8 @@
     "search": "Ricerca",
     "who_to_follow": "Chi seguire",
     "preferences": "Preferenze",
-    "bookmarks": "Segnalibri"
+    "bookmarks": "Segnalibri",
+    "chats": "Conversazioni"
   },
   "notifications": {
     "followed_you": "ti segue",
@@ -85,7 +86,7 @@
     "change_password": "Cambia password",
     "change_password_error": "C'è stato un problema durante il cambiamento della password.",
     "changed_password": "Password cambiata correttamente!",
-    "collapse_subject": "Ripiega messaggi con Oggetto",
+    "collapse_subject": "Ripiega messaggi con oggetto",
     "confirm_new_password": "Conferma la nuova password",
     "current_password": "La tua password attuale",
     "data_import_export_tab": "Importa o esporta dati",
@@ -257,7 +258,12 @@
         "panel_header": "Titolo pannello",
         "badge_notification": "Notifica",
         "popover": "Suggerimenti, menù, sbalzi",
-        "toggled": "Scambiato"
+        "toggled": "Scambiato",
+        "chat": {
+          "border": "Bordo",
+          "outgoing": "Inviati",
+          "incoming": "Ricevuti"
+        }
       },
       "common_colors": {
         "rgbo": "Icone, accenti, medaglie",
@@ -404,7 +410,8 @@
     "reset_profile_banner": "Azzera stendardo profilo",
     "reset_avatar_confirm": "Vuoi veramente azzerare l'icona?",
     "reset_banner_confirm": "Vuoi veramente azzerare lo stendardo?",
-    "reset_background_confirm": "Vuoi veramente azzerare lo sfondo?"
+    "reset_background_confirm": "Vuoi veramente azzerare lo sfondo?",
+    "chatMessageRadius": "Messaggi istantanei"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",
@@ -472,7 +479,8 @@
     "follow_again": "Reinvio richiesta?",
     "follow_progress": "Richiedo…",
     "follow_sent": "Richiesta inviata!",
-    "favorites": "Preferiti"
+    "favorites": "Preferiti",
+    "message": "Contatta"
   },
   "chat": {
     "title": "Chat"
@@ -484,7 +492,8 @@
     "scope_options": "Opzioni visibilità",
     "text_limit": "Lunghezza massima",
     "title": "Caratteristiche",
-    "who_to_follow": "Chi seguire"
+    "who_to_follow": "Chi seguire",
+    "pleroma_chat_messages": "Chiacchiere"
   },
   "finder": {
     "error_fetching_user": "Errore nel recupero dell'utente",
@@ -736,17 +745,17 @@
     "add_comment_description": "La segnalazione sarà inviata ai moderatori della tua stanza. Puoi motivarla qui sotto:"
   },
   "password_reset": {
-    "password_reset_required_but_mailer_is_disabled": "Devi reimpostare la tua parola d'ordine, ma non puoi farlo. Contatta il tuo amministratore.",
-    "password_reset_required": "Devi reimpostare la tua parola d'ordine per poter continuare.",
-    "password_reset_disabled": "Non puoi azzerare la tua parola d'ordine. Contatta il tuo amministratore.",
+    "password_reset_required_but_mailer_is_disabled": "Devi reimpostare la tua password, ma non puoi farlo. Contatta il tuo amministratore.",
+    "password_reset_required": "Devi reimpostare la tua password per poter continuare.",
+    "password_reset_disabled": "Non puoi azzerare la tua password. Contatta il tuo amministratore.",
     "too_many_requests": "Hai raggiunto il numero massimo di tentativi, riprova più tardi.",
     "not_found": "Non ho trovato questa email o nome utente.",
     "return_home": "Torna alla pagina principale",
     "check_email": "Controlla la tua posta elettronica.",
     "placeholder": "La tua email o nome utente",
-    "instruction": "Inserisci il tuo indirizzo email o il tuo nome utente. Ti invieremo un collegamento per reimpostare la tua parola d'ordine.",
-    "password_reset": "Azzera parola d'ordine",
-    "forgot_password": "Parola d'ordine dimenticata?"
+    "instruction": "Inserisci il tuo indirizzo email o il tuo nome utente. Ti invieremo un collegamento per reimpostare la tua password.",
+    "password_reset": "Azzera password",
+    "forgot_password": "Password dimenticata?"
   },
   "search": {
     "no_results": "Nessun risultato",
@@ -779,5 +788,26 @@
     "reply": "Rispondi",
     "repeat": "Ripeti",
     "media_upload": "Carica allegati"
+  },
+  "display_date": {
+    "today": "Oggi"
+  },
+  "file_type": {
+    "file": "File",
+    "image": "Immagine",
+    "video": "Video",
+    "audio": "Audio"
+  },
+  "chats": {
+    "empty_chat_list_placeholder": "Non hai conversazioni. Contatta qualcuno!",
+    "error_sending_message": "Errore. Il messaggio non è stato inviato.",
+    "error_loading_chat": "Errore. La conversazione non è stata caricata.",
+    "delete_confirm": "Vuoi veramente eliminare questo messaggio?",
+    "more": "Altro",
+    "empty_message_error": "Non puoi inviare messaggi vuoti",
+    "new": "Nuova conversazione",
+    "chats": "Conversazioni",
+    "delete": "Elimina",
+    "message_user": "Contatta {nickname}"
   }
 }

From 40e3595ad3e85ff0fec39bdbf538b7cb053617ef Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 12 Jul 2020 15:41:34 +0300
Subject: [PATCH 320/415] fix chrome69

---
 src/services/theme_data/pleromafe.js          | 30 +++++++++++--------
 src/services/theme_data/theme_data.service.js | 10 +++++--
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js
index b58ca9be..7ed85797 100644
--- a/src/services/theme_data/pleromafe.js
+++ b/src/services/theme_data/pleromafe.js
@@ -675,23 +675,22 @@ export const SLOT_INHERITANCE = {
     depends: ['bg']
   },
 
-  chatMessage: {
-    depends: ['chatBg']
-  },
-
   chatMessageIncomingBg: {
-    depends: ['chatMessage'],
-    layer: 'chatMessage'
+    depends: ['chatBg']
   },
 
   chatMessageIncomingText: {
     depends: ['text'],
-    layer: 'text'
+    layer: 'chatMessage',
+    variant: 'chatMessageIncomingBg',
+    textColor: true
   },
 
   chatMessageIncomingLink: {
     depends: ['link'],
-    layer: 'link'
+    layer: 'chatMessage',
+    variant: 'chatMessageIncomingBg',
+    textColor: 'preserve'
   },
 
   chatMessageIncomingBorder: {
@@ -701,22 +700,27 @@ export const SLOT_INHERITANCE = {
   },
 
   chatMessageOutgoingBg: {
-    depends: ['chatMessage'],
+    depends: ['chatMessageIncomingBg'],
     color: (mod, chatMessage) => brightness(5 * mod, chatMessage).rgb
   },
 
   chatMessageOutgoingText: {
     depends: ['text'],
-    layer: 'text'
+    layer: 'chatMessage',
+    variant: 'chatMessageOutgoingBg',
+    textColor: true
   },
 
   chatMessageOutgoingLink: {
     depends: ['link'],
-    layer: 'link'
+    layer: 'chatMessage',
+    variant: 'chatMessageOutgoingBg',
+    textColor: 'preserve'
   },
 
   chatMessageOutgoingBorder: {
-    depends: ['chatMessage'],
-    opacity: 'chatMessage'
+    depends: ['chatMessageOutgoingBg'],
+    opacity: 'border',
+    color: (mod, border) => brightness(2 * mod, border).rgb
   }
 }
diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js
index dd87e3cf..138ed5c6 100644
--- a/src/services/theme_data/theme_data.service.js
+++ b/src/services/theme_data/theme_data.service.js
@@ -128,14 +128,18 @@ export const topoSort = (
   while (unprocessed.length > 0) {
     step(unprocessed.pop())
   }
-  return output.sort((a, b) => {
+
+  // The index thing is to make sorting stable on browsers
+  // where Array.sort() isn't stable
+  return output.map((data, index) => ({ data, index })).sort(({ data: a, index: ai }, { data: b, index: bi }) => {
+    console.log(a, b, ai, bi)
     const depsA = getDeps(a, inheritance).length
     const depsB = getDeps(b, inheritance).length
 
-    if (depsA === depsB || (depsB !== 0 && depsA !== 0)) return 0
+    if (depsA === depsB || (depsB !== 0 && depsA !== 0)) return ai - bi
     if (depsA === 0 && depsB !== 0) return -1
     if (depsB === 0 && depsA !== 0) return 1
-  })
+  }).map(({ data }) => data)
 }
 
 const expandSlotValue = (value) => {

From 2c35afeebf4e508fd911a90d3c4af3a75e4484ab Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Mon, 13 Jul 2020 00:06:45 +0300
Subject: [PATCH 321/415] Add desktop chat notifications

---
 src/modules/api.js                            |  2 +
 src/modules/chats.js                          | 15 ++++--
 src/modules/statuses.js                       | 47 ++++---------------
 src/services/chat_utils/chat_utils.js         | 18 +++++++
 .../desktop_notification_utils.js             |  9 ++++
 .../notification_utils/notification_utils.js  | 40 ++++++++++++----
 6 files changed, 82 insertions(+), 49 deletions(-)
 create mode 100644 src/services/chat_utils/chat_utils.js
 create mode 100644 src/services/desktop_notification_utils/desktop_notification_utils.js

diff --git a/src/modules/api.js b/src/modules/api.js
index 68402602..5e213f0d 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,5 +1,6 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import { WSConnectionStatus } from '../services/api/api.service.js'
+import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 import { Socket } from 'phoenix'
 
 const api = {
@@ -77,6 +78,7 @@ const api = {
                   messages: [message.chatUpdate.lastMessage]
                 })
                 dispatch('updateChat', { chat: message.chatUpdate })
+                maybeShowChatNotification(store, message.chatUpdate)
               }
             }
           )
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 228d6256..c7609018 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import { find, omitBy, orderBy, sumBy } from 'lodash'
 import chatService from '../services/chat_service/chat_service.js'
 import { parseChat, parseChatMessage } from '../services/entity_normalizer/entity_normalizer.service.js'
+import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 
 const emptyChatList = () => ({
   data: [],
@@ -59,8 +60,12 @@ const chats = {
           return chats
         })
     },
-    addNewChats ({ rootState, commit, dispatch, rootGetters }, { chats }) {
-      commit('addNewChats', { dispatch, chats, rootGetters })
+    addNewChats (store, { chats }) {
+      const { commit, dispatch, rootGetters } = store
+      const newChatMessageSideEffects = (chat) => {
+        maybeShowChatNotification(store, chat)
+      }
+      commit('addNewChats', { dispatch, chats, rootGetters, newChatMessageSideEffects })
     },
     updateChat ({ commit }, { chat }) {
       commit('updateChat', { chat })
@@ -130,13 +135,17 @@ const chats = {
     setCurrentChatId (state, { chatId }) {
       state.currentChatId = chatId
     },
-    addNewChats (state, { _dispatch, chats, _rootGetters }) {
+    addNewChats (state, { chats, newChatMessageSideEffects }) {
       chats.forEach((updatedChat) => {
         const chat = getChatById(state, updatedChat.id)
 
         if (chat) {
+          const isNewMessage = (chat.lastMessage && chat.lastMessage.id) !== (updatedChat.lastMessage && updatedChat.lastMessage.id)
           chat.lastMessage = updatedChat.lastMessage
           chat.unread = updatedChat.unread
+          if (isNewMessage && chat.unread) {
+            newChatMessageSideEffects(updatedChat)
+          }
         } else {
           state.chatList.data.push(updatedChat)
           Vue.set(state.chatList.idStore, updatedChat.id, updatedChat)
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 64f5b587..e108b2a7 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,9 +13,8 @@ import {
   omitBy
 } from 'lodash'
 import { set } from 'vue'
-import { isStatusNotification, prepareNotificationObject } from '../services/notification_utils/notification_utils.js'
+import { isStatusNotification, maybeShowNotification } from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
-import { muteWordHits } from '../services/status_parser/status_parser.js'
 
 const emptyTl = (userId = 0) => ({
   statuses: [],
@@ -77,17 +76,6 @@ export const prepareStatus = (status) => {
   return status
 }
 
-const visibleNotificationTypes = (rootState) => {
-  return [
-    rootState.config.notificationVisibility.likes && 'like',
-    rootState.config.notificationVisibility.mentions && 'mention',
-    rootState.config.notificationVisibility.repeats && 'repeat',
-    rootState.config.notificationVisibility.follows && 'follow',
-    rootState.config.notificationVisibility.moves && 'move',
-    rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reactions'
-  ].filter(_ => _)
-}
-
 const mergeOrAdd = (arr, obj, item) => {
   const oldItem = obj[item.id]
 
@@ -325,7 +313,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 }
 
-const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters }) => {
+const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters, newNotificationSideEffects }) => {
   each(notifications, (notification) => {
     if (isStatusNotification(notification.type)) {
       notification.action = addStatusToGlobalStorage(state, notification.action).item
@@ -348,27 +336,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
       state.notifications.data.push(notification)
       state.notifications.idStore[notification.id] = notification
 
-      if ('Notification' in window && window.Notification.permission === 'granted') {
-        const notifObj = prepareNotificationObject(notification, rootGetters.i18n)
-
-        const reasonsToMuteNotif = (
-          notification.seen ||
-            state.notifications.desktopNotificationSilence ||
-            !visibleNotificationTypes.includes(notification.type) ||
-            (
-              notification.type === 'mention' && status && (
-                status.muted ||
-                  muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
-              )
-            )
-        )
-        if (!reasonsToMuteNotif) {
-          let desktopNotification = new window.Notification(notifObj.title, notifObj)
-          // Chrome is known for not closing notifications automatically
-          // according to MDN, anyway.
-          setTimeout(desktopNotification.close.bind(desktopNotification), 5000)
-        }
-      }
+      newNotificationSideEffects(notification)
     } else if (notification.seen) {
       state.notifications.idStore[notification.id].seen = true
     }
@@ -609,8 +577,13 @@ const statuses = {
     addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false, userId, pagination }) {
       commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser, userId, pagination })
     },
-    addNewNotifications ({ rootState, commit, dispatch, rootGetters }, { notifications, older }) {
-      commit('addNewNotifications', { visibleNotificationTypes: visibleNotificationTypes(rootState), dispatch, notifications, older, rootGetters })
+    addNewNotifications (store, { notifications, older }) {
+      const { commit, dispatch, rootGetters } = store
+
+      const newNotificationSideEffects = (notification) => {
+        maybeShowNotification(store, notification)
+      }
+      commit('addNewNotifications', { dispatch, notifications, older, rootGetters, newNotificationSideEffects })
     },
     setError ({ rootState, commit }, { value }) {
       commit('setError', { value })
diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js
new file mode 100644
index 00000000..7264ebcc
--- /dev/null
+++ b/src/services/chat_utils/chat_utils.js
@@ -0,0 +1,18 @@
+import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
+
+export const maybeShowChatNotification = (store, chat) => {
+  if (!chat.lastMessage) return
+
+  const opts = {
+    tag: chat.lastMessage.id,
+    title: chat.account.name,
+    icon: chat.account.profile_image_url,
+    body: chat.lastMessage.content
+  }
+
+  if (chat.lastMessage.attachment && chat.lastMessage.attachment.type === 'image') {
+    opts.image = chat.lastMessage.attachment.preview_url
+  }
+
+  showDesktopNotification(store.rootState, opts)
+}
diff --git a/src/services/desktop_notification_utils/desktop_notification_utils.js b/src/services/desktop_notification_utils/desktop_notification_utils.js
new file mode 100644
index 00000000..b84a1f75
--- /dev/null
+++ b/src/services/desktop_notification_utils/desktop_notification_utils.js
@@ -0,0 +1,9 @@
+export const showDesktopNotification = (rootState, desktopNotificationOpts) => {
+  if (!('Notification' in window && window.Notification.permission === 'granted')) return
+  if (rootState.statuses.notifications.desktopNotificationSilence) { return }
+
+  const desktopNotification = new window.Notification(desktopNotificationOpts.title, desktopNotificationOpts)
+  // Chrome is known for not closing notifications automatically
+  // according to MDN, anyway.
+  setTimeout(desktopNotification.close.bind(desktopNotification), 5000)
+}
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 5cc19215..d912d19f 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -1,16 +1,22 @@
 import { filter, sortBy, includes } from 'lodash'
+import { muteWordHits } from '../status_parser/status_parser.js'
+import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 
 export const notificationsFromStore = store => store.state.statuses.notifications.data
 
-export const visibleTypes = store => ([
-  store.state.config.notificationVisibility.likes && 'like',
-  store.state.config.notificationVisibility.mentions && 'mention',
-  store.state.config.notificationVisibility.repeats && 'repeat',
-  store.state.config.notificationVisibility.follows && 'follow',
-  store.state.config.notificationVisibility.followRequest && 'follow_request',
-  store.state.config.notificationVisibility.moves && 'move',
-  store.state.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction'
-].filter(_ => _))
+export const visibleTypes = store => {
+  const rootState = store.rootState || store.state
+
+  return ([
+    rootState.config.notificationVisibility.likes && 'like',
+    rootState.config.notificationVisibility.mentions && 'mention',
+    rootState.config.notificationVisibility.repeats && 'repeat',
+    rootState.config.notificationVisibility.follows && 'follow',
+    rootState.config.notificationVisibility.followRequest && 'follow_request',
+    rootState.config.notificationVisibility.moves && 'move',
+    rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction'
+  ].filter(_ => _))
+}
 
 const statusNotifications = ['like', 'mention', 'repeat', 'pleroma:emoji_reaction']
 
@@ -32,6 +38,22 @@ const sortById = (a, b) => {
   }
 }
 
+const isMutedNotification = (store, notification) => {
+  if (!notification.status) return
+  return notification.status.muted || muteWordHits(notification.status, store.rootGetters.mergedConfig.muteWords).length > 0
+}
+
+export const maybeShowNotification = (store, notification) => {
+  const rootState = store.rootState || store.state
+
+  if (notification.seen) return
+  if (!visibleTypes(store).includes(notification.type)) return
+  if (notification.type === 'mention' && isMutedNotification(store, notification)) return
+
+  const notificationObject = prepareNotificationObject(notification, store.rootGetters.i18n)
+  showDesktopNotification(rootState, notificationObject)
+}
+
 export const filteredNotificationsFromStore = (store, types) => {
   // map is just to clone the array since sort mutates it and it causes some issues
   let sortedNotifications = notificationsFromStore(store).map(_ => _).sort(sortById)

From 54dea24bb8b34021debdb2ab505a2e0b5b770ed9 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Mon, 13 Jul 2020 15:48:19 +0300
Subject: [PATCH 322/415] Do not display desktop chat notification when the
 chat is focused

---
 src/services/chat_utils/chat_utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js
index 7264ebcc..ab898ced 100644
--- a/src/services/chat_utils/chat_utils.js
+++ b/src/services/chat_utils/chat_utils.js
@@ -2,6 +2,7 @@ import { showDesktopNotification } from '../desktop_notification_utils/desktop_n
 
 export const maybeShowChatNotification = (store, chat) => {
   if (!chat.lastMessage) return
+  if (store.rootState.chats.currentChatId === chat.id && !document.hidden) return
 
   const opts = {
     tag: chat.lastMessage.id,

From 8fcd37a3b9c3c66afd5bcf08b083db9eee0bd652 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 13 Jul 2020 13:29:44 -0500
Subject: [PATCH 323/415] Remove i18n entries that are deprecated or need to be
 retranslated

---
 src/i18n/de.json          | 2 --
 src/i18n/es.json          | 5 -----
 src/i18n/et.json          | 5 -----
 src/i18n/eu.json          | 7 +------
 src/i18n/fi.json          | 5 -----
 src/i18n/fr.json          | 5 -----
 src/i18n/it.json          | 5 -----
 src/i18n/ja_easy.json     | 5 -----
 src/i18n/ja_pedantic.json | 5 -----
 src/i18n/nb.json          | 5 -----
 src/i18n/nl.json          | 5 -----
 src/i18n/oc.json          | 7 +------
 src/i18n/pl.json          | 5 -----
 src/i18n/ru.json          | 4 ----
 src/i18n/zh.json          | 5 -----
 15 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/src/i18n/de.json b/src/i18n/de.json
index a44e58cb..97580773 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -401,8 +401,6 @@
     "changed_email": "Email Adresse erfolgreich geändert!",
     "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
     "change_email": "Ändere Email",
-    "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
-    "notification_setting_followers": "Nutzer, die dir folgen",
     "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
     "accent": "Akzent"
   },
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 931d4c64..0ebed55e 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -344,11 +344,6 @@
       "true": "sí"
     },
     "notifications": "Notificaciones",
-    "notification_setting": "Recibir notificaciones de:",
-    "notification_setting_follows": "Usuarios que sigues",
-    "notification_setting_non_follows": "Usuarios que no sigues",
-    "notification_setting_followers": "Usuarios que te siguen",
-    "notification_setting_non_followers": "Usuarios que no te siguen",
     "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
     "notification_blocks": "El bloqueo de un usuario detiene todas las notificaciones y también las cancela.",
     "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
diff --git a/src/i18n/et.json b/src/i18n/et.json
index b5ae4275..1d710450 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -304,14 +304,9 @@
     "enable_web_push_notifications": "Luba veebipõhised push-teated",
     "notification_blocks": "Kasutaja blokeerimisel ei tule neilt enam teateid ning nendele teilt ka mitte.",
     "notification_setting_privacy_option": "Peida saatja ning sisu push-teadetelt",
-    "notification_setting": "Saa teateid nendelt:",
     "notifications": "Teated",
     "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.",
     "notification_setting_privacy": "Privaatsus",
-    "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi",
-    "notification_setting_followers": "Kasutajatelt, kes jälgivad sind",
-    "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi",
-    "notification_setting_follows": "Kasutajatelt, keda jälgid",
     "notification_setting_filters": "Filtrid",
     "greentext": "Meemi nooled",
     "fun": "Naljad",
diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 1c75bf75..f4ba1652 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -344,11 +344,6 @@
       "true": "bai"
     },
     "notifications": "Jakinarazpenak",
-    "notification_setting": "Jaso pertsona honen jakinarazpenak:",
-    "notification_setting_follows": "Jarraitutako erabiltzaileak",
-    "notification_setting_non_follows": "Jarraitzen ez dituzun erabiltzaileak",
-    "notification_setting_followers": "Zu jarraitzen zaituzten erabiltzaileak",
-    "notification_setting_non_followers": "Zu jarraitzen ez zaituzten erabiltzaileak",
     "notification_mutes": "Erabiltzaile jakin baten jakinarazpenak jasotzeari uzteko, isilarazi ezazu.",
     "notification_blocks": "Erabiltzaile bat blokeatzeak jakinarazpen guztiak gelditzen ditu eta harpidetza ezeztatu.",
     "enable_web_push_notifications": "Gaitu web jakinarazpenak",
@@ -639,4 +634,4 @@
     "password_reset_required": "Pasahitza berrezarri behar duzu saioa hasteko.",
     "password_reset_required_but_mailer_is_disabled": "Pasahitza berrezarri behar duzu, baina pasahitza berrezartzeko aukera desgaituta dago. Mesedez, jarri harremanetan instantziaren administratzailearekin."
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 3e63377f..bdddefc1 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -284,7 +284,6 @@
     "show_moderator_badge": "Näytä Moderaattori-merkki profiilissani",
     "useStreamingApi": "Vastaanota viestiejä ja ilmoituksia reaaliajassa",
     "notification_setting_filters": "Suodattimet",
-    "notification_setting": "Vastaanota ilmoituksia seuraavista:",
     "notification_setting_privacy_option": "Piilota lähettäjä ja sisältö sovelluksen ulkopuolisista ilmoituksista",
     "enable_web_push_notifications": "Ota käyttöön sovelluksen ulkopuoliset ilmoitukset",
     "app_name": "Sovelluksen nimi",
@@ -490,10 +489,6 @@
     "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
     "mutes_tab": "Mykistykset",
     "new_email": "Uusi sähköpostiosoite",
-    "notification_setting_follows": "Käyttäjät joita seuraat",
-    "notification_setting_non_follows": "Käyttäjät joita et seuraa",
-    "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
-    "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
     "notification_setting_privacy": "Yksityisyys",
     "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
     "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 31b69a0f..1992c31b 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -319,11 +319,6 @@
       "true": "oui"
     },
     "notifications": "Notifications",
-    "notification_setting": "Reçevoir les notifications de :",
-    "notification_setting_follows": "Utilisateurs que vous suivez",
-    "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas",
-    "notification_setting_followers": "Utilisateurs qui vous suivent",
-    "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas",
     "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.",
     "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.",
     "enable_web_push_notifications": "Activer les notifications de push web",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 24520c09..512b8bd2 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -338,11 +338,6 @@
     "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.",
     "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push",
     "notification_setting_privacy": "Privacy",
-    "notification_setting_followers": "Utenti che ti seguono",
-    "notification_setting_non_followers": "Utenti che non ti seguono",
-    "notification_setting_non_follows": "Utenti che non segui",
-    "notification_setting_follows": "Utenti che segui",
-    "notification_setting": "Ricevi notifiche da:",
     "notification_setting_filters": "Filtri",
     "notifications": "Notifiche",
     "greentext": "Frecce da meme",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 978e43b3..44cb4b5e 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -382,11 +382,6 @@
     "fun": "おたのしみ",
     "greentext": "ミームやじるし",
     "notifications": "つうち",
-    "notification_setting": "つうちをうけとる:",
-    "notification_setting_follows": "あなたがフォローしているひとから",
-    "notification_setting_non_follows": "あなたがフォローしていないひとから",
-    "notification_setting_followers": "あなたをフォローしているひとから",
-    "notification_setting_non_followers": "あなたをフォローしていないひとから",
     "notification_mutes": "あるユーザーからのつうちをとめるには、ミュートしてください。",
     "notification_blocks": "ブロックしているユーザーからのつうちは、すべてとまります。",
     "enable_web_push_notifications": "ウェブプッシュつうちをゆるす",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 2ca7dca8..018be475 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -345,11 +345,6 @@
       "true": "はい"
     },
     "notifications": "通知",
-    "notification_setting": "通知を受け取る:",
-    "notification_setting_follows": "あなたがフォローしているユーザーから",
-    "notification_setting_non_follows": "あなたがフォローしていないユーザーから",
-    "notification_setting_followers": "あなたをフォローしているユーザーから",
-    "notification_setting_non_followers": "あなたをフォローしていないユーザーから",
     "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートしてください。",
     "notification_blocks": "ブロックしているユーザーからの通知は、すべて止まります。",
     "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index 248b05bc..533d87bc 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -330,11 +330,6 @@
       "true": "ja"
     },
     "notifications": "Varsler",
-    "notification_setting": "Motta varsler i fra:",
-    "notification_setting_follows": "Brukere du følger",
-    "notification_setting_non_follows": "Brukere du ikke følger",
-    "notification_setting_followers": "Brukere som følger deg",
-    "notification_setting_non_followers": "Brukere som ikke følger deg",
     "notification_mutes": "For å stoppe å motta varsler i fra en spesifikk bruker, kan du dempe dem.",
     "notification_blocks": "Hvis du blokkerer en bruker vil det stoppe alle varsler og i tilleg få dem til å slutte å følge deg",
     "enable_web_push_notifications": "Skru på pushnotifikasjoner i nettlesere",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index bf270f87..deb659fb 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -390,9 +390,6 @@
         "link": "een leuke kleine link"
       }
     },
-    "notification_setting_follows": "Gebruikers die je volgt",
-    "notification_setting_non_follows": "Gebruikers die je niet volgt",
-    "notification_setting_followers": "Gebruikers die je volgen",
     "notification_setting_privacy": "Privacy",
     "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen",
     "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.",
@@ -460,7 +457,6 @@
     "upload_a_photo": "Upload een foto",
     "fun": "Plezier",
     "greentext": "Meme pijlen",
-    "notification_setting": "Ontvang meldingen van:",
     "block_export_button": "Exporteer je geblokkeerde gebruikers naar een csv bestand",
     "block_import_error": "Fout bij importeren blokkades",
     "discoverable": "Sta toe dat dit account ontdekt kan worden in zoekresultaten en andere diensten",
@@ -469,7 +465,6 @@
     "hide_follows_description": "Niet tonen wie ik volg",
     "show_moderator_badge": "Moderators badge tonen in mijn profiel",
     "notification_setting_filters": "Filters",
-    "notification_setting_non_followers": "Gebruikers die je niet volgen",
     "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.",
     "version": {
       "frontend_version": "Frontend Versie",
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index 680ad6dd..00183b8c 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -288,11 +288,6 @@
       "true": "òc"
     },
     "notifications": "Notificacions",
-    "notification_setting": "Recebre las notificacions de :",
-    "notification_setting_follows": "Utilizaires que seguissètz",
-    "notification_setting_non_follows": "Utilizaires que seguissètz pas",
-    "notification_setting_followers": "Utilizaires que vos seguisson",
-    "notification_setting_non_followers": "Utilizaires que vos seguisson pas",
     "notification_mutes": "Per recebre pas mai d’un utilizaire en particular, botatz-lo en silenci.",
     "notification_blocks": "Blocar un utilizaire arrèsta totas las notificacions tan coma quitar de los seguir.",
     "enable_web_push_notifications": "Activar las notificacions web push",
@@ -550,4 +545,4 @@
     "people_talking": "{count} personas ne parlan",
     "no_results": "Cap de resultats"
   }
-}
\ No newline at end of file
+}
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 61e09318..c68399d4 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -405,11 +405,6 @@
     "fun": "Zabawa",
     "greentext": "Memiczne strzałki",
     "notifications": "Powiadomienia",
-    "notification_setting": "Otrzymuj powiadomienia od:",
-    "notification_setting_follows": "Ludzi których obserwujesz",
-    "notification_setting_non_follows": "Ludzi których nie obserwujesz",
-    "notification_setting_followers": "Ludzi którzy obserwują ciebie",
-    "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
     "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
     "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
     "enable_web_push_notifications": "Włącz powiadomienia push",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 08f05d18..40d688e3 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -350,12 +350,8 @@
         "link": "ссылка"
       }
     },
-    "notification_setting_non_followers": "Не читающие вас",
     "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
     "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
-    "notification_setting_followers": "Читающие вас",
-    "notification_setting_follows": "Читаемые вами",
-    "notification_setting_non_follows": "Не читаемые вами"
   },
   "timeline": {
     "collapse": "Свернуть",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 7e620bdf..fce321f6 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -336,11 +336,6 @@
       "true": "是"
     },
     "notifications": "通知",
-    "notification_setting": "通知来源：",
-    "notification_setting_follows": "你所关注的用户",
-    "notification_setting_non_follows": "你没有关注的用户",
-    "notification_setting_followers": "关注你的用户",
-    "notification_setting_non_followers": "没有关注你的用户",
     "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。",
     "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。",
     "enable_web_push_notifications": "启用 web 推送通知",

From 3598360ce55bf7701716a9974599f901ddb66bf7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 14 Jul 2020 11:54:03 +0300
Subject: [PATCH 324/415] fix missed conflict

---
 src/components/side_drawer/side_drawer.vue | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 4a4e7610..0587ee02 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -86,27 +86,11 @@
           </router-link>
         </li>
         <li
-<<<<<<< HEAD
           v-if="chat"
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
             <i class="button-icon icon-chat" /> {{ $t("nav.chat") }}
-=======
-          v-if="currentUser || !privateMode"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/public">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
-        <li
-          v-if="federating && (currentUser || !privateMode)"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/all">
-            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
->>>>>>> develop
           </router-link>
         </li>
       </ul>

From 7859c5fe4bcd4b6a0a78a84830ccc55693f253f0 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 14 Jul 2020 14:43:26 +0300
Subject: [PATCH 325/415] polish preview styles a bit

---
 src/components/post_status_form/post_status_form.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 3dcf1f79..7a96a389 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -80,8 +80,7 @@
           >
             {{ $t('post_status.preview') }}
             <i
-              class="icon-down-open"
-              :style="{ transform: showPreview ? 'rotate(0deg)' : 'rotate(-90deg)' }"
+              :class="showPreview ? 'icon-up-open' : 'icon-down-open'"
             />
           </a>
           <i
@@ -374,6 +373,7 @@
   }
 
   .preview-heading {
+    padding-left: 0.5em;
     display: flex;
     width: 100%;
 
@@ -389,10 +389,9 @@
     &:hover {
       text-decoration: underline;
     }
-  }
-
-  .icon-down-open {
-    transition: transform 0.1s;
+    i {
+      font-size: 0.9em;
+    }
   }
 
   .preview-container {

From b8c1b25397f2a07811fa381977a372595ffe3786 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 14 Jul 2020 15:08:04 +0300
Subject: [PATCH 326/415] remove most of reply preview and autoload related
 stuff

---
 src/components/mobile_nav/mobile_nav.js            |  2 +-
 src/components/settings_modal/tabs/general_tab.vue | 10 ----------
 src/components/timeline/timeline.js                |  1 -
 src/i18n/ar.json                                   |  1 -
 src/i18n/ca.json                                   |  1 -
 src/i18n/cs.json                                   |  1 -
 src/i18n/de.json                                   |  1 -
 src/i18n/en.json                                   |  1 -
 src/i18n/eo.json                                   |  1 -
 src/i18n/es.json                                   |  1 -
 src/i18n/et.json                                   |  1 -
 src/i18n/eu.json                                   |  1 -
 src/i18n/fi.json                                   |  1 -
 src/i18n/fr.json                                   |  1 -
 src/i18n/ga.json                                   |  1 -
 src/i18n/he.json                                   |  1 -
 src/i18n/hu.json                                   |  1 -
 src/i18n/it.json                                   |  1 -
 src/i18n/ja_easy.json                              |  1 -
 src/i18n/ja_pedantic.json                          |  1 -
 src/i18n/ko.json                                   |  1 -
 src/i18n/nb.json                                   |  1 -
 src/i18n/nl.json                                   |  1 -
 src/i18n/oc.json                                   |  1 -
 src/i18n/pl.json                                   |  1 -
 src/i18n/pt.json                                   |  1 -
 src/i18n/ro.json                                   |  1 -
 src/i18n/ru.json                                   |  1 -
 src/i18n/te.json                                   |  1 -
 src/i18n/zh.json                                   |  1 -
 src/modules/config.js                              |  2 --
 31 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 4613d090..b2b5d264 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -69,7 +69,7 @@ const MobileNav = {
       this.$refs.notifications.markAsSeen()
     },
     onScroll ({ target: { scrollTop, clientHeight, scrollHeight } }) {
-      if (this.$store.getters.mergedConfig.autoLoad && scrollTop + clientHeight >= scrollHeight) {
+      if (scrollTop + clientHeight >= scrollHeight) {
         this.$refs.notifications.fetchOlderNotifications()
       }
     }
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index f89c0480..7f06d0bd 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -53,16 +53,6 @@
             </small>
           </Checkbox>
         </li>
-        <li>
-          <Checkbox v-model="autoLoad">
-            {{ $t('settings.autoload') }}
-          </Checkbox>
-        </li>
-        <li>
-          <Checkbox v-model="hoverPreview">
-            {{ $t('settings.reply_link_preview') }}
-          </Checkbox>
-        </li>
         <li>
           <Checkbox v-model="emojiReactionsOnTimeline">
             {{ $t('settings.emoji_reactions_on_timeline') }}
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index bac73022..a829bd02 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -148,7 +148,6 @@ const Timeline = {
       const bodyBRect = document.body.getBoundingClientRect()
       const height = Math.max(bodyBRect.height, -(bodyBRect.y))
       if (this.timeline.loading === false &&
-          this.$store.getters.mergedConfig.autoLoad &&
           this.$el.offsetHeight > 0 &&
           (window.innerHeight + window.pageYOffset) >= (height - 750)) {
         this.fetchOlderStatuses()
diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 8bba2b97..cfa48d36 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -147,7 +147,6 @@
     "profile_tab": "الملف الشخصي",
     "radii_help": "",
     "replies_in_timeline": "الردود على الخيط الزمني",
-    "reply_link_preview": "",
     "reply_visibility_all": "عرض كافة الردود",
     "reply_visibility_following": "",
     "reply_visibility_self": "",
diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index 42d7745c..dfe23276 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -145,7 +145,6 @@
     "profile_tab": "Perfil",
     "radii_help": "Configura l'arrodoniment de les vores (en píxels)",
     "replies_in_timeline": "Replies in timeline",
-    "reply_link_preview": "Mostra el missatge citat en passar el ratolí per sobre de l'enllaç de resposta",
     "reply_visibility_all": "Mostra totes les respostes",
     "reply_visibility_following": "Mostra només les respostes a entrades meves o d'usuàries que jo segueixo",
     "reply_visibility_self": "Mostra només les respostes a entrades meves",
diff --git a/src/i18n/cs.json b/src/i18n/cs.json
index 42e75567..1d64d9c3 100644
--- a/src/i18n/cs.json
+++ b/src/i18n/cs.json
@@ -206,7 +206,6 @@
     "profile_tab": "Profil",
     "radii_help": "Nastavit zakulacení rohů rozhraní (v pixelech)",
     "replies_in_timeline": "Odpovědi v časové ose",
-    "reply_link_preview": "Povolit náhledy odkazu pro odpověď při přejetí myši",
     "reply_visibility_all": "Zobrazit všechny odpovědi",
     "reply_visibility_following": "Zobrazit pouze odpovědi směřované na mě nebo uživatele, které sleduji",
     "reply_visibility_self": "Zobrazit pouze odpovědi směřované na mě",
diff --git a/src/i18n/de.json b/src/i18n/de.json
index a44e58cb..fc04a474 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -225,7 +225,6 @@
     "profile_tab": "Profil",
     "radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen",
     "replies_in_timeline": "Antworten in der Zeitleiste",
-    "reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren",
     "reply_visibility_all": "Alle Antworten zeigen",
     "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
     "reply_visibility_self": "Nur Antworten an mich anzeigen",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 796a527c..e8a083e4 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -385,7 +385,6 @@
     "profile_tab": "Profile",
     "radii_help": "Set up interface edge rounding (in pixels)",
     "replies_in_timeline": "Replies in timeline",
-    "reply_link_preview": "Enable reply-link preview on mouse hover",
     "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",
diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 6c5b3a74..ce0490ae 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -203,7 +203,6 @@
     "profile_tab": "Profilo",
     "radii_help": "Agordi fasadan rondigon de randoj (bildere)",
     "replies_in_timeline": "Respondoj en tempolinio",
-    "reply_link_preview": "Ŝalti respond-ligilan antaŭvidon dum musa ŝvebo",
     "reply_visibility_all": "Montri ĉiujn respondojn",
     "reply_visibility_following": "Montri nur respondojn por mi aŭ miaj abonatoj",
     "reply_visibility_self": "Montri nur respondojn por mi",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 931d4c64..b495bc62 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -307,7 +307,6 @@
     "profile_tab": "Perfil",
     "radii_help": "Establezca el redondeo de las esquinas de la interfaz (en píxeles)",
     "replies_in_timeline": "Réplicas en la línea temporal",
-    "reply_link_preview": "Activar la previsualización del enlace de responder al pasar el ratón por encima",
     "reply_visibility_all": "Mostrar todas las réplicas",
     "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
     "reply_visibility_self": "Solo mostrar réplicas para mí",
diff --git a/src/i18n/et.json b/src/i18n/et.json
index b5ae4275..41dfaa4a 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -130,7 +130,6 @@
     "nsfw_clickthrough": "Peida tööks-mittesobivad(NSFW) manuste hiireklõpsu taha",
     "profile_background": "Profiilitaust",
     "profile_banner": "Profiilibänner",
-    "reply_link_preview": "Luba algpostituse kuvamine vastustes",
     "set_new_avatar": "Vali uus profiilipilt",
     "set_new_profile_background": "Vali uus profiilitaust",
     "set_new_profile_banner": "Vali uus profiilibänner",
diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 1c75bf75..09586ebd 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -307,7 +307,6 @@
     "profile_tab": "Profila",
     "radii_help": "Konfiguratu interfazearen ertzen biribiltzea (pixeletan)",
     "replies_in_timeline": "Denbora-lerroko erantzunak",
-    "reply_link_preview": "Gaitu erantzun-estekaren aurrebista arratoiarekin",
     "reply_visibility_all": "Erakutsi erantzun guztiak",
     "reply_visibility_following": "Erakutsi bakarrik niri zuzendutako edo nik jarraitutako erabiltzaileen erantzunak",
     "reply_visibility_self": "Erakutsi bakarrik niri zuzendutako erantzunak",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 3e63377f..5a7a9408 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -250,7 +250,6 @@
     "profile_tab": "Profiili",
     "radii_help": "Aseta reunojen pyöristys (pikseleinä)",
     "replies_in_timeline": "Keskustelut aikajanalla",
-    "reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
     "reply_visibility_all": "Näytä kaikki vastaukset",
     "reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
     "reply_visibility_self": "Näytä vain vastaukset minulle",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 31b69a0f..90ffc244 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -282,7 +282,6 @@
     "profile_tab": "Profil",
     "radii_help": "Vous pouvez ici choisir le niveau d'arrondi des angles de l'interface (en pixels)",
     "replies_in_timeline": "Réponses au journal",
-    "reply_link_preview": "Afficher un aperçu lors du survol de liens vers une réponse",
     "reply_visibility_all": "Montrer toutes les réponses",
     "reply_visibility_following": "Afficher uniquement les réponses adressées à moi ou aux personnes que je suis",
     "reply_visibility_self": "Afficher uniquement les réponses adressées à moi",
diff --git a/src/i18n/ga.json b/src/i18n/ga.json
index 7a10ba40..9e5b3843 100644
--- a/src/i18n/ga.json
+++ b/src/i18n/ga.json
@@ -147,7 +147,6 @@
     "profile_tab": "Próifíl",
     "radii_help": "Cruinniú imeall comhéadan a chumrú (i bpicteilíní)",
     "replies_in_timeline": "Freagraí sa amlíne",
-    "reply_link_preview": "Cumasaigh réamhamharc nasc freagartha ar chlár na luiche",
     "reply_visibility_all": "Taispeáin gach freagra",
     "reply_visibility_following": "Taispeáin freagraí amháin atá dírithe ar mise nó ar úsáideoirí atá mé ag leanúint",
     "reply_visibility_self": "Taispeáin freagraí amháin atá dírithe ar mise",
diff --git a/src/i18n/he.json b/src/i18n/he.json
index 1c034960..77ec4e04 100644
--- a/src/i18n/he.json
+++ b/src/i18n/he.json
@@ -240,7 +240,6 @@
     "profile_tab": "פרופיל",
     "radii_help": "קבע מראש עיגול פינות לממשק (בפיקסלים)",
     "replies_in_timeline": "תגובות בציר הזמן",
-    "reply_link_preview": "החל תצוגה מקדימה של לינק-תגובה בעת ריחוף עם העכבר",
     "reply_visibility_all": "הראה את כל התגובות",
     "reply_visibility_following": "הראה תגובות שמופנות אליי או לעקובים שלי בלבד",
     "reply_visibility_self": "הראה תגובות שמופנות אליי בלבד",
diff --git a/src/i18n/hu.json b/src/i18n/hu.json
index e98fdc44..ea6311db 100644
--- a/src/i18n/hu.json
+++ b/src/i18n/hu.json
@@ -52,7 +52,6 @@
     "nsfw_clickthrough": "NSFW átkattintási tartalom elrejtésének engedélyezése",
     "profile_background": "Profil háttérkép",
     "profile_banner": "Profil Banner",
-    "reply_link_preview": "Válasz-link előzetes mutatása egér rátételkor",
     "set_new_avatar": "Új avatár",
     "set_new_profile_background": "Új profil háttér beállítása",
     "set_new_profile_banner": "Új profil banner",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 24520c09..a5b94338 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -67,7 +67,6 @@
     "nsfw_clickthrough": "Fai click per visualizzare gli allegati offuscati",
     "profile_background": "Sfondo della tua pagina",
     "profile_banner": "Stendardo del tuo profilo",
-    "reply_link_preview": "Visualizza le risposte al passaggio del cursore",
     "set_new_avatar": "Scegli una nuova icona",
     "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
     "set_new_profile_banner": "Scegli un nuovo stendardo per il tuo profilo",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 978e43b3..52da09bf 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -343,7 +343,6 @@
     "profile_tab": "プロフィール",
     "radii_help": "インターフェースのまるさをせっていする。",
     "replies_in_timeline": "タイムラインのリプライ",
-    "reply_link_preview": "カーソルをかさねたとき、リプライのプレビューをみる",
     "reply_visibility_all": "すべてのリプライをみる",
     "reply_visibility_following": "わたしにあてられたリプライと、フォローしているひとからのリプライをみる",
     "reply_visibility_self": "わたしにあてられたリプライをみる",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 2ca7dca8..89222b45 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -308,7 +308,6 @@
     "profile_tab": "プロフィール",
     "radii_help": "インターフェースの丸さを設定する。",
     "replies_in_timeline": "タイムラインのリプライ",
-    "reply_link_preview": "カーソルを重ねたとき、リプライのプレビューを見る",
     "reply_visibility_all": "すべてのリプライを見る",
     "reply_visibility_following": "私に宛てられたリプライと、フォローしている人からのリプライを見る",
     "reply_visibility_self": "私に宛てられたリプライを見る",
diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 402a354c..516d95d1 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -172,7 +172,6 @@
     "profile_tab": "프로필",
     "radii_help": "인터페이스 모서리 둥글기 (픽셀 단위)",
     "replies_in_timeline": "답글을 타임라인에",
-    "reply_link_preview": "마우스를 올려서 답글 링크 미리보기 활성화",
     "reply_visibility_all": "모든 답글 보기",
     "reply_visibility_following": "나에게 직접 오는 답글이나 내가 팔로우 중인 사람에게서 오는 답글만 표시",
     "reply_visibility_self": "나에게 직접 전송 된 답글만 보이기",
diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index 248b05bc..877f63db 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -293,7 +293,6 @@
     "profile_tab": "Profil",
     "radii_help": "Bestem hvor runde hjørnene i brukergrensesnittet skal være (i piksler)",
     "replies_in_timeline": "Svar på tidslinje",
-    "reply_link_preview": "Vis en forhåndsvisning når du holder musen over svar til en status",
     "reply_visibility_all": "Vis alle svar",
     "reply_visibility_following": "Vis bare svar som er til meg eller folk jeg følger",
     "reply_visibility_self": "Vis bare svar som er til meg",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index bf270f87..c9abb9ae 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -217,7 +217,6 @@
     "profile_tab": "Profiel",
     "radii_help": "Stel afronding van hoeken in de interface in (in pixels)",
     "replies_in_timeline": "Antwoorden in tijdlijn",
-    "reply_link_preview": "Antwoord-link weergave inschakelen bij aanwijzen met muisaanwijzer",
     "reply_visibility_all": "Alle antwoorden tonen",
     "reply_visibility_following": "Enkel antwoorden tonen die aan mij of gevolgde gebruikers gericht zijn",
     "reply_visibility_self": "Enkel antwoorden tonen die aan mij gericht zijn",
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index 680ad6dd..d6ea6cf7 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -252,7 +252,6 @@
     "profile_tab": "Perfil",
     "radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)",
     "replies_in_timeline": "Responsas del flux",
-    "reply_link_preview": "Activar l’apercebut en passar la mirga",
     "reply_visibility_all": "Mostrar totas las responsas",
     "reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi",
     "reply_visibility_self": "Mostrar pas que las responsas que me son destinadas",
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 61e09318..9670d2d9 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -362,7 +362,6 @@
     "profile_tab": "Profil",
     "radii_help": "Ustaw zaokrąglenie krawędzi interfejsu (w pikselach)",
     "replies_in_timeline": "Odpowiedzi na osi czasu",
-    "reply_link_preview": "Włącz dymek z podglądem postu po najechaniu na znak odpowiedzi",
     "reply_visibility_all": "Pokazuj wszystkie odpowiedzi",
     "reply_visibility_following": "Pokazuj tylko odpowiedzi skierowane do mnie i osób które obserwuję",
     "reply_visibility_self": "Pokazuj tylko odpowiedzi skierowane do mnie",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 41a34483..5e8e6fdd 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -203,7 +203,6 @@
     "profile_tab": "Perfil",
     "radii_help": "Arredondar arestas da interface (em pixel)",
     "replies_in_timeline": "Respostas na linha do tempo",
-    "reply_link_preview": "Habilitar a pré-visualização de de respostas ao passar o mouse.",
     "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",
diff --git a/src/i18n/ro.json b/src/i18n/ro.json
index 3cee264f..22b8999f 100644
--- a/src/i18n/ro.json
+++ b/src/i18n/ro.json
@@ -52,7 +52,6 @@
     "nsfw_clickthrough": "Permite ascunderea al atașamentelor NSFW",
     "profile_background": "Fundalul de profil",
     "profile_banner": "Banner de profil",
-    "reply_link_preview": "Permite previzualizarea linkului de răspuns la planarea de mouse",
     "set_new_avatar": "Setează avatar nou",
     "set_new_profile_background": "Setează fundal nou",
     "set_new_profile_banner": "Setează banner nou la profil",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 08f05d18..76b0e3aa 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -211,7 +211,6 @@
     "profile_tab": "Профиль",
     "radii_help": "Скругление углов элементов интерфейса (в пикселях)",
     "replies_in_timeline": "Ответы в ленте",
-    "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
     "reply_visibility_all": "Показывать все ответы",
     "reply_visibility_following": "Показывать только ответы мне или тех на кого я подписан",
     "reply_visibility_self": "Показывать только ответы мне",
diff --git a/src/i18n/te.json b/src/i18n/te.json
index 6022349d..4e64be87 100644
--- a/src/i18n/te.json
+++ b/src/i18n/te.json
@@ -178,7 +178,6 @@
   "settings.profile_tab": "Profile",
   "settings.radii_help": "Set up interface edge rounding (in pixels)",
   "settings.replies_in_timeline": "Replies in timeline",
-  "settings.reply_link_preview": "Enable reply-link preview on mouse hover",
   "settings.reply_visibility_all": "Show all replies",
   "settings.reply_visibility_following": "Only show replies directed at me or users I'm following",
   "settings.reply_visibility_self": "Only show replies directed at me",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 7e620bdf..bda34633 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -299,7 +299,6 @@
     "profile_tab": "个人资料",
     "radii_help": "设置界面边缘的圆角 (单位：像素)",
     "replies_in_timeline": "时间线中的回复",
-    "reply_link_preview": "启用鼠标悬停时预览回复链接",
     "reply_visibility_all": "显示所有回复",
     "reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复",
     "reply_visibility_self": "只显示发送给我的回复",
diff --git a/src/modules/config.js b/src/modules/config.js
index e0fe72df..409d77a4 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -31,9 +31,7 @@ export const defaultState = {
   preloadImage: true,
   loopVideo: true,
   loopVideoSilentOnly: true,
-  autoLoad: true,
   streaming: false,
-  hoverPreview: true,
   emojiReactionsOnTimeline: true,
   autohideFloatingPostButton: false,
   pauseOnUnfocused: true,

From 89d1fb5cf48753e738cf513fff7e8d11109fe385 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 14 Jul 2020 15:15:02 +0300
Subject: [PATCH 327/415] remove remaining autoload i18n

---
 src/i18n/ar.json          | 1 -
 src/i18n/ca.json          | 1 -
 src/i18n/cs.json          | 1 -
 src/i18n/de.json          | 1 -
 src/i18n/en.json          | 1 -
 src/i18n/eo.json          | 1 -
 src/i18n/es.json          | 1 -
 src/i18n/et.json          | 1 -
 src/i18n/eu.json          | 1 -
 src/i18n/fi.json          | 1 -
 src/i18n/fr.json          | 1 -
 src/i18n/ga.json          | 1 -
 src/i18n/he.json          | 1 -
 src/i18n/hu.json          | 1 -
 src/i18n/it.json          | 1 -
 src/i18n/ja_easy.json     | 1 -
 src/i18n/ja_pedantic.json | 1 -
 src/i18n/ko.json          | 1 -
 src/i18n/nb.json          | 1 -
 src/i18n/nl.json          | 1 -
 src/i18n/oc.json          | 1 -
 src/i18n/pl.json          | 1 -
 src/i18n/pt.json          | 1 -
 src/i18n/ro.json          | 1 -
 src/i18n/ru.json          | 1 -
 src/i18n/te.json          | 1 -
 src/i18n/zh.json          | 1 -
 27 files changed, 27 deletions(-)

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index cfa48d36..a475d291 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -73,7 +73,6 @@
   "settings": {
     "attachmentRadius": "المُرفَقات",
     "attachments": "المُرفَقات",
-    "autoload": "",
     "avatar": "الصورة الرمزية",
     "avatarAltRadius": "الصور الرمزية (الإشعارات)",
     "avatarRadius": "الصور الرمزية",
diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index dfe23276..c91fc073 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -73,7 +73,6 @@
   "settings": {
     "attachmentRadius": "Adjunts",
     "attachments": "Adjunts",
-    "autoload": "Recarrega automàticament en arribar a sota de tot.",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatars en les notificacions",
     "avatarRadius": "Avatars",
diff --git a/src/i18n/cs.json b/src/i18n/cs.json
index 1d64d9c3..4e8cbcda 100644
--- a/src/i18n/cs.json
+++ b/src/i18n/cs.json
@@ -112,7 +112,6 @@
     "app_name": "Název aplikace",
     "attachmentRadius": "Přílohy",
     "attachments": "Přílohy",
-    "autoload": "Povolit automatické načítání při rolování dolů",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatary (oznámení)",
     "avatarRadius": "Avatary",
diff --git a/src/i18n/de.json b/src/i18n/de.json
index fc04a474..4deea07e 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -131,7 +131,6 @@
   "settings": {
     "attachmentRadius": "Anhänge",
     "attachments": "Anhänge",
-    "autoload": "Aktiviere automatisches Laden von älteren Beiträgen beim scrollen",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatare (Benachrichtigungen)",
     "avatarRadius": "Avatare",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e8a083e4..f5c21b69 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -265,7 +265,6 @@
     "allow_following_move": "Allow auto-follow when following account moves",
     "attachmentRadius": "Attachments",
     "attachments": "Attachments",
-    "autoload": "Enable automatic loading when scrolled to the bottom",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatars (Notifications)",
     "avatarRadius": "Avatars",
diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index ce0490ae..fb115872 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -109,7 +109,6 @@
     "app_name": "Nomo de aplikaĵo",
     "attachmentRadius": "Kunsendaĵoj",
     "attachments": "Kunsendaĵoj",
-    "autoload": "Ŝalti memfaran enlegadon ĉe subo de paĝo",
     "avatar": "Profilbildo",
     "avatarAltRadius": "Profilbildoj (sciigoj)",
     "avatarRadius": "Profilbildoj",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index b495bc62..8151a799 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -203,7 +203,6 @@
     },
     "attachmentRadius": "Adjuntos",
     "attachments": "Adjuntos",
-    "autoload": "Habilitar carga automática al llegar al final de la página",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatares (Notificaciones)",
     "avatarRadius": "Avatares",
diff --git a/src/i18n/et.json b/src/i18n/et.json
index 41dfaa4a..3368d169 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -116,7 +116,6 @@
   },
   "settings": {
     "attachments": "Manused",
-    "autoload": "Luba ajajoone automaatne uuendamine kui ajajoon on põhja keritud",
     "avatar": "Profiilipilt",
     "bio": "Bio",
     "current_avatar": "Sinu praegune profiilipilt",
diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 09586ebd..476f555d 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -203,7 +203,6 @@
     },
     "attachmentRadius": "Eranskinak",
     "attachments": "Eranskinak",
-    "autoload": "Gaitu karga automatikoa beheraino mugitzean",
     "avatar": "Avatarra",
     "avatarAltRadius": "Avatarra (Aipamenak)",
     "avatarRadius": "Avatarrak",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 5a7a9408..7ab9fe4a 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -163,7 +163,6 @@
   "settings": {
     "attachmentRadius": "Liitteet",
     "attachments": "Liitteet",
-    "autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
     "avatar": "Profiilikuva",
     "avatarAltRadius": "Profiilikuvat (ilmoitukset)",
     "avatarRadius": "Profiilikuvat",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 90ffc244..f41be424 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -182,7 +182,6 @@
     },
     "attachmentRadius": "Pièces jointes",
     "attachments": "Pièces jointes",
-    "autoload": "Charger la suite automatiquement une fois le bas de la page atteint",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatars (Notifications)",
     "avatarRadius": "Avatars",
diff --git a/src/i18n/ga.json b/src/i18n/ga.json
index 9e5b3843..74a48bfc 100644
--- a/src/i18n/ga.json
+++ b/src/i18n/ga.json
@@ -73,7 +73,6 @@
   "settings": {
     "attachmentRadius": "Ceangaltáin",
     "attachments": "Ceangaltáin",
-    "autoload": "Cumasaigh luchtú uathoibríoch nuair a scrollaítear go bun",
     "avatar": "Phictúir phrófíle",
     "avatarAltRadius": "Phictúirí phrófíle (Fograí)",
     "avatarRadius": "Phictúirí phrófíle",
diff --git a/src/i18n/he.json b/src/i18n/he.json
index 77ec4e04..b1c9da69 100644
--- a/src/i18n/he.json
+++ b/src/i18n/he.json
@@ -140,7 +140,6 @@
     "app_name": "שם האפליקציה",
     "attachmentRadius": "צירופים",
     "attachments": "צירופים",
-    "autoload": "החל טעינה אוטומטית בגלילה לתחתית הדף",
     "avatar": "תמונת פרופיל",
     "avatarAltRadius": "תמונות פרופיל (התראות)",
     "avatarRadius": "תמונות פרופיל",
diff --git a/src/i18n/hu.json b/src/i18n/hu.json
index ea6311db..41355800 100644
--- a/src/i18n/hu.json
+++ b/src/i18n/hu.json
@@ -38,7 +38,6 @@
   },
   "settings": {
     "attachments": "Csatolmányok",
-    "autoload": "Autoatikus betöltés engedélyezése lap aljára görgetéskor",
     "avatar": "Avatár",
     "bio": "Bio",
     "current_avatar": "Jelenlegi avatár",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index a5b94338..7a8faf68 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -53,7 +53,6 @@
   },
   "settings": {
     "attachments": "Allegati",
-    "autoload": "Abilita caricamento automatico quando raggiungi il fondo pagina",
     "avatar": "Icona utente",
     "bio": "Introduzione",
     "current_avatar": "La tua icona attuale",
diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 52da09bf..194068ce 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -234,7 +234,6 @@
     },
     "attachmentRadius": "ファイル",
     "attachments": "ファイル",
-    "autoload": "したにスクロールしたとき、じどうてきによみこむ。",
     "avatar": "アバター",
     "avatarAltRadius": "つうちのアバター",
     "avatarRadius": "アバター",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 89222b45..0acecf50 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -203,7 +203,6 @@
     },
     "attachmentRadius": "ファイル",
     "attachments": "ファイル",
-    "autoload": "下にスクロールしたとき、自動的に読み込む。",
     "avatar": "アバター",
     "avatarAltRadius": "通知のアバター",
     "avatarRadius": "アバター",
diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 516d95d1..0968949b 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -90,7 +90,6 @@
   "settings": {
     "attachmentRadius": "첨부물",
     "attachments": "첨부물",
-    "autoload": "최하단에 도착하면 자동으로 로드 활성화",
     "avatar": "아바타",
     "avatarAltRadius": "아바타 (알림)",
     "avatarRadius": "아바타",
diff --git a/src/i18n/nb.json b/src/i18n/nb.json
index 877f63db..af0f9a45 100644
--- a/src/i18n/nb.json
+++ b/src/i18n/nb.json
@@ -193,7 +193,6 @@
     },
     "attachmentRadius": "Vedlegg",
     "attachments": "Vedlegg",
-    "autoload": "Automatisk lasting når du blar ned til bunnen",
     "avatar": "Profilbilde",
     "avatarAltRadius": "Profilbilde (Varslinger)",
     "avatarRadius": "Profilbilde",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index c9abb9ae..2f2a1786 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -136,7 +136,6 @@
   "settings": {
     "attachmentRadius": "Bijlages",
     "attachments": "Bijlages",
-    "autoload": "Automatisch laden inschakelen wanneer tot de bodem gescrold wordt",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatars (Meldingen)",
     "avatarRadius": "Avatars",
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index d6ea6cf7..6606c7f2 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -152,7 +152,6 @@
     "app_name": "Nom de l’aplicacion",
     "attachmentRadius": "Pèças juntas",
     "attachments": "Pèças juntas",
-    "autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatars (Notificacions)",
     "avatarRadius": "Avatars",
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 9670d2d9..ee583016 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -249,7 +249,6 @@
     "allow_following_move": "Zezwalaj na automatyczną obserwację gdy obserwowane konto migruje",
     "attachmentRadius": "Załączniki",
     "attachments": "Załączniki",
-    "autoload": "Włącz automatyczne ładowanie po przewinięciu do końca strony",
     "avatar": "Awatar",
     "avatarAltRadius": "Awatary (powiadomienia)",
     "avatarRadius": "Awatary",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 5e8e6fdd..1b8694d9 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -109,7 +109,6 @@
     "app_name": "Nome do aplicativo",
     "attachmentRadius": "Anexos",
     "attachments": "Anexos",
-    "autoload": "Habilitar carregamento automático quando a rolagem chegar ao fim.",
     "avatar": "Avatar",
     "avatarAltRadius": "Avatares (Notificações)",
     "avatarRadius": "Avatares",
diff --git a/src/i18n/ro.json b/src/i18n/ro.json
index 22b8999f..d800a8d4 100644
--- a/src/i18n/ro.json
+++ b/src/i18n/ro.json
@@ -38,7 +38,6 @@
   },
   "settings": {
     "attachments": "Atașamente",
-    "autoload": "Permite încărcarea automată când scrolat la capăt",
     "avatar": "Avatar",
     "bio": "Bio",
     "current_avatar": "Avatarul curent",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 76b0e3aa..a128d564 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -124,7 +124,6 @@
     },
     "attachmentRadius": "Прикреплённые файлы",
     "attachments": "Вложения",
-    "autoload": "Включить автоматическую загрузку при прокрутке вниз",
     "avatar": "Аватар",
     "avatarAltRadius": "Аватары в уведомлениях",
     "avatarRadius": "Аватары",
diff --git a/src/i18n/te.json b/src/i18n/te.json
index 4e64be87..bb68d29e 100644
--- a/src/i18n/te.json
+++ b/src/i18n/te.json
@@ -83,7 +83,6 @@
   "settings.app_name": "అనువర్తన పేరు",
   "settings.attachmentRadius": "జోడింపులు",
   "settings.attachments": "జోడింపులు",
-  "settings.autoload": "క్రిందికి స్క్రోల్ చేయబడినప్పుడు స్వయంచాలక లోడింగ్ని ప్రారంభించు",
   "settings.avatar": "అవతారం",
   "settings.avatarAltRadius": "అవతారాలు (ప్రకటనలు)",
   "settings.avatarRadius": "అవతారాలు",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index bda34633..9c345a77 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -199,7 +199,6 @@
     },
     "attachmentRadius": "附件",
     "attachments": "附件",
-    "autoload": "启用滚动到底部时的自动加载",
     "avatar": "头像",
     "avatarAltRadius": "头像（通知）",
     "avatarRadius": "头像",

From 97a01b057de79fdd5e8a9a19c99fcac571c5e78f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 14 Jul 2020 15:35:39 +0300
Subject: [PATCH 328/415] mention removed options in changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49ec550c..d1bc2ef0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add colons to the emoji alt text, to make them copyable
 - Add better visual indication for drag-and-drop for files
 - When disabling attachments, the placeholder links now show an icon and the description instead of just IMAGE or VIDEO etc
+- Remove unnecessary options for 'automatic loading when loading older' and 'reply previews'
 
 ### Fixed
 - Custom Emoji will display in poll options now.

From 5af094949147a93a9812ded6d5000dcc5b602181 Mon Sep 17 00:00:00 2001
From: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Tue, 14 Jul 2020 13:04:00 +0000
Subject: [PATCH 329/415] Apply suggestion to
 src/services/theme_data/theme_data.service.js

---
 src/services/theme_data/theme_data.service.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js
index 138ed5c6..b619f810 100644
--- a/src/services/theme_data/theme_data.service.js
+++ b/src/services/theme_data/theme_data.service.js
@@ -132,7 +132,6 @@ export const topoSort = (
   // The index thing is to make sorting stable on browsers
   // where Array.sort() isn't stable
   return output.map((data, index) => ({ data, index })).sort(({ data: a, index: ai }, { data: b, index: bi }) => {
-    console.log(a, b, ai, bi)
     const depsA = getDeps(a, inheritance).length
     const depsB = getDeps(b, inheritance).length
 

From 00d662c4a0d2a546f0f650d23e15612e6bee15cd Mon Sep 17 00:00:00 2001
From: Dym Sohin <pleroma-git@dym.sh>
Date: Tue, 14 Jul 2020 19:47:02 +0000
Subject: [PATCH 330/415] make reactions-search case-insensitive

---
 src/components/react_button/react_button.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index f0931446..abcf0455 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -28,7 +28,10 @@ const ReactButton = {
     },
     emojis () {
       if (this.filterWord !== '') {
-        return this.$store.state.instance.emoji.filter(emoji => emoji.displayText.includes(this.filterWord))
+        const filterWordLowercase = this.filterWord.toLowerCase()
+        return this.$store.state.instance.emoji.filter(emoji =>
+          emoji.displayText.toLowerCase().includes(filterWordLowercase)
+        )
       }
       return this.$store.state.instance.emoji || []
     },

From 51b235f7aadeb793fc5f09d647adf3514ff98127 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 15 Jul 2020 12:26:14 +0300
Subject: [PATCH 331/415] adjust icon use

---
 src/components/post_status_form/post_status_form.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 7a96a389..b1c74aad 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -80,7 +80,8 @@
           >
             {{ $t('post_status.preview') }}
             <i
-              :class="showPreview ? 'icon-up-open' : 'icon-down-open'"
+              class="icon-left-open"
+              :style="{ 'transform': showPreview ? 'rotate(90deg)' : 'rotate(-90deg)' }"
             />
           </a>
           <i
@@ -385,11 +386,13 @@
   .preview-toggle {
     display: flex;
     cursor: pointer;
+    user-select: none;
 
     &:hover {
       text-decoration: underline;
     }
     i {
+      margin-left: 0.2em;
       font-size: 0.9em;
     }
   }

From 89a677f5e822456f0e8ec510ed6193a8e1783297 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 15 Jul 2020 16:19:57 +0300
Subject: [PATCH 332/415] add basic idempotency support

---
 .../post_status_form/post_status_form.js      | 59 +++++++++++--------
 src/services/api/api.service.js               | 10 +++-
 .../status_poster/status_poster.service.js    | 11 +++-
 3 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 1c0accac..29841261 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -61,6 +61,7 @@ const PostStatusForm = {
     StatusContent
   },
   mounted () {
+    this.updateIdempotencyKey()
     this.resize(this.$refs.textarea)
 
     if (this.replyTo) {
@@ -111,7 +112,8 @@ const PostStatusForm = {
       dropStopTimeout: null,
       preview: null,
       previewLoading: false,
-      emojiInputShown: false
+      emojiInputShown: false,
+      idempotencyKey: ''
     }
   },
   computed: {
@@ -214,6 +216,32 @@ const PostStatusForm = {
     }
   },
   methods: {
+    clearStatus () {
+      const newStatus = this.newStatus
+      this.newStatus = {
+        status: '',
+        spoilerText: '',
+        files: [],
+        visibility: newStatus.visibility,
+        contentType: newStatus.contentType,
+        poll: {},
+        mediaDescriptions: {}
+      }
+      this.pollFormVisible = false
+      this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
+      this.clearPollForm()
+      if (this.preserveFocus) {
+        this.$nextTick(() => {
+          this.$refs.textarea.focus()
+        })
+      }
+      let el = this.$el.querySelector('textarea')
+      el.style.height = 'auto'
+      el.style.height = undefined
+      this.error = null
+      this.updateIdempotencyKey()
+      if (this.preview) this.previewStatus()
+    },
     async postStatus (event, newStatus, opts = {}) {
       if (this.posting) { return }
       if (this.disableSubmit) { return }
@@ -253,36 +281,16 @@ const PostStatusForm = {
         store: this.$store,
         inReplyToStatusId: this.replyTo,
         contentType: newStatus.contentType,
-        poll
+        poll,
+        idempotencyKey: this.idempotencyKey
       }
 
       const postHandler = this.postHandler ? this.postHandler : statusPoster.postStatus
 
       postHandler(postingOptions).then((data) => {
         if (!data.error) {
-          this.newStatus = {
-            status: '',
-            spoilerText: '',
-            files: [],
-            visibility: newStatus.visibility,
-            contentType: newStatus.contentType,
-            poll: {},
-            mediaDescriptions: {}
-          }
-          this.pollFormVisible = false
-          this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
-          this.clearPollForm()
+          this.clearStatus()
           this.$emit('posted', data)
-          if (this.preserveFocus) {
-            this.$nextTick(() => {
-              this.$refs.textarea.focus()
-            })
-          }
-          let el = this.$el.querySelector('textarea')
-          el.style.height = 'auto'
-          el.style.height = undefined
-          this.error = null
-          if (this.preview) this.previewStatus()
         } else {
           this.error = data.error
         }
@@ -530,6 +538,9 @@ const PostStatusForm = {
     },
     handleEmojiInputShow (value) {
       this.emojiInputShown = value
+    },
+    updateIdempotencyKey () {
+      this.idempotencyKey = Date.now().toString()
     }
   }
 }
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 40ea5bd9..da519001 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -631,7 +631,8 @@ const postStatus = ({
   mediaIds = [],
   inReplyToStatusId,
   contentType,
-  preview
+  preview,
+  idempotencyKey
 }) => {
   const form = new FormData()
   const pollOptions = poll.options || []
@@ -665,10 +666,15 @@ const postStatus = ({
     form.append('preview', 'true')
   }
 
+  let postHeaders = authHeaders(credentials)
+  if (idempotencyKey) {
+    postHeaders['idempotency-key'] = idempotencyKey
+  }
+
   return fetch(MASTODON_POST_STATUS_URL, {
     body: form,
     method: 'POST',
-    headers: authHeaders(credentials)
+    headers: postHeaders
   })
     .then((response) => {
       return response.json()
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index ac469175..812f74d5 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -11,7 +11,8 @@ const postStatus = ({
   media = [],
   inReplyToStatusId = undefined,
   contentType = 'text/plain',
-  preview = false
+  preview = false,
+  idempotencyKey = ''
 }) => {
   const mediaIds = map(media, 'id')
 
@@ -25,9 +26,14 @@ const postStatus = ({
     inReplyToStatusId,
     contentType,
     poll,
-    preview
+    preview,
+    idempotencyKey
   })
     .then((data) => {
+      return {
+        error: 'test'
+      }
+      /*
       if (!data.error && !preview) {
         store.dispatch('addNewStatuses', {
           statuses: [data],
@@ -37,6 +43,7 @@ const postStatus = ({
         })
       }
       return data
+      */
     })
     .catch((err) => {
       return {

From d85904f42f7e6c46b6e793fc6a5addf96c7ae9cb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 15 Jul 2020 16:36:06 +0300
Subject: [PATCH 333/415] add extra sanity stuff to make input boxes more
 stable

---
 .../post_status_form/post_status_form.js      | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 1c0accac..6bceed90 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -27,6 +27,11 @@ const buildMentionsString = ({ user, attentions = [] }, currentUser) => {
   return mentions.length > 0 ? mentions.join(' ') + ' ' : ''
 }
 
+// Converts a string with px to a number like '2px' -> 2
+const pxStringToNumber = (str) => {
+  return Number(str.substring(0, str.length - 2))
+}
+
 const PostStatusForm = {
   props: [
     'replyTo',
@@ -423,7 +428,7 @@ const PostStatusForm = {
        * scroll is different for `Window` and `Element`s
        */
       const bottomBottomPaddingStr = window.getComputedStyle(bottomRef)['padding-bottom']
-      const bottomBottomPadding = Number(bottomBottomPaddingStr.substring(0, bottomBottomPaddingStr.length - 2))
+      const bottomBottomPadding = pxStringToNumber(bottomBottomPaddingStr)
 
       const scrollerRef = this.$el.closest('.sidebar-scroller') ||
             this.$el.closest('.post-form-modal-view') ||
@@ -432,10 +437,12 @@ const PostStatusForm = {
       // Getting info about padding we have to account for, removing 'px' part
       const topPaddingStr = window.getComputedStyle(target)['padding-top']
       const bottomPaddingStr = window.getComputedStyle(target)['padding-bottom']
-      const topPadding = Number(topPaddingStr.substring(0, topPaddingStr.length - 2))
-      const bottomPadding = Number(bottomPaddingStr.substring(0, bottomPaddingStr.length - 2))
+      const topPadding = pxStringToNumber(topPaddingStr)
+      const bottomPadding = pxStringToNumber(bottomPaddingStr)
       const vertPadding = topPadding + bottomPadding
 
+      const oldHeight = pxStringToNumber(target.style.height)
+
       /* Explanation:
        *
        * https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight
@@ -464,8 +471,13 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const heightWithoutPadding = target.scrollHeight - vertPadding
-      const newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
+      const heightWithoutPadding = Math.floor(target.scrollHeight - vertPadding)
+      let newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
+      // This is a bit of a hack to combat target.scrollHeight being different on every other input
+      // on some browsers for whatever reason. Don't change the height if difference is 1px or less.
+      if (Math.abs(newHeight - oldHeight) <= 1) {
+        newHeight = oldHeight
+      }
       target.style.height = `${newHeight}px`
       this.$emit('resize', newHeight)
       // END content size update

From d4dfc5dcdf2cd70366d53779adf4bab170f0863b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 15 Jul 2020 09:02:42 -0500
Subject: [PATCH 334/415] JSON and the Quest For Punishing Trailing Commas

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

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 362281e5..df172935 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -349,7 +349,7 @@
       }
     },
     "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
-    "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
+    "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)"
   },
   "timeline": {
     "collapse": "Свернуть",

From 149941828f4cd751e20e8a94644567b89e0e61ea Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 15 Jul 2020 09:56:46 -0500
Subject: [PATCH 335/415] Improve layout of the Notifications Filters section

---
 .../settings_modal/tabs/notifications_tab.vue     | 15 +++++----------
 src/i18n/en.json                                  |  3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index eb9d5598..86eed3f5 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -2,16 +2,11 @@
   <div :label="$t('settings.notifications')">
     <div class="setting-item">
       <h2>{{ $t('settings.notification_setting_filters') }}</h2>
-      <div class="select-multiple">
-        <span class="label">{{ $t('settings.notification_setting') }}</span>
-        <ul class="option-list">
-          <li>
-            <Checkbox v-model="notificationSettings.block_from_strangers">
-              {{ $t('settings.notification_setting_block_from_strangers') }}
-            </Checkbox>
-          </li>
-        </ul>
-      </div>
+      <p>
+        <Checkbox v-model="notificationSettings.block_from_strangers">
+          {{ $t('settings.notification_setting_block_from_strangers') }}
+        </Checkbox>
+      </p>
     </div>
 
     <div class="setting-item">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 98834359..dc714bce 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -433,8 +433,7 @@
     "greentext": "Meme arrows",
     "notifications": "Notifications",
     "notification_setting_filters": "Filters",
-    "notification_setting": "Block notifications from:",
-    "notification_setting_block_from_strangers": "Users who you do not follow",
+    "notification_setting_block_from_strangers": "Block notifications from users who you do not follow",
     "notification_setting_privacy": "Privacy",
     "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications",
     "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",

From 0c7c24d3d1e4580d6ce03f71b9381aa3f6b689cb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 10:18:18 +0300
Subject: [PATCH 336/415] make idempotency watch entire status

---
 .../post_status_form/post_status_form.js         | 16 +++++++++-------
 .../status_poster/status_poster.service.js       |  5 -----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 29841261..c70c2232 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -208,14 +208,18 @@ const PostStatusForm = {
     })
   },
   watch: {
-    'newStatus.contentType': function () {
-      this.autoPreview()
-    },
-    'newStatus.spoilerText': function () {
-      this.autoPreview()
+    'newStatus': {
+      deep: true,
+      handler () {
+        this.statusChanged()
+      }
     }
   },
   methods: {
+    statusChanged () {
+      this.autoPreview()
+      this.updateIdempotencyKey()
+    },
     clearStatus () {
       const newStatus = this.newStatus
       this.newStatus = {
@@ -239,7 +243,6 @@ const PostStatusForm = {
       el.style.height = 'auto'
       el.style.height = undefined
       this.error = null
-      this.updateIdempotencyKey()
       if (this.preview) this.previewStatus()
     },
     async postStatus (event, newStatus, opts = {}) {
@@ -407,7 +410,6 @@ const PostStatusForm = {
       }
     },
     onEmojiInputInput (e) {
-      this.autoPreview()
       this.$nextTick(() => {
         this.resize(this.$refs['textarea'])
       })
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 812f74d5..f09196aa 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -30,10 +30,6 @@ const postStatus = ({
     idempotencyKey
   })
     .then((data) => {
-      return {
-        error: 'test'
-      }
-      /*
       if (!data.error && !preview) {
         store.dispatch('addNewStatuses', {
           statuses: [data],
@@ -43,7 +39,6 @@ const postStatus = ({
         })
       }
       return data
-      */
     })
     .catch((err) => {
       return {

From bca77ef97f8562b2f3a4227756d923e6a2023073 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 10:50:03 +0300
Subject: [PATCH 337/415] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1bc2ef0..c3a76a77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Videos are not cropped awkwardly in the uploads section anymore
 - Reply filtering options in Settings -> Filtering now work again using filtering on server
 - Don't show just blank-screen when cookies are disabled
+- Add status idempotency to prevent accidental double posting when posting returns an error
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From 476954295e6c0a6d00919dee5d870cbc600cdd7c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 11:00:18 +0300
Subject: [PATCH 338/415] add title attributes to more things in status header

---
 src/components/status/status.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index f6b5dd6f..91cc4f62 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -72,7 +72,10 @@
           :user="statusoid.user"
         />
         <div class="media-body faint">
-          <span class="user-name">
+          <span
+            class="user-name"
+            :title="retweeter"
+          >
             <router-link
               v-if="retweeterHtml"
               :to="retweeterProfileLink"
@@ -129,16 +132,19 @@
                 <h4
                   v-if="status.user.name_html"
                   class="user-name"
+                  :title="status.user.name"
                   v-html="status.user.name_html"
                 />
                 <h4
                   v-else
                   class="user-name"
+                  :title="status.user.name"
                 >
                   {{ status.user.name }}
                 </h4>
                 <router-link
                   class="account-name"
+                  :title="status.user.screen_name"
                   :to="userProfileLink"
                 >
                   {{ status.user.screen_name }}
@@ -222,7 +228,10 @@
                 >
                   <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
                 </span>
-                <router-link :to="replyProfileLink">
+                <router-link
+                  :title="replyToName"
+                  :to="replyProfileLink"
+                >
                   {{ replyToName }}
                 </router-link>
                 <span

From 717adf22cc38894285fcb91be5b59c5f10e8d901 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 11:10:45 +0300
Subject: [PATCH 339/415] add title to user card account name too

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

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 9529d7f6..75db5db1 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -66,6 +66,7 @@
             <div class="bottom-line">
               <router-link
                 class="user-screen-name"
+                :title="user.screen_name"
                 :to="userProfileLink(user)"
               >
                 @{{ user.screen_name }}

From 6079301ec45c6c13a1f8b5f9f6acf52b5a449331 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 17:42:16 +0300
Subject: [PATCH 340/415] Move user list from reactions to its own component,
 make favs and rts use it

---
 .../emoji_reactions/emoji_reactions.js        |  4 +-
 .../emoji_reactions/emoji_reactions.vue       | 65 +---------------
 src/components/status/status.js               | 30 ++++----
 src/components/status/status.vue              | 35 ++++++---
 .../user_list_popover/user_list_popover.js    | 13 ++++
 .../user_list_popover/user_list_popover.vue   | 74 +++++++++++++++++++
 6 files changed, 131 insertions(+), 90 deletions(-)
 create mode 100644 src/components/user_list_popover/user_list_popover.js
 create mode 100644 src/components/user_list_popover/user_list_popover.vue

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index ae7f53be..bb11b840 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -1,5 +1,5 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
-import Popover from '../popover/popover.vue'
+import UserListPopover from '../user_list_popover/user_list_popover.vue'
 
 const EMOJI_REACTION_COUNT_CUTOFF = 12
 
@@ -7,7 +7,7 @@ const EmojiReactions = {
   name: 'EmojiReactions',
   components: {
     UserAvatar,
-    Popover
+    UserListPopover
   },
   props: ['status'],
   data: () => ({
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index bac4c605..2f14b5b2 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -1,44 +1,11 @@
 <template>
   <div class="emoji-reactions">
-    <Popover
+    <UserListPopover
       v-for="(reaction) in emojiReactions"
       :key="reaction.name"
-      trigger="hover"
-      placement="top"
-      :offset="{ y: 5 }"
+      :users="accountsForEmoji[reaction.name]"
     >
-      <div
-        slot="content"
-        class="reacted-users"
-      >
-        <div v-if="accountsForEmoji[reaction.name].length">
-          <div
-            v-for="(account) in accountsForEmoji[reaction.name]"
-            :key="account.id"
-            class="reacted-user"
-          >
-            <UserAvatar
-              :user="account"
-              class="avatar-small"
-              :compact="true"
-            />
-            <div class="reacted-user-names">
-              <!-- eslint-disable vue/no-v-html -->
-              <span
-                class="reacted-user-name"
-                v-html="account.name_html"
-              />
-              <!-- eslint-enable vue/no-v-html -->
-              <span class="reacted-user-screen-name">{{ account.screen_name }}</span>
-            </div>
-          </div>
-        </div>
-        <div v-else>
-          <i class="icon-spin4 animate-spin" />
-        </div>
-      </div>
       <button
-        slot="trigger"
         class="emoji-reaction btn btn-default"
         :class="{ 'picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
         @click="emojiOnClick(reaction.name, $event)"
@@ -47,7 +14,7 @@
         <span class="reaction-emoji">{{ reaction.name }}</span>
         <span>{{ reaction.count }}</span>
       </button>
-    </Popover>
+    </UserListPopover>
     <a
       v-if="tooManyReactions"
       class="emoji-reaction-expand faint"
@@ -69,32 +36,6 @@
   flex-wrap: wrap;
 }
 
-.reacted-users {
-  padding: 0.5em;
-}
-
-.reacted-user {
-  padding: 0.25em;
-  display: flex;
-  flex-direction: row;
-
-  .reacted-user-names {
-    display: flex;
-    flex-direction: column;
-    margin-left: 0.5em;
-    min-width: 5em;
-
-    img {
-      width: 1em;
-      height: 1em;
-    }
-  }
-
-  .reacted-user-screen-name {
-    font-size: 9px;
-  }
-}
-
 .emoji-reaction {
   padding: 0 0.5em;
   margin-right: 0.5em;
diff --git a/src/components/status/status.js b/src/components/status/status.js
index ad0b72a9..d263da68 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -9,6 +9,7 @@ import AvatarList from '../avatar_list/avatar_list.vue'
 import Timeago from '../timeago/timeago.vue'
 import StatusContent from '../status_content/status_content.vue'
 import StatusPopover from '../status_popover/status_popover.vue'
+import UserListPopover from '../user_list_popover/user_list_popover.vue'
 import EmojiReactions from '../emoji_reactions/emoji_reactions.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
@@ -18,6 +19,21 @@ import { mapGetters, mapState } from 'vuex'
 
 const Status = {
   name: 'Status',
+  components: {
+    FavoriteButton,
+    ReactButton,
+    RetweetButton,
+    ExtraButtons,
+    PostStatusForm,
+    UserCard,
+    UserAvatar,
+    AvatarList,
+    Timeago,
+    StatusPopover,
+    UserListPopover,
+    EmojiReactions,
+    StatusContent
+  },
   props: [
     'statusoid',
     'expandable',
@@ -197,20 +213,6 @@ const Status = {
       currentUser: state => state.users.currentUser
     })
   },
-  components: {
-    FavoriteButton,
-    ReactButton,
-    RetweetButton,
-    ExtraButtons,
-    PostStatusForm,
-    UserCard,
-    UserAvatar,
-    AvatarList,
-    Timeago,
-    StatusPopover,
-    EmojiReactions,
-    StatusContent
-  },
   methods: {
     visibilityIcon (visibility) {
       switch (visibility) {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index f6b5dd6f..4764f467 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -265,24 +265,30 @@
               class="favs-repeated-users"
             >
               <div class="stats">
-                <div
+                <UserListPopover
                   v-if="statusFromGlobalRepository.rebloggedBy && statusFromGlobalRepository.rebloggedBy.length > 0"
-                  class="stat-count"
+                  :users="statusFromGlobalRepository.rebloggedBy"
                 >
-                  <a class="stat-title">{{ $t('status.repeats') }}</a>
-                  <div class="stat-number">
-                    {{ statusFromGlobalRepository.rebloggedBy.length }}
+                  <div class="stat-count">
+                    <a class="stat-title">{{ $t('status.repeats') }}</a>
+                    <div class="stat-number">
+                      {{ statusFromGlobalRepository.rebloggedBy.length }}
+                    </div>
                   </div>
-                </div>
-                <div
+                </UserListPopover>
+                <UserListPopover
                   v-if="statusFromGlobalRepository.favoritedBy && statusFromGlobalRepository.favoritedBy.length > 0"
-                  class="stat-count"
+                  :users="statusFromGlobalRepository.favoritedBy"
                 >
-                  <a class="stat-title">{{ $t('status.favorites') }}</a>
-                  <div class="stat-number">
-                    {{ statusFromGlobalRepository.favoritedBy.length }}
+                  <div
+                    class="stat-count"
+                  >
+                    <a class="stat-title">{{ $t('status.favorites') }}</a>
+                    <div class="stat-number">
+                      {{ statusFromGlobalRepository.favoritedBy.length }}
+                    </div>
                   </div>
-                </div>
+                </UserListPopover>
                 <div class="avatar-row">
                   <AvatarList :users="combinedFavsAndRepeatsUsers" />
                 </div>
@@ -722,6 +728,11 @@ $status-margin: 0.75em;
 
     .stat-count {
       margin-right: $status-margin;
+      user-select: none;
+
+      &:hover .stat-title {
+        text-decoration: underline;
+      }
 
       .stat-title {
         color: var(--faint, $fallback--faint);
diff --git a/src/components/user_list_popover/user_list_popover.js b/src/components/user_list_popover/user_list_popover.js
new file mode 100644
index 00000000..26d2ed1a
--- /dev/null
+++ b/src/components/user_list_popover/user_list_popover.js
@@ -0,0 +1,13 @@
+
+const UserListPopover = {
+  name: 'UserListPopover',
+  props: [
+    'users'
+  ],
+  components: {
+    Popover: () => import('../popover/popover.vue'),
+    UserAvatar: () => import('../user_avatar/user_avatar.vue')
+  }
+}
+
+export default UserListPopover
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
new file mode 100644
index 00000000..b6b7ab95
--- /dev/null
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -0,0 +1,74 @@
+<template>
+  <Popover
+    trigger="hover"
+    placement="top"
+    :offset="{ y: 5 }"
+  >
+    <template slot="trigger">
+      <slot />
+    </template>
+    <div
+      slot="content"
+      class="reacted-users"
+    >
+      <div v-if="users.length">
+        <div
+          v-for="(user) in users"
+          :key="user.id"
+          class="reacted-user"
+        >
+          <UserAvatar
+            :user="user"
+            class="avatar-small"
+            :compact="true"
+          />
+          <div class="reacted-user-names">
+            <!-- eslint-disable vue/no-v-html -->
+            <span
+              class="reacted-user-name"
+              v-html="user.name_html"
+            />
+            <!-- eslint-enable vue/no-v-html -->
+            <span class="reacted-user-screen-name">{{ user.screen_name }}</span>
+          </div>
+        </div>
+      </div>
+      <div v-else>
+        <i class="icon-spin4 animate-spin" />
+      </div>
+    </div>
+  </Popover>
+</template>
+
+<script src="./user_list_popover.js" ></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.reacted-users {
+  padding: 0.5em;
+}
+
+.reacted-user {
+  padding: 0.25em;
+  display: flex;
+  flex-direction: row;
+
+  .reacted-user-names {
+    display: flex;
+    flex-direction: column;
+    margin-left: 0.5em;
+    min-width: 5em;
+
+    img {
+      width: 1em;
+      height: 1em;
+    }
+  }
+
+  .reacted-user-screen-name {
+    font-size: 9px;
+  }
+}
+
+</style>

From 8e0414dc7c5fd6d86d6f94958fa94e24f33b08c4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 17:45:07 +0300
Subject: [PATCH 341/415] change class names to not have reacts in them

---
 .../user_list_popover/user_list_popover.vue   | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index b6b7ab95..6bd786b3 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -9,27 +9,24 @@
     </template>
     <div
       slot="content"
-      class="reacted-users"
+      class="user-list-popover"
     >
       <div v-if="users.length">
         <div
           v-for="(user) in users"
           :key="user.id"
-          class="reacted-user"
+          class="user-list-row"
         >
           <UserAvatar
             :user="user"
             class="avatar-small"
             :compact="true"
           />
-          <div class="reacted-user-names">
+          <div class="user-list-names">
             <!-- eslint-disable vue/no-v-html -->
-            <span
-              class="reacted-user-name"
-              v-html="user.name_html"
-            />
+            <span v-html="user.name_html" />
             <!-- eslint-enable vue/no-v-html -->
-            <span class="reacted-user-screen-name">{{ user.screen_name }}</span>
+            <span class="user-list-screen-name">{{ user.screen_name }}</span>
           </div>
         </div>
       </div>
@@ -45,29 +42,29 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.reacted-users {
+.user-list-popover {
   padding: 0.5em;
-}
 
-.reacted-user {
-  padding: 0.25em;
-  display: flex;
-  flex-direction: row;
-
-  .reacted-user-names {
+  .user-list-row {
+    padding: 0.25em;
     display: flex;
-    flex-direction: column;
-    margin-left: 0.5em;
-    min-width: 5em;
+    flex-direction: row;
 
-    img {
-      width: 1em;
-      height: 1em;
+    .user-list-names {
+      display: flex;
+      flex-direction: column;
+      margin-left: 0.5em;
+      min-width: 5em;
+
+      img {
+        width: 1em;
+        height: 1em;
+      }
     }
-  }
 
-  .reacted-user-screen-name {
-    font-size: 9px;
+    .user-list-screen-name {
+      font-size: 9px;
+    }
   }
 }
 

From 85e09d81c74547daf30c5b9be97eb11beff8f490 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 17:47:26 +0300
Subject: [PATCH 342/415] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01c588b5..38c26b10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Descriptions can be set on uploaded files before posting
 - Added status preview option to preview your statuses before posting
 - When a post is a reply to an unavailable post, the 'Reply to'-text has a strike-through style
+- Added ability to see all favoriting or repeating users when hovering the number on highlighted statuses
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it

From caae2668ce2da0b74f1332e7a4d55b4b504de040 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 16 Jul 2020 18:08:00 +0300
Subject: [PATCH 343/415] add 16 users cap to user list popover

---
 src/components/user_list_popover/user_list_popover.js  | 5 +++++
 src/components/user_list_popover/user_list_popover.vue | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/user_list_popover/user_list_popover.js b/src/components/user_list_popover/user_list_popover.js
index 26d2ed1a..b60f2c4c 100644
--- a/src/components/user_list_popover/user_list_popover.js
+++ b/src/components/user_list_popover/user_list_popover.js
@@ -7,6 +7,11 @@ const UserListPopover = {
   components: {
     Popover: () => import('../popover/popover.vue'),
     UserAvatar: () => import('../user_avatar/user_avatar.vue')
+  },
+  computed: {
+    usersCapped () {
+      return this.users.slice(0, 16)
+    }
   }
 }
 
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 6bd786b3..185c73ca 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -13,7 +13,7 @@
     >
       <div v-if="users.length">
         <div
-          v-for="(user) in users"
+          v-for="(user) in usersCapped"
           :key="user.id"
           class="user-list-row"
         >

From f28ba3dfdbeed48a641319a29c4924700b4fe209 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 17 Jul 2020 09:33:18 +0300
Subject: [PATCH 344/415] Limit reply filtering to home and public

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

diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 214294eb..d0cddf84 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -43,7 +43,9 @@ const fetchAndUpdate = ({
   args['userId'] = userId
   args['tag'] = tag
   args['withMuted'] = !hideMutedPosts
-  if (loggedIn) args['replyVisibility'] = replyVisibility
+  if (loggedIn && ['friends', 'public', 'publicAndExternal'].includes(timeline)) {
+    args['replyVisibility'] = replyVisibility
+  }
 
   const numStatusesBeforeFetch = timelineData.statuses.length
 

From 5b9d22e2c5b339cadc54e0742f7d1d8c963e4a6a Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Fri, 17 Jul 2020 12:01:01 +0300
Subject: [PATCH 345/415] Fix the notifications polling when all the latest
 notifications are unread

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

diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index d282074a..80be02ca 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -35,7 +35,7 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
     const notifications = timelineData.data
     const readNotifsIds = notifications.filter(n => n.seen).map(n => n.id)
     const numUnseenNotifs = notifications.length - readNotifsIds.length
-    if (numUnseenNotifs > 0) {
+    if (numUnseenNotifs > 0 && readNotifsIds.length > 0) {
       args['since'] = Math.max(...readNotifsIds)
       fetchNotifications({ store, args, older })
     }

From 9ff59ad113eddcf44c3db6fefb2d240b3c4a4860 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Tue, 14 Jul 2020 21:05:08 +0000
Subject: [PATCH 346/415] Translated using Weblate (Polish)

Currently translated at 92.1% (614 of 666 strings)

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

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 930f3555..389b49db 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -68,7 +68,9 @@
     "disable": "Wyłącz",
     "enable": "Włącz",
     "confirm": "Potwierdź",
-    "verify": "Zweryfikuj"
+    "verify": "Zweryfikuj",
+    "close": "Zamknij",
+    "loading": "Ładowanie…"
   },
   "image_cropper": {
     "crop_picture": "Przytnij obrazek",
@@ -118,7 +120,8 @@
     "user_search": "Wyszukiwanie użytkowników",
     "search": "Wyszukiwanie",
     "who_to_follow": "Sugestie obserwacji",
-    "preferences": "Preferencje"
+    "preferences": "Preferencje",
+    "bookmarks": "Zakładki"
   },
   "notifications": {
     "broken_favorite": "Nieznany status, szukam go…",
@@ -190,7 +193,9 @@
       "private": "Tylko dla obserwujących – Umieść dla osób, które cię obserwują",
       "public": "Publiczny – Umieść na publicznych osiach czasu",
       "unlisted": "Niewidoczny – Nie umieszczaj na publicznych osiach czasu"
-    }
+    },
+    "preview_empty": "Pusty",
+    "preview": "Podgląd"
   },
   "registration": {
     "bio": "Bio",
@@ -553,7 +558,12 @@
     },
     "notification_setting_privacy": "Prywatność",
     "notification_setting_filters": "Filtry",
-    "notification_setting_privacy_option": "Ukryj nadawcę i zawartość powiadomień push"
+    "notification_setting_privacy_option": "Ukryj nadawcę i zawartość powiadomień push",
+    "reset_avatar": "Zresetuj awatar",
+    "profile_fields": {
+      "value": "Zawartość",
+      "label": "Metadane profilu"
+    }
   },
   "time": {
     "day": "{0} dzień",
@@ -599,7 +609,8 @@
     "show_new": "Pokaż nowe",
     "up_to_date": "Na bieżąco",
     "no_more_statuses": "Brak kolejnych statusów",
-    "no_statuses": "Brak statusów"
+    "no_statuses": "Brak statusów",
+    "reload": "Odśwież"
   },
   "status": {
     "favorites": "Ulubione",
@@ -732,5 +743,16 @@
     "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
     "password_reset_required": "Musisz zresetować hasło, by się zalogować.",
     "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji."
+  },
+  "file_type": {
+    "file": "Plik"
+  },
+  "chats": {
+    "more": "Więcej",
+    "delete": "Usuń",
+    "you": "Ty:"
+  },
+  "display_date": {
+    "today": "Dzisiaj"
   }
 }

From 8f618928337429efbd322834a430f85f7b4963f2 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Fri, 17 Jul 2020 18:25:06 +0000
Subject: [PATCH 347/415] Translated using Weblate (Italian)

Currently translated at 100.0% (662 of 662 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 b9333781..b27edd61 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -404,7 +404,9 @@
     "reset_avatar_confirm": "Vuoi veramente azzerare l'icona?",
     "reset_banner_confirm": "Vuoi veramente azzerare lo stendardo?",
     "reset_background_confirm": "Vuoi veramente azzerare lo sfondo?",
-    "chatMessageRadius": "Messaggi istantanei"
+    "chatMessageRadius": "Messaggi istantanei",
+    "notification_setting_hide_notification_contents": "Nascondi mittente e contenuti delle notifiche push",
+    "notification_setting_block_from_strangers": "Blocca notifiche da utenti che non segui"
   },
   "timeline": {
     "error_fetching": "Errore nell'aggiornamento",
@@ -801,6 +803,7 @@
     "new": "Nuova conversazione",
     "chats": "Conversazioni",
     "delete": "Elimina",
-    "message_user": "Contatta {nickname}"
+    "message_user": "Contatta {nickname}",
+    "you": "Tu:"
   }
 }

From 10fce88f3797756b3b10186d96c4e5ca1411bd63 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 13:57:59 +0000
Subject: [PATCH 348/415] Translated using Weblate (Catalan)

Currently translated at 29.0% (192 of 662 strings)

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

diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index c91fc073..f2bcdd06 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -95,8 +95,8 @@
     "default_vis": "Abast per defecte de les entrades",
     "delete_account": "Esborra el compte",
     "delete_account_description": "Esborra permanentment el teu compte i tots els missatges",
-    "delete_account_error": "No s'ha pogut esborrar el compte. Si continua el problema, contacta amb l'administració del node",
-    "delete_account_instructions": "Confirma que vols esborrar el compte escrivint la teva contrasenya aquí sota",
+    "delete_account_error": "No s'ha pogut esborrar el compte. Si continua el problema, contacta amb l'administració del node.",
+    "delete_account_instructions": "Confirma que vols esborrar el compte escrivint la teva contrasenya aquí sota.",
     "export_theme": "Desa el tema",
     "filtering": "Filtres",
     "filtering_explanation": "Es silenciaran totes les entrades que continguin aquestes paraules. Separa-les per línies",
@@ -118,7 +118,7 @@
     "invalid_theme_imported": "No s'ha entès l'arxiu carregat perquè no és un tema vàlid de Pleroma. No s'ha fet cap canvi als temes actuals.",
     "limited_availability": "No està disponible en aquest navegador",
     "links": "Enllaços",
-    "lock_account_description": "Restringeix el teu compte només a seguidores aprovades.",
+    "lock_account_description": "Restringeix el teu compte només a seguidores aprovades",
     "loop_video": "Reprodueix els vídeos en bucle",
     "loop_video_silent_only": "Reprodueix en bucles només els vídeos sense so (com els \"GIF\" de Mastodon)",
     "name": "Nom",
@@ -158,7 +158,7 @@
     "streaming": "Carrega automàticament entrades noves quan estigui a dalt de tot",
     "text": "Text",
     "theme": "Tema",
-    "theme_help": "Personalitza els colors del tema. Escriu-los en format RGB hexadecimal (#rrggbb)",
+    "theme_help": "Personalitza els colors del tema. Escriu-los en format RGB hexadecimal (#rrggbb).",
     "tooltipRadius": "Missatges sobreposats",
     "user_settings": "Configuració personal",
     "values": {

From c0144b5187000bd37599f1286894ab8a276ec0ed Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 13:59:05 +0000
Subject: [PATCH 349/415] Translated using Weblate (Czech)

Currently translated at 55.1% (365 of 662 strings)

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

diff --git a/src/i18n/cs.json b/src/i18n/cs.json
index 4e8cbcda..d9aed34a 100644
--- a/src/i18n/cs.json
+++ b/src/i18n/cs.json
@@ -256,7 +256,7 @@
         "contrast": {
           "hint": "Poměr kontrastu je {ratio}, {level} {context}",
           "level": {
-            "aa": "splňuje směrnici úrovně AA  (minimální)",
+            "aa": "splňuje směrnici úrovně AA (minimální)",
             "aaa": "splňuje směrnici úrovně AAA (doporučováno)",
             "bad": "nesplňuje žádné směrnice přístupnosti"
           },
@@ -398,7 +398,6 @@
     "reply_to": "Odpověď uživateli",
     "replies_list": "Odpovědi:"
   },
-
   "user_card": {
     "approve": "Schválit",
     "block": "Blokovat",
@@ -444,7 +443,7 @@
     "favorite": "Oblíbit",
     "user_settings": "Uživatelské nastavení"
   },
-  "upload":{
+  "upload": {
     "error": {
       "base": "Nahrávání selhalo.",
       "file_too_big": "Soubor je příliš velký [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",

From bfb768cdde6b8644130db2091f3c609b1c3a35ab Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 14:03:36 +0000
Subject: [PATCH 350/415] Translated using Weblate (German)

Currently translated at 68.7% (455 of 662 strings)

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

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 6179147e..413b9bfc 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -66,7 +66,7 @@
     "who_to_follow": "Wem folgen"
   },
   "notifications": {
-    "broken_favorite": "Unbekannte Nachricht, suche danach...",
+    "broken_favorite": "Unbekannte Nachricht, suche danach…",
     "favorited_you": "favorisierte deine Nachricht",
     "followed_you": "folgt dir",
     "load_older": "Ältere Benachrichtigungen laden",
@@ -115,7 +115,7 @@
     "registration": "Registrierung",
     "token": "Einladungsschlüssel",
     "captcha": "CAPTCHA",
-    "new_captcha": "Zum Erstellen eines neuen Captcha auf das Bild klicken.",
+    "new_captcha": "Zum Erstellen eines neuen Captcha auf das Bild klicken",
     "validations": {
       "username_required": "darf nicht leer sein",
       "fullname_required": "darf nicht leer sein",
@@ -161,7 +161,7 @@
     "pad_emoji": "Emojis mit Leerzeichen umrahmen",
     "export_theme": "Farbschema speichern",
     "filtering": "Filtern",
-    "filtering_explanation": "Alle Beiträge, welche diese Wörter enthalten, werden ausgeblendet. Ein Wort pro Zeile.",
+    "filtering_explanation": "Alle Beiträge, welche diese Wörter enthalten, werden ausgeblendet. Ein Wort pro Zeile",
     "follow_export": "Follower exportieren",
     "follow_export_button": "Exportiere deine Follows in eine csv-Datei",
     "follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.",
@@ -247,7 +247,7 @@
     "streaming": "Aktiviere automatisches Laden (Streaming) von neuen Beiträgen",
     "text": "Text",
     "theme": "Farbschema",
-    "theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen",
+    "theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen.",
     "theme_help_v2_1": "Du kannst auch die Farben und die Deckkraft bestimmter Komponenten überschreiben, indem du das Kontrollkästchen umschaltest. Verwende die Schaltfläche \"Alle löschen\", um alle Überschreibungen zurückzusetzen.",
     "theme_help_v2_2": "Unter einigen Einträgen befinden sich Symbole für Hintergrund-/Textkontrastindikatoren, für detaillierte Informationen fahre mit der Maus darüber. Bitte beachte, dass bei der Verwendung von Transparenz Kontrastindikatoren den schlechtest möglichen Fall darstellen.",
     "tooltipRadius": "Tooltips/Warnungen",
@@ -321,7 +321,7 @@
           "always_drop_shadow": "Achtung, dieser Schatten verwendet immer {0}, wenn der Browser dies unterstützt.",
           "drop_shadow_syntax": "{0} unterstützt Parameter {1} und Schlüsselwort {2} nicht.",
           "avatar_inset": "Bitte beachte, dass die Kombination von eingesetzten und nicht eingesetzten Schatten auf Avataren zu unerwarteten Ergebnissen bei transparenten Avataren führen kann.",
-          "spread_zero": "Schatten mit einer Streuung > 0 erscheinen so, als ob sie auf Null gesetzt wären.",
+          "spread_zero": "Schatten mit einer Streuung > 0 erscheinen so, als ob sie auf Null gesetzt wären",
           "inset_classic": "Eingesetzte Schatten werden mit {0} verwendet"
         },
         "components": {
@@ -375,7 +375,7 @@
       "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
       "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
       "title": "Zwei-Faktor Authentifizierung",
-      "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes...",
+      "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes…",
       "authentication_methods": "Authentifizierungsmethoden",
       "scan": {
         "title": "Scan",
@@ -407,7 +407,7 @@
     "conversation": "Unterhaltung",
     "error_fetching": "Fehler beim Laden",
     "load_older": "Lade ältere Beiträge",
-    "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden.",
+    "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden",
     "repeated": "wiederholte",
     "show_new": "Zeige Neuere",
     "up_to_date": "Aktuell"
@@ -481,7 +481,7 @@
     "not_found": "Benutzername/E-Mail-Adresse nicht gefunden. Vertippt?",
     "too_many_requests": "Kurze Pause. Zu viele Versuche. Bitte, später nochmal probieren.",
     "password_reset_disabled": "Passwortzurücksetzen deaktiviert. Bitte Administrator kontaktieren.",
-    "password_reset_required": "Passwortzurücksetzen erforderlich",
+    "password_reset_required": "Passwortzurücksetzen erforderlich.",
     "password_reset_required_but_mailer_is_disabled": "Passwortzurücksetzen wäre erforderlich, ist aber deaktiviert. Bitte Administrator kontaktieren."
   },
   "about": {
@@ -516,9 +516,9 @@
   },
   "domain_mute_card": {
     "mute": "Stummschalten",
-    "mute_progress": "Wird stummgeschaltet..",
+    "mute_progress": "Wird stummgeschaltet…",
     "unmute": "Stummschaltung aufheben",
-    "unmute_progress": "Stummschaltung wird aufgehoben.."
+    "unmute_progress": "Stummschaltung wird aufgehoben…"
   },
   "exporter": {
     "export": "Exportieren",

From 98d21603035ea629839e176144b57061b11ddd31 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 14:00:17 +0000
Subject: [PATCH 351/415] Translated using Weblate (Esperanto)

Currently translated at 49.5% (328 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index fb115872..b8abbf71 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -317,7 +317,7 @@
       },
       "fonts": {
         "_tab_label": "Tiparoj",
-        "help": "Elektu tiparon uzotan por eroj de la fasado. Por \"propra\" vi devas enigi la precizan nomon de tiparo tiel, kiel ĝi aperas en la sistemo",
+        "help": "Elektu tiparon uzotan por eroj de la fasado. Por \"propra\" vi devas enigi la precizan nomon de tiparo tiel, kiel ĝi aperas en la sistemo.",
         "components": {
           "interface": "Fasado",
           "input": "Enigaj kampoj",
@@ -402,7 +402,7 @@
     "favorite": "Ŝati",
     "user_settings": "Agordoj de uzanto"
   },
-  "upload":{
+  "upload": {
     "error": {
       "base": "Alŝuto malsukcesis.",
       "file_too_big": "Dosiero estas tro granda [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",

From 83962f90c8be43668de862c36c19919b99db0e5e Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 13:53:49 +0000
Subject: [PATCH 352/415] Translated using Weblate (Basque)

Currently translated at 77.3% (512 of 662 strings)

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

diff --git a/src/i18n/eu.json b/src/i18n/eu.json
index 295a767f..f04203f0 100644
--- a/src/i18n/eu.json
+++ b/src/i18n/eu.json
@@ -84,7 +84,7 @@
     "preferences": "Hobespenak"
   },
   "notifications": {
-    "broken_favorite": "Egoera ezezaguna, bilatzen...",
+    "broken_favorite": "Egoera ezezaguna, bilatzen…",
     "favorited_you": "zure mezua gogoko du",
     "followed_you": "Zu jarraitzen zaitu",
     "load_older": "Kargatu jakinarazpen zaharragoak",
@@ -128,7 +128,7 @@
     "new_status": "Mezu berri bat idatzi",
     "account_not_locked_warning": "Zure kontua ez dago {0}. Edozeinek jarraitzen hastearekin, zure mezuak irakur ditzake.",
     "account_not_locked_warning_link": "Blokeatuta",
-    "attachments_sensitive": "Nabarmendu eranskinak hunkigarri gisa ",
+    "attachments_sensitive": "Nabarmendu eranskinak hunkigarri gisa",
     "content_type": {
       "text/plain": "Testu arrunta",
       "text/html": "HTML",
@@ -187,9 +187,9 @@
       "confirm_and_enable": "Baieztatu eta gaitu OTP",
       "title": "Bi-faktore autentifikazioa",
       "generate_new_recovery_codes": "Sortu berreskuratze kode berriak",
-      "warning_of_generate_new_codes": "Berreskuratze kode berriak sortzean, zure berreskuratze kode zaharrak ez dute balioko",
+      "warning_of_generate_new_codes": "Berreskuratze kode berriak sortzean, zure berreskuratze kode zaharrak ez dute balioko.",
       "recovery_codes": "Berreskuratze kodea",
-      "waiting_a_recovery_codes": "Babes-kopia kodeak jasotzen...",
+      "waiting_a_recovery_codes": "Babes-kopia kodeak jasotzen…",
       "recovery_codes_warning": "Idatzi edo gorde kodeak leku seguruan - bestela ez dituzu berriro ikusiko. Zure 2FA aplikaziorako sarbidea eta berreskuratze kodeak galduz gero, zure kontutik blokeatuta egongo zara.",
       "authentication_methods": "Autentifikazio metodoa",
       "scan": {
@@ -198,7 +198,7 @@
         "secret_code": "Giltza"
       },
       "verify": {
-        "desc": "Bi-faktore autentifikazioa gaitzeko, sar ezazu bi-faktore kodea zure app-tik"
+        "desc": "Bi-faktore autentifikazioa gaitzeko, sar ezazu bi-faktore kodea zure app-tik:"
       }
     },
     "attachmentRadius": "Eranskinak",
@@ -220,7 +220,7 @@
     "cOrange": "Laranja (Gogokoa)",
     "cRed": "Gorria (ezeztatu)",
     "change_password": "Pasahitza aldatu",
-    "change_password_error": "Arazao bat egon da zure pasahitza aldatzean",
+    "change_password_error": "Arazao bat egon da zure pasahitza aldatzean.",
     "changed_password": "Pasahitza ondo aldatu da!",
     "collapse_subject": "Bildu gaia daukaten mezuak",
     "composing": "Idazten",
@@ -247,7 +247,7 @@
     "follows_imported": "Jarraitzaileak inportatuta! Prozesatzeak denbora pixka bat iraungo du.",
     "foreground": "Aurreko planoa",
     "general": "Orokorra",
-    "hide_attachments_in_convo": "Ezkutatu eranskinak elkarrizketatan ",
+    "hide_attachments_in_convo": "Ezkutatu eranskinak elkarrizketatan",
     "hide_attachments_in_tl": "Ezkutatu eranskinak donbora-lerroan",
     "hide_muted_posts": "Ezkutatu mutututako erabiltzaileen mezuak",
     "max_thumbnails": "Mezu bakoitzeko argazki-miniatura kopuru maximoa",
@@ -427,7 +427,7 @@
       },
       "fonts": {
         "_tab_label": "Letra-tipoak",
-        "help": "Aukeratu letra-tipoak erabiltzailearen interfazean erabiltzeko. \"Pertsonalizatua\" letra-tipoan, sisteman agertzen den  izen berdinarekin idatzi behar duzu.",
+        "help": "Aukeratu letra-tipoak erabiltzailearen interfazean erabiltzeko. \"Pertsonalizatua\" letra-tipoan, sisteman agertzen den izen berdinarekin idatzi behar duzu.",
         "components": {
           "interface": "Interfazea",
           "input": "Sarrera eremuak",
@@ -527,7 +527,7 @@
     "favorites": "Gogokoak",
     "follow": "Jarraitu",
     "follow_sent": "Eskaera bidalita!",
-    "follow_progress": "Eskatzen...",
+    "follow_progress": "Eskatzen…",
     "follow_again": "Eskaera berriro bidali?",
     "follow_unfollow": "Jarraitzeari utzi",
     "followees": "Jarraitzen",
@@ -546,11 +546,11 @@
     "subscribe": "Harpidetu",
     "unsubscribe": "Harpidetza ezeztatu",
     "unblock": "Blokeoa kendu",
-    "unblock_progress": "Blokeoa ezeztatzen...",
-    "block_progress": "Blokeatzen...",
+    "unblock_progress": "Blokeoa ezeztatzen…",
+    "block_progress": "Blokeatzen…",
     "unmute": "Isiltasuna kendu",
-    "unmute_progress": "Isiltasuna kentzen...",
-    "mute_progress": "Isiltzen...",
+    "unmute_progress": "Isiltasuna kentzen…",
+    "mute_progress": "Isiltzen…",
     "hide_repeats": "Ezkutatu errepikapenak",
     "show_repeats": "Erakutsi errpekiapenak",
     "admin_menu": {

From 2fe8b3937b2fe9e74e0a604622f15930f089c139 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier"
 <contact+translate.pleroma.social@hacktivis.me>
Date: Sat, 18 Jul 2020 14:02:32 +0000
Subject: [PATCH 353/415] Translated using Weblate (French)

Currently translated at 89.8% (595 of 662 strings)

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

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index ac653058..794ed812 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -343,7 +343,8 @@
           "migration_snapshot_ok": "Pour être sûr un instantanée du thème à été chargé. Vos pouvez essayer de charger ses données.",
           "fe_downgraded": "Retour en arrière de la version de PleromaFE.",
           "fe_upgraded": "Le moteur de thème PleromaFE à été mis à jour après un changement de version.",
-          "snapshot_missing": "Aucun instantané du thème à été trouvé dans le fichier, il peut y avoir un rendu différent à la vision originelle."
+          "snapshot_missing": "Aucun instantané du thème à été trouvé dans le fichier, il peut y avoir un rendu différent à la vision originelle.",
+          "snapshot_present": "Un instantané du thème à été chargé, toutes les valeurs sont dont écrasées. Vous pouvez autrement charger le thème complètement."
         },
         "keep_as_is": "Garder tel-quel",
         "use_source": "Nouvelle version"
@@ -619,7 +620,7 @@
         "reject": "Rejeté",
         "replace": "Remplacer",
         "keyword_policies": "Politiques par mot-clés",
-        "ftl_removal": "Suppression du flux \"Ensemble du réseau connu\"",
+        "ftl_removal": "Suppression du flux fédéré",
         "is_replaced_by": "→"
       },
       "simple": {

From 89379b10cc4773248439553c0d183df6587d79b3 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 14:08:05 +0000
Subject: [PATCH 354/415] Translated using Weblate (Irish)

Currently translated at 29.4% (195 of 662 strings)

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

diff --git a/src/i18n/ga.json b/src/i18n/ga.json
index 74a48bfc..3ec5d86b 100644
--- a/src/i18n/ga.json
+++ b/src/i18n/ga.json
@@ -36,7 +36,7 @@
     "twkn": "An Líonra Iomlán"
   },
   "notifications": {
-    "broken_favorite": "Post anaithnid. Cuardach dó...",
+    "broken_favorite": "Post anaithnid. Cuardach dó…",
     "favorited_you": "toghadh le do phost",
     "followed_you": "lean tú",
     "load_older": "Luchtaigh fógraí aosta",
@@ -84,7 +84,7 @@
     "cOrange": "Oráiste (Cosúil)",
     "cRed": "Dearg (Cealaigh)",
     "change_password": "Athraigh do pasfhocal",
-    "change_password_error": "Bhí fadhb ann ag athrú do pasfhocail",
+    "change_password_error": "Bhí fadhb ann ag athrú do pasfhocail.",
     "changed_password": "Athraigh an pasfhocal go rathúil!",
     "collapse_subject": "Poist a chosc le teidil",
     "confirm_new_password": "Deimhnigh do pasfhocal nua",
@@ -160,7 +160,7 @@
     "streaming": "Cumasaigh post nua a shruthú uathoibríoch nuair a scrollaítear go barr an leathanaigh",
     "text": "Téacs",
     "theme": "Téama",
-    "theme_help": "Úsáid cód daith hex (#rrggbb) chun do schéim a saincheapadh",
+    "theme_help": "Úsáid cód daith hex (#rrggbb) chun do schéim a saincheapadh.",
     "tooltipRadius": "Bileoga eolais",
     "user_settings": "Socruithe úsáideora",
     "values": {

From 18e2396da4e47429a5ac16da379bac73d99b58c9 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 14:06:11 +0000
Subject: [PATCH 355/415] Translated using Weblate (Hebrew)

Currently translated at 48.7% (323 of 662 strings)

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

diff --git a/src/i18n/he.json b/src/i18n/he.json
index b1c9da69..7f2bf58f 100644
--- a/src/i18n/he.json
+++ b/src/i18n/he.json
@@ -70,9 +70,9 @@
     "preferences": "העדפות"
   },
   "notifications": {
-    "broken_favorite": "סטאטוס לא ידוע, מחפש...",
+    "broken_favorite": "סטאטוס לא ידוע, מחפש…",
     "favorited_you": "אהב את הסטטוס שלך",
-    "followed_you": "עקב אחריך!",
+    "followed_you": "עקב אחריך",
     "load_older": "טען התראות ישנות",
     "notifications": "התראות",
     "read": "קרא!",
@@ -178,7 +178,7 @@
     "follow_export": "יצוא עקיבות",
     "follow_export_button": "ייצא את הנעקבים שלך לקובץ csv",
     "follow_import": "יבוא עקיבות",
-    "follow_import_error": "שגיאה בייבוא נעקבים.",
+    "follow_import_error": "שגיאה בייבוא נעקבים",
     "follows_imported": "נעקבים יובאו! ייקח זמן מה לעבד אותם.",
     "foreground": "חזית",
     "general": "כללי",
@@ -311,7 +311,7 @@
     "favorites": "מועדפים",
     "follow": "עקוב",
     "follow_sent": "בקשה נשלחה!",
-    "follow_progress": "מבקש...",
+    "follow_progress": "מבקש…",
     "follow_again": "שלח בקשה שוב?",
     "follow_unfollow": "בטל עקיבה",
     "followees": "נעקבים",
@@ -327,11 +327,11 @@
     "report": "דווח",
     "statuses": "סטטוסים",
     "unblock": "הסר חסימה",
-    "unblock_progress": "מסיר חסימה...",
-    "block_progress": "חוסם...",
+    "unblock_progress": "מסיר חסימה…",
+    "block_progress": "חוסם…",
     "unmute": "הסר השתקה",
-    "unmute_progress": "מסיר השתקה...",
-    "mute_progress": "משתיק...",
+    "unmute_progress": "מסיר השתקה…",
+    "mute_progress": "משתיק…",
     "admin_menu": {
       "moderation": "ניהול (צוות)",
       "grant_admin": "הפוך למנהל",
@@ -377,7 +377,7 @@
     "favorite": "מועדף",
     "user_settings": "הגדרות משתמש"
   },
-  "upload":{
+  "upload": {
     "error": {
       "base": "העלאה נכשלה.",
       "file_too_big": "קובץ גדול מדי [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",

From 9db096fa693d2f3182ee552c5b57414b3b0d798f Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Sat, 18 Jul 2020 14:09:34 +0000
Subject: [PATCH 356/415] Translated using Weblate (Japanese)

Currently translated at 81.8% (542 of 662 strings)

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

diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 1a1a1a9d..255648e7 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -27,7 +27,7 @@
   },
   "exporter": {
     "export": "エクスポート",
-    "processing": "おまちください。しばらくすると、あなたのファイルをダウンロードするように、メッセージがでます。"
+    "processing": "おまちください。しばらくすると、あなたのファイルをダウンロードするように、メッセージがでます"
   },
   "features_panel": {
     "chat": "チャット",
@@ -39,7 +39,7 @@
     "who_to_follow": "おすすめユーザー"
   },
   "finder": {
-    "error_fetching_user": "ユーザーけんさくがエラーになりました。",
+    "error_fetching_user": "ユーザーけんさくがエラーになりました",
     "find_user": "ユーザーをさがす"
   },
   "general": {
@@ -80,9 +80,9 @@
     "enter_recovery_code": "リカバリーコードをいれてください",
     "enter_two_factor_code": "2-ファクターコードをいれてください",
     "recovery_code": "リカバリーコード",
-    "heading" : {
-      "totp" : "2-ファクターにんしょう",
-      "recovery" : "2-ファクターリカバリー"
+    "heading": {
+      "totp": "2-ファクターにんしょう",
+      "recovery": "2-ファクターリカバリー"
     }
   },
   "media_modal": {
@@ -107,7 +107,7 @@
     "preferences": "せってい"
   },
   "notifications": {
-    "broken_favorite": "ステータスがみつかりません。さがしています...",
+    "broken_favorite": "ステータスがみつかりません。さがしています…",
     "favorited_you": "あなたのステータスがおきにいりされました",
     "followed_you": "フォローされました",
     "load_older": "ふるいつうちをみる",
@@ -172,10 +172,10 @@
       "unlisted": "このとうこうは、パブリックタイムラインと、つながっているすべてのネットワークでは、みることができません"
     },
     "scope": {
-      "direct": "ダイレクト: メンションされたユーザーのみにとどきます。",
-      "private": "フォロワーげんてい: フォロワーのみにとどきます。",
-      "public": "パブリック: パブリックタイムラインにとどきます。",
-      "unlisted": "アンリステッド: パブリックタイムラインにとどきません。"
+      "direct": "ダイレクト: メンションされたユーザーのみにとどきます",
+      "private": "フォロワーげんてい: フォロワーのみにとどきます",
+      "public": "パブリック: パブリックタイムラインにとどきます",
+      "unlisted": "アンリステッド: パブリックタイムラインにとどきません"
     }
   },
   "registration": {
@@ -212,17 +212,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" : "コードをかきうつすか、ひとにみられないところにセーブしてください。そうでなければ、あなたはこのコードをふたたびみることはできません。もしあなたが、2FAアプリのアクセスをうしなって、なおかつ、リカバリーコードもおもいだせないならば、あなたはあなたのアカウントから、しめだされます。",
-      "authentication_methods" : "にんしょうメソッド",
+      "generate_new_recovery_codes": "あたらしいリカバリーコードをつくる",
+      "warning_of_generate_new_codes": "あたらしいリカバリーコードをつくったら、ふるいコードはつかえなくなります。",
+      "recovery_codes": "リカバリーコード。",
+      "waiting_a_recovery_codes": "バックアップコードをうけとっています…",
+      "recovery_codes_warning": "コードをかきうつすか、ひとにみられないところにセーブしてください。そうでなければ、あなたはこのコードをふたたびみることはできません。もしあなたが、2FAアプリのアクセスをうしなって、なおかつ、リカバリーコードもおもいだせないならば、あなたはあなたのアカウントから、しめだされます。",
+      "authentication_methods": "にんしょうメソッド",
       "scan": {
         "title": "スキャン",
         "desc": "あなたの2-ファクターアプリをつかって、このQRコードをスキャンするか、テキストキーをうちこんでください:",
@@ -273,12 +273,12 @@
     "pad_emoji": "えもじをピッカーでえらんだとき、えもじのまわりにスペースをいれる",
     "export_theme": "セーブ",
     "filtering": "フィルタリング",
-    "filtering_explanation": "これらのことばをふくむすべてのものがミュートされます。1ぎょうに1つのことばをかいてください。",
+    "filtering_explanation": "これらのことばをふくむすべてのものがミュートされます。1ぎょうに1つのことばをかいてください",
     "follow_export": "フォローのエクスポート",
     "follow_export_button": "エクスポート",
     "follow_export_processing": "おまちください。まもなくファイルをダウンロードできます。",
     "follow_import": "フォローインポート",
-    "follow_import_error": "フォローのインポートがエラーになりました。",
+    "follow_import_error": "フォローのインポートがエラーになりました",
     "follows_imported": "フォローがインポートされました！ すこしじかんがかかるかもしれません。",
     "foreground": "フォアグラウンド",
     "general": "ぜんぱん",
@@ -340,7 +340,7 @@
     "profile_background": "プロフィールのバックグラウンド",
     "profile_banner": "プロフィールバナー",
     "profile_tab": "プロフィール",
-    "radii_help": "インターフェースのまるさをせっていする。",
+    "radii_help": "インターフェースのまるさをせっていする",
     "replies_in_timeline": "タイムラインのリプライ",
     "reply_visibility_all": "すべてのリプライをみる",
     "reply_visibility_following": "わたしにあてられたリプライと、フォローしているひとからのリプライをみる",
@@ -367,7 +367,7 @@
     "streaming": "うえまでスクロールしたとき、じどうてきにストリーミングする",
     "text": "もじ",
     "theme": "テーマ",
-    "theme_help": "カラーテーマをカスタマイズできます",
+    "theme_help": "カラーテーマをカスタマイズできます。",
     "theme_help_v2_1": "チェックボックスをONにすると、コンポーネントごとに、いろと、とうめいどを、オーバーライドできます。「すべてクリア」ボタンをおすと、すべてのオーバーライドを、やめます。",
     "theme_help_v2_2": "バックグラウンドとテキストのコントラストをあらわすアイコンがあります。マウスをホバーすると、くわしいせつめいがでます。とうめいないろをつかっているときは、もっともわるいばあいのコントラストがしめされます。",
     "upload_a_photo": "がぞうをアップロード",
@@ -402,8 +402,8 @@
           "hint": "コントラストは {ratio} です。{level}。({context})",
           "level": {
             "aa": "AAレベルガイドライン (ミニマル) をみたします",
-            "aaa": "AAAレベルガイドライン (レコメンデッド) をみたします。",
-            "bad": "ガイドラインをみたしません。"
+            "aaa": "AAAレベルガイドライン (レコメンデッド) をみたします",
+            "bad": "ガイドラインをみたしません"
           },
           "context": {
             "18pt": "おおきい (18ポイントいじょう) テキスト",
@@ -447,8 +447,8 @@
           "always_drop_shadow": "ブラウザーがサポートしていれば、つねに {0} がつかわれます。",
           "drop_shadow_syntax": "{0} は、{1} パラメーターと {2} キーワードをサポートしていません。",
           "avatar_inset": "うちがわのかげと、そとがわのかげを、いっしょにつかうと、とうめいなアバターが、へんなみためになります。",
-          "spread_zero": "ひろがりが 0 よりもおおきなかげは、0 とおなじです。",
-          "inset_classic": "うちがわのかげは {0} をつかいます。"
+          "spread_zero": "ひろがりが 0 よりもおおきなかげは、0 とおなじです",
+          "inset_classic": "うちがわのかげは {0} をつかいます"
         },
         "components": {
           "panel": "パネル",
@@ -483,7 +483,7 @@
         "content": "ほんぶん",
         "error": "エラーのれい",
         "button": "ボタン",
-        "text": "これは{0}と{1}のれいです。",
+        "text": "これは{0}と{1}のれいです",
         "mono": "monospace",
         "input": "はねだくうこうに、つきました。",
         "faint_link": "とてもたすけになるマニュアル",
@@ -586,11 +586,11 @@
     "subscribe": "サブスクライブ",
     "unsubscribe": "サブスクライブをやめる",
     "unblock": "ブロックをやめる",
-    "unblock_progress": "ブロックをとりけしています...",
-    "block_progress": "ブロックしています...",
+    "unblock_progress": "ブロックをとりけしています…",
+    "block_progress": "ブロックしています…",
     "unmute": "ミュートをやめる",
-    "unmute_progress": "ミュートをとりけしています...",
-    "mute_progress": "ミュートしています...",
+    "unmute_progress": "ミュートをとりけしています…",
+    "mute_progress": "ミュートしています…",
     "hide_repeats": "リピートをかくす",
     "show_repeats": "リピートをみる",
     "admin_menu": {
@@ -638,11 +638,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": "B",

From 70129c934c80dd7e53c6e4aa042a100a2912b893 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 20 Jul 2020 16:47:50 +0000
Subject: [PATCH 357/415] Translated using Weblate (Esperanto)

Currently translated at 60.1% (398 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index b8abbf71..7bfca941 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -7,12 +7,13 @@
     "gopher": "Gopher",
     "media_proxy": "Aŭdvidaĵa prokurilo",
     "scope_options": "Agordoj de amplekso",
-    "text_limit": "Teksta limo",
+    "text_limit": "Limo de teksto",
     "title": "Funkcioj",
-    "who_to_follow": "Kiun aboni"
+    "who_to_follow": "Kiun aboni",
+    "pleroma_chat_messages": "Babilejo de Pleroma"
   },
   "finder": {
-    "error_fetching_user": "Eraro alportante uzanton",
+    "error_fetching_user": "Eraris alporto de uzanto",
     "find_user": "Trovi uzanton"
   },
   "general": {
@@ -20,12 +21,25 @@
     "submit": "Sendi",
     "more": "Pli",
     "generic_error": "Eraro okazis",
-    "optional": "Malnepra"
+    "optional": "malnepra",
+    "close": "Fermi",
+    "verify": "Kontroli",
+    "confirm": "Konfirmi",
+    "enable": "Ŝalti",
+    "disable": "Malŝalti",
+    "cancel": "Nuligi",
+    "dismiss": "Forlasi",
+    "show_less": "Montri malplion",
+    "show_more": "Montri plion",
+    "retry": "Reprovi",
+    "error_retry": "Bonvolu reprovi",
+    "loading": "Enlegante…"
   },
   "image_cropper": {
     "crop_picture": "Tondi bildon",
     "save": "Konservi",
-    "cancel": "Nuligi"
+    "cancel": "Nuligi",
+    "save_without_cropping": "Konservi sen tondado"
   },
   "login": {
     "login": "Saluti",
@@ -34,8 +48,16 @@
     "password": "Pasvorto",
     "placeholder": "ekz. lain",
     "register": "Registriĝi",
-    "username": "Salutnomo",
-    "hint": "Salutu por partopreni la diskutadon"
+    "username": "Uzantonomo",
+    "hint": "Salutu por partopreni la diskutadon",
+    "heading": {
+      "recovery": "Rehavo de duobla aŭtentikigo",
+      "totp": "Duobla aŭtentikigo"
+    },
+    "recovery_code": "Rehava kodo",
+    "enter_two_factor_code": "Enigu kodon de duobla aŭtentikigo",
+    "enter_recovery_code": "Enigu rehavan kodon",
+    "authentication_code": "Aŭtentikiga kodo"
   },
   "media_modal": {
     "previous": "Antaŭa",
@@ -45,7 +67,7 @@
     "about": "Pri",
     "back": "Reen",
     "chat": "Loka babilejo",
-    "friend_requests": "Abonaj petoj",
+    "friend_requests": "Petoj pri abono",
     "mentions": "Mencioj",
     "dms": "Rektaj mesaĝoj",
     "public_tl": "Publika tempolinio",
@@ -53,7 +75,11 @@
     "twkn": "La tuta konata reto",
     "user_search": "Serĉi uzantojn",
     "who_to_follow": "Kiun aboni",
-    "preferences": "Agordoj"
+    "preferences": "Agordoj",
+    "chats": "Babiloj",
+    "search": "Serĉi",
+    "interactions": "Interagoj",
+    "administration": "Administrado"
   },
   "notifications": {
     "broken_favorite": "Nekonata stato, serĉante ĝin…",
@@ -63,7 +89,10 @@
     "notifications": "Sciigoj",
     "read": "Legite!",
     "repeated_you": "ripetis vian staton",
-    "no_more_notifications": "Neniuj pliaj sciigoj"
+    "no_more_notifications": "Neniuj pliaj sciigoj",
+    "reacted_with": "reagis per {0}",
+    "migrated_to": "migris al",
+    "follow_request": "volas vin aboni"
   },
   "post_status": {
     "new_status": "Afiŝi novan staton",
@@ -415,5 +444,68 @@
       "GiB": "GiB",
       "TiB": "TiB"
     }
+  },
+  "emoji": {
+    "search_emoji": "Serĉi bildosignon",
+    "keep_open": "Teni elektilon malfermita",
+    "emoji": "Bildsignoj",
+    "stickers": "Glumarkoj"
+  },
+  "polls": {
+    "not_enough_options": "Tro malmultaj unikaj elektebloj en la enketo",
+    "expired": "Enketo finiĝis antaŭ {0}",
+    "expires_in": "Enketo finiĝas je {0}",
+    "expiry": "Aĝo de enketo",
+    "multiple_choices": "Pluraj elektoj",
+    "single_choice": "Unu elekto",
+    "type": "Speco de enketo",
+    "vote": "Voĉi",
+    "votes": "voĉoj",
+    "option": "Elekteblo",
+    "add_option": "Aldoni elekteblon",
+    "add_poll": "Aldoni enketon"
+  },
+  "importer": {
+    "error": "Eraris enporto de ĉi tiu dosiero.",
+    "success": "Enportita sukcese.",
+    "submit": "Sendi"
+  },
+  "exporter": {
+    "processing": "Traktante; baldaŭ vi ricevos peton elŝuti vian dosieron",
+    "export": "Elporti"
+  },
+  "domain_mute_card": {
+    "unmute_progress": "Malsilentigante…",
+    "unmute": "Malsilentigi",
+    "mute_progress": "Silentigante…",
+    "mute": "Silentigi"
+  },
+  "about": {
+    "staff": "Skipo",
+    "mrf": {
+      "simple": {
+        "media_nsfw_desc": "Ĉi tiu nodo devigas vidaŭdaĵojn esti markitaj kiel konsternaj en afiŝoj el la jenaj nodoj:",
+        "media_nsfw": "Devige marki vidaŭdaĵojn konsternaj",
+        "media_removal_desc": "Ĉi tiu nodo forigas vidaŭdaĵojn de afiŝoj el la jenaj nodoj:",
+        "media_removal": "Forigo de vidaŭdaĵoj",
+        "ftl_removal": "Forigo de la historio de «La tuta konata reto»",
+        "quarantine_desc": "Ĉi tiu nodo sendos nur publikajn afiŝojn al la jenaj nodoj:",
+        "quarantine": "Kvaranteno",
+        "reject_desc": "Ĉi tiu nodo ne akceptos mesaĝojn de la jenaj nodoj:",
+        "reject": "Rifuzi",
+        "accept_desc": "Ĉi tiu nodo nur akceptas mesaĝojn de la jenaj nodoj:",
+        "accept": "Akcepti",
+        "simple_policies": "Specialaj politikoj de la nodo"
+      },
+      "mrf_policies": "Ŝaltis politikon de MRF",
+      "keyword": {
+        "is_replaced_by": "→",
+        "replace": "Anstataŭigi",
+        "reject": "Rifuzi",
+        "ftl_removal": "Forigo de la historio de «La tuta konata reto»",
+        "keyword_policies": "Politiko pri ŝlosilvortoj"
+      },
+      "federation": "Federado"
+    }
   }
 }

From 6e49afcac4f0c216ecff1c7f196a3a77fac890dc Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 20 Jul 2020 17:15:37 +0000
Subject: [PATCH 358/415] Translated using Weblate (Esperanto)

Currently translated at 60.1% (398 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 7bfca941..c489db4c 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -449,7 +449,8 @@
     "search_emoji": "Serĉi bildosignon",
     "keep_open": "Teni elektilon malfermita",
     "emoji": "Bildsignoj",
-    "stickers": "Glumarkoj"
+    "stickers": "Glumarkoj",
+    "add_emoji": "Enigi bildosignon"
   },
   "polls": {
     "not_enough_options": "Tro malmultaj unikaj elektebloj en la enketo",

From 51fd4bd5bacf0679032ff0c3c3d7efae2f407dd1 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 20 Jul 2020 17:15:47 +0000
Subject: [PATCH 359/415] Translated using Weblate (Esperanto)

Currently translated at 68.2% (452 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index c489db4c..bae1918c 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -96,11 +96,14 @@
   },
   "post_status": {
     "new_status": "Afiŝi novan staton",
-    "account_not_locked_warning": "Via konto ne estas {0}. Iu ajn povas vin aboni por vidi viajn afiŝoj nur por abonantoj.",
+    "account_not_locked_warning": "Via konto ne estas {0}. Iu ajn povas vin aboni por vidi eĉ viajn afiŝoj nur por abonantoj.",
     "account_not_locked_warning_link": "ŝlosita",
-    "attachments_sensitive": "Marki kunsendaĵojn kiel konsternajn",
+    "attachments_sensitive": "Marki kunsendaĵojn konsternaj",
     "content_type": {
-      "text/plain": "Plata teksto"
+      "text/plain": "Plata teksto",
+      "text/bbcode": "BBCode",
+      "text/markdown": "Markdown",
+      "text/html": "HTML"
     },
     "content_warning": "Temo (malnepra)",
     "default": "Ĵus alvenis al la Universala Kongreso!",
@@ -111,7 +114,19 @@
       "private": "Nur abonantoj – Afiŝi nur al abonantoj",
       "public": "Publika – Afiŝi al publikaj tempolinioj",
       "unlisted": "Nelistigita – Ne afiŝi al publikaj tempolinioj"
-    }
+    },
+    "scope_notice": {
+      "unlisted": "Ĉi tiu afiŝo ne estos videbla en la Publika historio kaj La tuta konata reto",
+      "private": "Ĉi tiu afiŝo estos videbla nur al viaj abonantoj",
+      "public": "Ĉi tiu afiŝo estos videbla al ĉiuj"
+    },
+    "media_description_error": "Malsukcesis afiŝo de vidaŭdaĵoj; reprovu",
+    "empty_status_error": "Ne povas afiŝi malplenan staton sen dosieroj",
+    "preview_empty": "Malplena",
+    "preview": "Antaŭrigardo",
+    "direct_warning_to_first_only": "Ĉi tiu afiŝo estas nur videbla al uzantoj menciitaj je la komenco de la mesaĝo.",
+    "direct_warning_to_all": "Ĉi tiu afiŝo estos videbla al ĉiuj menciitaj uzantoj.",
+    "media_description": "Priskribo de vidaŭdaĵo"
   },
   "registration": {
     "bio": "Priskribo",
@@ -121,10 +136,10 @@
     "registration": "Registriĝo",
     "token": "Invita ĵetono",
     "captcha": "TESTO DE HOMECO",
-    "new_captcha": "Alklaku la bildon por akiri novan teston",
+    "new_captcha": "Klaku la bildon por akiri novan teston",
     "username_placeholder": "ekz. lain",
     "fullname_placeholder": "ekz. Lain Iwakura",
-    "bio_placeholder": "ekz.\nSaluton, mi estas Lain\nMi estas animea knabino vivante en Japanujo. Eble vi konas min de la retejo « Wired ».",
+    "bio_placeholder": "ekz.\nSaluton, mi estas Lain.\nMi estas animea knabino vivanta en Japanujo. Eble vi konas min pro la retejo « Wired ».",
     "validations": {
       "username_required": "ne povas resti malplena",
       "fullname_required": "ne povas resti malplena",
@@ -143,26 +158,26 @@
     "avatarRadius": "Profilbildoj",
     "background": "Fono",
     "bio": "Priskribo",
-    "blocks_tab": "Baroj",
+    "blocks_tab": "Blokitoj",
     "btnRadius": "Butonoj",
-    "cBlue": "Blua (Respondo, abono)",
-    "cGreen": "Verda (Kunhavigo)",
-    "cOrange": "Oranĝa (Ŝato)",
-    "cRed": "Ruĝa (Nuligo)",
+    "cBlue": "Blua (respondi, aboni)",
+    "cGreen": "Verda (kunhavigi)",
+    "cOrange": "Oranĝa (ŝati)",
+    "cRed": "Ruĝa (nuligi)",
     "change_password": "Ŝanĝi pasvorton",
-    "change_password_error": "Okazis eraro dum ŝanĝo de via pasvorto.",
+    "change_password_error": "Eraris ŝanĝo de via pasvorto.",
     "changed_password": "Pasvorto sukcese ŝanĝiĝis!",
     "collapse_subject": "Maletendi afiŝojn kun temoj",
-    "composing": "Verkante",
+    "composing": "Verkado",
     "confirm_new_password": "Konfirmu novan pasvorton",
     "current_avatar": "Via nuna profilbildo",
     "current_password": "Nuna pasvorto",
     "current_profile_banner": "Via nuna profila rubando",
-    "data_import_export_tab": "Enporto / Elporto de datenoj",
-    "default_vis": "Implicita videbleca amplekso",
+    "data_import_export_tab": "Enporto / Elporto de datumoj",
+    "default_vis": "Implicita amplekso de vidibleco",
     "delete_account": "Forigi konton",
-    "delete_account_description": "Por ĉiam forigi vian konton kaj ĉiujn viajn mesaĝojn",
-    "delete_account_error": "Okazis eraro dum forigo de via kanto. Se tio daŭre okazados, bonvolu kontakti la administranton de via nodo.",
+    "delete_account_description": "Por ĉiam forigi viajn datumojn kaj malaktivigi vian konton.",
+    "delete_account_error": "Eraris forigo de via kanto. Se tio daŭre ripetiĝos, bonvolu kontakti la administranton de via nodo.",
     "delete_account_instructions": "Entajpu sube vian pasvorton por konfirmi forigon de konto.",
     "avatar_size_instruction": "La rekomendata malpleja grando de profilbildoj estas 150×150 bilderoj.",
     "export_theme": "Konservi antaŭagordon",
@@ -372,7 +387,39 @@
         "checkbox": "Mi legetis la kondiĉojn de uzado",
         "link": "bela eta ligil’"
       }
-    }
+    },
+    "discoverable": "Permesi trovon de ĉi tiu konto en serĉrezultoj kaj aliaj servoj",
+    "mutes_and_blocks": "Silentigitoj kaj blokitoj",
+    "chatMessageRadius": "Babileja mesaĝo",
+    "changed_email": "Retpoŝtadreso sukcese ŝanĝiĝis!",
+    "change_email_error": "Eraris ŝanĝo de via retpoŝtadreso.",
+    "change_email": "Ŝanĝi retpoŝtadreson",
+    "bot": "Ĉi tio estas robota konto",
+    "blocks_imported": "Blokitoj enportiĝis! Traktado daŭros iom da tempo.",
+    "block_import_error": "Eraris enporto de blokitoj",
+    "block_export": "Elporto de blokitoj",
+    "block_import": "Enporto de blokitoj",
+    "block_export_button": "Elporti viajn blokitojn al CSV-dosiero",
+    "allow_following_move": "Permesi memagan abonadon kiam abonata konto migras",
+    "mfa": {
+      "verify": {
+        "desc": "Por ŝalti duoblan aŭtentikigon, enigu la kodon el via aplikaĵo por duobla aŭtentikigo:"
+      },
+      "scan": {
+        "secret_code": "Ŝlosilo",
+        "desc": "Uzante vian aplikaĵon por duobla aŭtentikigo, skanu ĉi tiun rapidrespondan kodon aŭ enigu tekstan ŝlosilon:",
+        "title": "Skani"
+      },
+      "authentication_methods": "Metodoj de aŭtentikigo",
+      "recovery_codes_warning": "Notu la kodojn aŭ konservu ilin en sekura loko – alie vi ne revidos ilin. Se vi perdos aliron al via aplikaĵo por duobla aŭtentikigo kaj al la rehavaj kodoj, vi ne povos aliri vian konton.",
+      "waiting_a_recovery_codes": "Ricevante savkopiajn kodojn…",
+      "recovery_codes": "Rehavaj kodoj.",
+      "warning_of_generate_new_codes": "Kiam vi estigos novajn rehavajn kodojn, viaj malnovaj ne plu funkcios.",
+      "generate_new_recovery_codes": "Estigi novajn rehavajn kodojn",
+      "title": "Duobla aŭtentikigo"
+    },
+    "enter_current_password_to_confirm": "Enigu vian pasvorton por konfirmi vian identecon",
+    "security": "Sekureco"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -450,7 +497,11 @@
     "keep_open": "Teni elektilon malfermita",
     "emoji": "Bildsignoj",
     "stickers": "Glumarkoj",
-    "add_emoji": "Enigi bildosignon"
+    "add_emoji": "Enigi bildosignon",
+    "load_all": "Enlegante ĉiujn {emojiAmount} bildosignojn",
+    "load_all_hint": "Enlegis la {saneAmount} unuajn bildosignojn; enlego de ĉiuj povus kaŭzi problemojn pri efikeco.",
+    "unicode": "Unikoda bildosigno",
+    "custom": "Propra bildosigno"
   },
   "polls": {
     "not_enough_options": "Tro malmultaj unikaj elektebloj en la enketo",
@@ -508,5 +559,22 @@
       },
       "federation": "Federado"
     }
+  },
+  "selectable_list": {
+    "select_all": "Elekti ĉion"
+  },
+  "remote_user_resolver": {
+    "error": "Netrovinte.",
+    "searching_for": "Serĉante",
+    "remote_user_resolver": "Trovilo de foraj uzantoj"
+  },
+  "interactions": {
+    "load_older": "Enlegi pli malnovajn interagojn",
+    "moves": "Migrado de uzantoj",
+    "follows": "Novaj abonoj",
+    "favs_repeats": "Ripetoj kaj ŝatoj"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma ne povis aliri deponejon de la foliumilo. Via saluto kaj viaj lokaj agordoj ne estos konservitaj, kaj vi eble renkontos neatenditajn problemojn. Provu permesi kuketojn."
   }
 }

From dee8f7febed57d2f40c203af4c0ac1cde0270da7 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 20 Jul 2020 19:02:48 +0000
Subject: [PATCH 360/415] Translated using Weblate (Esperanto)

Currently translated at 72.6% (481 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index bae1918c..195c0ed8 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -179,26 +179,26 @@
     "delete_account_description": "Por ĉiam forigi viajn datumojn kaj malaktivigi vian konton.",
     "delete_account_error": "Eraris forigo de via kanto. Se tio daŭre ripetiĝos, bonvolu kontakti la administranton de via nodo.",
     "delete_account_instructions": "Entajpu sube vian pasvorton por konfirmi forigon de konto.",
-    "avatar_size_instruction": "La rekomendata malpleja grando de profilbildoj estas 150×150 bilderoj.",
+    "avatar_size_instruction": "La rekomendata minimuma grando de profilbildoj estas 150×150 bilderoj.",
     "export_theme": "Konservi antaŭagordon",
     "filtering": "Filtrado",
-    "filtering_explanation": "Ĉiuj statoj kun tiuj ĉi vortoj silentiĝos, po unu linio",
-    "follow_export": "Abona elporto",
+    "filtering_explanation": "Ĉiuj statoj kun tiuj ĉi vortoj silentiĝos; skribu po unu linie",
+    "follow_export": "Elporto de abonoj",
     "follow_export_button": "Elporti viajn abonojn al CSV-dosiero",
     "follow_export_processing": "Traktante; baldaŭ vi ricevos peton elŝuti la dosieron",
-    "follow_import": "Abona enporto",
+    "follow_import": "Enporto de abonoj",
     "follow_import_error": "Eraro enportante abonojn",
-    "follows_imported": "Abonoj enportiĝis! Traktado daŭros iom.",
+    "follows_imported": "Abonoj enportiĝis! Traktado daŭros iom da tempo.",
     "foreground": "Malfono",
     "general": "Ĝenerala",
     "hide_attachments_in_convo": "Kaŝi kunsendaĵojn en interparoloj",
     "hide_attachments_in_tl": "Kaŝi kunsendaĵojn en tempolinio",
-    "max_thumbnails": "Plej multa nombro da bildetoj po afiŝo",
-    "hide_isp": "Kaŝi nodo-propran breton",
+    "max_thumbnails": "Maksimuma nombro da bildetoj en afiŝo",
+    "hide_isp": "Kaŝi breton propran al nodo",
     "preload_images": "Antaŭ-enlegi bildojn",
     "use_one_click_nsfw": "Malfermi konsternajn kunsendaĵojn per nur unu klako",
-    "hide_post_stats": "Kaŝi statistikon de afiŝoj (ekz. nombron da ŝatoj)",
-    "hide_user_stats": "Kaŝi statistikon de uzantoj (ekz. nombron da abonantoj)",
+    "hide_post_stats": "Kaŝi statistikon de afiŝoj (ekz. nombron de ŝatoj)",
+    "hide_user_stats": "Kaŝi statistikon de uzantoj (ekz. nombron de abonantoj)",
     "hide_filtered_statuses": "Kaŝi filtritajn statojn",
     "import_followers_from_a_csv_file": "Enporti abonojn el CSV-dosiero",
     "import_theme": "Enlegi antaŭagordojn",
@@ -213,9 +213,9 @@
     "links": "Ligiloj",
     "lock_account_description": "Limigi vian konton al nur abonantoj aprobitaj",
     "loop_video": "Ripetadi filmojn",
-    "loop_video_silent_only": "Ripetadi nur filmojn sen sono (ekz. la \"GIF-ojn\" de Mastodon)",
+    "loop_video_silent_only": "Ripetadi nur filmojn sen sono (ekz. la «GIF-ojn» de Mastodon)",
     "mutes_tab": "Silentigoj",
-    "play_videos_in_modal": "Ludi filmojn rekte en la aŭdvidaĵa spektilo",
+    "play_videos_in_modal": "Ludi filmojn en ŝpruca kadro",
     "use_contain_fit": "Ne tondi la kunsendaĵon en bildetoj",
     "name": "Nomo",
     "name_bio": "Nomo kaj priskribo",
@@ -226,50 +226,50 @@
     "notification_visibility_mentions": "Mencioj",
     "notification_visibility_repeats": "Ripetoj",
     "no_rich_text_description": "Forigi riĉtekstajn formojn de ĉiuj afiŝoj",
-    "no_blocks": "Neniuj baroj",
+    "no_blocks": "Neniuj blokitoj",
     "no_mutes": "Neniuj silentigoj",
     "hide_follows_description": "Ne montri kiun mi sekvas",
     "hide_followers_description": "Ne montri kiu min sekvas",
     "show_admin_badge": "Montri la insignon de administranto en mia profilo",
-    "show_moderator_badge": "Montri la insignon de kontrolanto en mia profilo",
-    "nsfw_clickthrough": "Ŝalti traklakan kaŝon de konsternaj kunsendaĵoj",
+    "show_moderator_badge": "Montri la insignon de reguligisto en mia profilo",
+    "nsfw_clickthrough": "Ŝalti traklakan kaŝadon de konsternaj kunsendaĵoj",
     "oauth_tokens": "Ĵetonoj de OAuth",
     "token": "Ĵetono",
-    "refresh_token": "Ĵetono de novigo",
+    "refresh_token": "Ĵetono de aktualigo",
     "valid_until": "Valida ĝis",
     "revoke_token": "Senvalidigi",
     "panelRadius": "Bretoj",
     "pause_on_unfocused": "Paŭzigi elsendfluon kiam langeto ne estas fokusata",
     "presets": "Antaŭagordoj",
-    "profile_background": "Profila fono",
-    "profile_banner": "Profila rubando",
+    "profile_background": "Fono de profilo",
+    "profile_banner": "Rubando de profilo",
     "profile_tab": "Profilo",
     "radii_help": "Agordi fasadan rondigon de randoj (bildere)",
     "replies_in_timeline": "Respondoj en tempolinio",
     "reply_visibility_all": "Montri ĉiujn respondojn",
     "reply_visibility_following": "Montri nur respondojn por mi aŭ miaj abonatoj",
     "reply_visibility_self": "Montri nur respondojn por mi",
-    "saving_err": "Eraro dum konservo de agordoj",
+    "saving_err": "Eraris konservado de agordoj",
     "saving_ok": "Agordoj konserviĝis",
     "security_tab": "Sekureco",
     "scope_copy": "Kopii amplekson por respondo (rektaj mesaĝoj ĉiam kopiiĝas)",
     "set_new_avatar": "Agordi novan profilbildon",
-    "set_new_profile_background": "Agordi novan profilan fonon",
-    "set_new_profile_banner": "Agordi novan profilan rubandon",
+    "set_new_profile_background": "Agordi novan fonon de profilo",
+    "set_new_profile_banner": "Agordi novan rubandon de profilo",
     "settings": "Agordoj",
-    "subject_input_always_show": "Ĉiam montri teman kampon",
-    "subject_line_behavior": "Kopii temon por respondo",
-    "subject_line_email": "Kiel retpoŝto: \"re: temo\"",
+    "subject_input_always_show": "Ĉiam montri kampon de temo",
+    "subject_line_behavior": "Kopii temon dum respondado",
+    "subject_line_email": "Kiel retpoŝto: «re: temo»",
     "subject_line_mastodon": "Kiel Mastodon: kopii senŝanĝe",
     "subject_line_noop": "Ne kopii",
     "post_status_content_type": "Afiŝi specon de la enhavo de la stato",
-    "stop_gifs": "Movi GIF-bildojn dum musa ŝvebo",
-    "streaming": "Ŝalti memfaran fluigon de novaj afiŝoj ĉe la supro de la paĝo",
+    "stop_gifs": "Movi GIF-bildojn dum ŝvebo de muso",
+    "streaming": "Ŝalti memagan fluigon de novaj afiŝoj kiam vi vidas la supron de la paĝo",
     "text": "Teksto",
     "theme": "Haŭto",
     "theme_help": "Uzu deksesumajn kolorkodojn (#rrvvbb) por adapti vian koloran haŭton.",
-    "theme_help_v2_1": "Vi ankaŭ povas superagordi la kolorojn kaj travideblecon de kelkaj eroj per marko de la markbutono; uzu la butonon \"Vakigi ĉion\" por forigi ĉîujn superagordojn.",
-    "theme_help_v2_2": "Bildsimboloj sub kelkaj eroj estas indikiloj de kontrasto inter fono kaj teksto; muse ŝvebu por detalaj informoj. Bonvolu memori, ke la indikilo montras la plej malbonan okazeblon dum sia uzo.",
+    "theme_help_v2_1": "Vi ankaŭ povas superagordi la kolorojn kaj travideblecon de kelkaj eroj per marko de la markbutono; uzu la butonon «Vakigi ĉion» por forigi ĉîujn superagordojn.",
+    "theme_help_v2_2": "Bildsimboloj sub kelkaj eroj estas indikiloj de kontrasto inter fono kaj teksto; ŝvebigu muson por detalaj informoj. Bonvolu memori, ke la indikilo montras la plej malbonan okazeblon dum sia uzo.",
     "tooltipRadius": "Ŝpruchelpiloj/avertoj",
     "upload_a_photo": "Alŝuti foton",
     "user_settings": "Agordoj de uzanto",
@@ -419,7 +419,38 @@
       "title": "Duobla aŭtentikigo"
     },
     "enter_current_password_to_confirm": "Enigu vian pasvorton por konfirmi vian identecon",
-    "security": "Sekureco"
+    "security": "Sekureco",
+    "fun": "Amuzo",
+    "type_domains_to_mute": "Serĉu silentigotajn retnomojn",
+    "useStreamingApiWarning": "(Nerekomendate, eksperimente, povas preterpasi afiŝojn)",
+    "useStreamingApi": "Ricevi afiŝojn kaj sciigojn realtempe",
+    "user_mutes": "Uzantoj",
+    "reset_background_confirm": "Ĉu vi certe volas restarigi la fonon?",
+    "reset_banner_confirm": "Ĉu vi certe volas restarigi la rubandon?",
+    "reset_avatar_confirm": "Ĉu vi certe volas restarigi la profilbildon?",
+    "reset_profile_banner": "Restarigi rubandon de profilo",
+    "reset_profile_background": "Restarigi fonon de profilo",
+    "reset_avatar": "Restarigi profilbildon",
+    "minimal_scopes_mode": "Minimumigi elekteblojn pri amplekso de afiŝoj",
+    "search_user_to_block": "Serĉu, kiun vi volas bloki",
+    "search_user_to_mute": "Serĉu, kiun vi volas silentigi",
+    "autohide_floating_post_button": "Memage kaŝi la butonon por Nova afiŝo (poŝtelefone)",
+    "hide_followers_count_description": "Ne montri nombron de abonantoj",
+    "hide_follows_count_description": "Ne montri nombron de abonoj",
+    "notification_visibility_emoji_reactions": "Reagoj",
+    "notification_visibility_moves": "Migroj",
+    "new_email": "Nova retpoŝtadreso",
+    "profile_fields": {
+      "value": "Enhavo",
+      "name": "Etikedo",
+      "add_field": "Aldoni kampon",
+      "label": "Pridatumoj de profilo"
+    },
+    "import_blocks_from_a_csv_file": "Enporti blokitojn el CSV-dosiero",
+    "hide_muted_posts": "Kaŝi afiŝojn de silentigitaj uzantoj",
+    "emoji_reactions_on_timeline": "Montri bildosignajn reagojn en la tempolinio",
+    "pad_emoji": "Meti spacetojn ĉirkaŭ bildosigno post ties elekto",
+    "domain_mutes": "Retnomoj"
   },
   "timeline": {
     "collapse": "Maletendi",

From 537c1fd81781d6df9a963ee3067b7c16624580be Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Mon, 20 Jul 2020 21:51:16 +0000
Subject: [PATCH 361/415] Translated using Weblate (Polish)

Currently translated at 92.4% (612 of 662 strings)

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

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 389b49db..a169f815 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -34,9 +34,9 @@
   },
   "domain_mute_card": {
     "mute": "Wycisz",
-    "mute_progress": "Wyciszam...",
+    "mute_progress": "Wyciszam…",
     "unmute": "Odcisz",
-    "unmute_progress": "Odciszam..."
+    "unmute_progress": "Odciszam…"
   },
   "exporter": {
     "export": "Eksportuj",
@@ -70,7 +70,8 @@
     "confirm": "Potwierdź",
     "verify": "Zweryfikuj",
     "close": "Zamknij",
-    "loading": "Ładowanie…"
+    "loading": "Ładowanie…",
+    "retry": "Spróbuj ponownie"
   },
   "image_cropper": {
     "crop_picture": "Przytnij obrazek",
@@ -563,7 +564,8 @@
     "profile_fields": {
       "value": "Zawartość",
       "label": "Metadane profilu"
-    }
+    },
+    "bot": "To konto jest prowadzone przez bota"
   },
   "time": {
     "day": "{0} dzień",

From c7966a20283dd9eda3582291b8548928e811d855 Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Mon, 20 Jul 2020 22:03:13 +0000
Subject: [PATCH 362/415] Translated using Weblate (Polish)

Currently translated at 92.5% (613 of 662 strings)

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

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index a169f815..629e8a11 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -240,7 +240,7 @@
       "generate_new_recovery_codes": "Wygeneruj nowe kody zapasowe",
       "warning_of_generate_new_codes": "Po tym gdy wygenerujesz nowe kody zapasowe, stare przestaną działać.",
       "recovery_codes": "Kody zapasowe.",
-      "waiting_a_recovery_codes": "Otrzymuję kody zapasowe...",
+      "waiting_a_recovery_codes": "Otrzymuję kody zapasowe…",
       "recovery_codes_warning": "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał(-a) dostępu do swojego konta.",
       "authentication_methods": "Metody weryfikacji",
       "scan": {

From 0546326b222d0d861e15401768dfad80ec2b9175 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 22 Jul 2020 09:43:22 +0300
Subject: [PATCH 363/415] update icon to hopefully look fine on both browsers

---
 src/components/post_status_form/post_status_form.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index b1c74aad..7ee9e748 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -79,10 +79,7 @@
             @click.stop.prevent="togglePreview"
           >
             {{ $t('post_status.preview') }}
-            <i
-              class="icon-left-open"
-              :style="{ 'transform': showPreview ? 'rotate(90deg)' : 'rotate(-90deg)' }"
-            />
+            <i :class="showPreview ? 'icon-left-open' : 'icon-right-open'" />
           </a>
           <i
             v-show="previewLoading"
@@ -393,7 +390,8 @@
     }
     i {
       margin-left: 0.2em;
-      font-size: 0.9em;
+      font-size: 0.8em;
+      transform: rotate(90deg);
     }
   }
 

From dac075c61a33eafa6778d04b9f972dbc1e1dfb57 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Tue, 21 Jul 2020 14:53:01 +0300
Subject: [PATCH 364/415] Fix mobile setting modal behavior: ensure the mobile
 browser address bar doesn't overlap the modal top panel.

---
 src/App.scss                                     | 16 ++++++++++++++++
 src/components/settings_modal/settings_modal.js  | 15 +++++++++++++++
 .../settings_modal/settings_modal.scss           |  3 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/App.scss b/src/App.scss
index e2e2d079..21c00bac 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -943,6 +943,22 @@ nav {
   line-height: 1.3rem;
 }
 
+.settings-modal-layout {
+  @media all and (max-width: 800px) {
+    height: 100%;
+
+    body {
+      height: 100vh;
+      overflow-y: hidden;
+      position: fixed;
+    }
+
+    #app {
+      height: 100%;
+    }
+  }
+}
+
 .chat-layout {
   // Needed for smoother chat navigation in the desktop Safari (otherwise the chat layout "jumps" as the chat opens).
   overflow: hidden;
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index f0d49c91..b6880445 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -36,6 +36,21 @@ const SettingsModal = {
     modalPeeked () {
       return this.$store.state.interface.settingsModalState === 'minimized'
     }
+  },
+  watch: {
+    modalActivated (newValue) {
+      if (newValue) {
+        let html = document.querySelector('html')
+        if (html) {
+          html.classList.add('settings-modal-layout')
+        }
+      } else {
+        let html = document.querySelector('html')
+        if (html) {
+          html.classList.remove('settings-modal-layout')
+        }
+      }
+    }
   }
 }
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 0da4d9a8..e7f4d3d3 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -1,6 +1,7 @@
 @import 'src/_variables.scss';
 .settings-modal {
   overflow: hidden;
+  height: 100%;
 
   &.peek {
     .settings-modal-panel {
@@ -27,7 +28,7 @@
 
     @media all and (max-width: 800px) {
       max-width: 100vw;
-      height: 100vh;
+      height: 100%;
     }
 
     >.panel-body {

From 61dd1a3b4935d0466bfd77e026c19461d62b124f Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 23 Jul 2020 09:06:50 +0300
Subject: [PATCH 365/415] Add body 100% width for the preview, refactor the
 modalActivated watcher, use body scroll lock for the setting tab content

---
 src/App.scss                                      |  1 +
 src/components/settings_modal/settings_modal.js   | 13 +++++--------
 src/components/settings_modal/settings_modal.scss |  4 ++++
 src/components/tab_switcher/tab_switcher.js       |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 21c00bac..336c4998 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -949,6 +949,7 @@ nav {
 
     body {
       height: 100vh;
+      width: 100%;
       overflow-y: hidden;
       position: fixed;
     }
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index b6880445..4f54d6a3 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -38,17 +38,14 @@ const SettingsModal = {
     }
   },
   watch: {
+    // This is the only way to access the <html> element.
     modalActivated (newValue) {
+      let html = document.querySelector('html')
+      if (!html) return
       if (newValue) {
-        let html = document.querySelector('html')
-        if (html) {
-          html.classList.add('settings-modal-layout')
-        }
+        html.classList.add('settings-modal-layout')
       } else {
-        let html = document.querySelector('html')
-        if (html) {
-          html.classList.remove('settings-modal-layout')
-        }
+        html.classList.remove('settings-modal-layout')
       }
     }
   }
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index e7f4d3d3..f32db4bd 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -14,6 +14,10 @@
        * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible
        */
       transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
+
+      @media all and (max-width: 800px) {
+        transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 100px));
+      }
     }
   }
 
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 7891cb78..919eb7cd 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -134,7 +134,7 @@ export default Vue.component('tab-switcher', {
         <div class="tabs">
           {tabs}
         </div>
-        <div ref="contents" class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')}>
+        <div ref="contents" class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')} v-body-scroll-lock>
           {contents}
         </div>
       </div>

From 2298ad0011e8507a138d967ed142641981e1e297 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 23 Jul 2020 09:41:22 +0300
Subject: [PATCH 366/415] Use bock-scroll-lock directive for the settings modal

---
 src/App.scss                                    | 17 -----------------
 src/components/settings_modal/settings_modal.js | 12 ------------
 .../settings_modal/settings_modal.scss          |  3 +--
 src/components/tab_switcher/tab_switcher.js     | 11 +++++++++--
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 336c4998..e2e2d079 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -943,23 +943,6 @@ nav {
   line-height: 1.3rem;
 }
 
-.settings-modal-layout {
-  @media all and (max-width: 800px) {
-    height: 100%;
-
-    body {
-      height: 100vh;
-      width: 100%;
-      overflow-y: hidden;
-      position: fixed;
-    }
-
-    #app {
-      height: 100%;
-    }
-  }
-}
-
 .chat-layout {
   // Needed for smoother chat navigation in the desktop Safari (otherwise the chat layout "jumps" as the chat opens).
   overflow: hidden;
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 4f54d6a3..f0d49c91 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -36,18 +36,6 @@ const SettingsModal = {
     modalPeeked () {
       return this.$store.state.interface.settingsModalState === 'minimized'
     }
-  },
-  watch: {
-    // This is the only way to access the <html> element.
-    modalActivated (newValue) {
-      let html = document.querySelector('html')
-      if (!html) return
-      if (newValue) {
-        html.classList.add('settings-modal-layout')
-      } else {
-        html.classList.remove('settings-modal-layout')
-      }
-    }
   }
 }
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index f32db4bd..cdb32fd7 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -1,7 +1,6 @@
 @import 'src/_variables.scss';
 .settings-modal {
   overflow: hidden;
-  height: 100%;
 
   &.peek {
     .settings-modal-panel {
@@ -16,7 +15,7 @@
       transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
 
       @media all and (max-width: 800px) {
-        transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 100px));
+        transform: translateY(calc(100% - 50px));
       }
     }
   }
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 919eb7cd..19206610 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { mapState } from 'vuex'
 
 import './tab_switcher.scss'
 
@@ -44,7 +45,13 @@ export default Vue.component('tab-switcher', {
       } else {
         return this.active
       }
-    }
+    },
+    bodyLocked () {
+      return this.settingsModalState === 'visible'
+    },
+    ...mapState({
+      settingsModalState: state => state.interface.settingsModalState
+    })
   },
   beforeUpdate () {
     const currentSlot = this.$slots.default[this.active]
@@ -134,7 +141,7 @@ export default Vue.component('tab-switcher', {
         <div class="tabs">
           {tabs}
         </div>
-        <div ref="contents" class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')} v-body-scroll-lock>
+        <div ref="contents" class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')} v-body-scroll-lock={this.bodyLocked}>
           {contents}
         </div>
       </div>

From fdbacba36a99b1f2ef200b8194a1964d9b87f9e1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 23 Jul 2020 15:09:32 +0300
Subject: [PATCH 367/415] resume last lasttime instead of always friends/public

---
 src/components/nav_panel/nav_panel.js         | 3 +++
 src/components/side_drawer/side_drawer.js     | 3 +++
 src/components/timeline_menu/timeline_menu.js | 1 +
 src/modules/interface.js                      | 9 ++++++++-
 src/modules/users.js                          | 1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 6ed7fc33..623dfaec 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -12,6 +12,9 @@ const NavPanel = {
       return !!timelineNames()[this.$route.name]
     },
     timelinesRoute () {
+      if (this.$store.state.interface.lastTimeline) {
+        return this.$store.state.interface.lastTimeline
+      }
       return this.currentUser ? 'friends' : 'public-timeline'
     },
     ...mapState({
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index e13c66db..281052e5 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -50,6 +50,9 @@ const SideDrawer = {
       return this.$store.state.instance.federating
     },
     timelinesRoute () {
+      if (this.$store.state.interface.lastTimeline) {
+        return this.$store.state.interface.lastTimeline
+      }
       return this.currentUser ? 'friends' : 'public-timeline'
     },
     ...mapState({
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 02c1318d..0afeb8b4 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -26,6 +26,7 @@ const TimelineMenu = {
     if (this.currentUser && this.currentUser.locked) {
       this.$store.dispatch('startFetchingFollowRequests')
     }
+    this.$store.dispatch('setLastTimeline', this.$route.name)
   },
   methods: {
     openMenu () {
diff --git a/src/modules/interface.js b/src/modules/interface.js
index ec08ac0a..748d3025 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -16,7 +16,8 @@ const defaultState = {
   },
   mobileLayout: false,
   globalNotices: [],
-  layoutHeight: 0
+  layoutHeight: 0,
+  lastTimeline: null
 }
 
 const interfaceMod = {
@@ -69,6 +70,9 @@ const interfaceMod = {
     },
     setLayoutHeight (state, value) {
       state.layoutHeight = value
+    },
+    setLastTimeline (state, value) {
+      state.lastTimeline = value
     }
   },
   actions: {
@@ -117,6 +121,9 @@ const interfaceMod = {
     },
     setLayoutHeight ({ commit }, value) {
       commit('setLayoutHeight', value)
+    },
+    setLastTimeline ({ commit }, value) {
+      commit('setLastTimeline', value)
     }
   }
 }
diff --git a/src/modules/users.js b/src/modules/users.js
index 16c1e566..9245db5c 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -499,6 +499,7 @@ const users = {
           store.commit('clearNotifications')
           store.commit('resetStatuses')
           store.dispatch('resetChats')
+          store.dispatch('setLastTimeline', 'public-timeline')
         })
     },
     loginUser (store, accessToken) {

From 77d65d6cecfae1bdbf5e5b7d8c882d39846b91f1 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 23 Jul 2020 12:20:48 +0300
Subject: [PATCH 368/415] Ensures the minimized modal is always 50px above the
 mobile browser bottom bar regardless of whether or not it is visible.

---
 src/components/settings_modal/settings_modal.scss | 3 +++
 src/components/tab_switcher/tab_switcher.js       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index cdb32fd7..90446b36 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -15,6 +15,9 @@
       transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
 
       @media all and (max-width: 800px) {
+        /* For mobile, the modal takes 100% of the available screen.
+           This ensures the minimized modal is always 50px above the browser bottom bar regardless of whether or not it is visible.
+        */
         transform: translateY(calc(100% - 50px));
       }
     }
diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 19206610..40b5b3ca 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -46,7 +46,7 @@ export default Vue.component('tab-switcher', {
         return this.active
       }
     },
-    bodyLocked () {
+    settingsModalVisible () {
       return this.settingsModalState === 'visible'
     },
     ...mapState({
@@ -141,7 +141,7 @@ export default Vue.component('tab-switcher', {
         <div class="tabs">
           {tabs}
         </div>
-        <div ref="contents" class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')} v-body-scroll-lock={this.bodyLocked}>
+        <div ref="contents" class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')} v-body-scroll-lock={this.settingsModalVisible}>
           {contents}
         </div>
       </div>

From 222ad2dd50823074ad323a4a9ff75842808fbe25 Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Thu, 23 Jul 2020 16:39:01 +0300
Subject: [PATCH 369/415] Make the single line mode is consistent with
 status-content line height

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

diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index bf8d376e..ab48786c 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -275,6 +275,7 @@ $status-margin: 0.75em;
       white-space: nowrap;
       text-overflow: ellipsis;
       overflow: hidden;
+      height: 1.4em;
     }
   }
 }

From 96929d9930e6960c2c13d2ce7e960bd1d900920e Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@soykaf.club>
Date: Thu, 23 Jul 2020 17:31:35 +0200
Subject: [PATCH 370/415] ChatPanel: Rename `chat` to `shoutbox`.

To remove confusion with the new ChatMessages.
---
 src/components/chat_panel/chat_panel.vue | 4 ++--
 src/i18n/en.json                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 12968cfb..ca529b5a 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -10,7 +10,7 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <span>{{ $t('chat.title') }}</span>
+          <span>{{ $t('shoutbox.title') }}</span>
           <i
             v-if="floating"
             class="icon-cancel"
@@ -64,7 +64,7 @@
       >
         <div class="title">
           <i class="icon-comment-empty" />
-          {{ $t('chat.title') }}
+          {{ $t('shoutbox.title') }}
         </div>
       </div>
     </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index dc714bce..6bc63cfd 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -29,8 +29,8 @@
     },
     "staff": "Staff"
   },
-  "chat": {
-    "title": "Chat"
+  "shoutbox": {
+    "title": "Shoutbox"
   },
   "domain_mute_card": {
     "mute": "Mute",

From f9e4afa3e95ab991edf1663ec60ef22d382db8e1 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 24 Jul 2020 17:24:34 +0300
Subject: [PATCH 371/415] update poll to post status form on deleting option

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

diff --git a/src/components/poll/poll_form.js b/src/components/poll/poll_form.js
index c0c1ccf7..df93f038 100644
--- a/src/components/poll/poll_form.js
+++ b/src/components/poll/poll_form.js
@@ -75,6 +75,7 @@ export default {
     deleteOption (index, event) {
       if (this.options.length > 2) {
         this.options.splice(index, 1)
+        this.updatePollToParent()
       }
     },
     convertExpiryToUnit (unit, amount) {

From b73c62b17ace8003ac19bd18ea923baaeb7e412a Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 21 Jul 2020 16:27:55 +0000
Subject: [PATCH 372/415] Translated using Weblate (Esperanto)

Currently translated at 77.4% (513 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 195c0ed8..6420584e 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -278,7 +278,7 @@
       "true": "jes"
     },
     "notifications": "Sciigoj",
-    "enable_web_push_notifications": "Ŝalti retajn puŝajn sciigojn",
+    "enable_web_push_notifications": "Ŝalti retajn pasivajn sciigojn",
     "style": {
       "switcher": {
         "keep_color": "Konservi kolorojn",
@@ -286,10 +286,22 @@
         "keep_opacity": "Konservi maltravideblecon",
         "keep_roundness": "Konservi rondecon",
         "keep_fonts": "Konservi tiparojn",
-        "save_load_hint": "Elektebloj de \"konservi\" konservas la nuntempajn agordojn dum elektado aŭ enlegado de haŭtoj. Ĝi ankaŭ konservas tiujn agordojn dum elportado de haŭto. Kun ĉiuj markbutonoj nemarkitaj, elporto de la haŭto ĉion konservos.",
+        "save_load_hint": "Elektebloj de «konservi» konservas la nuntempajn agordojn dum elektado aŭ enlegado de haŭtoj. Ĝi ankaŭ konservas tiujn agordojn dum elportado de haŭto. Kun ĉiuj markbutonoj nemarkitaj, elporto de la haŭto ĉion konservos.",
         "reset": "Restarigi",
         "clear_all": "Vakigi ĉion",
-        "clear_opacity": "Vakigi maltravideblecon"
+        "clear_opacity": "Vakigi maltravideblecon",
+        "help": {
+          "fe_downgraded": "Versio de PleromaFE reen iris.",
+          "fe_upgraded": "La motoro de haŭtoj de la Fasado de Pleroma ĝisdatiĝis post ĝisdatigo de la versio.",
+          "older_version_imported": "La enportita dosiero estis farita per pli malnova versio de Fasado.",
+          "future_version_imported": "La enportita dosiero estis farita per pli nova versio de la fasado.",
+          "v2_imported": "La dosiero, kiun vi enportis, estis farita por malnova fasado. Ni provas maksimumigi interkonformecon, sed tamen eble montriĝos misoj.",
+          "upgraded_from_v2": "PleromaFE estis ĝisdatigita; la haŭto eble aspektos malsame ol kiel vi ĝin memoras."
+        },
+        "use_source": "Nova versio",
+        "use_snapshot": "Malnova versio",
+        "keep_as_is": "Teni senŝanĝa",
+        "load_theme": "Enlegi haŭton"
       },
       "common": {
         "color": "Koloro",
@@ -297,7 +309,7 @@
         "contrast": {
           "hint": "Proporcio de kontrasto estas {ratio}, ĝi {level} {context}",
           "level": {
-            "aa": "plenumas la gvidilon je nivelo AA (malpleja)",
+            "aa": "plenumas la gvidilon je nivelo AA (minimuma)",
             "aaa": "plenumas la gvidilon je nivela AAA (rekomendita)",
             "bad": "plenumas neniujn faciluzajn gvidilojn"
           },
@@ -310,21 +322,39 @@
       "common_colors": {
         "_tab_label": "Komunaj",
         "main": "Komunaj koloroj",
-        "foreground_hint": "Vidu langeton \"Specialaj\" por pli detalaj agordoj",
+        "foreground_hint": "Vidu langeton «Specialaj» por pli detalaj agordoj",
         "rgbo": "Bildsimboloj, emfazoj, insignoj"
       },
       "advanced_colors": {
         "_tab_label": "Specialaj",
-        "alert": "Averta fono",
+        "alert": "Fono de averto",
         "alert_error": "Eraro",
-        "badge": "Insigna fono",
+        "badge": "Fono de insigno",
         "badge_notification": "Sciigo",
         "panel_header": "Kapo de breto",
         "top_bar": "Supra breto",
         "borders": "Limoj",
         "buttons": "Butonoj",
         "inputs": "Enigaj kampoj",
-        "faint_text": "Malvigla teksto"
+        "faint_text": "Malvigla teksto",
+        "chat": {
+          "border": "Limo",
+          "outgoing": "Eliraj",
+          "incoming": "Envenaj"
+        },
+        "tabs": "Langetoj",
+        "disabled": "Malŝaltita",
+        "selectedMenu": "Elektita menuero",
+        "selectedPost": "Elektita afiŝo",
+        "pressed": "Premita",
+        "highlight": "Emfazitaj eroj",
+        "icons": "Bildsimboloj",
+        "poll": "Grafo de enketo",
+        "underlay": "Subtavolo",
+        "popover": "Ŝpruchelpiloj, menuoj",
+        "post": "Afiŝoj/Priskriboj de uzantoj",
+        "alert_neutral": "Neŭtrala",
+        "alert_warning": "Averto"
       },
       "radii": {
         "_tab_label": "Rondeco"
@@ -339,7 +369,7 @@
         "inset": "Internigo",
         "hint": "Por ombroj vi ankaŭ povas uzi --variable kiel koloran valoron, por uzi variantojn de CSS3. Bonvolu rimarki, ke tiuokaze agordoj de maltravidebleco ne funkcios.",
         "filter_hint": {
-          "always_drop_shadow": "Averto: ĉi tiu ombro ĉiam uzas {0} kiam la foliumilo ĝin subtenas.",
+          "always_drop_shadow": "Averto: ĉi tiu ombro ĉiam uzas {0} kiam la foliumilo tion subtenas.",
           "drop_shadow_syntax": "{0} ne subtenas parametron {1} kaj ŝlosilvorton {2}.",
           "avatar_inset": "Bonvolu rimarki, ke agordi ambaŭ internajn kaj eksterajn ombrojn por profilbildoj povas redoni neatenditajn rezultojn ĉe profilbildoj travideblaj.",
           "spread_zero": "Ombroj kun vastigo > 0 aperos kvazaŭ ĝi estus fakte nulo",
@@ -355,7 +385,7 @@
           "button": "Butono",
           "buttonHover": "Butono (je ŝvebo)",
           "buttonPressed": "Butono (premita)",
-          "buttonPressedHover": "Butono (premita je ŝvebo)",
+          "buttonPressedHover": "Butono (premita kaj je ŝvebo)",
           "input": "Eniga kampo"
         }
       },
@@ -450,7 +480,14 @@
     "hide_muted_posts": "Kaŝi afiŝojn de silentigitaj uzantoj",
     "emoji_reactions_on_timeline": "Montri bildosignajn reagojn en la tempolinio",
     "pad_emoji": "Meti spacetojn ĉirkaŭ bildosigno post ties elekto",
-    "domain_mutes": "Retnomoj"
+    "domain_mutes": "Retnomoj",
+    "notification_blocks": "Blokinte uzanton vi malabonos ĝin kaj haltigos ĉiujn sciigojn.",
+    "notification_mutes": "Por ne plu ricevi sciigojn de certa uzanto, silentigu.",
+    "notification_setting_hide_notification_contents": "Kaŝi la sendinton kaj la enhavojn de pasivaj sciigoj",
+    "notification_setting_privacy": "Privateco",
+    "notification_setting_block_from_strangers": "Bloki sciigojn de uzantoj, kiujn vi ne abonas",
+    "notification_setting_filters": "Filtriloj",
+    "greentext": "Memecitaĵoj"
   },
   "timeline": {
     "collapse": "Maletendi",

From 6e651c76936cf830a45b1ec9f04e0ce4b185d261 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 21 Jul 2020 17:26:01 +0000
Subject: [PATCH 373/415] Translated using Weblate (Esperanto)

Currently translated at 77.4% (513 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 6420584e..b162eabd 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -391,7 +391,7 @@
       },
       "fonts": {
         "_tab_label": "Tiparoj",
-        "help": "Elektu tiparon uzotan por eroj de la fasado. Por \"propra\" vi devas enigi la precizan nomon de tiparo tiel, kiel ĝi aperas en la sistemo.",
+        "help": "Elektu tiparon uzotan por eroj de la fasado. Por «propra» vi devas enigi la precizan nomon de tiparo tiel, kiel ĝi aperas en la sistemo.",
         "components": {
           "interface": "Fasado",
           "input": "Enigaj kampoj",

From 1c44376cc83319f421d2d2c71c5489b96c09a6ed Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Tue, 21 Jul 2020 18:35:44 +0000
Subject: [PATCH 374/415] Translated using Weblate (Polish)

Currently translated at 95.6% (633 of 662 strings)

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

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 629e8a11..5863ba8e 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -196,7 +196,8 @@
       "unlisted": "Niewidoczny – Nie umieszczaj na publicznych osiach czasu"
     },
     "preview_empty": "Pusty",
-    "preview": "Podgląd"
+    "preview": "Podgląd",
+    "empty_status_error": "Nie można wysłać pustego wpisu bez plików"
   },
   "registration": {
     "bio": "Bio",
@@ -345,8 +346,8 @@
     "notification_visibility_moves": "Użytkownik migruje",
     "notification_visibility_emoji_reactions": "Reakcje",
     "no_rich_text_description": "Usuwaj formatowanie ze wszystkich postów",
-    "no_blocks": "Bez blokad",
-    "no_mutes": "Bez wyciszeń",
+    "no_blocks": "Brak blokad",
+    "no_mutes": "Brak wyciszeń",
     "hide_follows_description": "Nie pokazuj kogo obserwuję",
     "hide_followers_description": "Nie pokazuj kto mnie obserwuje",
     "hide_follows_count_description": "Nie pokazuj licznika obserwowanych",
@@ -488,7 +489,11 @@
         "selectedMenu": "Wybrany element menu",
         "disabled": "Wyłączone",
         "toggled": "Przełączone",
-        "tabs": "Karty"
+        "tabs": "Karty",
+        "chat": {
+          "outgoing": "Wiadomości wychodzące",
+          "incoming": "Wiadomości przychodzące"
+        }
       },
       "radii": {
         "_tab_label": "Zaokrąglenie"
@@ -563,9 +568,12 @@
     "reset_avatar": "Zresetuj awatar",
     "profile_fields": {
       "value": "Zawartość",
-      "label": "Metadane profilu"
+      "label": "Metadane profilu",
+      "name": "Nazwa",
+      "add_field": "Dodaj pole"
     },
-    "bot": "To konto jest prowadzone przez bota"
+    "bot": "To konto jest prowadzone przez bota",
+    "notification_setting_hide_notification_contents": "Ukryj nadawcę i zawartość powiadomień push"
   },
   "time": {
     "day": "{0} dzień",
@@ -627,7 +635,11 @@
     "mute_conversation": "Wycisz konwersację",
     "unmute_conversation": "Odcisz konwersację",
     "status_unavailable": "Status niedostępny",
-    "copy_link": "Kopiuj link do statusu"
+    "copy_link": "Kopiuj link do statusu",
+    "unbookmark": "Usuń z zakładek",
+    "bookmark": "Dodaj do zakładek",
+    "hide_content": "Ukryj zawartość",
+    "show_content": "Pokaż zawartość"
   },
   "user_card": {
     "approve": "Przyjmij",
@@ -682,7 +694,8 @@
       "quarantine": "Zakaż federowania postów od tego użytkownika",
       "delete_user": "Usuń użytkownika",
       "delete_user_confirmation": "Czy jesteś absolutnie pewny(-a)? Ta operacja nie może być cofnięta."
-    }
+    },
+    "message": "Napisz"
   },
   "user_profile": {
     "timeline_title": "Oś czasu użytkownika",
@@ -747,12 +760,21 @@
     "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji."
   },
   "file_type": {
-    "file": "Plik"
+    "file": "Plik",
+    "image": "Zdjęcie",
+    "video": "Wideo",
+    "audio": "Audio"
   },
   "chats": {
     "more": "Więcej",
     "delete": "Usuń",
-    "you": "Ty:"
+    "you": "Ty:",
+    "delete_confirm": "Czy na pewno chcesz usunąć tą wiadomość?",
+    "message_user": "Napisz do {nickname}",
+    "error_sending_message": "Coś poszło nie tak podczas wysyłania wiadomości.",
+    "error_loading_chat": "Coś poszło nie tak podczas ładowania czatu.",
+    "empty_message_error": "Nie można wysłać pustej wiadomości",
+    "new": "Nowy czat"
   },
   "display_date": {
     "today": "Dzisiaj"

From 536d035913bf4e301765277026ac0cbf7bb21713 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 22 Jul 2020 14:34:32 +0000
Subject: [PATCH 375/415] Translated using Weblate (Esperanto)

Currently translated at 86.7% (574 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index b162eabd..f1fa5273 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -487,39 +487,45 @@
     "notification_setting_privacy": "Privateco",
     "notification_setting_block_from_strangers": "Bloki sciigojn de uzantoj, kiujn vi ne abonas",
     "notification_setting_filters": "Filtriloj",
-    "greentext": "Memecitaĵoj"
+    "greentext": "Memecitaĵoj",
+    "version": {
+      "frontend_version": "Versio de fasado",
+      "backend_version": "Versio de internaĵo",
+      "title": "Versio"
+    }
   },
   "timeline": {
     "collapse": "Maletendi",
     "conversation": "Interparolo",
-    "error_fetching": "Eraro dum ĝisdatigo",
+    "error_fetching": "Eraris ĝisdatigo",
     "load_older": "Montri pli malnovajn statojn",
     "no_retweet_hint": "Afiŝo estas markita kiel rekta aŭ nur por abonantoj, kaj ne eblas ĝin ripeti",
     "repeated": "ripetita",
     "show_new": "Montri novajn",
     "up_to_date": "Ĝisdata",
     "no_more_statuses": "Neniuj pliaj statoj",
-    "no_statuses": "Neniuj statoj"
+    "no_statuses": "Neniuj statoj",
+    "reload": "Enlegi ree"
   },
   "user_card": {
     "approve": "Aprobi",
-    "block": "Bari",
-    "blocked": "Barita!",
+    "block": "Bloki",
+    "blocked": "Blokita!",
     "deny": "Rifuzi",
     "favorites": "Ŝatataj",
     "follow": "Aboni",
     "follow_sent": "Peto sendiĝis!",
-    "follow_progress": "Petanta…",
-    "follow_again": "Ĉu sendi peton denove?",
+    "follow_progress": "Petante…",
+    "follow_again": "Ĉu sendi peton ree?",
     "follow_unfollow": "Malaboni",
     "followees": "Abonatoj",
     "followers": "Abonantoj",
-    "following": "Abonanta!",
+    "following": "Abonata!",
     "follows_you": "Abonas vin!",
     "its_you": "Tio estas vi!",
-    "media": "Aŭdvidaĵoj",
+    "media": "Vidaŭdaĵoj",
     "mute": "Silentigi",
-    "muted": "Silentigitaj",
+    "muted": "Silentigita",
     "per_day": "tage",
     "remote_follow": "Fore aboni",
     "statuses": "Statoj",
@@ -528,7 +534,11 @@
     "block_progress": "Baranta…",
     "unmute": "Malsilentigi",
     "unmute_progress": "Malsilentiganta…",
-    "mute_progress": "Silentiganta…"
+    "mute_progress": "Silentiganta…",
+    "report": "Raporti",
+    "message": "Mesaĝo",
+    "mention": "Mencio",
+    "hidden": "Kaŝita"
   },
   "user_profile": {
     "timeline_title": "Uzanta tempolinio",
@@ -644,5 +654,62 @@
   },
   "errors": {
     "storage_unavailable": "Pleroma ne povis aliri deponejon de la foliumilo. Via saluto kaj viaj lokaj agordoj ne estos konservitaj, kaj vi eble renkontos neatenditajn problemojn. Provu permesi kuketojn."
+  },
+  "status": {
+    "hide_content": "Kaŝi enhavon",
+    "show_content": "Montri enhavon",
+    "hide_full_subject": "Kaŝi plenan temon",
+    "show_full_subject": "Montri plenan temon",
+    "thread_muted_and_words": ", enhavas vortojn:",
+    "thread_muted": "Fadeno silentigita",
+    "copy_link": "Kopii ligilon al stato",
+    "status_unavailable": "Stato ne estas disponebla",
+    "unmute_conversation": "Malsilentigi interparolon",
+    "mute_conversation": "Silentigi interparolon",
+    "replies_list": "Respondoj:",
+    "reply_to": "Responde al",
+    "delete_confirm": "Ĉu vi certe volas forigi ĉi tiun staton?",
+    "unbookmark": "Senlegosigni",
+    "bookmark": "Legosigni",
+    "pinned": "Fiksita",
+    "unpin": "Malfiksi de profilo",
+    "pin": "Fiksi al profilo",
+    "delete": "Forigi staton",
+    "repeats": "Ripetoj",
+    "favorites": "Ŝatataj"
+  },
+  "time": {
+    "years_short": "{0}j",
+    "year_short": "{0}j",
+    "years": "{0} jaroj",
+    "year": "{0} jaro",
+    "weeks_short": "{0}s",
+    "week_short": "{0}s",
+    "weeks": "{0} semajnoj",
+    "week": "{0} semajno",
+    "seconds_short": "{0}s",
+    "second_short": "{0}s",
+    "seconds": "{0} sekundoj",
+    "second": "{0} sekundo",
+    "now_short": "nun",
+    "now": "ĵus",
+    "months_short": "{0}m",
+    "month_short": "{0}m",
+    "months": "{0} monatoj",
+    "month": "{0} monato",
+    "minutes_short": "{0}m",
+    "minute_short": "{0}m",
+    "minutes": "{0} minutoj",
+    "minute": "{0} minuto",
+    "in_past": "antaŭ {0}",
+    "in_future": "post {0}",
+    "hours_short": "{0}h",
+    "hour_short": "{0}h",
+    "hours": "{0} horoj",
+    "hour": "{0} horo",
+    "days_short": "{0}t",
+    "day_short": "{0}t",
+    "days": "{0} tagoj",
+    "day": "{0} tago"
   }
 }

From 023d1c01bdc679fbaec3553e86c6a492c11aaa1f Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 22 Jul 2020 15:27:51 +0000
Subject: [PATCH 376/415] Translated using Weblate (Esperanto)

Currently translated at 97.5% (646 of 662 strings)

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

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index f1fa5273..b66f557a 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -5,7 +5,7 @@
   "features_panel": {
     "chat": "Babilejo",
     "gopher": "Gopher",
-    "media_proxy": "Aŭdvidaĵa prokurilo",
+    "media_proxy": "Vidaŭdaĵa prokurilo",
     "scope_options": "Agordoj de amplekso",
     "text_limit": "Limo de teksto",
     "title": "Funkcioj",
@@ -79,7 +79,8 @@
     "chats": "Babiloj",
     "search": "Serĉi",
     "interactions": "Interagoj",
-    "administration": "Administrado"
+    "administration": "Administrado",
+    "bookmarks": "Legosignoj"
   },
   "notifications": {
     "broken_favorite": "Nekonata stato, serĉante ĝin…",
@@ -292,10 +293,10 @@
         "clear_opacity": "Vakigi maltravideblecon",
         "help": {
           "fe_downgraded": "Versio de PleromaFE reen iris.",
-          "fe_upgraded": "La motoro de haŭtoj de la Fasado de Pleroma ĝisdatiĝis post ĝisdatigo de la versio.",
-          "older_version_imported": "La enportita dosiero estis farita per pli malnova versio de Fasado.",
-          "future_version_imported": "La enportita dosiero estis farita per pli nova versio de la fasado.",
-          "v2_imported": "La dosiero, kiun vi enportis, estis farita por malnova fasado. Ni provas maksimumigi interkonformecon, sed tamen eble montriĝos misoj.",
+          "fe_upgraded": "La motoro de haŭtoj de PleromaFE ĝisdatiĝis post ĝisdatigo de la versio.",
+          "older_version_imported": "La enportita dosiero estis farita per pli malnova versio de PleromaFE.",
+          "future_version_imported": "La enportita dosiero estis farita per pli nova versio de PleromaFE.",
+          "v2_imported": "La dosiero, kiun vi enportis, estis farita por malnova versio de PleromaFE. Ni provas maksimumigi interkonformecon, sed tamen eble montriĝos misoj.",
           "upgraded_from_v2": "PleromaFE estis ĝisdatigita; la haŭto eble aspektos malsame ol kiel vi ĝin memoras."
         },
         "use_source": "Nova versio",
@@ -446,7 +447,8 @@
       "recovery_codes": "Rehavaj kodoj.",
       "warning_of_generate_new_codes": "Kiam vi estigos novajn rehavajn kodojn, viaj malnovaj ne plu funkcios.",
       "generate_new_recovery_codes": "Estigi novajn rehavajn kodojn",
-      "title": "Duobla aŭtentikigo"
+      "title": "Duobla aŭtentikigo",
+      "otp": "OTP"
     },
     "enter_current_password_to_confirm": "Enigu vian pasvorton por konfirmi vian identecon",
     "security": "Sekureco",
@@ -492,7 +494,8 @@
       "frontend_version": "Versio de fasado",
       "backend_version": "Versio de internaĵo",
       "title": "Versio"
-    }
+    },
+    "accent": "Emfazo"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -529,32 +532,59 @@
     "per_day": "tage",
     "remote_follow": "Fore aboni",
     "statuses": "Statoj",
-    "unblock": "Malbari",
-    "unblock_progress": "Malbaranta…",
-    "block_progress": "Baranta…",
+    "unblock": "Malbloki",
+    "unblock_progress": "Malblokante…",
+    "block_progress": "Blokante…",
     "unmute": "Malsilentigi",
-    "unmute_progress": "Malsilentiganta…",
-    "mute_progress": "Silentiganta…",
+    "unmute_progress": "Malsilentigante…",
+    "mute_progress": "Silentigante…",
     "report": "Raporti",
     "message": "Mesaĝo",
     "mention": "Mencio",
-    "hidden": "Kaŝita"
+    "hidden": "Kaŝita",
+    "admin_menu": {
+      "delete_user_confirmation": "Ĉu vi tute certas? Ĉi tiu ago ne estas malfarebla.",
+      "delete_user": "Forigi uzanton",
+      "quarantine": "Malpermesi federadon de afiŝoj de uzanto",
+      "disable_any_subscription": "Malpermesi ĉian abonadon al uzanto",
+      "disable_remote_subscription": "Malpermesi abonadon al uzanto el foraj nodoj",
+      "sandbox": "Devigi afiŝojn esti nur por abonantoj",
+      "force_unlisted": "Devigi afiŝojn nelistiĝi",
+      "strip_media": "Forigi vidaŭdaĵojn de afiŝoj",
+      "force_nsfw": "Marki ĉiujn afiŝojn konsternaj",
+      "delete_account": "Forigi konton",
+      "deactivate_account": "Malaktivigi konton",
+      "activate_account": "Aktivigi konton",
+      "revoke_moderator": "Malnomumi reguligiston",
+      "grant_moderator": "Nomumi reguligiston",
+      "revoke_admin": "Malnomumi administranton",
+      "grant_admin": "Nomumi administranton",
+      "moderation": "Reguligado"
+    },
+    "show_repeats": "Montri ripetojn",
+    "hide_repeats": "Kaŝi ripetojn",
+    "unsubscribe": "Ne ricevi sciigojn",
+    "subscribe": "Ricevi sciigojn"
   },
   "user_profile": {
-    "timeline_title": "Uzanta tempolinio",
+    "timeline_title": "Historio de uzanto",
     "profile_does_not_exist": "Pardonu, ĉi tiu profilo ne ekzistas.",
-    "profile_loading_error": "Pardonu, eraro okazis dum enlegado de ĉi tiu profilo."
+    "profile_loading_error": "Pardonu, eraris enlego de ĉi tiu profilo."
   },
   "who_to_follow": {
     "more": "Pli",
     "who_to_follow": "Kiun aboni"
   },
   "tool_tip": {
-    "media_upload": "Alŝuti aŭdvidaĵon",
+    "media_upload": "Alŝuti vidaŭdaĵon",
     "repeat": "Ripeti",
     "reply": "Respondi",
     "favorite": "Ŝati",
-    "user_settings": "Agordoj de uzanto"
+    "user_settings": "Agordoj de uzanto",
+    "bookmark": "Legosigno",
+    "reject_follow_request": "Rifuzi abonpeton",
+    "accept_follow_request": "Akcepti abonpeton",
+    "add_reaction": "Aldoni reagon"
   },
   "upload": {
     "error": {
@@ -627,7 +657,7 @@
         "accept": "Akcepti",
         "simple_policies": "Specialaj politikoj de la nodo"
       },
-      "mrf_policies": "Ŝaltis politikon de MRF",
+      "mrf_policies": "Ŝaltis politikon de Mesaĝa ŝanĝilaro (MRF)",
       "keyword": {
         "is_replaced_by": "→",
         "replace": "Anstataŭigi",
@@ -635,7 +665,8 @@
         "ftl_removal": "Forigo de la historio de «La tuta konata reto»",
         "keyword_policies": "Politiko pri ŝlosilvortoj"
       },
-      "federation": "Federado"
+      "federation": "Federado",
+      "mrf_policies_desc": "Politikoj de Mesaĝa ŝanĝilaro (MRF) efikas sur federa konduto de la nodo.  La sekvaj politikoj estas ŝaltitaj:"
     }
   },
   "selectable_list": {
@@ -711,5 +742,55 @@
     "day_short": "{0}t",
     "days": "{0} tagoj",
     "day": "{0} tago"
+  },
+  "search": {
+    "people": "Personoj",
+    "no_results": "Neniuj rezultoj",
+    "people_talking": "{count} personoj parolas",
+    "person_talking": "{count} persono parolas",
+    "hashtags": "Kradvortoj"
+  },
+  "display_date": {
+    "today": "Hodiaŭ"
+  },
+  "file_type": {
+    "file": "Dosiero",
+    "image": "Bildo",
+    "video": "Filmo",
+    "audio": "Sono"
+  },
+  "chats": {
+    "empty_chat_list_placeholder": "Vi ankoraŭ havas neniun babilon. Komencu novan babilon!",
+    "error_sending_message": "Io misokazis dum sendado de la mesaĝo.",
+    "error_loading_chat": "Io misokazis dum enlego de la babilo.",
+    "delete_confirm": "Ĉu vi certe volas forigi ĉi tiun mesaĝon?",
+    "more": "Pli",
+    "empty_message_error": "Ne povas sendi malplenan mesaĝon",
+    "new": "Nova babilo",
+    "chats": "Babiloj",
+    "delete": "Forigi",
+    "you": "Vi:"
+  },
+  "password_reset": {
+    "password_reset_required_but_mailer_is_disabled": "Vi devas restarigi vian pasvorton, sed restarigado de pasvortoj estas malŝaltita. Bonvolu kontakti la administranton de via nodo.",
+    "password_reset_required": "Vi devas restarigi vian pasvorton por saluti.",
+    "password_reset_disabled": "Restarigado de pasvortoj estas malŝaltita. Bonvolu kontakti la administranton de via nodo.",
+    "too_many_requests": "Vi atingis la limon de provoj, reprovu pli poste.",
+    "not_found": "Ni ne trovis tiun retpoŝtadreson aŭ uzantonomon.",
+    "return_home": "Reiri al la hejmpaĝo",
+    "check_email": "Kontrolu vian retpoŝton pro ligilo por restarigi vian pasvorton.",
+    "placeholder": "Via retpoŝtadreso aŭ uzantonomo",
+    "instruction": "Enigu vian retpoŝtadreson aŭ uzantonomon. Ni sendos al vi ligilon por restarigi vian pasvorton.",
+    "password_reset": "Restarigi pasvorton",
+    "forgot_password": "Ĉu vi forgesis pasvorton?"
+  },
+  "user_reporting": {
+    "generic_error": "Eraris traktado de via peto.",
+    "submit": "Sendi",
+    "forward_to": "Plusendi al {0}",
+    "forward_description": "La konto venas de alia servilo. Ĉu kopio de la raporto sendiĝu ankaŭ tien?",
+    "additional_comments": "Aldonaj komentoj",
+    "add_comment_description": "Ĉi tiu raporto sendiĝos al reguligistoj de via nodo. Vi povas komprenigi kial vi raportas ĉi tiun konton sube:",
+    "title": "Raportante {0}"
   }
 }

From 28cafdd1bb67f12300b0c418a5ae9817fbf940fb Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Thu, 23 Jul 2020 22:44:28 +0000
Subject: [PATCH 377/415] Translated using Weblate (Italian)

Currently translated at 100.0% (662 of 662 strings)

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

diff --git a/src/i18n/it.json b/src/i18n/it.json
index b27edd61..1473614a 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -805,5 +805,8 @@
     "delete": "Elimina",
     "message_user": "Contatta {nickname}",
     "you": "Tu:"
+  },
+  "shoutbox": {
+    "title": "Graffiti"
   }
 }

From 61d78ff11b18df641958f0492ff0f00512e31543 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 27 Jul 2020 22:49:57 +0300
Subject: [PATCH 378/415] separate status scss into another file

---
 src/components/status/status.scss | 434 +++++++++++++++++++++++++++++
 src/components/status/status.vue  | 437 +-----------------------------
 2 files changed, 435 insertions(+), 436 deletions(-)
 create mode 100644 src/components/status/status.scss

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
new file mode 100644
index 00000000..05edd1bf
--- /dev/null
+++ b/src/components/status/status.scss
@@ -0,0 +1,434 @@
+
+@import '../../_variables.scss';
+
+$status-margin: 0.75em;
+
+.status-body {
+  flex: 1;
+  min-width: 0;
+}
+
+.status-pin {
+  padding: $status-margin $status-margin 0;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.media-left {
+  margin-right: $status-margin;
+}
+
+.status-el {
+  border-left-width: 0px;
+  min-width: 0;
+  border-color: $fallback--border;
+  border-color: var(--border, $fallback--border);
+
+  border-left: 4px $fallback--cRed;
+  border-left: 4px var(--cRed, $fallback--cRed);
+
+  &_focused {
+    background-color: $fallback--lightBg;
+    background-color: var(--selectedPost, $fallback--lightBg);
+    color: $fallback--text;
+    color: var(--selectedPostText, $fallback--text);
+    --lightText: var(--selectedPostLightText, $fallback--light);
+    --faint: var(--selectedPostFaintText, $fallback--faint);
+    --faintLink: var(--selectedPostFaintLink, $fallback--faint);
+    --postLink: var(--selectedPostPostLink, $fallback--faint);
+    --postFaintLink: var(--selectedPostFaintPostLink, $fallback--faint);
+    --icon: var(--selectedPostIcon, $fallback--icon);
+  }
+
+  .timeline & {
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+  }
+
+  .media-body {
+    flex: 1;
+    padding: 0;
+  }
+
+  .status-usercard {
+    margin-bottom: $status-margin;
+  }
+
+  .user-name {
+    white-space: nowrap;
+    font-size: 14px;
+    overflow: hidden;
+    flex-shrink: 0;
+    max-width: 85%;
+    font-weight: bold;
+
+    img.emoji {
+      width: 14px;
+      height: 14px;
+      vertical-align: middle;
+      object-fit: contain
+    }
+  }
+
+  .status-favicon {
+    height: 18px;
+    width: 18px;
+    margin-right: 0.4em;
+  }
+
+  .media-heading {
+    padding: 0;
+    vertical-align: bottom;
+    flex-basis: 100%;
+    margin-bottom: 0.5em;
+
+    small {
+      font-weight: lighter;
+    }
+
+    .heading-name-row {
+      padding: 0;
+      display: flex;
+      justify-content: space-between;
+      line-height: 18px;
+
+      a {
+        display: inline-block;
+        word-break: break-all;
+      }
+
+      .name-and-account-name {
+        display: flex;
+        min-width: 0;
+      }
+
+      .user-name {
+        flex-shrink: 1;
+        margin-right: 0.4em;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .account-name {
+        min-width: 1.6em;
+        margin-right: 0.4em;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        flex: 1 1 0;
+      }
+    }
+
+    .heading-right {
+      display: flex;
+      flex-shrink: 0;
+    }
+
+    .timeago {
+      margin-right: 0.2em;
+    }
+
+    .heading-reply-row {
+      position: relative;
+      align-content: baseline;
+      font-size: 12px;
+      line-height: 18px;
+      max-width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      align-items: stretch;
+
+      > .reply-to-and-accountname > a {
+        overflow: hidden;
+        max-width: 100%;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        word-break: break-all;
+      }
+    }
+
+    .reply-to-and-accountname {
+      display: flex;
+      height: 18px;
+      margin-right: 0.5em;
+      max-width: 100%;
+      .icon-reply {
+        transform: scaleX(-1);
+      }
+    }
+
+    .reply-info {
+      display: flex;
+    }
+
+    .reply-to-popover {
+      min-width: 0;
+    }
+
+    .reply-to {
+      display: flex;
+    }
+
+    .reply-to-text {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      margin: 0 0.4em 0 0.2em;
+    }
+
+    .strikethrough {
+      text-decoration: line-through;
+    }
+
+    .replies-separator {
+      margin-left: 0.4em;
+    }
+
+    .replies {
+      line-height: 18px;
+      font-size: 12px;
+      display: flex;
+      flex-wrap: wrap;
+      & > * {
+        margin-right: 0.4em;
+      }
+    }
+
+    .reply-link {
+      height: 17px;
+    }
+  }
+
+  .retweet-info {
+    padding: 0.4em $status-margin;
+    margin: 0;
+
+    .avatar.still-image {
+      border-radius: $fallback--avatarAltRadius;
+      border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+      margin-left: 28px;
+      width: 20px;
+      height: 20px;
+    }
+
+    .media-body {
+      font-size: 1em;
+      line-height: 22px;
+
+      display: flex;
+      align-content: center;
+      flex-wrap: wrap;
+
+      .user-name {
+        font-weight: bold;
+        overflow: hidden;
+        text-overflow: ellipsis;
+
+        img {
+          width: 14px;
+          height: 14px;
+          vertical-align: middle;
+          object-fit: contain
+        }
+      }
+
+      i {
+        padding: 0 0.2em;
+      }
+
+      a {
+        max-width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+}
+
+.status-fadein {
+  animation-duration: 0.4s;
+  animation-name: fadein;
+}
+
+@keyframes fadein {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.status-conversation {
+  border-left-style: solid;
+}
+
+.status-actions {
+  position: relative;
+  width: 100%;
+  display: flex;
+  margin-top: $status-margin;
+
+  > * {
+    max-width: 4em;
+    flex: 1;
+  }
+}
+
+.button-icon.icon-reply {
+  &:not(.button-icon-disabled):hover,
+  &.button-icon-active {
+    color: $fallback--cBlue;
+    color: var(--cBlue, $fallback--cBlue);
+  }
+}
+
+.button-icon.icon-reply {
+  &:not(.button-icon-disabled) {
+    cursor: pointer;
+  }
+}
+
+.status:hover .animated.avatar {
+  canvas {
+    display: none;
+  }
+  img {
+    visibility: visible;
+  }
+}
+
+.status {
+  display: flex;
+  padding: $status-margin;
+  &.is-retweet {
+    padding-top: 0;
+  }
+}
+
+.status-conversation:last-child {
+  border-bottom: none;
+}
+
+.muted {
+  padding: .25em .6em;
+  height: 1.2em;
+  line-height: 1.2em;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: flex;
+  flex-wrap: nowrap;
+
+  .username, .mute-thread, .mute-words {
+    word-wrap: normal;
+    word-break: normal;
+    white-space: nowrap;
+  }
+
+  .username, .mute-words {
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  .username {
+    flex: 0 1 auto;
+    margin-right: .2em;
+  }
+
+  .mute-thread {
+    flex: 0 0 auto;
+  }
+
+  .mute-words {
+    flex: 1 0 5em;
+    margin-left: .2em;
+    &::before {
+      content: ' '
+    }
+  }
+
+  .unmute {
+    flex: 0 0 auto;
+    margin-left: auto;
+    display: block;
+    margin-left: auto;
+  }
+}
+
+.reply-body {
+  flex: 1;
+}
+
+.favs-repeated-users {
+  margin-top: $status-margin;
+
+  .stats {
+    width: 100%;
+    display: flex;
+    line-height: 1em;
+
+    .stat-count {
+      margin-right: $status-margin;
+      user-select: none;
+
+      &:hover .stat-title {
+        text-decoration: underline;
+      }
+
+      .stat-title {
+        color: var(--faint, $fallback--faint);
+        font-size: 12px;
+        text-transform: uppercase;
+        position: relative;
+      }
+
+      .stat-number {
+        font-weight: bolder;
+        font-size: 16px;
+        line-height: 1em;
+      }
+    }
+
+    .avatar-row {
+      flex: 1;
+      overflow: hidden;
+      position: relative;
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: '';
+        position: absolute;
+        height: 100%;
+        width: 1px;
+        left: 0;
+        background-color: var(--faint, $fallback--faint);
+      }
+    }
+  }
+}
+
+@media all and (max-width: 800px) {
+  .status-el {
+    .retweet-info {
+      .avatar.still-image {
+        margin-left: 20px;
+      }
+    }
+  }
+  .status {
+    max-width: 100%;
+  }
+
+  .status .avatar.still-image {
+    width: 40px;
+    height: 40px;
+
+    &.avatar-compact {
+      width: 32px;
+      height: 32px;
+    }
+  }
+}
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index e1e56ec9..b1a53df6 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -375,439 +375,4 @@
 </template>
 
 <script src="./status.js" ></script>
-<style lang="scss">
-@import '../../_variables.scss';
-
-$status-margin: 0.75em;
-
-.status-body {
-  flex: 1;
-  min-width: 0;
-}
-
-.status-pin {
-  padding: $status-margin $status-margin 0;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
-.media-left {
-  margin-right: $status-margin;
-}
-
-.status-el {
-  border-left-width: 0px;
-  min-width: 0;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-
-  border-left: 4px $fallback--cRed;
-  border-left: 4px var(--cRed, $fallback--cRed);
-
-  &_focused {
-    background-color: $fallback--lightBg;
-    background-color: var(--selectedPost, $fallback--lightBg);
-    color: $fallback--text;
-    color: var(--selectedPostText, $fallback--text);
-    --lightText: var(--selectedPostLightText, $fallback--light);
-    --faint: var(--selectedPostFaintText, $fallback--faint);
-    --faintLink: var(--selectedPostFaintLink, $fallback--faint);
-    --postLink: var(--selectedPostPostLink, $fallback--faint);
-    --postFaintLink: var(--selectedPostFaintPostLink, $fallback--faint);
-    --icon: var(--selectedPostIcon, $fallback--icon);
-  }
-
-  .timeline & {
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-  }
-
-  .media-body {
-    flex: 1;
-    padding: 0;
-  }
-
-  .status-usercard {
-    margin-bottom: $status-margin;
-  }
-
-  .user-name {
-    white-space: nowrap;
-    font-size: 14px;
-    overflow: hidden;
-    flex-shrink: 0;
-    max-width: 85%;
-    font-weight: bold;
-
-    img.emoji {
-      width: 14px;
-      height: 14px;
-      vertical-align: middle;
-      object-fit: contain
-    }
-  }
-
-  .status-favicon {
-    height: 18px;
-    width: 18px;
-    margin-right: 0.4em;
-  }
-
-  .media-heading {
-    padding: 0;
-    vertical-align: bottom;
-    flex-basis: 100%;
-    margin-bottom: 0.5em;
-
-    small {
-      font-weight: lighter;
-    }
-
-    .heading-name-row {
-      padding: 0;
-      display: flex;
-      justify-content: space-between;
-      line-height: 18px;
-
-      a {
-        display: inline-block;
-        word-break: break-all;
-      }
-
-      .name-and-account-name {
-        display: flex;
-        min-width: 0;
-      }
-
-      .user-name {
-        flex-shrink: 1;
-        margin-right: 0.4em;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .account-name {
-        min-width: 1.6em;
-        margin-right: 0.4em;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex: 1 1 0;
-      }
-    }
-
-    .heading-right {
-      display: flex;
-      flex-shrink: 0;
-    }
-
-    .timeago {
-      margin-right: 0.2em;
-    }
-
-    .heading-reply-row {
-      position: relative;
-      align-content: baseline;
-      font-size: 12px;
-      line-height: 18px;
-      max-width: 100%;
-      display: flex;
-      flex-wrap: wrap;
-      align-items: stretch;
-
-      > .reply-to-and-accountname > a {
-        overflow: hidden;
-        max-width: 100%;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        word-break: break-all;
-      }
-    }
-
-    .reply-to-and-accountname {
-      display: flex;
-      height: 18px;
-      margin-right: 0.5em;
-      max-width: 100%;
-      .icon-reply {
-        transform: scaleX(-1);
-      }
-    }
-
-    .reply-info {
-      display: flex;
-    }
-
-    .reply-to-popover {
-      min-width: 0;
-    }
-
-    .reply-to {
-      display: flex;
-    }
-
-    .reply-to-text {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      margin: 0 0.4em 0 0.2em;
-    }
-
-    .strikethrough {
-      text-decoration: line-through;
-    }
-
-    .replies-separator {
-      margin-left: 0.4em;
-    }
-
-    .replies {
-      line-height: 18px;
-      font-size: 12px;
-      display: flex;
-      flex-wrap: wrap;
-      & > * {
-        margin-right: 0.4em;
-      }
-    }
-
-    .reply-link {
-      height: 17px;
-    }
-  }
-
-  .retweet-info {
-    padding: 0.4em $status-margin;
-    margin: 0;
-
-    .avatar.still-image {
-      border-radius: $fallback--avatarAltRadius;
-      border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
-      margin-left: 28px;
-      width: 20px;
-      height: 20px;
-    }
-
-    .media-body {
-      font-size: 1em;
-      line-height: 22px;
-
-      display: flex;
-      align-content: center;
-      flex-wrap: wrap;
-
-      .user-name {
-        font-weight: bold;
-        overflow: hidden;
-        text-overflow: ellipsis;
-
-        img {
-          width: 14px;
-          height: 14px;
-          vertical-align: middle;
-          object-fit: contain
-        }
-      }
-
-      i {
-        padding: 0 0.2em;
-      }
-
-      a {
-        max-width: 100%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-}
-
-.status-fadein {
-  animation-duration: 0.4s;
-  animation-name: fadein;
-}
-
-@keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-.status-conversation {
-  border-left-style: solid;
-}
-
-.status-actions {
-  position: relative;
-  width: 100%;
-  display: flex;
-  margin-top: $status-margin;
-
-  > * {
-    max-width: 4em;
-    flex: 1;
-  }
-}
-
-.button-icon.icon-reply {
-  &:not(.button-icon-disabled):hover,
-  &.button-icon-active {
-    color: $fallback--cBlue;
-    color: var(--cBlue, $fallback--cBlue);
-  }
-}
-
-.button-icon.icon-reply {
-  &:not(.button-icon-disabled) {
-    cursor: pointer;
-  }
-}
-
-.status:hover .animated.avatar {
-  canvas {
-    display: none;
-  }
-  img {
-    visibility: visible;
-  }
-}
-
-.status {
-  display: flex;
-  padding: $status-margin;
-  &.is-retweet {
-    padding-top: 0;
-  }
-}
-
-.status-conversation:last-child {
-  border-bottom: none;
-}
-
-.muted {
-  padding: .25em .6em;
-  height: 1.2em;
-  line-height: 1.2em;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: flex;
-  flex-wrap: nowrap;
-
-  .username, .mute-thread, .mute-words {
-    word-wrap: normal;
-    word-break: normal;
-    white-space: nowrap;
-  }
-
-  .username, .mute-words {
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-
-  .username {
-    flex: 0 1 auto;
-    margin-right: .2em;
-  }
-
-  .mute-thread {
-    flex: 0 0 auto;
-  }
-
-  .mute-words {
-    flex: 1 0 5em;
-    margin-left: .2em;
-    &::before {
-      content: ' '
-    }
-  }
-
-  .unmute {
-    flex: 0 0 auto;
-    margin-left: auto;
-    display: block;
-    margin-left: auto;
-  }
-}
-
-.reply-body {
-  flex: 1;
-}
-
-.favs-repeated-users {
-  margin-top: $status-margin;
-
-  .stats {
-    width: 100%;
-    display: flex;
-    line-height: 1em;
-
-    .stat-count {
-      margin-right: $status-margin;
-      user-select: none;
-
-      &:hover .stat-title {
-        text-decoration: underline;
-      }
-
-      .stat-title {
-        color: var(--faint, $fallback--faint);
-        font-size: 12px;
-        text-transform: uppercase;
-        position: relative;
-      }
-
-      .stat-number {
-        font-weight: bolder;
-        font-size: 16px;
-        line-height: 1em;
-      }
-    }
-
-    .avatar-row {
-      flex: 1;
-      overflow: hidden;
-      position: relative;
-      display: flex;
-      align-items: center;
-
-      &::before {
-        content: '';
-        position: absolute;
-        height: 100%;
-        width: 1px;
-        left: 0;
-        background-color: var(--faint, $fallback--faint);
-      }
-    }
-  }
-}
-
-@media all and (max-width: 800px) {
-  .status-el {
-    .retweet-info {
-      .avatar.still-image {
-        margin-left: 20px;
-      }
-    }
-  }
-  .status {
-    max-width: 100%;
-  }
-
-  .status .avatar.still-image {
-    width: 40px;
-    height: 40px;
-
-    &.avatar-compact {
-      width: 32px;
-      height: 32px;
-    }
-  }
-}
-
-</style>
+<style src="./status.css" lang="scss"></style>

From 65b6e23c00f09f3627e29987302cd16c9e069da2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 28 Jul 2020 01:27:11 +0300
Subject: [PATCH 379/415] refactor status

---
 package.json                                  |    7 +-
 .../chat_list_item/chat_list_item.scss        |    2 +-
 src/components/conversation/conversation.vue  |   33 +-
 .../notifications/notifications.scss          |   15 +-
 src/components/status/status.scss             |  639 ++++----
 src/components/status/status.vue              |   48 +-
 .../status_content/status_content.vue         |   13 +-
 .../status_popover/status_popover.vue         |    3 +-
 src/components/timeline/timeline.vue          |    2 +-
 .../user_reporting_modal.vue                  |    3 +-
 yarn.lock                                     | 1437 ++++++++++++++++-
 11 files changed, 1786 insertions(+), 416 deletions(-)

diff --git a/package.json b/package.json
index 96231171..e289729c 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
     "cropperjs": "^1.4.3",
     "diff": "^3.0.1",
     "escape-html": "^1.0.3",
-    "parse-link-header": "^1.0.1",
     "localforage": "^1.5.0",
+    "parse-link-header": "^1.0.1",
     "phoenix": "^1.3.0",
     "portal-vue": "^2.1.4",
     "v-click-outside": "^2.1.1",
@@ -36,7 +36,6 @@
     "vuex": "^3.0.1"
   },
   "devDependencies": {
-    "karma-mocha-reporter": "^2.2.1",
     "@babel/core": "^7.7.5",
     "@babel/plugin-transform-runtime": "^7.7.6",
     "@babel/preset-env": "^7.7.6",
@@ -80,6 +79,7 @@
     "karma-coverage": "^1.1.1",
     "karma-firefox-launcher": "^1.1.0",
     "karma-mocha": "^1.2.0",
+    "karma-mocha-reporter": "^2.2.1",
     "karma-sinon-chai": "^2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.26",
@@ -101,6 +101,9 @@
     "shelljs": "^0.7.4",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
+    "stylelint": "^13.6.1",
+    "stylelint-config-standard": "^20.0.0",
+    "stylelint-rscss": "^0.4.0",
     "url-loader": "^1.1.2",
     "vue-loader": "^14.0.0",
     "vue-style-loader": "^4.0.0",
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index 617054ec..10ba45f2 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -77,7 +77,7 @@
     border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
   }
 
-  .status-body {
+  .StatusContent {
     img.emoji {
       width: 1.4em;
       height: 1.4em;
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 2e48240a..7e2c6a9d 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    class="timeline panel-default"
-    :class="[isExpanded ? 'panel' : 'panel-disabled']"
+    class="Conversation"
+    :class="{ '-expanded' : isExpanded, 'panel' : isExpanded }"
   >
     <div
       v-if="isExpanded"
@@ -28,7 +28,7 @@
       :replies="getReplies(status.id)"
       :in-profile="inProfile"
       :profile-user-id="profileUserId"
-      class="status-fadein panel-body"
+      class="conversation-status status-fadein panel-body"
       @goto="setHighlight"
       @toggleExpanded="toggleExpanded"
     />
@@ -40,14 +40,25 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.timeline {
-  .panel-disabled {
-    .status-el {
-      border-left: none;
-      border-bottom-width: 1px;
-      border-bottom-style: solid;
-      border-color: var(--border, $fallback--border);
-      border-radius: 0;
+.Conversation {
+  .conversation-status {
+    border-left: none;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-color: var(--border, $fallback--border);
+    border-radius: 0;
+  }
+
+  &.-expanded {
+    .conversation-status:last-child {
+      border-bottom: none;
+    }
+  }
+
+  &:not(.-expanded) > {
+    .conversation-status:last-child {
+      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
+      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
     }
   }
 }
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index b1a3ad70..1bd91995 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -60,16 +60,8 @@
       height: 32px;
     }
 
-    .status-body {
-      color: $fallback--faint;
-      color: var(--faint, $fallback--faint);
-      a {
-        color: var(--faintLink);
-      }
-      .status-content a {
-        color: var(--postFaintLink);
-      }
-    }
+    --link: var(--faintLink);
+    --text: var(--faint);
   }
 
   .follow-request-accept {
@@ -106,7 +98,8 @@
     }
   }
 
-  .status-el {
+  /* TODO cleanup this */
+  .Status {
     flex: 1;
   }
 
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 05edd1bf..85e433c4 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -3,36 +3,31 @@
 
 $status-margin: 0.75em;
 
-.status-body {
-  flex: 1;
-  min-width: 0;
-}
-
-.status-pin {
-  padding: $status-margin $status-margin 0;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
-.media-left {
-  margin-right: $status-margin;
-}
-
-.status-el {
-  border-left-width: 0px;
+.Status {
   min-width: 0;
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
-
   border-left: 4px $fallback--cRed;
   border-left: 4px var(--cRed, $fallback--cRed);
 
-  &_focused {
+  // TODO find a way to do this in a cleaner way without JS
+  // stylelint-disable rscss/class-format
+  &:hover .avatar.animated {
+    canvas {
+      display: none;
+    }
+
+    img {
+      visibility: visible;
+    }
+  }
+
+  &.-focused {
     background-color: $fallback--lightBg;
     background-color: var(--selectedPost, $fallback--lightBg);
     color: $fallback--text;
     color: var(--selectedPostText, $fallback--text);
+
     --lightText: var(--selectedPostLightText, $fallback--light);
     --faint: var(--selectedPostFaintText, $fallback--faint);
     --faintLink: var(--selectedPostFaintLink, $fallback--faint);
@@ -41,17 +36,32 @@ $status-margin: 0.75em;
     --icon: var(--selectedPostIcon, $fallback--icon);
   }
 
-  .timeline & {
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
+  .status-container {
+    display: flex;
+    padding: $status-margin;
+
+    &.-repeat {
+      padding-top: 0;
+    }
   }
 
-  .media-body {
+  .pin {
+    padding: $status-margin $status-margin 0;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+
+  .left-side {
+    margin-right: $status-margin;
+  }
+
+  .right-side {
     flex: 1;
-    padding: 0;
+    min-width: 0;
   }
 
-  .status-usercard {
+  .usercard {
     margin-bottom: $status-margin;
   }
 
@@ -59,15 +69,17 @@ $status-margin: 0.75em;
     white-space: nowrap;
     font-size: 14px;
     overflow: hidden;
-    flex-shrink: 0;
     max-width: 85%;
     font-weight: bold;
+    flex-shrink: 1;
+    margin-right: 0.4em;
+    text-overflow: ellipsis;
 
-    img.emoji {
+    .emoji {
       width: 14px;
       height: 14px;
       vertical-align: middle;
-      object-fit: contain
+      object-fit: contain;
     }
   }
 
@@ -77,358 +89,305 @@ $status-margin: 0.75em;
     margin-right: 0.4em;
   }
 
-  .media-heading {
-    padding: 0;
-    vertical-align: bottom;
-    flex-basis: 100%;
+  .status-heading {
     margin-bottom: 0.5em;
+  }
 
-    small {
-      font-weight: lighter;
-    }
+  .heading-name-row {
+    display: flex;
+    justify-content: space-between;
+    line-height: 18px;
 
-    .heading-name-row {
-      padding: 0;
-      display: flex;
-      justify-content: space-between;
-      line-height: 18px;
-
-      a {
-        display: inline-block;
-        word-break: break-all;
-      }
-
-      .name-and-account-name {
-        display: flex;
-        min-width: 0;
-      }
-
-      .user-name {
-        flex-shrink: 1;
-        margin-right: 0.4em;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .account-name {
-        min-width: 1.6em;
-        margin-right: 0.4em;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex: 1 1 0;
-      }
-    }
-
-    .heading-right {
-      display: flex;
-      flex-shrink: 0;
-    }
-
-    .timeago {
-      margin-right: 0.2em;
-    }
-
-    .heading-reply-row {
-      position: relative;
-      align-content: baseline;
-      font-size: 12px;
-      line-height: 18px;
-      max-width: 100%;
-      display: flex;
-      flex-wrap: wrap;
-      align-items: stretch;
-
-      > .reply-to-and-accountname > a {
-        overflow: hidden;
-        max-width: 100%;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        word-break: break-all;
-      }
-    }
-
-    .reply-to-and-accountname {
-      display: flex;
-      height: 18px;
-      margin-right: 0.5em;
-      max-width: 100%;
-      .icon-reply {
-        transform: scaleX(-1);
-      }
-    }
-
-    .reply-info {
-      display: flex;
-    }
-
-    .reply-to-popover {
-      min-width: 0;
-    }
-
-    .reply-to {
-      display: flex;
-    }
-
-    .reply-to-text {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      margin: 0 0.4em 0 0.2em;
-    }
-
-    .strikethrough {
-      text-decoration: line-through;
-    }
-
-    .replies-separator {
-      margin-left: 0.4em;
-    }
-
-    .replies {
-      line-height: 18px;
-      font-size: 12px;
-      display: flex;
-      flex-wrap: wrap;
-      & > * {
-        margin-right: 0.4em;
-      }
-    }
-
-    .reply-link {
-      height: 17px;
+    a {
+      display: inline-block;
+      word-break: break-all;
     }
   }
 
-  .retweet-info {
-    padding: 0.4em $status-margin;
-    margin: 0;
+  .account-name {
+    min-width: 1.6em;
+    margin-right: 0.4em;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex: 1 1 0;
+  }
 
-    .avatar.still-image {
-      border-radius: $fallback--avatarAltRadius;
-      border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
-      margin-left: 28px;
-      width: 20px;
-      height: 20px;
+  .heading-left {
+    display: flex;
+    min-width: 0;
+  }
+
+  .heading-right {
+    display: flex;
+    flex-shrink: 0;
+  }
+
+  .timeago {
+    margin-right: 0.2em;
+  }
+
+  .heading-reply-row {
+    position: relative;
+    align-content: baseline;
+    font-size: 12px;
+    line-height: 18px;
+    max-width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: stretch;
+  }
+
+  .reply-to-and-accountname {
+    display: flex;
+    height: 18px;
+    margin-right: 0.5em;
+    max-width: 100%;
+
+    .icon-reply {
+      // mirror the icon
+      transform: scaleX(-1);
+    }
+  }
+
+  .reply-to-popover {
+    min-width: 0;
+    margin-right: 0.4em;
+
+    &:hover {
+      border-bottom: 1px solid var(--faint);
     }
 
-    .media-body {
-      font-size: 1em;
-      line-height: 22px;
+    .faint-link:hover {
+      // override default
+      text-decoration: none;
+    }
+  }
 
+  .reply-to {
+    display: flex;
+  }
+
+  .reply-to-text {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-left: 0.2em;
+
+    &.-strikethrough {
+      text-decoration: line-through;
+    }
+  }
+
+  .replies-separator {
+    margin-left: 0.4em;
+  }
+
+  .replies {
+    line-height: 18px;
+    font-size: 12px;
+    display: flex;
+    flex-wrap: wrap;
+
+    & > * {
+      margin-right: 0.4em;
+    }
+  }
+
+  .reply-link {
+    height: 17px;
+  }
+
+  .repeat-info {
+    padding: 0.4em $status-margin;
+    line-height: 22px;
+
+    .right-side {
       display: flex;
       align-content: center;
       flex-wrap: wrap;
+    }
 
-      .user-name {
-        font-weight: bold;
-        overflow: hidden;
-        text-overflow: ellipsis;
-
-        img {
-          width: 14px;
-          height: 14px;
-          vertical-align: middle;
-          object-fit: contain
-        }
-      }
-
-      i {
-        padding: 0 0.2em;
-      }
-
-      a {
-        max-width: 100%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
+    i {
+      padding: 0 0.2em;
     }
   }
-}
 
-.status-fadein {
-  animation-duration: 0.4s;
-  animation-name: fadein;
-}
-
-@keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-.status-conversation {
-  border-left-style: solid;
-}
-
-.status-actions {
-  position: relative;
-  width: 100%;
-  display: flex;
-  margin-top: $status-margin;
-
-  > * {
-    max-width: 4em;
-    flex: 1;
-  }
-}
-
-.button-icon.icon-reply {
-  &:not(.button-icon-disabled):hover,
-  &.button-icon-active {
-    color: $fallback--cBlue;
-    color: var(--cBlue, $fallback--cBlue);
-  }
-}
-
-.button-icon.icon-reply {
-  &:not(.button-icon-disabled) {
-    cursor: pointer;
-  }
-}
-
-.status:hover .animated.avatar {
-  canvas {
-    display: none;
-  }
-  img {
-    visibility: visible;
-  }
-}
-
-.status {
-  display: flex;
-  padding: $status-margin;
-  &.is-retweet {
-    padding-top: 0;
-  }
-}
-
-.status-conversation:last-child {
-  border-bottom: none;
-}
-
-.muted {
-  padding: .25em .6em;
-  height: 1.2em;
-  line-height: 1.2em;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: flex;
-  flex-wrap: nowrap;
-
-  .username, .mute-thread, .mute-words {
-    word-wrap: normal;
-    word-break: normal;
-    white-space: nowrap;
+  .repeater-avatar {
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+    margin-left: 28px;
+    width: 20px;
+    height: 20px;
   }
 
-  .username, .mute-words {
+  .repeater-name {
+    text-overflow: ellipsis;
+    margin-right: 0;
+
+    .emoji {
+      width: 14px;
+      height: 14px;
+      vertical-align: middle;
+      object-fit: contain;
+    }
+  }
+
+  .status-fadein {
+    animation-duration: 0.4s;
+    animation-name: fadein;
+  }
+
+  @keyframes fadein {
+    from {
+      opacity: 0;
+    }
+
+    to {
+      opacity: 1;
+    }
+  }
+
+  .status-actions {
+    position: relative;
+    width: 100%;
+    display: flex;
+    margin-top: $status-margin;
+
+    > * {
+      max-width: 4em;
+      flex: 1;
+    }
+  }
+
+  .button-reply {
+    &:not(.-disabled) {
+      cursor: pointer;
+    }
+
+    &:not(.-disabled):hover,
+    &.-active {
+      color: $fallback--cBlue;
+      color: var(--cBlue, $fallback--cBlue);
+    }
+  }
+
+  .muted {
+    padding: 0.25em 0.6em;
+    height: 1.2em;
+    line-height: 1.2em;
     text-overflow: ellipsis;
     overflow: hidden;
-  }
+    display: flex;
+    flex-wrap: nowrap;
 
-  .username {
-    flex: 0 1 auto;
-    margin-right: .2em;
-  }
+    & .user-name,
+    & .mute-thread,
+    & .mute-words {
+      word-wrap: normal;
+      word-break: normal;
+      white-space: nowrap;
+    }
 
-  .mute-thread {
-    flex: 0 0 auto;
-  }
+    & .user-name,
+    & .mute-words {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
 
-  .mute-words {
-    flex: 1 0 5em;
-    margin-left: .2em;
-    &::before {
-      content: ' '
+    .user-name {
+      font-weight: normal;
+      flex: 0 1 auto;
+      margin-right: 0.2em;
+    }
+
+    .mute-thread {
+      flex: 0 0 auto;
+    }
+
+    .mute-words {
+      flex: 1 0 5em;
+      margin-left: 0.2em;
+
+      &::before {
+        content: ' ';
+      }
+    }
+
+    .unmute {
+      flex: 0 0 auto;
+      margin-left: auto;
+      display: block;
     }
   }
 
-  .unmute {
-    flex: 0 0 auto;
-    margin-left: auto;
-    display: block;
-    margin-left: auto;
+  .reply-body {
+    flex: 1;
   }
-}
 
-.reply-body {
-  flex: 1;
-}
-
-.favs-repeated-users {
-  margin-top: $status-margin;
+  .favs-repeated-users {
+    margin-top: $status-margin;
+  }
 
   .stats {
     width: 100%;
     display: flex;
     line-height: 1em;
+  }
 
-    .stat-count {
-      margin-right: $status-margin;
-      user-select: none;
+  .avatar-row {
+    flex: 1;
+    overflow: hidden;
+    position: relative;
+    display: flex;
+    align-items: center;
 
-      &:hover .stat-title {
-        text-decoration: underline;
-      }
-
-      .stat-title {
-        color: var(--faint, $fallback--faint);
-        font-size: 12px;
-        text-transform: uppercase;
-        position: relative;
-      }
-
-      .stat-number {
-        font-weight: bolder;
-        font-size: 16px;
-        line-height: 1em;
-      }
+    &::before {
+      content: '';
+      position: absolute;
+      height: 100%;
+      width: 1px;
+      left: 0;
+      background-color: var(--faint, $fallback--faint);
     }
+  }
 
-    .avatar-row {
-      flex: 1;
-      overflow: hidden;
+  .stat-count {
+    margin-right: $status-margin;
+    user-select: none;
+
+    .stat-title {
+      color: var(--faint, $fallback--faint);
+      font-size: 12px;
+      text-transform: uppercase;
       position: relative;
-      display: flex;
-      align-items: center;
+    }
 
-      &::before {
-        content: '';
-        position: absolute;
-        height: 100%;
-        width: 1px;
-        left: 0;
-        background-color: var(--faint, $fallback--faint);
+    .stat-number {
+      font-weight: bolder;
+      font-size: 16px;
+      line-height: 1em;
+    }
+
+    &:hover .stat-title {
+      text-decoration: underline;
+    }
+  }
+
+  @media all and (max-width: 800px) {
+    .repeater-avatar {
+      margin-left: 20px;
+    }
+
+    .avatar:not(.repeater-avatar) {
+      width: 40px;
+      height: 40px;
+
+      // TODO define those other way somehow?
+      // stylelint-disable rscss/class-format
+      &.avatar-compact {
+        width: 32px;
+        height: 32px;
       }
     }
   }
 }
-
-@media all and (max-width: 800px) {
-  .status-el {
-    .retweet-info {
-      .avatar.still-image {
-        margin-left: 20px;
-      }
-    }
-  }
-  .status {
-    max-width: 100%;
-  }
-
-  .status .avatar.still-image {
-    width: 40px;
-    height: 40px;
-
-    &.avatar-compact {
-      width: 32px;
-      height: 32px;
-    }
-  }
-}
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index b1a53df6..2b18b2f6 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -2,8 +2,8 @@
   <!-- eslint-disable vue/no-v-html -->
   <div
     v-if="!hideStatus"
-    class="status-el"
-    :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]"
+    class="Status"
+    :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]"
   >
     <div
       v-if="error"
@@ -16,8 +16,8 @@
       />
     </div>
     <template v-if="muted && !isPreview">
-      <div class="media status container muted">
-        <small class="username">
+      <div class="status-csontainer muted">
+        <small class="user-name">
           <i
             v-if="muted && retweet"
             class="button-icon icon-retweet"
@@ -54,7 +54,7 @@
     <template v-else>
       <div
         v-if="showPinned"
-        class="status-pin"
+        class="pin"
       >
         <i class="fa icon-pin faint" />
         <span class="faint">{{ $t('status.pinned') }}</span>
@@ -63,17 +63,17 @@
         v-if="retweet && !noHeading && !inConversation"
         :class="[repeaterClass, { highlighted: repeaterStyle }]"
         :style="[repeaterStyle]"
-        class="media container retweet-info"
+        class="status-container repeat-info"
       >
         <UserAvatar
           v-if="retweet"
-          class="media-left"
+          class="left-side repeater-avatar"
           :better-shadow="betterShadow"
           :user="statusoid.user"
         />
-        <div class="media-body faint">
+        <div class="right-side faint">
           <span
-            class="user-name"
+            class="user-name repeater-name"
             :title="retweeter"
           >
             <router-link
@@ -95,14 +95,14 @@
       </div>
 
       <div
-        :class="[userClass, { highlighted: userStyle, 'is-retweet': retweet && !inConversation }]"
+        :class="[userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
         :style="[ userStyle ]"
-        class="media status"
+        class="status-container"
         :data-tags="tags"
       >
         <div
           v-if="!noHeading"
-          class="media-left"
+          class="left-side"
         >
           <router-link
             :to="userProfileLink"
@@ -115,20 +115,20 @@
             />
           </router-link>
         </div>
-        <div class="status-body">
+        <div class="right-side">
           <UserCard
             v-if="userExpanded"
             :user-id="status.user.id"
             :rounded="true"
             :bordered="true"
-            class="status-usercard"
+            class="usercard"
           />
           <div
             v-if="!noHeading"
-            class="media-heading"
+            class="status-heading"
           >
             <div class="heading-name-row">
-              <div class="name-and-account-name">
+              <div class="heading-left">
                 <h4
                   v-if="status.user.name_html"
                   class="user-name"
@@ -218,10 +218,10 @@
                     :aria-label="$t('tool_tip.reply')"
                     @click.prevent="gotoOriginal(status.in_reply_to_status_id)"
                   >
-                    <i class="button-icon icon-reply" />
+                    <i class="button-icon reply-button icon-reply" />
                     <span
                       class="faint-link reply-to-text"
-                      :class="{ 'strikethrough': !status.parent_visible }"
+                      :class="{ '-strikethrough': !status.parent_visible }"
                     >
                       {{ $t('status.reply_to') }}
                     </span>
@@ -317,19 +317,19 @@
 
           <div
             v-if="!noHeading && !isPreview"
-            class="status-actions media-body"
+            class="status-actions"
           >
             <div>
               <i
                 v-if="loggedIn"
-                class="button-icon icon-reply"
+                class="button-icon button-reply icon-reply"
                 :title="$t('tool_tip.reply')"
-                :class="{'button-icon-active': replying}"
+                :class="{'-active': replying}"
                 @click.prevent="toggleReplying"
               />
               <i
                 v-else
-                class="button-icon button-icon-disabled icon-reply"
+                class="button-icon button-reply -disabled icon-reply"
                 :title="$t('tool_tip.reply')"
               />
               <span v-if="status.replies_count > 0">{{ status.replies_count }}</span>
@@ -357,7 +357,7 @@
       </div>
       <div
         v-if="replying"
-        class="container"
+        class="status-container"
       >
         <PostStatusForm
           class="reply-body"
@@ -375,4 +375,4 @@
 </template>
 
 <script src="./status.js" ></script>
-<style src="./status.css" lang="scss"></style>
+<style src="./status.scss" lang="scss"></style>
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index bf8d376e..8539933c 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- eslint-disable vue/no-v-html -->
-  <div class="status-body">
+  <div class="StatusContent">
     <slot name="header" />
     <div
       v-if="status.summary_html"
@@ -133,7 +133,7 @@
 
 $status-margin: 0.75em;
 
-.status-body {
+.StatusContent {
   flex: 1;
   min-width: 0;
 
@@ -283,13 +283,4 @@ $status-margin: 0.75em;
   color: $fallback--cGreen;
   color: var(--postGreentext, $fallback--cGreen);
 }
-
-.timeline :not(.panel-disabled) > {
-  .status-el:last-child {
-    border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-    border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
-    border-bottom: none;
-  }
-}
-
 </style>
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index f5948207..40a7fa27 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -52,7 +52,8 @@
   box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
   box-shadow: var(--popupShadow);
 
-  .status-el.status-el {
+  /* TODO cleanup this */
+  .Status.Status {
     border: none;
   }
 
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 111c0976..4f4caf93 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="classes.root">
+  <div :class="[classes.root, 'timeline']">
     <div :class="classes.header">
       <div class="title">
         {{ title }}
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 6ee53461..2a8d8d48 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -146,7 +146,8 @@
     display: flex;
     justify-content: space-between;
 
-    > .status-el {
+    /* TODO cleanup this */
+    > .Status {
       flex: 1;
     }
 
diff --git a/yarn.lock b/yarn.lock
index 09316863..14be84a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,6 +8,13 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
+"@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
@@ -15,6 +22,28 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
+"@babel/core@>=7.9.0":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330"
+  integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.10.5"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.10.5"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.5"
+    "@babel/types" "^7.10.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/core@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e"
@@ -35,6 +64,15 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz#1b903554bc8c583ee8d25f1e8969732e6b829a69"
+  integrity sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig==
+  dependencies:
+    "@babel/types" "^7.10.5"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
@@ -94,6 +132,15 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-function-name@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
@@ -103,6 +150,13 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-get-function-arity@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
@@ -117,6 +171,13 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-member-expression-to-functions@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz#172f56e7a63e78112f3a04055f24365af702e7ee"
+  integrity sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==
+  dependencies:
+    "@babel/types" "^7.10.5"
+
 "@babel/helper-member-expression-to-functions@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
@@ -137,6 +198,26 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-module-imports@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
+"@babel/helper-module-transforms@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz#120c271c0b3353673fcdfd8c053db3c544a260d6"
+  integrity sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
+
 "@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
@@ -149,6 +230,13 @@
     "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-optimise-call-expression@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
@@ -179,6 +267,16 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-replace-supers@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
@@ -189,6 +287,14 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-simple-access@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
@@ -197,6 +303,13 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helper-split-export-declaration@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz#2c70576eaa3b5609b24cb99db2888cc3fc4251d1"
+  integrity sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-split-export-declaration@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
@@ -204,6 +317,11 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+
 "@babel/helper-wrap-function@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
@@ -214,6 +332,15 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/helpers@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
@@ -231,6 +358,20 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.10.4", "@babel/parser@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b"
+  integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==
+
 "@babel/parser@^7.7.4", "@babel/parser@^7.7.5":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
@@ -663,6 +804,15 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
@@ -672,6 +822,21 @@
     "@babel/parser" "^7.7.4"
     "@babel/types" "^7.7.4"
 
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz#77ce464f5b258be265af618d8fddf0536f20b564"
+  integrity sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.10.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/parser" "^7.10.5"
+    "@babel/types" "^7.10.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
 "@babel/traverse@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
@@ -695,6 +860,15 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.10.4", "@babel/types@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"
+  integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
@@ -710,6 +884,67 @@
   dependencies:
     qrcode "^1.3.0"
 
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
+"@stylelint/postcss-css-in-js@^0.37.1":
+  version "0.37.2"
+  resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
+  integrity sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==
+  dependencies:
+    "@babel/core" ">=7.9.0"
+
+"@stylelint/postcss-markdown@^0.36.1":
+  version "0.36.1"
+  resolved "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz#829b87e6c0f108014533d9d7b987dc9efb6632e8"
+  integrity sha512-iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw==
+  dependencies:
+    remark "^12.0.0"
+    unist-util-find-all-after "^3.0.1"
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/minimist@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
+  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
+"@types/unist@^2.0.0", "@types/unist@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
+  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+
 "@ungap/event-target@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@ungap/event-target/-/event-target-0.1.0.tgz#88d527d40de86c4b0c99a060ca241d755999915b"
@@ -940,6 +1175,16 @@ ajv@^6.1.0, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.10.2:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@^6.5.5:
   version "6.6.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d"
@@ -981,6 +1226,11 @@ ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -991,6 +1241,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
@@ -1062,6 +1320,11 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
@@ -1078,6 +1341,16 @@ arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
 
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+
+arrify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
+  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
+
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -1165,6 +1438,19 @@ autoprefixer@^6.3.1, autoprefixer@^6.4.0:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
+autoprefixer@^9.8.0:
+  version "9.8.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.5.tgz#2c225de229ddafe1d1424c02791d0c3e10ccccaa"
+  integrity sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==
+  dependencies:
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001097"
+    colorette "^1.2.0"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.32"
+    postcss-value-parser "^4.1.0"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -1328,6 +1614,11 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
+bail@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
+  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
+
 balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1478,6 +1769,13 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1546,6 +1844,16 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
+browserslist@^4.12.0:
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.13.0.tgz#42556cba011e1b0a2775b611cba6a8eca18e940d"
+  integrity sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==
+  dependencies:
+    caniuse-lite "^1.0.30001093"
+    electron-to-chromium "^1.3.488"
+    escalade "^3.0.1"
+    node-releases "^1.1.58"
+
 browserslist@^4.6.0, browserslist@^4.8.2:
   version "4.8.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
@@ -1682,6 +1990,15 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+  dependencies:
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
+
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -1690,6 +2007,16 @@ camelcase@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
 
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+camelcase@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
+  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
+
 can-promise@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/can-promise/-/can-promise-0.0.1.tgz#7a7597ad801fb14c8b22341dfec314b6bd6ad8d3"
@@ -1714,10 +2041,20 @@ caniuse-lite@^1.0.30001015:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
   integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
 
+caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001097:
+  version "1.0.30001107"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001107.tgz#809360df7a5b3458f627aa46b0f6ed6d5239da9a"
+  integrity sha512-86rCH+G8onCmdN4VZzJet5uPELII59cUzDphko3thQFgAQG1RNa+sVLDoALIhRYmflo5iSIzWY3vu1XTWtNMQQ==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+ccount@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
+  integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
+
 chai-nightwatch@~0.1.x:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/chai-nightwatch/-/chai-nightwatch-0.1.1.tgz#1ca56de768d3c0868fe7fc2f4d32c2fe894e6be9"
@@ -1758,6 +2095,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -1766,6 +2111,26 @@ chalk@~0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
+character-entities-html4@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+  integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
+
+character-entities-legacy@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
+  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
+
+character-entities@^1.0.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
+  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
+
+character-reference-invalid@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
+  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -1880,6 +2245,13 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
+clone-regexp@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
+  integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
+  dependencies:
+    is-regexp "^2.0.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -1898,6 +2270,11 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
+collapse-white-space@^1.0.2:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -1911,10 +2288,22 @@ color-convert@^1.3.0, color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3, color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
@@ -1929,6 +2318,11 @@ color@^0.11.0:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
+colorette@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -2123,6 +2517,17 @@ cosmiconfig@^5.0.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
+cosmiconfig@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.7.2"
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -2236,6 +2641,11 @@ cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
 
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
 cssnano@^3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
@@ -2365,13 +2775,21 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -2502,6 +2920,13 @@ dijkstrajs@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -2545,7 +2970,7 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
-domelementtype@1:
+domelementtype@1, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
 
@@ -2559,6 +2984,13 @@ domhandler@2.1:
   dependencies:
     domelementtype "1"
 
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
 domutils@1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
@@ -2572,6 +3004,14 @@ domutils@1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -2612,6 +3052,11 @@ electron-to-chromium@^1.3.322:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
   integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
 
+electron-to-chromium@^1.3.488:
+  version "1.3.509"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.509.tgz#830fcb89cd66dc2984d18d794973b99e3f00584c"
+  integrity sha512-cN4lkjNRuTG8rtAqTOVgwpecEC2kbKA04PG6YijcKGHK/kD0xLjiqExcAOmLUwtXZRF8cBeam2I0VZcih919Ug==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -2628,6 +3073,11 @@ emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -2698,7 +3148,7 @@ ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
 
-entities@~1.1.1:
+entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
 
@@ -2745,6 +3195,11 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
+escalade@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
+  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -3004,6 +3459,13 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execall@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
+  integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==
+  dependencies:
+    clone-regexp "^2.1.0"
+
 exit-hook@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
@@ -3143,6 +3605,23 @@ fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.1.1:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -3155,6 +3634,13 @@ fastparse@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
 
+fastq@^1.6.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
+  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  dependencies:
+    reusify "^1.0.4"
+
 fd-slicer@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -3211,6 +3697,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
@@ -3270,6 +3763,14 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -3433,6 +3934,11 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -3441,6 +3947,11 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
+get-stdin@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -3488,6 +3999,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob@7.0.5:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
@@ -3542,6 +4060,22 @@ glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
+
 globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -3550,6 +4084,18 @@ globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
+globby@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -3560,6 +4106,18 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+  integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
+
+gonzales-pe@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
+  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
+  dependencies:
+    minimist "^1.2.5"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
@@ -3598,6 +4156,11 @@ har-validator@~5.1.0:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -3626,6 +4189,11 @@ has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -3737,6 +4305,11 @@ html-tags@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b"
   integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=
 
+html-tags@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
+  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
+
 html-webpack-plugin@^3.0.0, html-webpack-plugin@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
@@ -3749,6 +4322,18 @@ html-webpack-plugin@^3.0.0, html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
+htmlparser2@^3.10.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
 htmlparser2@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
@@ -3860,6 +4445,11 @@ ignore@^4.0.2, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
 
+ignore@^5.1.4, ignore@^5.1.8:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -3886,6 +4476,14 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-fresh@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -3893,6 +4491,11 @@ import-from@^2.1.0:
   dependencies:
     resolve-from "^3.0.0"
 
+import-lazy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3903,6 +4506,11 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -3926,12 +4534,12 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-inherits@~2.0.0:
+inherits@^2.0.0, inherits@~2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@~1.3.0:
+ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -4005,6 +4613,24 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-alphabetical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
+  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
+
+is-alphanumeric@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4"
+  integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=
+
+is-alphanumerical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
+  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
+  dependencies:
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4019,6 +4645,11 @@ is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
+is-buffer@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
+  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
+
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -4045,6 +4676,11 @@ is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
+is-decimal@^1.0.0, is-decimal@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -4109,6 +4745,11 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -4121,12 +4762,17 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   dependencies:
     is-extglob "^2.1.1"
 
+is-hexadecimal@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
+  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
+
 is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
@@ -4147,6 +4793,11 @@ is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -4163,10 +4814,15 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.0.0:
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
+is-plain-obj@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -4191,6 +4847,11 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-regexp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
+  integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
+
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -4207,7 +4868,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
@@ -4219,10 +4880,20 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-whitespace-character@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
+  integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
+
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
 
+is-word-character@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
+  integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
+
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
@@ -4418,6 +5089,13 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -4533,12 +5211,27 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
+kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+known-css-properties@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.19.0.tgz#5d92b7fa16c72d971bda9b7fe295bdf61836ee5b"
+  integrity sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==
+
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
   dependencies:
     invert-kv "^2.0.0"
 
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4552,6 +5245,11 @@ lie@3.1.1:
   dependencies:
     immediate "~3.0.5"
 
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
 listenercount@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
@@ -4624,6 +5322,13 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
 lodash._arraycopy@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
@@ -4877,18 +5582,30 @@ lodash@^4.17.13:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
   dependencies:
     chalk "^1.0.0"
 
-log-symbols@^2.1.0:
+log-symbols@^2.1.0, log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
     chalk "^2.0.1"
 
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+  dependencies:
+    chalk "^4.0.0"
+
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
@@ -4903,6 +5620,11 @@ lolex@^1.4.0, lolex@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
 
+longest-streak@^2.0.1:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
+  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
+
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -4962,12 +5684,29 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
+map-obj@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
+  integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==
+
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
   dependencies:
     object-visit "^1.0.0"
 
+markdown-escapes@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
+  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
+
+markdown-table@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
+  integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
+  dependencies:
+    repeat-string "^1.0.0"
+
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
@@ -4976,6 +5715,11 @@ math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
 
+mathml-tag-names@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
+  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -4984,6 +5728,13 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
+mdast-util-compact@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz#cabc69a2f43103628326f35b1acf735d55c99490"
+  integrity sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -5018,10 +5769,34 @@ meow@^3.3.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
+meow@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-7.0.1.tgz#1ed4a0a50b3844b451369c48362eb0515f04c1dc"
+  integrity sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    arrify "^2.0.1"
+    camelcase "^6.0.0"
+    camelcase-keys "^6.2.2"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "^4.0.2"
+    normalize-package-data "^2.5.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.13.1"
+    yargs-parser "^18.1.3"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -5062,6 +5837,14 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -5101,6 +5884,11 @@ mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
 mini-css-extract-plugin@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
@@ -5129,6 +5917,15 @@ minimatch@3.0.3:
   dependencies:
     brace-expansion "^1.0.0"
 
+minimist-options@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
+
 minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -5137,6 +5934,11 @@ minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minipass@^2.2.1, minipass@^2.3.4:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
@@ -5382,6 +6184,11 @@ node-releases@^1.1.42:
   dependencies:
     semver "^6.3.0"
 
+node-releases@^1.1.58:
+  version "1.1.60"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
+  integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
+
 nomnomnomnom@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/nomnomnomnom/-/nomnomnomnom-2.0.1.tgz#b2239f031c8d04da67e32836e1e3199e12f7a8e2"
@@ -5411,6 +6218,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -5425,6 +6242,11 @@ normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
+normalize-selector@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
+  integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
+
 normalize-url@^1.4.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
@@ -5645,6 +6467,13 @@ p-limit@^2.0.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -5657,6 +6486,13 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
@@ -5728,6 +6564,18 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
+parse-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
+  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -5751,6 +6599,16 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-json@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz#7cfe35c1ccd641bce3981467e6c2ece61b3b3878"
+  integrity sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+    lines-and-columns "^1.1.6"
+
 parse-link-header@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-link-header/-/parse-link-header-1.0.1.tgz#bedfe0d2118aeb84be75e7b025419ec8a61140a7"
@@ -5796,6 +6654,11 @@ path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -5836,6 +6699,11 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -5858,6 +6726,11 @@ phoenix@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.4.0.tgz#9cec8dbd8cbc59ecd2147bc09ca8ceb56b860d75"
 
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -5977,6 +6850,20 @@ postcss-filter-plugins@^2.0.0:
   dependencies:
     postcss "^5.0.4"
 
+postcss-html@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204"
+  integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==
+  dependencies:
+    htmlparser2 "^3.10.0"
+
+postcss-less@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
+  integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
+  dependencies:
+    postcss "^7.0.14"
+
 postcss-load-config@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
@@ -6018,6 +6905,11 @@ postcss-loader@^3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
+postcss-media-query-parser@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+  integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
+
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
@@ -6149,6 +7041,52 @@ postcss-reduce-transforms@^1.0.3:
     postcss "^5.0.8"
     postcss-value-parser "^3.0.1"
 
+postcss-reporter@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz#7c055120060a97c8837b4e48215661aafb74245f"
+  integrity sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==
+  dependencies:
+    chalk "^2.4.1"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    postcss "^7.0.7"
+
+postcss-resolve-nested-selector@0.1.1, postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+  integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
+
+postcss-safe-parser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
+  integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
+  dependencies:
+    postcss "^7.0.26"
+
+postcss-sass@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3"
+  integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    postcss "^7.0.21"
+
+postcss-scss@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
+  integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
+  dependencies:
+    postcss "^7.0.6"
+
+postcss-selector-parser@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.1.tgz#fdbf696103b12b0a64060e5610507f410491f7c8"
+  integrity sha1-/b9pYQOxKwpkBg5WEFB/QQSR98g=
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
@@ -6157,6 +7095,15 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-svgo@^2.1.1:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
@@ -6166,6 +7113,11 @@ postcss-svgo@^2.1.1:
     postcss-value-parser "^3.2.3"
     svgo "^0.7.0"
 
+postcss-syntax@^0.36.2:
+  version "0.36.2"
+  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
+  integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
+
 postcss-unique-selectors@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
@@ -6178,6 +7130,11 @@ postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
 
+postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
 postcss-zindex@^2.0.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
@@ -6212,6 +7169,15 @@ postcss@^7.0.0:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.6, postcss@^7.0.7:
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6369,6 +7335,11 @@ querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
+
 randomatic@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
@@ -6434,6 +7405,15 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -6450,6 +7430,16 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
 "readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -6480,6 +7470,15 @@ readable-stream@1.1.x:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+readable-stream@^3.1.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -6501,6 +7500,14 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
+  dependencies:
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
+
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -6605,6 +7612,57 @@ relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
+remark-parse@^8.0.0:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
+  integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==
+  dependencies:
+    ccount "^1.0.0"
+    collapse-white-space "^1.0.2"
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    is-word-character "^1.0.0"
+    markdown-escapes "^1.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    trim "0.0.1"
+    trim-trailing-lines "^1.0.0"
+    unherit "^1.0.4"
+    unist-util-remove-position "^2.0.0"
+    vfile-location "^3.0.0"
+    xtend "^4.0.1"
+
+remark-stringify@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.1.tgz#e2a9dc7a7bf44e46a155ec78996db896780d8ce5"
+  integrity sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==
+  dependencies:
+    ccount "^1.0.0"
+    is-alphanumeric "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    longest-streak "^2.0.1"
+    markdown-escapes "^1.0.0"
+    markdown-table "^2.0.0"
+    mdast-util-compact "^2.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    stringify-entities "^3.0.0"
+    unherit "^1.0.4"
+    xtend "^4.0.1"
+
+remark@^12.0.0:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-12.0.1.tgz#f1ddf68db7be71ca2bad0a33cd3678b86b9c709f"
+  integrity sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==
+  dependencies:
+    remark-parse "^8.0.0"
+    remark-stringify "^8.0.0"
+    unified "^9.0.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -6627,7 +7685,7 @@ repeat-string@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
 
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.0.0, repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -6637,6 +7695,11 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
+replace-ext@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
+
 request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
@@ -6691,6 +7754,11 @@ resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -6730,6 +7798,11 @@ ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rfdc@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
@@ -6760,6 +7833,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -6776,6 +7854,11 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -6969,6 +8052,11 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -7151,6 +8239,11 @@ spdx-license-ids@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
 
+specificity@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
+  integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -7181,6 +8274,11 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
+state-toggle@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
+  integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -7260,12 +8358,28 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
 string_decoder@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -7276,6 +8390,17 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.0.1.tgz#32154b91286ab0869ab2c07696223bd23b6dbfc0"
+  integrity sha512-Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ==
+  dependencies:
+    character-entities-html4 "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.2"
+    is-hexadecimal "^1.0.0"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -7294,6 +8419,13 @@ strip-ansi@^5.1.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-ansi@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
@@ -7318,10 +8450,103 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
+
 strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+  integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
+
+stylelint-config-recommended@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
+  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
+
+stylelint-config-standard@^20.0.0:
+  version "20.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz#06135090c9e064befee3d594289f50e295b5e20d"
+  integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==
+  dependencies:
+    stylelint-config-recommended "^3.0.0"
+
+stylelint-rscss@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/stylelint-rscss/-/stylelint-rscss-0.4.0.tgz#ea77c478e1c703dbda878c00f53bbc002b2d07b7"
+  integrity sha1-6nfEeOHHA9vah4wA9Tu8ACstB7c=
+  dependencies:
+    postcss-resolve-nested-selector "0.1.1"
+    postcss-selector-parser "2.2.1"
+
+stylelint@^13.6.1:
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.6.1.tgz#cc1d76338116d55e8ff2be94c4a4386c1239b878"
+  integrity sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==
+  dependencies:
+    "@stylelint/postcss-css-in-js" "^0.37.1"
+    "@stylelint/postcss-markdown" "^0.36.1"
+    autoprefixer "^9.8.0"
+    balanced-match "^1.0.0"
+    chalk "^4.1.0"
+    cosmiconfig "^6.0.0"
+    debug "^4.1.1"
+    execall "^2.0.0"
+    file-entry-cache "^5.0.1"
+    get-stdin "^8.0.0"
+    global-modules "^2.0.0"
+    globby "^11.0.1"
+    globjoin "^0.1.4"
+    html-tags "^3.1.0"
+    ignore "^5.1.8"
+    import-lazy "^4.0.0"
+    imurmurhash "^0.1.4"
+    known-css-properties "^0.19.0"
+    leven "^3.1.0"
+    lodash "^4.17.15"
+    log-symbols "^4.0.0"
+    mathml-tag-names "^2.1.3"
+    meow "^7.0.1"
+    micromatch "^4.0.2"
+    normalize-selector "^0.2.0"
+    postcss "^7.0.32"
+    postcss-html "^0.36.0"
+    postcss-less "^3.1.4"
+    postcss-media-query-parser "^0.2.3"
+    postcss-reporter "^6.0.1"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-safe-parser "^4.0.2"
+    postcss-sass "^0.4.4"
+    postcss-scss "^2.1.1"
+    postcss-selector-parser "^6.0.2"
+    postcss-syntax "^0.36.2"
+    postcss-value-parser "^4.1.0"
+    resolve-from "^5.0.0"
+    slash "^3.0.0"
+    specificity "^0.4.1"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    style-search "^0.1.0"
+    sugarss "^2.0.0"
+    svg-tags "^1.0.0"
+    table "^5.4.6"
+    v8-compile-cache "^2.1.1"
+    write-file-atomic "^3.0.3"
+
+sugarss@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
+  integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==
+  dependencies:
+    postcss "^7.0.2"
+
 supports-color@3.1.2, supports-color@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
@@ -7350,6 +8575,13 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@@ -7376,6 +8608,16 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
+table@^5.4.6:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
@@ -7491,6 +8733,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -7520,10 +8769,30 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
+trim-newlines@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
+  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+trim-trailing-lines@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
+  integrity sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==
+
+trim@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
+
+trough@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
+  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
+
 tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -7560,6 +8829,21 @@ type-detect@^4.0.0:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
 
+type-fest@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
+  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -7567,6 +8851,13 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -7586,6 +8877,14 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
+unherit@^1.0.4:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
+  integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
+  dependencies:
+    inherits "^2.0.0"
+    xtend "^4.0.0"
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -7609,6 +8908,18 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
   integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
 
+unified@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.1.0.tgz#7ba82e5db4740c47a04e688a9ca8335980547410"
+  integrity sha512-VXOv7Ic6twsKGJDeZQ2wwPqXs2hM0KNu5Hkg9WgAZbSD1pxhZ7p8swqg583nw1Je2fhwHy6U8aEjiI79x1gvag==
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^2.0.0"
+    trough "^1.0.0"
+    vfile "^4.0.0"
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -7638,6 +8949,49 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+unist-util-find-all-after@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz#95cc62f48812d879b4685a0512bf1b838da50e9a"
+  integrity sha512-0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw==
+  dependencies:
+    unist-util-is "^4.0.0"
+
+unist-util-is@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.2.tgz#c7d1341188aa9ce5b3cff538958de9895f14a5de"
+  integrity sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==
+
+unist-util-remove-position@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc"
+  integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
+unist-util-stringify-position@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
+  dependencies:
+    "@types/unist" "^2.0.2"
+
+unist-util-visit-parents@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz#4dd262fb9dcfe44f297d53e882fc6ff3421173d5"
+  integrity sha512-0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^4.0.0"
+
+unist-util-visit@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
+  integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit-parents "^3.0.0"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -7709,7 +9063,7 @@ useragent@2.3.0:
     lru-cache "4.1.x"
     tmp "0.0.x"
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
@@ -7748,6 +9102,11 @@ v-click-outside@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/v-click-outside/-/v-click-outside-2.1.3.tgz#b7297abe833a439dc0895e6418a494381e64b5e7"
 
+v8-compile-cache@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
+  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -7771,6 +9130,30 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+vfile-location@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.0.1.tgz#d78677c3546de0f7cd977544c367266764d31bb3"
+  integrity sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==
+
+vfile-message@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+vfile@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.1.1.tgz#282d28cebb609183ac51703001bc18b3e3f17de9"
+  integrity sha512-lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    replace-ext "1.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-message "^2.0.0"
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -7952,7 +9335,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.0.9, which@^1.1.1, which@^1.2.9:
+which@^1.0.9, which@^1.1.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
@@ -7993,6 +9376,16 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+write-file-atomic@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
@@ -8019,6 +9412,11 @@ xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
+xtend@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -8031,6 +9429,11 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
 
+yaml@^1.7.2:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
@@ -8038,6 +9441,14 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^18.1.3:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"

From 7870b3f7ec4ee2f7e900f62204f00f18c6bbdb6e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 28 Jul 2020 01:54:40 +0300
Subject: [PATCH 380/415] neater way to do hover thing with still image

---
 src/components/status/status.scss          | 13 +---
 src/components/still-image/still-image.vue | 75 +++++++++++-----------
 2 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 85e433c4..8797211e 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -10,16 +10,9 @@ $status-margin: 0.75em;
   border-left: 4px $fallback--cRed;
   border-left: 4px var(--cRed, $fallback--cRed);
 
-  // TODO find a way to do this in a cleaner way without JS
-  // stylelint-disable rscss/class-format
-  &:hover .avatar.animated {
-    canvas {
-      display: none;
-    }
-
-    img {
-      visibility: visible;
-    }
+  &:hover .avatar {
+    --still-image-img: visible;
+    --still-image-canvas: hidden;
   }
 
   &.-focused {
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 2ebf33ba..6fa055de 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -35,43 +35,6 @@
   display: flex;
   align-items: center;
 
-  &:hover canvas {
-    display: none;
-  }
-
-  img {
-    width: 100%;
-    min-height: 100%;
-    object-fit: contain;
-  }
-
-  &.animated {
-    &:hover::before,
-    img {
-      visibility: hidden;
-    }
-
-    &:hover img {
-      visibility: visible
-    }
-
-    &::before {
-      content: 'gif';
-      position: absolute;
-      line-height: 10px;
-      font-size: 10px;
-      top: 5px;
-      left: 5px;
-      background: rgba(127,127,127,.5);
-      color: #FFF;
-      display: block;
-      padding: 2px 4px;
-      border-radius: $fallback--tooltipRadius;
-      border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-      z-index: 2;
-    }
-  }
-
   canvas {
     position: absolute;
     top: 0;
@@ -81,6 +44,44 @@
     width: 100%;
     height: 100%;
     object-fit: contain;
+    visibility: var(--still-image-canvas, visible);
+  }
+
+  img {
+    width: 100%;
+    min-height: 100%;
+    object-fit: contain;
+  }
+
+  &.animated {
+    &::before {
+      content: 'gif';
+      position: absolute;
+      line-height: 10px;
+      font-size: 10px;
+      top: 5px;
+      left: 5px;
+      background: rgba(127, 127, 127, 0.5);
+      color: #fff;
+      display: block;
+      padding: 2px 4px;
+      border-radius: $fallback--tooltipRadius;
+      border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+      z-index: 2;
+    }
+
+    &:hover canvas {
+      display: none;
+    }
+
+    &:hover::before,
+    img {
+      visibility: var(--still-image-img, hidden);
+    }
+
+    &:hover img {
+      visibility: visible;
+    }
   }
 }
 </style>

From 5cf5325de2975d6379e7c1928cdf5536b1806733 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 28 Jul 2020 02:03:41 +0300
Subject: [PATCH 381/415] bump node to 10 for stylint

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f6d3c92..34a91030 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 # This file is a template, and might need editing before it works on your project.
 # Official framework image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/node/tags/
-image: node:8
+image: node:10
 
 stages:
   - lint

From e86c5ea1fa7dcbae582707430a821d2197576f7b Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 28 Jul 2020 09:40:04 +0300
Subject: [PATCH 382/415] fix non-timeline routes breaking current/previous
 timeline

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

diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index c637dbd4..9eed10f6 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="classes.root">
     <div :class="classes.header">
-      <TimelineMenu />
+      <TimelineMenu v-if="!embedded" />
       <div
         v-if="timelineError"
         class="loadmore-error alert error"
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index 0afeb8b4..fcc7b4ef 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -26,7 +26,9 @@ const TimelineMenu = {
     if (this.currentUser && this.currentUser.locked) {
       this.$store.dispatch('startFetchingFollowRequests')
     }
-    this.$store.dispatch('setLastTimeline', this.$route.name)
+    if (timelineNames().includes(this.$route.name)) {
+      this.$store.dispatch('setLastTimeline', this.$route.name)
+    }
   },
   methods: {
     openMenu () {

From e57562959f5e71fd6e3bf180e2856d504ffb1fcf Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 28 Jul 2020 09:41:00 +0300
Subject: [PATCH 383/415] fix oops

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

diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index fcc7b4ef..c0d75c54 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -26,7 +26,7 @@ const TimelineMenu = {
     if (this.currentUser && this.currentUser.locked) {
       this.$store.dispatch('startFetchingFollowRequests')
     }
-    if (timelineNames().includes(this.$route.name)) {
+    if (timelineNames()[this.$route.name]) {
       this.$store.dispatch('setLastTimeline', this.$route.name)
     }
   },

From fbdcec1a22ae0b3a78fd9e025ffa84cc1f7804df Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 28 Jul 2020 16:08:36 -0500
Subject: [PATCH 384/415] Let's serve the README image from GitLab

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

diff --git a/README.md b/README.md
index b66383ad..54529a70 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 > A single column frontend designed for Pleroma.
 
-![screenshot](https://i.imgur.com/DJVqSJ0.png)
+![screenshot](/uploads/796c5ecf985ed1e2b0943ee0df131ed0/DJVqSJ0.png)
 
 # For Translators
 

From 2a1c9e094c719f9dcfc17c70ffd58c068272b6d6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:08:49 +0300
Subject: [PATCH 385/415] more fixes

---
 src/components/status/status.scss | 19 ++++++++++++++-----
 src/components/status/status.vue  | 12 ++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 8797211e..46088cf9 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -58,7 +58,7 @@ $status-margin: 0.75em;
     margin-bottom: $status-margin;
   }
 
-  .user-name {
+  .status-username {
     white-space: nowrap;
     font-size: 14px;
     overflow: hidden;
@@ -143,10 +143,13 @@ $status-margin: 0.75em;
     }
   }
 
-  .reply-to-popover {
+  & .reply-to-popover,
+  & .reply-to-no-popover {
     min-width: 0;
     margin-right: 0.4em;
+  }
 
+  .reply-to-popover {
     &:hover {
       border-bottom: 1px solid var(--faint);
     }
@@ -273,7 +276,7 @@ $status-margin: 0.75em;
     display: flex;
     flex-wrap: nowrap;
 
-    & .user-name,
+    & .status-username,
     & .mute-thread,
     & .mute-words {
       word-wrap: normal;
@@ -281,16 +284,17 @@ $status-margin: 0.75em;
       white-space: nowrap;
     }
 
-    & .user-name,
+    & .status-username,
     & .mute-words {
       text-overflow: ellipsis;
       overflow: hidden;
     }
 
-    .user-name {
+    .status-username {
       font-weight: normal;
       flex: 0 1 auto;
       margin-right: 0.2em;
+      font-size: smaller;
     }
 
     .mute-thread {
@@ -313,6 +317,11 @@ $status-margin: 0.75em;
     }
   }
 
+  .reply-form {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
   .reply-body {
     flex: 1;
   }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 2b18b2f6..8df82edc 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -17,7 +17,7 @@
     </div>
     <template v-if="muted && !isPreview">
       <div class="status-csontainer muted">
-        <small class="user-name">
+        <small class="status-username">
           <i
             v-if="muted && retweet"
             class="button-icon icon-retweet"
@@ -73,7 +73,7 @@
         />
         <div class="right-side faint">
           <span
-            class="user-name repeater-name"
+            class="status-username repeater-name"
             :title="retweeter"
           >
             <router-link
@@ -131,13 +131,13 @@
               <div class="heading-left">
                 <h4
                   v-if="status.user.name_html"
-                  class="user-name"
+                  class="status-username"
                   :title="status.user.name"
                   v-html="status.user.name_html"
                 />
                 <h4
                   v-else
-                  class="user-name"
+                  class="status-username"
                   :title="status.user.name"
                 >
                   {{ status.user.name }}
@@ -229,7 +229,7 @@
                 </StatusPopover>
                 <span
                   v-else
-                  class="reply-to"
+                  class="reply-to-no-popover"
                 >
                   <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
                 </span>
@@ -357,7 +357,7 @@
       </div>
       <div
         v-if="replying"
-        class="status-container"
+        class="status-container reply-form"
       >
         <PostStatusForm
           class="reply-body"

From 839681bbc70c87110625af11e5a8b5593b59136e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:12:13 +0300
Subject: [PATCH 386/415] add stylelint to CI/npm, only one file for now.

---
 .gitlab-ci.yml | 1 +
 package.json   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34a91030..85d3ee44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ lint:
   script:
     - yarn
     - npm run lint
+    - npm run stylelint
 
 test:
   stage: test
diff --git a/package.json b/package.json
index e289729c..75d9ee56 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "unit:watch": "karma start test/unit/karma.conf.js --single-run=false",
     "e2e": "node test/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
+    "stylelint": "npx stylelint src/components/status/status.scss",
     "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
     "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
   },

From dce057f24ec7b8ea6806210c97a4bf2c65584cc2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:16:55 +0300
Subject: [PATCH 387/415] lint

---
 src/components/poll/poll.vue     | 2 +-
 src/components/status/status.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index adbb0555..ceba9eea 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -17,7 +17,7 @@
           <span class="result-percentage">
             {{ percentageForOption(option.votes_count) }}%
           </span>
-          <span v-html="option.title_html"></span>
+          <span v-html="option.title_html" />
         </div>
         <div
           class="result-fill"
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 8df82edc..45251f17 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -150,8 +150,8 @@
                   {{ status.user.screen_name }}
                 </router-link>
                 <img
-                  class="status-favicon"
                   v-if="!!(status.user && status.user.favicon)"
+                  class="status-favicon"
                   :src="status.user.favicon"
                 >
               </div>

From 24fd9372ce0781126717f9357ac1d86de936a934 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:18:13 +0300
Subject: [PATCH 388/415] i am an idiot sandwich

---
 .stylelintrc.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .stylelintrc.json

diff --git a/.stylelintrc.json b/.stylelintrc.json
new file mode 100644
index 00000000..fbf3a245
--- /dev/null
+++ b/.stylelintrc.json
@@ -0,0 +1,19 @@
+{
+  "extends": [
+    "stylelint-rscss/config",
+    "stylelint-config-recommended",
+    "stylelint-config-standard"
+  ],
+  "rules": {
+    "declaration-no-important": true,
+    "rscss/no-descendant-combinator": false,
+    "rscss/class-format": [
+      true,
+      {
+        "component": "pascal-case",
+        "variant": "^-[a-z]\\w+",
+        "element": "^[a-z]\\w+"
+      }
+    ]
+  }
+}

From 10bb2b288d1b2d100bc4ba2d970229da7970c4d8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:26:07 +0300
Subject: [PATCH 389/415] remove unnecessary border-radius

---
 src/components/conversation/conversation.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 7e2c6a9d..4322500f 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -54,12 +54,5 @@
       border-bottom: none;
     }
   }
-
-  &:not(.-expanded) > {
-    .conversation-status:last-child {
-      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
-      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
-    }
-  }
 }
 </style>

From 0d02b04726d75687abd218fd6ad68690cf0cfbae Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:32:47 +0300
Subject: [PATCH 390/415] bring back red stripe

---
 src/components/conversation/conversation.vue | 10 +++++++++-
 src/components/status/status.scss            |  4 ----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 4322500f..19f769e5 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -45,13 +45,21 @@
     border-left: none;
     border-bottom-width: 1px;
     border-bottom-style: solid;
-    border-color: var(--border, $fallback--border);
+    border-bottom-color: var(--border, $fallback--border);
     border-radius: 0;
   }
 
   &.-expanded {
+    .conversation-status {
+      border-color: $fallback--border;
+      border-color: var(--border, $fallback--border);
+      border-left: 4px solid $fallback--cRed;
+      border-left: 4px solid var(--cRed, $fallback--cRed);
+    }
     .conversation-status:last-child {
       border-bottom: none;
+      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
+      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
     }
   }
 }
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 46088cf9..fec9f9e9 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -5,10 +5,6 @@ $status-margin: 0.75em;
 
 .Status {
   min-width: 0;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-  border-left: 4px $fallback--cRed;
-  border-left: 4px var(--cRed, $fallback--cRed);
 
   &:hover .avatar {
     --still-image-img: visible;

From a962ca6065412f6bde067f6d4a3d460914604c88 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:34:18 +0300
Subject: [PATCH 391/415] lint

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

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 19f769e5..997a4d10 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -56,6 +56,7 @@
       border-left: 4px solid $fallback--cRed;
       border-left: 4px solid var(--cRed, $fallback--cRed);
     }
+
     .conversation-status:last-child {
       border-bottom: none;
       border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;

From 0feab1d97cb4683f2cc1869e08078097e787fcd1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:41:03 +0300
Subject: [PATCH 392/415] more broken reply improvements

---
 src/components/status/status.scss | 17 +++++++++++++----
 src/components/status/status.vue  |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index fec9f9e9..898e914f 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -154,6 +154,19 @@ $status-margin: 0.75em;
       // override default
       text-decoration: none;
     }
+
+    &.-strikethrough {
+      position: relative;
+
+      &::after {
+        content: '';
+        display: block;
+        position: absolute;
+        top: 50%;
+        width: 100%;
+        border-bottom: 1px solid var(--faint);
+      }
+    }
   }
 
   .reply-to {
@@ -165,10 +178,6 @@ $status-margin: 0.75em;
     text-overflow: ellipsis;
     white-space: nowrap;
     margin-left: 0.2em;
-
-    &.-strikethrough {
-      text-decoration: line-through;
-    }
   }
 
   .replies-separator {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 45251f17..27af4340 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -211,6 +211,7 @@
                   :status-id="status.parent_visible && status.in_reply_to_status_id"
                   class="reply-to-popover"
                   style="min-width: 0"
+                  :class="{ '-strikethrough': !status.parent_visible }"
                 >
                   <a
                     class="reply-to"
@@ -221,7 +222,6 @@
                     <i class="button-icon reply-button icon-reply" />
                     <span
                       class="faint-link reply-to-text"
-                      :class="{ '-strikethrough': !status.parent_visible }"
                     >
                       {{ $t('status.reply_to') }}
                     </span>

From ae4dc3e4390c4ba1b632be6aae7cc92480a65918 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 13 Aug 2020 16:29:12 +0300
Subject: [PATCH 393/415] treat field name as text

---
 src/components/user_profile/user_profile.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 361a3b5c..c7c67c0a 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -20,13 +20,14 @@
           :key="index"
           class="user-profile-field"
         >
-          <!-- eslint-disable vue/no-v-html -->
           <dt
             :title="user.fields_text[index].name"
             class="user-profile-field-name"
             @click.prevent="linkClicked"
-            v-html="field.name"
-          />
+          >
+            {{ field.name }}
+          </dt>
+          <!-- eslint-disable vue/no-v-html -->
           <dd
             :title="user.fields_text[index].value"
             class="user-profile-field-value"

From 2fa050b1630e11efd1db17ad8d63a88ec7a9c8f9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:02 +0300
Subject: [PATCH 394/415] Fix muted notifications

---
 src/components/notification/notification.scss | 52 +++++++++++++++++++
 src/components/notification/notification.vue  |  3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 src/components/notification/notification.scss

diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
new file mode 100644
index 00000000..d0e63d81
--- /dev/null
+++ b/src/components/notification/notification.scss
@@ -0,0 +1,52 @@
+// TODO Copypaste from Status, should unify it somehow
+.Notification {
+  &.-muted {
+    padding: 0.25em 0.6em;
+    height: 1.2em;
+    line-height: 1.2em;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: flex;
+    flex-wrap: nowrap;
+
+    & .status-username,
+    & .mute-thread,
+    & .mute-words {
+      word-wrap: normal;
+      word-break: normal;
+      white-space: nowrap;
+    }
+
+    & .status-username,
+    & .mute-words {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+
+    .status-username {
+      font-weight: normal;
+      flex: 0 1 auto;
+      margin-right: 0.2em;
+      font-size: smaller;
+    }
+
+    .mute-thread {
+      flex: 0 0 auto;
+    }
+
+    .mute-words {
+      flex: 1 0 5em;
+      margin-left: 0.2em;
+
+      &::before {
+        content: ' ';
+      }
+    }
+
+    .unmute {
+      flex: 0 0 auto;
+      margin-left: auto;
+      display: block;
+    }
+  }
+}
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 044ac871..7fac3840 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -7,7 +7,7 @@
   <div v-else>
     <div
       v-if="needMute && !unmuted"
-      class="container muted"
+      class="Notification container -muted"
     >
       <small>
         <router-link :to="userProfileLink">
@@ -168,3 +168,4 @@
 </template>
 
 <script src="./notification.js"></script>
+<style src="./notification.scss" lang="scss"></style>

From 30219098a6ba5ac5369f8c130676de7a7c8daea9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:31 +0300
Subject: [PATCH 395/415] fix issues with reply-link

---
 src/components/status/status.scss | 21 ++++++++++++++++++---
 src/components/status/status.vue  |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 898e914f..7fbab3b8 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -133,6 +133,13 @@ $status-margin: 0.75em;
     margin-right: 0.5em;
     max-width: 100%;
 
+    .reply-to-link {
+      white-space: nowrap;
+      word-break: break-word;
+      text-overflow: ellipsis;
+      overflow-x: hidden;
+    }
+
     .icon-reply {
       // mirror the icon
       transform: scaleX(-1);
@@ -143,11 +150,20 @@ $status-margin: 0.75em;
   & .reply-to-no-popover {
     min-width: 0;
     margin-right: 0.4em;
+    flex-shrink: 0;
   }
 
   .reply-to-popover {
-    &:hover {
+    position: relative;
+
+    .reply-to:hover::before {
+      content: '';
+      display: block;
+      position: absolute;
+      bottom: 0;
+      width: 100%;
       border-bottom: 1px solid var(--faint);
+      pointer-events: none;
     }
 
     .faint-link:hover {
@@ -156,8 +172,6 @@ $status-margin: 0.75em;
     }
 
     &.-strikethrough {
-      position: relative;
-
       &::after {
         content: '';
         display: block;
@@ -165,6 +179,7 @@ $status-margin: 0.75em;
         top: 50%;
         width: 100%;
         border-bottom: 1px solid var(--faint);
+        pointer-events: none;
       }
     }
   }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 27af4340..282ad37d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -234,6 +234,7 @@
                   <span class="reply-to-text">{{ $t('status.reply_to') }}</span>
                 </span>
                 <router-link
+                  class="reply-to-link"
                   :title="replyToName"
                   :to="replyProfileLink"
                 >

From ecbbec7b9798caff1d401403592de5ba02a3f509 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:26:44 +0300
Subject: [PATCH 396/415] work around incorrect styles ordering in status
 popover

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

diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index 79a52e38..162eb210 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -38,7 +38,8 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.status-popover {
+/* popover styles load on-demand, so we need to override */
+.status-popover.popover {
   font-size: 1rem;
   min-width: 15em;
   max-width: 95%;

From a6223cec0c6bb037f1e64a3bc7dfd7fca354faa1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 00:52:51 +0300
Subject: [PATCH 397/415] Fix last line having slightly cut-off low-hanging
 parts of characters

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e7094bec..66252bda 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -481,7 +481,7 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const heightWithoutPadding = Math.floor(target.scrollHeight - vertPadding)
+      const heightWithoutPadding = Math.ceil(target.scrollHeight - vertPadding) + 1
       let newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
       // This is a bit of a hack to combat target.scrollHeight being different on every other input
       // on some browsers for whatever reason. Don't change the height if difference is 1px or less.

From 7de78b1401cf8454026afd0a2ba2578356173bcd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 23:50:23 +0300
Subject: [PATCH 398/415] revert change to form resize logic

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

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 66252bda..e7094bec 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -481,7 +481,7 @@ const PostStatusForm = {
 
       // BEGIN content size update
       target.style.height = 'auto'
-      const heightWithoutPadding = Math.ceil(target.scrollHeight - vertPadding) + 1
+      const heightWithoutPadding = Math.floor(target.scrollHeight - vertPadding)
       let newHeight = this.maxHeight ? Math.min(heightWithoutPadding, this.maxHeight) : heightWithoutPadding
       // This is a bit of a hack to combat target.scrollHeight being different on every other input
       // on some browsers for whatever reason. Don't change the height if difference is 1px or less.

From 815f230ac7ace5a1507afae91bafa57589a77522 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 18 Aug 2020 23:57:42 +0300
Subject: [PATCH 399/415] fixed some issues related to user avatar

---
 src/components/attachment/attachment.vue          |  8 ++++++--
 src/components/chat_list_item/chat_list_item.scss |  2 +-
 src/components/chat_title/chat_title.vue          |  2 +-
 src/components/status/status.scss                 |  2 +-
 src/components/still-image/still-image.vue        |  3 +--
 src/components/user_avatar/user_avatar.vue        |  6 ++++--
 src/components/user_card/user_card.vue            | 10 +++-------
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index be7377e9..63e0ceba 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -60,6 +60,7 @@
       @click="openModal"
     >
       <StillImage
+        class="image"
         :referrerpolicy="referrerpolicy"
         :mimetype="attachment.mimetype"
         :src="attachment.large_thumb_url || attachment.url"
@@ -281,8 +282,11 @@
   }
 
   .image-attachment {
-    width: 100%;
-    height: 100%;
+    &,
+    & .image {
+      width: 100%;
+      height: 100%;
+    }
 
     &.hidden {
       display: none;
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index 10ba45f2..9e97b28e 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -72,7 +72,7 @@
     }
   }
 
-  .avatar.still-image {
+  .Avatar {
     border-radius: $fallback--avatarAltRadius;
     border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
   }
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index c375b10b..b16ed39d 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -51,7 +51,7 @@
     }
   }
 
-  .still-image.avatar {
+  .Avatar {
     width: 23px;
     height: 23px;
     margin-right: 0.5em;
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 7fbab3b8..4973e4ba 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -6,7 +6,7 @@ $status-margin: 0.75em;
 .Status {
   min-width: 0;
 
-  &:hover .avatar {
+  &:hover {
     --still-image-img: visible;
     --still-image-canvas: hidden;
   }
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 6fa055de..ad82210d 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -30,8 +30,6 @@
   position: relative;
   line-height: 0;
   overflow: hidden;
-  width: 100%;
-  height: 100%;
   display: flex;
   align-items: center;
 
@@ -68,6 +66,7 @@
       border-radius: $fallback--tooltipRadius;
       border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
       z-index: 2;
+      visibility: var(--still-image-label-visibility, visible);
     }
 
     &:hover canvas {
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index 3545b801..e4e4127c 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -1,6 +1,6 @@
 <template>
   <StillImage
-    class="avatar"
+    class="Avatar"
     :alt="user.screen_name"
     :title="user.screen_name"
     :src="imgSrc(user.profile_image_url_original)"
@@ -13,7 +13,9 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.avatar.still-image {
+.Avatar {
+  --still-image-label-visibility: hidden;
+
   width: 48px;
   height: 48px;
   box-shadow: var(--avatarStatusShadow);
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 75db5db1..07fce79a 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -364,13 +364,9 @@
     }
   }
 
-  &:hover .animated.avatar {
-    canvas {
-      display: none;
-    }
-    img {
-      visibility: visible;
-    }
+  &:hover .avatar {
+    --still-image-img: visible;
+    --still-image-canvas: hidden;
   }
 
   &-avatar-link {

From 36c9368ae5b70098c12f86de8e15a23dd5fbc264 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:18:52 +0300
Subject: [PATCH 400/415] fix reply popovers being too slim

---
 src/components/status/status.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 4973e4ba..9d55bac3 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -154,7 +154,9 @@ $status-margin: 0.75em;
   }
 
   .reply-to-popover {
-    position: relative;
+    .reply-to {
+      position: relative;
+    }
 
     .reply-to:hover::before {
       content: '';

From 61966d290ae87b9aadd530ef180fc191d75e77d2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:22:08 +0300
Subject: [PATCH 401/415] fix lain's bug

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

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 7ee9e748..520c03ea 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -143,6 +143,7 @@
             v-model="newStatus.status"
             :placeholder="placeholder || $t('post_status.default')"
             rows="1"
+            cols="1"
             :disabled="posting"
             class="form-post-body"
             :class="{ 'scrollable-form': !!maxHeight }"

From d7c42f146905a85a0ff0bad6da85090d5349acdd Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 00:38:54 +0300
Subject: [PATCH 402/415] lint

---
 src/components/status/status.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 9d55bac3..c558466b 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -154,10 +154,6 @@ $status-margin: 0.75em;
   }
 
   .reply-to-popover {
-    .reply-to {
-      position: relative;
-    }
-
     .reply-to:hover::before {
       content: '';
       display: block;
@@ -188,6 +184,7 @@ $status-margin: 0.75em;
 
   .reply-to {
     display: flex;
+    position: relative;
   }
 
   .reply-to-text {

From 800047b81f4375577e7d7298409cea5bd751ea71 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 19 Aug 2020 12:14:00 +0300
Subject: [PATCH 403/415] fixed

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

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index c558466b..8d292d3f 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -170,7 +170,7 @@ $status-margin: 0.75em;
     }
 
     &.-strikethrough {
-      &::after {
+      .reply-to::after {
         content: '';
         display: block;
         position: absolute;

From 54b619dfec7255cec44dd2d23add1bbc9062ffee Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 19 Aug 2020 13:06:46 +0300
Subject: [PATCH 404/415] show tag name in title for tag timelines

---
 src/components/timeline_menu/timeline_menu.js  | 16 +++++++++++-----
 src/components/timeline_menu/timeline_menu.vue |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index c0d75c54..2be75b06 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -9,7 +9,8 @@ export const timelineNames = () => {
     'bookmarks': 'nav.bookmarks',
     'dms': 'nav.dms',
     'public-timeline': 'nav.public_tl',
-    'public-external-timeline': 'nav.twkn'
+    'public-external-timeline': 'nav.twkn',
+    'tag-timeline': 'tag'
   }
 }
 
@@ -40,6 +41,14 @@ const TimelineMenu = {
       setTimeout(() => {
         this.isOpen = true
       }, 25)
+    },
+    timelineName () {
+      const route = this.$route.name
+      if (route === 'tag-timeline') {
+        return '#' + this.$route.params.tag
+      }
+      const i18nkey = timelineNames()[this.$route.name]
+      return i18nkey ? this.$t(i18nkey) : route
     }
   },
   computed: {
@@ -47,10 +56,7 @@ const TimelineMenu = {
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating
-    }),
-    timelineNames () {
-      return timelineNames()
-    }
+    })
   }
 }
 
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index add8a6eb..be512d60 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -45,7 +45,7 @@
       slot="trigger"
       class="title timeline-menu-title"
     >
-      <span>{{ $t(timelineNames[$route.name]) }}</span>
+      <span>{{ timelineName() }}</span>
       <i class="icon-down-open" />
     </div>
   </Popover>

From a26fc61efad24bda2707f08ce8d54c7ca1b0b931 Mon Sep 17 00:00:00 2001
From: Ben Is <srsbzns@cock.li>
Date: Thu, 6 Aug 2020 20:45:15 +0000
Subject: [PATCH 405/415] Translated using Weblate (Italian)

Currently translated at 100.0% (663 of 663 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 1473614a..b88fdd29 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -36,7 +36,8 @@
     "who_to_follow": "Chi seguire",
     "preferences": "Preferenze",
     "bookmarks": "Segnalibri",
-    "chats": "Conversazioni"
+    "chats": "Conversazioni",
+    "timelines": "Sequenze"
   },
   "notifications": {
     "followed_you": "ti segue",

From c649f28faf08fc3096c653018807171e8bb8fd4d Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 19 Aug 2020 14:54:00 +0200
Subject: [PATCH 406/415] EntityNormalizer: Normalize thumbnail url.

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

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index c1bf8535..1884478a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -209,6 +209,7 @@ export const parseAttachment = (data) => {
   }
 
   output.url = data.url
+  output.large_thumb_url = data.preview_url
   output.description = data.description
 
   return output

From a0c17e1fd0f63e3c7bf827f415caf94e5d5bf95d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 19 Aug 2020 16:19:36 +0300
Subject: [PATCH 407/415] fix tests by removing only and adding empty func for
 notification tests

---
 test/unit/specs/modules/statuses.spec.js                  | 8 +++++---
 .../unit/specs/services/chat_service/chat_service.spec.js | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index fe42e85b..b790b231 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -330,7 +330,7 @@ describe('Statuses module', () => {
       const deletion = makeMockStatus({ id: '4', type: 'deletion' })
       deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
       deletion.uri = 'xxx'
-
+      const newNotificationSideEffects = () => {}
       mutations.addNewStatuses(state, { statuses: [status, otherStatus], user })
       mutations.addNewNotifications(
         state,
@@ -342,7 +342,8 @@ describe('Statuses module', () => {
             status: otherStatus,
             action: otherStatus,
             seen: false
-          }]
+          }],
+          newNotificationSideEffects
         })
 
       expect(state.notifications.data.length).to.eql(1)
@@ -356,7 +357,8 @@ describe('Statuses module', () => {
             status: mentionedStatus,
             action: mentionedStatus,
             seen: false
-          }]
+          }],
+          newNotificationSideEffects
         })
 
       mutations.addNewStatuses(state, { statuses: [mentionedStatus], user })
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 4e8e566b..3ee9839d 100644
--- a/test/unit/specs/services/chat_service/chat_service.spec.js
+++ b/test/unit/specs/services/chat_service/chat_service.spec.js
@@ -17,8 +17,7 @@ const message3 = {
   created_at: (new Date('2020-07-22T18:45:59.000Z'))
 }
 
-// TODO: only
-describe.only('chatService', () => {
+describe('chatService', () => {
   describe('.add', () => {
     it("Doesn't add duplicates", () => {
       const chat = chatService.empty()

From 06159101cf417e81e0a37217331b17460f9f800a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 25 Aug 2020 11:33:38 +0300
Subject: [PATCH 408/415] fix avatar overwrite classes in usercard

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

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 07fce79a..041bb80f 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -354,7 +354,7 @@
     align-items: flex-start;
     max-height: 56px;
 
-    .avatar {
+    .Avatar {
       flex: 1 0 100%;
       width: 56px;
       height: 56px;
@@ -364,7 +364,7 @@
     }
   }
 
-  &:hover .avatar {
+  &:hover .Avatar {
     --still-image-img: visible;
     --still-image-canvas: hidden;
   }

From f0ac40a42805ff8ae614bec4afd1c0cacd15c3dc Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 25 Aug 2020 11:40:02 +0300
Subject: [PATCH 409/415] change more animated gif avatars to work properly

---
 src/components/chat_message/chat_message.scss   | 2 +-
 src/components/notifications/notifications.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index 240beea4..7d4ff60c 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -2,7 +2,7 @@
 
 .chat-message-wrapper {
   &.hovered-message-chain {
-    .animated.avatar {
+    .animated.Avatar {
       canvas {
         display: none;
       }
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 1bd91995..c6b2a5b5 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -39,7 +39,7 @@
   word-wrap: break-word;
   word-break: break-word;
 
-  &:hover .animated.avatar {
+  &:hover .animated.Avatar {
     canvas {
       display: none;
     }

From c9ea2db69dbf0289f57cac53bf625bb44867943f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 25 Aug 2020 12:17:42 +0300
Subject: [PATCH 410/415] fix long poll labels overflowing

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

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index ceba9eea..1858f3e1 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -96,6 +96,7 @@
     align-items: center;
     padding: 0.1em 0.25em;
     z-index: 1;
+    word-break: break-word;
   }
   .result-percentage {
     width: 3.5em;

From 42598fc6752950b4d699ed76b1964ac9f28d5f36 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 26 Aug 2020 14:28:43 +0300
Subject: [PATCH 411/415] change changelog

---
 CHANGELOG.md | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86d1a97f..108e75da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,17 +3,9 @@ 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]
-### Changed
-- Greentext now has separate color slot for it
-- Removed the use of with_move parameters when fetching notifications
-- Push notifications now are the same as normal notfication, and are localized.
-- Updated Notification Settings to match new BE API
-
-### Fixed
-- Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
-- Multiple issues with muted statuses/notifications
-
 ## [Unreleased patch]
+
+## [2.1.0-rc0] - 2020-08-26
 ### Add
 - Added private notifications option for push notifications
 - 'Copy link' button for statuses (in the ellipsis menu)
@@ -34,6 +26,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add better visual indication for drag-and-drop for files
 - When disabling attachments, the placeholder links now show an icon and the description instead of just IMAGE or VIDEO etc
 - Remove unnecessary options for 'automatic loading when loading older' and 'reply previews'
+- Greentext now has separate color slot for it
+- Removed the use of with_move parameters when fetching notifications
+- Push notifications now are the same as normal notfication, and are localized.
+- Updated Notification Settings to match new BE API
 
 ### Fixed
 - Custom Emoji will display in poll options now.
@@ -52,6 +48,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Reply filtering options in Settings -> Filtering now work again using filtering on server
 - Don't show just blank-screen when cookies are disabled
 - Add status idempotency to prevent accidental double posting when posting returns an error
+- Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
+- Multiple issues with muted statuses/notifications
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From bdbc4b27b689846bd303ecd3c7ccc6a8f38a6b21 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 27 Aug 2020 16:49:01 +0300
Subject: [PATCH 412/415] set 2.1.0 date and remove rc from changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 108e75da..528a669c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,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]
-## [Unreleased patch]
 
-## [2.1.0-rc0] - 2020-08-26
+## [2.1.0] - 2020-08-28
 ### Add
 - Added private notifications option for push notifications
 - 'Copy link' button for statuses (in the ellipsis menu)

From 4ac882a3b0a267999ad878b14274012c4e848d86 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 27 Aug 2020 16:51:16 +0300
Subject: [PATCH 413/415] add back unreleased/patch

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 528a669c..52527db2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ 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]
+## [Unreleased patch]
+
 ## [2.1.0] - 2020-08-28
 ### Add
 - Added private notifications option for push notifications

From c0205d582a565e8848c413db3e4531b454f13690 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 27 Aug 2020 16:56:47 +0300
Subject: [PATCH 414/415] add missing release to changelog to fix conflicts

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52527db2..ee860265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [2.1.0] - 2020-08-28
 ### Add
-- Added private notifications option for push notifications
-- 'Copy link' button for statuses (in the ellipsis menu)
 - Autocomplete domains from list of known instances
 - 'Bot' settings option and badge
 - Added profile meta data fields that can be set in profile settings
@@ -20,7 +18,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added ability to see all favoriting or repeating users when hovering the number on highlighted statuses
 
 ### Changed
-- Registration page no longer requires email if the server is configured not to require it
 - Change heart to thumbs up in reaction picker
 - Close the media modal on navigation events
 - Add colons to the emoji alt text, to make them copyable
@@ -52,6 +49,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
 - Multiple issues with muted statuses/notifications
 
+
+## [2.0.5] - 2020-05-12
+### Add
+- Added private notifications option for push notifications
+- 'Copy link' button for statuses (in the ellipsis menu)
+
+### Changed
+- Registration page no longer requires email if the server is configured not to require it
+
+### Fixed
+- Status ellipsis menu closes properly when selecting certain options
+
 ## [2.0.3] - 2020-05-02
 ### Fixed
 - Show more/less works correctly with auto-collapsed subjects and long posts

From 748c4d8c71b42cd7dfc748c1713b22e06faf167c Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 27 Aug 2020 17:13:14 +0300
Subject: [PATCH 415/415] fix boomarks mistake in changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee860265..133a2770 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 status preview option to preview your statuses before posting
 - When a post is a reply to an unavailable post, the 'Reply to'-text has a strike-through style
 - Added ability to see all favoriting or repeating users when hovering the number on highlighted statuses
+- Bookmarks
 
 ### Changed
 - Change heart to thumbs up in reaction picker
@@ -49,7 +50,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)
 - Multiple issues with muted statuses/notifications
 
-
 ## [2.0.5] - 2020-05-12
 ### Add
 - Added private notifications option for push notifications
@@ -121,8 +121,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Ability to change user's email
 - About page
 - Added remote user redirect
-- Bookmarks
+
 ### Changed
 - changed the way fading effects for user profile/long statuses works, now uses css-mask instead of gradient background hacks which weren't exactly compatible with semi-transparent themes
+
 ### Fixed
 - improved hotkey behavior on autocomplete popup