fix conflicts

https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1424

Signed-off-by: Sam Therapy <sam@samtherapy.net>

CHANGELOG.md

@@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [2.4.2] - 2022-01-09
+### Added 
+- Added Apply and Reset buttons to the bottom of theme tab to minimize UI travel
+- Implemented user option to always show floating New Post button (normally mobile-only)
+- Display reasons for instance specific policies 
+- Added functionality to cancel follow request
+
+### Fixed
+- Fixed link to external profile not working on user profiles
+- Fixed mobile shoutbox display 
+- Fixed favicon badge not working in Chrome
+- Escape html more properly in subject/display name 
+
+
 ## [2.4.0] - 2021-08-08
 ### Added
 - Added a quick settings to timeline header for easier access
@@ -11,12 +25,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Implemented user option to change sidebar position to the right side
 - Implemented user option to hide floating shout panel
 - Implemented "edit profile" button if viewing own profile which opens profile settings
-- Added Apply and Reset buttons to the bottom of theme tab to minimize UI travel
-- Implemented user option to always show floating New Post button (normally mobile-only)
 
 ### Fixed
 - Fixed follow request count showing in the wrong location in mobile view
 
+
 ## [2.3.0] - 2021-03-01
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.

build/dev-server.js

@@ -21,7 +21,6 @@ var compiler = webpack(webpackConfig)
 
 var devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: webpackConfig.output.publicPath,
-  writeToDisk: true,
   stats: {
     colors: true,
     chunks: false

build/webpack.base.conf.js

@@ -3,7 +3,6 @@ var config = require('../config')
 var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
 var ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin')
-var CopyPlugin = require('copy-webpack-plugin');
 
 var env = process.env.NODE_ENV
 // check env & config/index.js to decide weither to enable CSS Sourcemaps for the
@@ -94,19 +93,6 @@ module.exports = {
     new ServiceWorkerWebpackPlugin({
       entry: path.join(__dirname, '..', 'src/sw.js'),
       filename: 'sw-pleroma.js'
-    }),
-    // This copies Ruffle's WASM to a directory so that JS side can access it
-    new CopyPlugin({
-      patterns: [
-        {
-          from: "node_modules/ruffle-mirror/*",
-          to: "static/ruffle",
-          flatten: true
-        },
-      ],
-      options: {
-        concurrency: 100,
-      },
     })
   ]
 }

package.json

@@ -33,7 +33,6 @@
     "phoenix": "^1.3.0",
     "portal-vue": "^2.1.4",
     "punycode.js": "^2.1.0",
-    "ruffle-mirror": "^2021.4.10",
     "v-click-outside": "^2.1.1",
     "vue": "^2.6.11",
     "vue-i18n": "^7.3.2",
@@ -59,7 +58,6 @@
     "chalk": "^1.1.3",
     "chromedriver": "^87.0.1",
     "connect-history-api-fallback": "^1.1.0",
-    "copy-webpack-plugin": "^6.4.1",
     "cross-spawn": "^4.0.2",
     "css-loader": "^0.28.0",
     "custom-event-polyfill": "^1.0.7",
@@ -114,7 +112,7 @@
     "url-loader": "^1.1.2",
     "vue-loader": "^14.0.0",
     "vue-style-loader": "^4.0.0",
-    "webpack": "^4.44.0",
+    "webpack": "^4.0.0",
     "webpack-dev-middleware": "^3.6.0",
     "webpack-hot-middleware": "^2.12.2",
     "webpack-merge": "^0.14.1"

src/App.js

@@ -89,6 +89,11 @@ export default {
         'order': this.$store.getters.mergedConfig.sidebarRight ? 99 : 0
       }
     },
+    fullscreenView () {
+      return {
+        'max-width': this.$store.getters.mergedConfig.fullscreenView ? 'initial' : '100em'
+      }
+    },
     thirdColumnAlign () {
       return {
         'order': this.$store.getters.mergedConfig.sidebarRight ? 0 : 99

src/App.vue

@@ -12,7 +12,7 @@
     <div class="app-bg-wrapper app-container-wrapper" />
     <div
       id="content"
-      :style="thirdColumnLayout"
+      :style="[thirdColumnLayout, fullscreenView]"
       class="container underlay"
     >
       <div

src/components/attachment/attachment.js

@@ -1,5 +1,4 @@
 import StillImage from '../still-image/still-image.vue'
-import Flash from '../flash/flash.vue'
 import VideoAttachment from '../video_attachment/video_attachment.vue'
 import nsfwImage from '../../assets/nsfw.png'
 import fileTypeService from '../../services/file_type/file_type.service.js'
@@ -44,7 +43,6 @@ const Attachment = {
     }
   },
   components: {
-    Flash,
     StillImage,
     VideoAttachment
   },

src/components/attachment/attachment.vue

@@ -117,11 +117,6 @@
         <!-- eslint-enable vue/no-v-html -->
       </div>
     </div>
-
-    <Flash
-      v-if="type === 'flash'"
-      :src="attachment.large_thumb_url || attachment.url"
-    />
   </div>
 </template>
 
@@ -177,7 +172,6 @@
   }
 
   .non-gallery.attachment {
-    &.flash,
     &.video {
       flex: 1 0 40%;
     }
@@ -189,7 +183,7 @@
       flex-grow: 0;
     }
     .video {
-      height: 260px;
+      //height: 260px;
       display: flex;
     }
     video {

src/components/desktop_nav/desktop_nav.js

@@ -69,7 +69,12 @@ export default {
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
-    privateMode () { return this.$store.state.instance.private }
+    privateMode () { return this.$store.state.instance.private },
+    fullscreenView () {
+      return {
+        'max-width': this.$store.getters.mergedConfig.fullscreenView ? 'initial' : null
+      }
+    }
   },
   methods: {
     scrollToTop () {

src/components/desktop_nav/desktop_nav.vue

@@ -5,7 +5,10 @@
     :class="{ '-logoLeft': logoLeft }"
     @click="scrollToTop()"
   >
-    <div class="inner-nav">
+    <div
+      class="inner-nav"
+      :style="fullscreenView"
+    >
       <div class="item sitename">
         <router-link
           v-if="!hideSitename"

src/components/flash/flash.js

@@ -1,52 +0,0 @@
-import RuffleService from '../../services/ruffle_service/ruffle_service.js'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faStop,
-  faExclamationTriangle
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faStop,
-  faExclamationTriangle
-)
-
-const Flash = {
-  props: [ 'src' ],
-  data () {
-    return {
-      player: false, // can be true, "hidden", false. hidden = element exists
-      loaded: false,
-      ruffleInstance: null
-    }
-  },
-  methods: {
-    openPlayer () {
-      if (this.player) return // prevent double-loading, or re-loading on failure
-      this.player = 'hidden'
-      RuffleService.getRuffle().then((ruffle) => {
-        const player = ruffle.newest().createPlayer()
-        player.config = {
-          letterbox: 'on'
-        }
-        const container = this.$refs.container
-        container.appendChild(player)
-        player.style.width = '100%'
-        player.style.height = '100%'
-        player.load(this.src).then(() => {
-          this.player = true
-        }).catch((e) => {
-          console.error('Error loading ruffle', e)
-          this.player = 'error'
-        })
-        this.ruffleInstance = player
-      })
-    },
-    closePlayer () {
-      console.log(this.ruffleInstance)
-      this.ruffleInstance.remove()
-      this.player = false
-    }
-  }
-}
-
-export default Flash

src/components/flash/flash.vue

@@ -1,88 +0,0 @@
-<template>
-  <div class="Flash">
-    <div
-      v-if="player === true || player === 'hidden'"
-      ref="container"
-      class="player"
-      :class="{ hidden: player === 'hidden' }"
-    />
-    <button
-      v-if="player !== true"
-      class="button-unstyled placeholder"
-      @click="openPlayer"
-    >
-      <span
-        v-if="player === 'hidden'"
-        class="label"
-      >
-        {{ $t('general.loading') }}
-      </span>
-      <span
-        v-if="player === 'error'"
-        class="label"
-      >
-        {{ $t('general.flash_fail') }}
-      </span>
-      <span
-        v-else
-        class="label"
-      >
-        <p>
-          {{ $t('general.flash_content') }}
-        </p>
-        <p>
-          <FAIcon icon="exclamation-triangle" />
-          {{ $t('general.flash_security') }}
-        </p>
-      </span>
-    </button>
-    <button
-      v-if="player"
-      class="button-unstyled hider"
-      @click="closePlayer"
-    >
-      <FAIcon icon="stop" />
-    </button>
-  </div>
-</template>
-
-<script src="./flash.js"></script>
-
-<style lang="scss">
-@import '../../_variables.scss';
-.Flash {
-  width: 100%;
-  height: 260px;
-  position: relative;
-
-  .player {
-    height: 100%;
-    width: 100%;
-  }
-
-  .hider {
-    top: 0;
-  }
-
-  .label {
-    text-align: center;
-    flex: 1 1 0;
-    line-height: 1.2;
-    white-space: normal;
-    word-wrap: normal;
-  }
-
-  .hidden {
-    display: none;
-    visibility: 'hidden';
-  }
-
-  .placeholder {
-    height: 100%;
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-}
-</style>

src/components/follow_button/follow_button.js

@@ -1,6 +1,6 @@
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 export default {
-  props: ['relationship', 'labelFollowing', 'buttonClass'],
+  props: ['relationship', 'user', 'labelFollowing', 'buttonClass'],
   data () {
     return {
       inProgress: false
@@ -14,7 +14,7 @@ export default {
       if (this.inProgress || this.relationship.following) {
         return this.$t('user_card.follow_unfollow')
       } else if (this.relationship.requested) {
-        return this.$t('user_card.follow_again')
+        return this.$t('user_card.follow_cancel')
       } else {
         return this.$t('user_card.follow')
       }
@@ -29,11 +29,14 @@ export default {
       } else {
         return this.$t('user_card.follow')
       }
+    },
+    disabled () {
+      return this.inProgress || this.user.deactivated
     }
   },
   methods: {
     onClick () {
-      this.relationship.following ? this.unfollow() : this.follow()
+      this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow()
     },
     follow () {
       this.inProgress = true

src/components/follow_button/follow_button.vue

@@ -2,7 +2,7 @@
   <button
     class="btn button-default follow-button"
     :class="{ toggled: isPressed }"
-    :disabled="inProgress"
+    :disabled="disabled"
     :title="title"
     @click="onClick"
   >

src/components/mention_link/mention_link.js

@@ -1,6 +1,7 @@
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { mapGetters, mapState } from 'vuex'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAt
@@ -12,6 +13,9 @@ library.add(
 
 const MentionLink = {
   name: 'MentionLink',
+  components: {
+    UserAvatar
+  },
   props: {
     url: {
       required: true,
@@ -50,6 +54,10 @@ const MentionLink = {
     userName () {
       return this.user && this.userNameFullUi.split('@')[0]
     },
+    serverName () {
+      // XXX assumed that domain does not contain @
+      return this.user && (this.userNameFullUi.split('@')[1] || this.$store.getters.instanceDomain)
+    },
     userNameFull () {
       return this.user && this.user.screen_name
     },
@@ -85,6 +93,31 @@ const MentionLink = {
         this.highlightType
       ]
     },
+    useAtIcon () {
+      return this.mergedConfig.useAtIcon
+    },
+    isRemote () {
+      return this.userName !== this.userNameFull
+    },
+    shouldShowFullUserName () {
+      const conf = this.mergedConfig.mentionLinkDisplay
+      if (conf === 'short') {
+        return false
+      } else if (conf === 'full') {
+        return true
+      } else { // full_for_remote
+        return this.isRemote
+      }
+    },
+    shouldShowTooltip () {
+      return this.mergedConfig.mentionLinkShowTooltip && this.mergedConfig.mentionLinkDisplay === 'short' && this.isRemote
+    },
+    shouldShowAvatar () {
+      return this.mergedConfig.mentionLinkShowAvatar
+    },
+    shouldFadeDomain () {
+      return this.mergedConfig.mentionLinkFadeDomain
+    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       currentUser: state => state.users.currentUser

src/components/mention_link/mention_link.scss

@@ -1,3 +1,5 @@
+@import '../../_variables.scss';
+
 .MentionLink {
   position: relative;
   white-space: normal;
@@ -10,6 +12,15 @@
     border-radius: 2px;
   }
 
+  .mention-avatar {
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+    width: 1.5em;
+    height: 1.5em;
+    vertical-align: middle;
+    user-select: none;
+    margin-right: 0.2em;
+  }
+
   .full {
     position: absolute;
     display: inline-block;
@@ -27,7 +38,8 @@
     user-select: all;
   }
 
-  .short {
+  .short.-with-tooltip,
+  .you {
     user-select: none;
   }
 
@@ -56,7 +68,7 @@
     }
 
     &.-striped {
-      & .userName,
+      & .shortName,
       & .full {
         background-image:
           repeating-linear-gradient(
@@ -70,14 +82,14 @@
     }
 
     &.-solid {
-      & .userName,
+      & .shortName,
       & .full {
         background-image: linear-gradient(var(--____highlight-tintColor2), var(--____highlight-tintColor2));
       }
     }
 
     &.-side {
-      & .userName,
+      & .shortName,
       & .userNameFull {
         box-shadow: 0 -5px 3px -4px inset var(--____highlight-solidColor);
       }
@@ -88,4 +100,12 @@
     opacity: 1;
     pointer-events: initial;
   }
+
+  .serverName.-faded {
+    color: var(--faintLink, $fallback--link);
+  }
+
+  .full .-faded {
+    color: var(--faint, $fallback--faint);
+  }
 }

src/components/mention_link/mention_link.vue

@@ -19,17 +19,30 @@
     >
       <a
         class="short button-unstyled"
+        :class="{ '-with-tooltip': shouldShowTooltip }"
         :href="url"
         @click.prevent="onClick"
       >
         <!-- eslint-disable vue/no-v-html -->
-        <FAIcon
+        <UserAvatar
+          v-if="shouldShowAvatar"
+          class="mention-avatar"
+          :user="user"
+        /><span
+          class="shortName"
+        ><FAIcon
+          v-if="useAtIcon"
           size="sm"
           icon="at"
           class="at"
-        /><span class="shortName"><span
+        />{{ !useAtIcon ? '@' : '' }}<span
           class="userName"
           v-html="userName"
+        /><span
+          v-if="shouldShowFullUserName"
+          class="serverName"
+          :class="{ '-faded': shouldFadeDomain }"
+          v-html="'@' + serverName"
         /></span>
         <span
           v-if="isYou"
@@ -38,14 +51,24 @@
         <!-- eslint-enable vue/no-v-html -->
       </a>
       <span
-        v-if="userName !== userNameFull"
+        v-if="shouldShowTooltip"
         class="full popover-default"
         :class="[highlightType]"
       >
         <span
           class="userNameFull"
-          v-text="'@' + userNameFull"
-        />
+        >
+          <!-- eslint-disable vue/no-v-html -->
+          @<span
+            class="userName"
+            v-html="userName"
+          /><span
+            class="serverName"
+            :class="{ '-faded': shouldFadeDomain }"
+            v-html="'@' + serverName"
+          />
+          <!-- eslint-enable vue/no-v-html -->
+        </span>
       </span>
     </span>
   </span>

src/components/nav_panel/nav_panel.vue

@@ -139,9 +139,7 @@
   .menu-item {
     display: block;
     box-sizing: border-box;
-    height: 3.5em;
-    line-height: 3.5em;
-    padding: 0 1em;
+    padding: .5em 1em;
     width: 100%;
     color: $fallback--link;
     color: var(--link, $fallback--link);
@@ -200,7 +198,7 @@
   .badge {
     position: absolute;
     right: 0.6rem;
-    top: 1.25em;
+    //top: 1.25em;
   }
 
   &.compact {

src/components/settings_modal/tabs/general_tab.js

@@ -30,6 +30,11 @@ const GeneralTab = {
         value: mode,
         label: this.$t(`settings.conversation_other_replies_button_${mode}`)
       })),
+      mentionLinkDisplayOptions: [ 'short', 'full_for_remote', 'full' ].map(mode => ({
+        key: mode,
+        value: mode,
+        label: this.$t(`settings.mention_link_display_${mode}`)
+      })),
       loopSilentAvailable:
       // Firefox
       Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||

src/components/settings_modal/tabs/general_tab.vue

@@ -21,6 +21,11 @@
             {{ $t('settings.show_third_column') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="fullscreenView">
+            {{ $t('settings.fullscreenView') }}
+          </BooleanSetting>
+        </li>
         <li v-if="instanceWallpaperUsed">
           <BooleanSetting path="hideInstanceWallpaper">
             {{ $t('settings.hide_wallpaper') }}
@@ -129,6 +134,41 @@
             </ChoiceSetting>
           </li>
         </ul>
+        <li>
+          <ChoiceSetting
+            id="mentionLinkDisplay"
+            path="mentionLinkDisplay"
+            :options="mentionLinkDisplayOptions"
+          >
+            {{ $t('settings.mention_link_display') }}
+          </ChoiceSetting>
+        </li>
+        <ul
+          class="setting-list suboptions"
+        >
+          <li
+            v-if="mentionLinkDisplay === 'short'"
+          >
+            <BooleanSetting path="mentionLinkShowTooltip">
+              {{ $t('settings.mention_link_show_tooltip') }}
+            </BooleanSetting>
+          </li>
+          <li>
+            <BooleanSetting path="useAtIcon">
+              {{ $t('settings.use_at_icon') }}
+            </BooleanSetting>
+          </li>
+          <li>
+            <BooleanSetting path="mentionLinkShowAvatar">
+              {{ $t('settings.mention_link_show_avatar') }}
+            </BooleanSetting>
+          </li>
+          <li>
+            <BooleanSetting path="mentionLinkFadeDomain">
+              {{ $t('settings.mention_link_fade_domain') }}
+            </BooleanSetting>
+          </li>
+        </ul>
       </ul>
     </div>
 

src/components/settings_modal/tabs/version_tab.js

@@ -3,6 +3,7 @@ import { extractCommit } from 'src/services/version/version.service'
 const pleromaFeCommitUrl = 'https://git.freecumextremist.com/twl/pleroma-fe/commit/'
 const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
 
+
 const VersionTab = {
   data () {
     const instance = this.$store.state.instance

src/components/status_content/status_content.vue

@@ -119,7 +119,7 @@ $status-margin: 0.75em;
 
   img, video {
     max-width: 100%;
-    max-height: 400px;
+    // max-height: 400px;
     vertical-align: middle;
     object-fit: contain;
 

src/components/user_card/user_card.vue

@@ -82,6 +82,12 @@
                 @{{ user.screen_name_ui }}
               </router-link>
               <template v-if="!hideBio">
+                <span
+                  v-if="user.deactivated"
+                  class="alert user-role"
+                >
+                  {{ $t('user_card.deactivated') }}
+                </span>
                 <span
                   v-if="!!visibleRole"
                   class="alert user-role"
@@ -160,7 +166,10 @@
           class="user-interactions"
         >
           <div class="btn-group">
-            <FollowButton :relationship="relationship" />
+            <FollowButton
+              :relationship="relationship"
+              :user="user"
+            />
             <template v-if="relationship.following">
               <ProgressButton
                 v-if="!relationship.subscribing"
@@ -195,6 +204,7 @@
             <button
               v-if="relationship.muting"
               class="btn button-default btn-block toggled"
+              :disabled="user.deactivated"
               @click="unmuteUser"
             >
               {{ $t('user_card.muted') }}
@@ -202,6 +212,7 @@
             <button
               v-else
               class="btn button-default btn-block"
+              :disabled="user.deactivated"
               @click="muteUser"
             >
               {{ $t('user_card.mute') }}
@@ -210,6 +221,7 @@
           <div>
             <button
               class="btn button-default btn-block"
+              :disabled="user.deactivated"
               @click="mentionUser"
             >
               {{ $t('user_card.mention') }}

src/i18n/ca.json

@@ -323,7 +323,10 @@
     "play_videos_in_modal": "Reproduir vídeos en un marc emergent",
     "file_export_import": {
       "errors": {
-        "invalid_file": "El fitxer seleccionat no és vàlid com a còpia de seguretat de la configuració. No s'ha realitzat cap canvi."
+        "invalid_file": "El fitxer seleccionat no és vàlid com a còpia de seguretat de la configuració. No s'ha realitzat cap canvi.",
+        "file_too_new": "Versió important incompatible: {fileMajor}, aquest PleromaFE (configuració versió {feMajor}) és massa antiga per gestionar-lo",
+        "file_too_old": "Versió important incompatible: {fileMajor}, la versió del fitxer és massa antiga i no està implementada (s'ha establert un mínim ver. {feMajor})",
+        "file_slightly_new": "La versió menor del fitxer és diferent, alguns paràmetres podrien no carregar-se"
       },
       "backup_settings": "Còpia de seguretat de la configuració a un fitxer",
       "backup_settings_theme": "Còpia de seguretat de la configuració i tema a un fitxer",
@@ -382,7 +385,8 @@
           "postCode": "Text monoespai en publicació (text enriquit)",
           "input": "Camps d'entrada",
           "interface": "Interfície"
-        }
+        },
+        "weight": "Pes (negreta)"
       },
       "preview": {
         "input": "Acabo d'aterrar a Los Angeles.",
@@ -394,7 +398,9 @@
         "error": "Exemple d'error",
         "faint_link": "Manual d'ajuda",
         "checkbox": "He llegit els termes i condicions",
-        "link": "un bonic enllaç"
+        "link": "un bonic enllaç",
+        "fine_print": "Llegiu el nostre {0} per no aprendre res útil!",
+        "text": "Un grapat més de {0} i {1}"
       },
       "shadows": {
         "spread": "Difon",
@@ -438,7 +444,8 @@
           "snapshot_missing": "No hi havia cap instantània del tema al fitxer, per tant podria veure's diferent del previst originalment.",
           "upgraded_from_v2": "PleromaFE s'ha actualitzat, el tema pot veure's un poc diferent de com recordes.",
           "fe_downgraded": "Versió de PleromaFE revertida.",
-          "older_version_imported": "El fitxer que has importat va ser creat en una versió del front-end més antiga."
+          "older_version_imported": "El fitxer que has importat va ser creat en una versió del front-end més antiga.",
+          "snapshot_present": "S'ha carregat la instantània del tema, de manera que tots els valors estan sobreescrits. En canvi, podeu carregar les dades reals del tema."
         },
         "keep_as_is": "Mantindre com està",
         "save_load_hint": "Les opcions \"Mantindre\" conserven les opcions configurades actualment al seleccionar o carregar temes, també emmagatzema aquestes opcions quan s'exporta un tema. Quan es desactiven totes les caselles de verificació, el tema exportat ho guardarà tot.",
@@ -532,7 +539,13 @@
     "notification_setting_hide_notification_contents": "Amagar el remitent i els continguts de les notificacions push",
     "notifications": "Notificacions",
     "notification_mutes": "Per a deixar de rebre notificacions d'un usuari en concret, silencia'l-ho.",
-    "theme_help_v2_2": "Les icones per baix d'algunes entrades són indicadors del contrast del fons/text, desplaça el ratolí per a més informació. Tingues en compte que quan s'utilitzen indicadors de contrast de transparència es mostra el pitjor cas possible."
+    "theme_help_v2_2": "Les icones per baix d'algunes entrades són indicadors del contrast del fons/text, desplaça el ratolí per a més informació. Tingues en compte que quan s'utilitzen indicadors de contrast de transparència es mostra el pitjor cas possible.",
+    "hide_shoutbox": "Oculta la casella de gàbia de grills",
+    "always_show_post_button": "Mostra sempre el botó flotant de publicació nova",
+    "pad_emoji": "Acompanya els emojis amb espais en afegir des del selector",
+    "mentions_new_style": "Enllaços d'esment més elegants",
+    "mentions_new_place": "Posa les mencions en una línia separada",
+    "post_status_content_type": "Format de publicació"
   },
   "time": {
     "day": "{0} dia",
@@ -617,10 +630,11 @@
       "disable_remote_subscription": "Deshabilita seguir algú des d'una instància remota",
       "delete_user": "Esborra la usuària",
       "grant_admin": "Concedir permisos d'Administració",
-      "grant_moderator": "Concedir permisos de Moderació"
+      "grant_moderator": "Concedir permisos de Moderació",
+      "force_unlisted": "Força que les publicacions no estiguin llistades",
+      "sandbox": "Força que els missatges siguin només seguidors"
     },
     "edit_profile": "Edita el perfil",
-    "follow_again": "Envia de nou la petició?",
     "hidden": "Amagat",
     "follow_sent": "Petició enviada!",
     "unmute_progress": "Deixant de silenciar…",
@@ -643,7 +657,8 @@
       "solid": "Fons sòlid",
       "striped": "Fons a ratlles",
       "side": "Ratlla lateral"
-    }
+    },
+    "media": "Media"
   },
   "user_profile": {
     "timeline_title": "Flux personal",
@@ -659,12 +674,14 @@
   },
   "remote_user_resolver": {
     "error": "No trobat.",
-    "searching_for": "Cercant per"
+    "searching_for": "Cercant per",
+    "remote_user_resolver": "Resolució d'usuari remot"
   },
   "interactions": {
     "load_older": "Carrega antigues interaccions",
     "favs_repeats": "Repeticions i favorits",
-    "follows": "Nous seguidors"
+    "follows": "Nous seguidors",
+    "moves": "Migració d'usuaris"
   },
   "emoji": {
     "stickers": "Adhesius",
@@ -776,7 +793,10 @@
     "pinned": "Destacat",
     "reply_to": "Contesta a",
     "pin": "Destaca al perfil",
-    "unmute_conversation": "Deixa de silenciar la conversa"
+    "unmute_conversation": "Deixa de silenciar la conversa",
+    "mentions": "Mencions",
+    "you": "(Tu)",
+    "plus_more": "+{number} més"
   },
   "user_reporting": {
     "additional_comments": "Comentaris addicionals",
@@ -802,7 +822,8 @@
     "no_results": "No hi ha resultats",
     "people": "Persones",
     "hashtags": "Etiquetes",
-    "people_talking": "{count} persones parlant"
+    "people_talking": "{count} persones parlant",
+    "person_talking": "{count} persones parlant"
   },
   "upload": {
     "file_size_units": {

src/i18n/cs.json

@@ -407,7 +407,6 @@
     "follow": "Sledovat",
     "follow_sent": "Požadavek odeslán!",
     "follow_progress": "Odeslílám požadavek…",
-    "follow_again": "Odeslat požadavek znovu?",
     "follow_unfollow": "Přestat sledovat",
     "followees": "Sledovaní",
     "followers": "Sledující",

src/i18n/de.json

@@ -569,7 +569,6 @@
     "follow": "Folgen",
     "follow_sent": "Anfrage gesendet!",
     "follow_progress": "Anfragen…",
-    "follow_again": "Anfrage erneut senden?",
     "follow_unfollow": "Folgen beenden",
     "followees": "Folgt",
     "followers": "Folgende",

src/i18n/en.json

@@ -82,10 +82,7 @@
     "role": {
       "admin": "Admin",
       "moderator": "Janny"
-    },
-    "flash_content": "Click to show Flash content using Ruffle (Experimental, may not work).",
-    "flash_security": "Note that this can be potentially dangerous since Flash content is still arbitrary code.",
-    "flash_fail": "Failed to load flash content, see console for details."
+    }
   },
   "image_cropper": {
     "crop_picture": "Crop picture",
@@ -374,6 +371,7 @@
     "instance_default": "(default: {value})",
     "instance_default_simple": "(default)",
     "interface": "Interface",
+    "fullscreenView": "Fullscreen view",
     "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",
@@ -493,6 +491,14 @@
       "true": "yes"
     },
     "virtual_scrolling": "Optimize timeline rendering",
+    "use_at_icon": "Display @ symbol as an icon instead of text",
+    "mention_link_display": "Display mention links",
+    "mention_link_display_short": "always as short names (e.g. @foo)",
+    "mention_link_display_full_for_remote": "as full names only for remote users (e.g. @foo@example.org)",
+    "mention_link_display_full": "always as full names (e.g. @foo@example.org)",
+    "mention_link_show_tooltip": "Show full user names as tooltip for remote users",
+    "mention_link_show_avatar": "Show user avatar beside the link",
+    "mention_link_fade_domain": "Fade domains (e.g. @example.org in @foo@example.org)",
     "fun": "Fun",
     "greentext": "Meme arrows",
     "notifications": "Notifications",
@@ -751,13 +757,14 @@
     "approve": "Approve",
     "block": "Block",
     "blocked": "Blocked!",
+    "deactivated": "Deactivated",
     "deny": "Deny",
     "edit_profile": "Edit profile",
     "favorites": "Favorites",
     "follow": "Follow",
+    "follow_cancel": "Cancel request",
     "follow_sent": "Request sent!",
     "follow_progress": "Requesting…",
-    "follow_again": "Send request again?",
     "follow_unfollow": "Unfollow",
     "followees": "Following",
     "followers": "Followers",

src/i18n/eo.json

@@ -553,7 +553,10 @@
     },
     "right_sidebar": "Montri flankan breton dekstre",
     "save": "Konservi ŝanĝojn",
-    "hide_shoutbox": "Kaŝi kriujon de nodo"
+    "hide_shoutbox": "Kaŝi kriujon de nodo",
+    "always_show_post_button": "Ĉiam montri ŝvebantan butonon por nova afiŝo",
+    "mentions_new_style": "Pli mojosaj menciligiloj",
+    "mentions_new_place": "Meti menciojn sur apartan linion"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -580,7 +583,6 @@
     "follow": "Aboni",
     "follow_sent": "Peto sendiĝis!",
     "follow_progress": "Petante…",
-    "follow_again": "Ĉu sendi peton ree?",
     "follow_unfollow": "Malaboni",
     "followees": "Abonatoj",
     "followers": "Abonantoj",
@@ -632,7 +634,8 @@
       "striped": "Stria fono",
       "solid": "Unueca fono",
       "disabled": "Senemfaze"
-    }
+    },
+    "edit_profile": "Redakti profilon"
   },
   "user_profile": {
     "timeline_title": "Historio de uzanto",
@@ -783,7 +786,10 @@
     "status_deleted": "Ĉi tiu afiŝo foriĝis",
     "nsfw": "Konsterna",
     "expand": "Etendi",
-    "external_source": "Ekstera fonto"
+    "external_source": "Ekstera fonto",
+    "mentions": "Mencioj",
+    "you": "(Vi)",
+    "plus_more": "+{number} pli"
   },
   "time": {
     "years_short": "{0}j",

src/i18n/es.json

@@ -599,7 +599,10 @@
       "backup_restore": "Copia de seguridad de la configuración"
     },
     "hide_shoutbox": "Ocultar cuadro de diálogo de la instancia",
-    "right_sidebar": "Mostrar la barra lateral a la derecha"
+    "right_sidebar": "Mostrar la barra lateral a la derecha",
+    "always_show_post_button": "Muestra siempre el botón flotante de Nueva Plubicación",
+    "mentions_new_style": "Enlaces de menciones más elegantes",
+    "mentions_new_place": "Situa las menciones en una línea separada"
   },
   "time": {
     "day": "{0} día",
@@ -676,7 +679,10 @@
     "status_deleted": "Esta publicación ha sido eliminada",
     "nsfw": "NSFW (No apropiado para el trabajo)",
     "expand": "Expandir",
-    "external_source": "Fuente externa"
+    "external_source": "Fuente externa",
+    "mentions": "Menciones",
+    "you": "(Tú)",
+    "plus_more": "+{number} más"
   },
   "user_card": {
     "approve": "Aprobar",
@@ -687,7 +693,6 @@
     "follow": "Seguir",
     "follow_sent": "¡Solicitud enviada!",
     "follow_progress": "Solicitando…",
-    "follow_again": "¿Enviar solicitud de nuevo?",
     "follow_unfollow": "Dejar de seguir",
     "followees": "Siguiendo",
     "followers": "Seguidores",

src/i18n/eu.json

@@ -569,7 +569,6 @@
     "follow": "Jarraitu",
     "follow_sent": "Eskaera bidalita!",
     "follow_progress": "Eskatzen…",
-    "follow_again": "Eskaera berriro bidali?",
     "follow_unfollow": "Jarraitzeari utzi",
     "followees": "Jarraitzen",
     "followers": "Jarraitzaileak",

src/i18n/fi.json

@@ -590,7 +590,6 @@
     "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",

src/i18n/fr.json

@@ -624,7 +624,6 @@
     "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",

src/i18n/he.json

@@ -312,7 +312,6 @@
     "follow": "עקוב",
     "follow_sent": "בקשה נשלחה!",
     "follow_progress": "מבקש…",
-    "follow_again": "שלח בקשה שוב?",
     "follow_unfollow": "בטל עקיבה",
     "followees": "נעקבים",
     "followers": "עוקבים",

src/i18n/id.json

@@ -208,7 +208,13 @@
     "enable_web_push_notifications": "Aktifkan notifikasi push web",
     "more_settings": "Lebih banyak pengaturan",
     "reply_visibility_all": "Tampilkan semua balasan",
-    "reply_visibility_self": "Hanya tampilkan balasan yang ditujukan kepada saya"
+    "reply_visibility_self": "Hanya tampilkan balasan yang ditujukan kepada saya",
+    "hide_muted_posts": "Sembunyikan postingan-postingan dari pengguna yang dibisukan",
+    "import_blocks_from_a_csv_file": "Impor blokiran dari berkas csv",
+    "domain_mutes": "Domain",
+    "composing": "Menulis",
+    "no_blocks": "Tidak ada yang diblokir",
+    "no_mutes": "Tidak ada yang dibisukan"
   },
   "about": {
     "mrf": {
@@ -222,7 +228,9 @@
         "reject_desc": "Instansi ini tidak akan menerima pesan dari instansi-instansi berikut:",
         "reject": "Tolak",
         "accept_desc": "Instansi ini hanya menerima pesan dari instansi-instansi berikut:",
-        "accept": "Terima"
+        "accept": "Terima",
+        "media_removal": "Penghapusan Media",
+        "media_removal_desc": "Instansi ini menghapus media dari postingan yang berasal dari instansi-instansi berikut:"
       },
       "federation": "Federasi",
       "mrf_policies": "Kebijakan MRF yang diaktifkan"
@@ -322,7 +330,6 @@
       "delete_user": "Hapus pengguna",
       "delete_user_confirmation": "Apakah Anda benar-benar yakin? Tindakan ini tidak dapat dibatalkan."
     },
-    "follow_again": "Kirim permintaan lagi?",
     "follow_unfollow": "Berhenti mengikuti",
     "followees": "Mengikuti",
     "followers": "Pengikut",
@@ -335,7 +342,9 @@
     "message": "Kirimkan pesan"
   },
   "user_profile": {
-    "timeline_title": "Linimasa pengguna"
+    "timeline_title": "Linimasa pengguna",
+    "profile_does_not_exist": "Maaf, profil ini tidak ada.",
+    "profile_loading_error": "Maaf, terjadi kesalahan ketika memuat profil ini."
   },
   "user_reporting": {
     "title": "Melaporkan {0}",

src/i18n/it.json

@@ -448,7 +448,10 @@