Merge remote-tracking branch 'origin/develop' into settings-modal

* origin/develop: (95 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Russian)
  Translated using Weblate (Polish)
  Translated using Weblate (Dutch)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  ...

CHANGELOG.md

@@ -6,6 +6,17 @@ 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
 
+## [Unreleased patch]
+### 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

docs/CONFIGURATION.md

@@ -19,32 +19,69 @@ There's currently no mechanism for user-settings synchronization across several
 
 ## Options
 
-### `theme`
+### `alwaysShowSubjectInput`
-Default theme used for new users. De-facto instance-default, user can change theme.
+`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`
+### `scopeCopy`
-hides the chat (TODO: even if it's enabled on backend)
+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
 
 ### `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,39 +89,22 @@ How to handle subject line (CW) when replying to a post.
 * `"noop"` - do not copy
 Instance-default.
 
-### `postContentType`
+### `theme`
-Default post formatting option (markdown/bbcode/plaintext/etc...)
+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"`
-
-### `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)
 
 ### `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.
 
 ### 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.
 
 ### 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)
@@ -92,13 +112,3 @@ Rich text formatting options are displayed depending on how many formatting opti
 ### 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.
-
-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!
-
-### 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.

src/App.js

@@ -101,7 +101,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 () {

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">

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')
 
@@ -241,6 +240,9 @@ const getNodeInfo = async ({ store }) => {
           : federation.enabled
       })
 
+      const accountActivationRequired = metadata.accountActivationRequired
+      store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })
+
       const accounts = metadata.staffAccounts
       resolveStaffAccounts({ store, accounts })
     } else {
@@ -304,6 +306,9 @@ const afterStoreSetup = async ({ store, i18n }) => {
     getNodeInfo({ store })
   ])
 
+  // Start fetching things that don't need to block the UI
+  store.dispatch('fetchMutes')
+
   const router = new VueRouter({
     mode: 'history',
     routes: routes(store),

src/components/account_actions/account_actions.js

@@ -3,7 +3,7 @@ import Popover from '../popover/popover.vue'
 
 const AccountActions = {
   props: [
-    'user'
+    'user', 'relationship'
   ],
   data () {
     return { }

src/components/account_actions/account_actions.vue

@@ -9,16 +9,16 @@
         class="account-tools-popover"
       >
         <div class="dropdown-menu">
-          <template v-if="user.following">
+          <template v-if="relationship.following">
             <button
-              v-if="user.showing_reblogs"
+              v-if="relationship.showing_reblogs"
               class="btn btn-default dropdown-item"
               @click="hideRepeats"
             >
               {{ $t('user_card.hide_repeats') }}
             </button>
             <button
-              v-if="!user.showing_reblogs"
+              v-if="!relationship.showing_reblogs"
               class="btn btn-default dropdown-item"
               @click="showRepeats"
             >
@@ -30,7 +30,7 @@
             />
           </template>
           <button
-            v-if="user.statusnet_blocking"
+            v-if="relationship.blocking"
             class="btn btn-default btn-block dropdown-item"
             @click="unblockUser"
           >

src/components/basic_user_card/basic_user_card.vue

@@ -12,7 +12,7 @@
       class="basic-user-card-expanded-content"
     >
       <UserCard
-        :user="user"
+        :user-id="user.id"
         :rounded="true"
         :bordered="true"
       />

src/components/block_card/block_card.js

@@ -11,8 +11,11 @@ const BlockCard = {
     user () {
       return this.$store.getters.findUser(this.userId)
     },
+    relationship () {
+      return this.$store.getters.relationship(this.userId)
+    },
     blocked () {
-      return this.user.statusnet_blocking
+      return this.relationship.blocking
     }
   },
   components: {

src/components/extra_buttons/extra_buttons.js

@@ -29,6 +29,11 @@ const ExtraButtons = {
       this.$store.dispatch('unmuteConversation', this.status.id)
         .then(() => this.$emit('onSuccess'))
         .catch(err => this.$emit('onError', err.error.error))
+    },
+    copyLink () {
+      navigator.clipboard.writeText(this.statusLink)
+        .then(() => this.$emit('onSuccess'))
+        .catch(err => this.$emit('onError', err.error.error))
     }
   },
   computed: {
@@ -46,6 +51,9 @@ const ExtraButtons = {
     },
     canMute () {
       return !!this.currentUser
+    },
+    statusLink () {
+      return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
     }
   }
 }

src/components/extra_buttons/extra_buttons.vue

@@ -1,11 +1,13 @@
 <template>
   <Popover
-    v-if="canDelete || canMute || canPin"
     trigger="click"
     placement="top"
     class="extra-button-popover"
   >
-    <div slot="content">
+    <div
+      slot="content"
+      slot-scope="{close}"
+    >
       <div class="dropdown-menu">
         <button
           v-if="canMute && !status.thread_muted"
@@ -23,28 +25,35 @@
         </button>
         <button
           v-if="!status.pinned && canPin"
-          v-close-popover
           class="dropdown-item dropdown-item-icon"
           @click.prevent="pinStatus"
+          @click="close"
         >
           <i class="icon-pin" /><span>{{ $t("status.pin") }}</span>
         </button>
         <button
           v-if="status.pinned && canPin"
-          v-close-popover
           class="dropdown-item dropdown-item-icon"
           @click.prevent="unpinStatus"
+          @click="close"
         >
           <i class="icon-pin" /><span>{{ $t("status.unpin") }}</span>
         </button>
         <button
           v-if="canDelete"
-          v-close-popover
           class="dropdown-item dropdown-item-icon"
           @click.prevent="deleteStatus"
+          @click="close"
         >
           <i class="icon-cancel" /><span>{{ $t("status.delete") }}</span>
         </button>
+        <button
+          class="dropdown-item dropdown-item-icon"
+          @click.prevent="copyLink"
+          @click="close"
+        >
+          <i class="icon-share" /><span>{{ $t("status.copy_link") }}</span>
+        </button>
       </div>
     </div>
     <i

src/components/follow_button/follow_button.js

@@ -1,6 +1,6 @@
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 export default {
-  props: ['user', 'labelFollowing', 'buttonClass'],
+  props: ['relationship', 'labelFollowing', 'buttonClass'],
   data () {
     return {
       inProgress: false
@@ -8,12 +8,12 @@ export default {
   },
   computed: {
     isPressed () {
-      return this.inProgress || this.user.following
+      return this.inProgress || this.relationship.following
     },
     title () {
-      if (this.inProgress || this.user.following) {
+      if (this.inProgress || this.relationship.following) {
         return this.$t('user_card.follow_unfollow')
-      } else if (this.user.requested) {
+      } else if (this.relationship.requested) {
         return this.$t('user_card.follow_again')
       } else {
         return this.$t('user_card.follow')
@@ -22,9 +22,9 @@ export default {
     label () {
       if (this.inProgress) {
         return this.$t('user_card.follow_progress')
-      } else if (this.user.following) {
+      } else if (this.relationship.following) {
         return this.labelFollowing || this.$t('user_card.following')
-      } else if (this.user.requested) {
+      } else if (this.relationship.requested) {
         return this.$t('user_card.follow_sent')
       } else {
         return this.$t('user_card.follow')
@@ -33,20 +33,20 @@ export default {
   },
   methods: {
     onClick () {
-      this.user.following ? this.unfollow() : this.follow()
+      this.relationship.following ? this.unfollow() : this.follow()
     },
     follow () {
       this.inProgress = true
-      requestFollow(this.user, this.$store).then(() => {
+      requestFollow(this.relationship.id, this.$store).then(() => {
         this.inProgress = false
       })
     },
     unfollow () {
       const store = this.$store
       this.inProgress = true
-      requestUnfollow(this.user, store).then(() => {
+      requestUnfollow(this.relationship.id, store).then(() => {
         this.inProgress = false
-        store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
+        store.commit('removeStatus', { timeline: 'friends', userId: this.relationship.id })
       })
     }
   }

src/components/follow_card/follow_card.js

@@ -18,6 +18,9 @@ const FollowCard = {
     },
     loggedIn () {
       return this.$store.state.users.currentUser
+    },
+    relationship () {
+      return this.$store.getters.relationship(this.user.id)
     }
   }
 }

src/components/follow_card/follow_card.vue

@@ -2,24 +2,24 @@
   <basic-user-card :user="user">
     <div class="follow-card-content-container">
       <span
-        v-if="!noFollowsYou && user.follows_you"
+        v-if="isMe || (!noFollowsYou && relationship.followed_by)"
         class="faint"
       >
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
       </span>
       <template v-if="!loggedIn">
         <div
-          v-if="!user.following"
+          v-if="!relationship.following"
           class="follow-card-follow-button"
         >
           <RemoteFollow :user="user" />
         </div>
       </template>
-      <template v-else>
+      <template v-else-if="!isMe">
         <FollowButton
-          :user="user"
+          :relationship="relationship"
-          class="follow-card-follow-button"
           :label-following="$t('user_card.follow_unfollow')"
+          class="follow-card-follow-button"
         />
       </template>
     </div>

src/components/mute_card/mute_card.js

@@ -11,8 +11,11 @@ const MuteCard = {
     user () {
       return this.$store.getters.findUser(this.userId)
     },
+    relationship () {
+      return this.$store.getters.relationship(this.userId)
+    },
     muted () {
-      return this.user.muted
+      return this.relationship.muting
     }
   },
   components: {
@@ -21,13 +24,13 @@ const MuteCard = {
   methods: {
     unmuteUser () {
       this.progress = true
-      this.$store.dispatch('unmuteUser', this.user.id).then(() => {
+      this.$store.dispatch('unmuteUser', this.userId).then(() => {
         this.progress = false
       })
     },
     muteUser () {
       this.progress = true
-      this.$store.dispatch('muteUser', this.user.id).then(() => {
+      this.$store.dispatch('muteUser', this.userId).then(() => {
         this.progress = false
       })
     }

src/components/notification/notification.js

@@ -75,7 +75,7 @@ const Notification = {
       return this.generateUserProfileLink(this.targetUser)
     },
     needMute () {
-      return this.user.muted
+      return this.$store.getters.relationship(this.user.id).muting
     },
     isStatusNotification () {
       return isStatusNotification(this.notification.type)

src/components/notification/notification.vue

@@ -40,7 +40,7 @@
       <div class="notification-right">
         <UserCard
           v-if="userExpanded"
-          :user="getUser(notification)"
+          :user-id="getUser(notification).id"
           :rounded="true"
           :bordered="true"
         />

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 () {

src/components/react_button/react_button.js

@@ -2,7 +2,7 @@ import Popover from '../popover/popover.vue'
 import { mapGetters } from 'vuex'
 
 const ReactButton = {
-  props: ['status', 'loggedIn'],
+  props: ['status'],
   data () {
     return {
       filterWord: ''

src/components/react_button/react_button.vue

@@ -37,7 +37,6 @@
       </div>
     </div>
     <i
-      v-if="loggedIn"
       slot="trigger"
       class="icon-smile button-icon add-reaction-button"
       :title="$t('tool_tip.add_reaction')"

src/components/registration/registration.js

@@ -1,5 +1,5 @@
 import { validationMixin } from 'vuelidate'
-import { required, sameAs } from 'vuelidate/lib/validators'
+import { required, requiredIf, sameAs } from 'vuelidate/lib/validators'
 import { mapActions, mapState } from 'vuex'
 
 const registration = {
@@ -14,15 +14,17 @@ const registration = {
     },
     captcha: {}
   }),
-  validations: {
+  validations () {
-    user: {
+    return {
-      email: { required },
+      user: {
-      username: { required },
+        email: { required: requiredIf(() => this.accountActivationRequired) },
-      fullname: { required },
+        username: { required },
-      password: { required },
+        fullname: { required },
-      confirm: {
+        password: { required },
-        required,
+        confirm: {
-        sameAsPassword: sameAs('password')
+          required,
+          sameAsPassword: sameAs('password')
+        }
       }
     }
   },
@@ -43,7 +45,8 @@ const registration = {
       signedIn: (state) => !!state.users.currentUser,
       isPending: (state) => state.users.signUpPending,
       serverValidationErrors: (state) => state.users.signUpErrors,
-      termsOfService: (state) => state.instance.tos
+      termsOfService: (state) => state.instance.tos,
+      accountActivationRequired: (state) => state.instance.accountActivationRequired
     })
   },
   methods: {

src/components/settings_modal/tabs/mutes_and_blocks_tab.js

@@ -85,18 +85,18 @@ const MutesAndBlocks = {
     },
     filterUnblockedUsers (userIds) {
       return reject(userIds, (userId) => {
-        const user = this.$store.getters.findUser(userId)
+        const relationship = this.$store.getters.relationship(this.userId)
-        return !user || user.statusnet_blocking || user.id === this.$store.state.users.currentUser.id
+        return relationship.blocking || userId === this.$store.state.users.currentUser.id
       })
     },
     filterUnMutedUsers (userIds) {
       return reject(userIds, (userId) => {
-        const user = this.$store.getters.findUser(userId)
+        const relationship = this.$store.getters.relationship(this.userId)
-        return !user || user.muted || user.id === this.$store.state.users.currentUser.id
+        return relationship.muting || userId === this.$store.state.users.currentUser.id
       })
     },
     queryUserIds (query) {
-      return this.$store.dispatch('searchUsers', query)
+      return this.$store.dispatch('searchUsers', { query })
         .then((users) => map(users, 'id'))
     },
     blockUsers (ids) {

src/components/settings_modal/tabs/notifications_tab.vue

@@ -1,6 +1,7 @@
 <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">
@@ -26,6 +27,17 @@
         </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

src/components/settings_modal/tabs/profile_tab.js

@@ -54,7 +54,7 @@ const ProfileTab = {
           ...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 () {

src/components/side_drawer/side_drawer.vue

@@ -19,7 +19,7 @@
       >
         <UserCard
           v-if="currentUser"
-          :user="currentUser"
+          :user-id="currentUser.id"
           :hide-bio="true"
         />
         <div

src/components/status/status.js

@@ -1,23 +1,17 @@
-import Attachment from '../attachment/attachment.vue'
 import FavoriteButton from '../favorite_button/favorite_button.vue'
 import ReactButton from '../react_button/react_button.vue'
 import RetweetButton from '../retweet_button/retweet_button.vue'
-import Poll from '../poll/poll.vue'
 import ExtraButtons from '../extra_buttons/extra_buttons.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 import UserCard from '../user_card/user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
-import Gallery from '../gallery/gallery.vue'
-import LinkPreview from '../link-preview/link-preview.vue'
 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 EmojiReactions from '../emoji_reactions/emoji_reactions.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
-import fileType from 'src/services/file_type/file_type.service'
-import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
-import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
 import { filter, unescape, uniqBy } from 'lodash'
 import { mapGetters, mapState } from 'vuex'
 
@@ -43,17 +37,10 @@ const Status = {
       replying: false,
       unmuted: false,
       userExpanded: false,
-      showingTall: this.inConversation && this.focused,
+      error: null
-      showingLongSubject: false,
-      error: null,
-      // not as computed because it sets the initial state which will be changed later
-      expandingSubject: !this.$store.getters.mergedConfig.collapseMessageWithSubject
     }
   },
   computed: {
-    localCollapseSubjectDefault () {
-      return this.mergedConfig.collapseMessageWithSubject
-    },
     muteWords () {
       return this.mergedConfig.muteWords
     },
@@ -79,10 +66,6 @@ const Status = {
       const highlight = this.mergedConfig.highlight
       return highlightStyle(highlight[user.screen_name])
     },
-    hideAttachments () {
-      return (this.mergedConfig.hideAttachments && !this.inConversation) ||
-        (this.mergedConfig.hideAttachmentsInConv && this.inConversation)
-    },
     userProfileLink () {
       return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
     },
@@ -118,7 +101,13 @@ const Status = {
 
       return hits
     },
-    muted () { return !this.unmuted && ((!(this.inProfile && this.status.user.id === this.profileUserId) && this.status.user.muted) || (!this.inConversation && this.status.thread_muted) || this.muteWordHits.length > 0) },
+    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)
+    },
     hideFilteredStatuses () {
       return this.mergedConfig.hideFilteredStatuses
     },
@@ -135,20 +124,6 @@ const Status = {
       // use conversation highlight only when in conversation
       return this.status.id === this.highlight
     },
-    // This is a bit hacky, but we want to approximate post height before rendering
-    // so we count newlines (masto uses <p> for paragraphs, GS uses <br> between them)
-    // as well as approximate line count by counting characters and approximating ~80
-    // per line.
-    //
-    // Using max-height + overflow: auto for status components resulted in false positives
-    // very often with japanese characters, and it was very annoying.
-    tallStatus () {
-      const lengthScore = this.status.statusnet_html.split(/<p|<br/).length + this.status.text.length / 80
-      return lengthScore > 20
-    },
-    longSubject () {
-      return this.status.summary.length > 900
-    },
     isReply () {
       return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id)
     },
@@ -178,8 +153,11 @@ const Status = {
         if (this.status.user.id === this.status.attentions[i].id) {
           continue
         }
-        const taggedUser = this.$store.getters.findUser(this.status.attentions[i].id)
+        // There's zero guarantee of this working. If we happen to have that user and their
-        if (checkFollowing && taggedUser && taggedUser.following) {
+        // 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) {
@@ -188,32 +166,6 @@ const Status = {
       }
       return this.status.attentions.length > 0
     },
-
-    // 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)
-    },
-    mightHideBecauseTall () {
-      return this.tallStatus && (!this.status.summary || !this.localCollapseSubjectDefault)
-    },
-    hideSubjectStatus () {
-      return this.mightHideBecauseSubject && !this.expandingSubject
-    },
-    hideTallStatus () {
-      return this.mightHideBecauseTall && !this.showingTall
-    },
-    showingMore () {
-      return (this.mightHideBecauseTall && this.showingTall) || (this.mightHideBecauseSubject && this.expandingSubject)
-    },
-    nsfwClickthrough () {
-      if (!this.status.nsfw) {
-        return false
-      }
-      if (this.status.summary && this.localCollapseSubjectDefault) {
-        return false
-      }
-      return true
-    },
     replySubject () {
       if (!this.status.summary) return ''
       const decodedSummary = unescape(this.status.summary)
@@ -227,83 +179,6 @@ const Status = {
         return ''
       }
     },
-    attachmentSize () {
-      if ((this.mergedConfig.hideAttachments && !this.inConversation) ||
-        (this.mergedConfig.hideAttachmentsInConv && this.inConversation) ||
-        (this.status.attachments.length > this.maxThumbnails)) {
-        return 'hide'
-      } else if (this.compact) {
-        return 'small'
-      }
-      return 'normal'
-    },
-    galleryTypes () {
-      if (this.attachmentSize === 'hide') {
-        return []
-      }
-      return this.mergedConfig.playVideosInModal
-        ? ['image', 'video']
-        : ['image']
-    },
-    galleryAttachments () {
-      return this.status.attachments.filter(
-        file => fileType.fileMatchesSomeType(this.galleryTypes, file)
-      )
-    },
-    nonGalleryAttachments () {
-      return this.status.attachments.filter(
-        file => !fileType.fileMatchesSomeType(this.galleryTypes, file)
-      )
-    },
-    hasImageAttachments () {
-      return this.status.attachments.some(
-        file => fileType.fileType(file.mimetype) === 'image'
-      )
-    },
-    hasVideoAttachments () {
-      return this.status.attachments.some(
-        file => fileType.fileType(file.mimetype) === 'video'
-      )
-    },
-    maxThumbnails () {
-      return this.mergedConfig.maxThumbnails
-    },
-    postBodyHtml () {
-      const html = this.status.statusnet_html
-
-      if (this.mergedConfig.greentext) {
-        try {
-          if (html.includes('&gt;')) {
-            // This checks if post has '>' at the beginning, excluding mentions so that @mention >impying works
-            return processHtml(html, (string) => {
-              if (string.includes('&gt;') &&
-                  string
-                    .replace(/<[^>]+?>/gi, '') // remove all tags
-                    .replace(/@\w+/gi, '') // remove mentions (even failed ones)
-                    .trim()
-                    .startsWith('&gt;')) {
-                return `<span class='greentext'>${string}</span>`
-              } else {
-                return string
-              }
-            })
-          } else {
-            return html
-          }
-        } catch (e) {
-          console.err('Failed to process status html', e)
-          return html
-        }
-      } else {
-        return html
-      }
-    },
-    contentHtml () {
-      if (!this.status.summary_html) {
-        return this.postBodyHtml
-      }
-      return this.status.summary_html + '<br />' + this.postBodyHtml
-    },
     combinedFavsAndRepeatsUsers () {
       // Use the status from the global status repository since favs and repeats are saved in it
       const combinedUsers = [].concat(
@@ -312,9 +187,6 @@ const Status = {
       )
       return uniqBy(combinedUsers, 'id')
     },
-    ownStatus () {
-      return this.status.user.id === this.currentUser.id
-    },
     tags () {
       return this.status.tags.filter(tagObj => tagObj.hasOwnProperty('name')).map(tagObj => tagObj.name).join(' ')
     },
@@ -328,21 +200,18 @@ const Status = {
     })
   },
   components: {
-    Attachment,
     FavoriteButton,
     ReactButton,
     RetweetButton,
     ExtraButtons,
     PostStatusForm,
-    Poll,
     UserCard,
     UserAvatar,
-    Gallery,
-    LinkPreview,
     AvatarList,
     Timeago,
     StatusPopover,
-    EmojiReactions
+    EmojiReactions,
+    StatusContent
   },
   methods: {
     visibilityIcon (visibility) {
@@ -363,32 +232,6 @@ const Status = {
     clearError () {
       this.error = undefined
     },
-    linkClicked (event) {
-      const target = event.target.closest('.status-content a')
-      if (target) {
-        if (target.className.match(/mention/)) {
-          const href = target.href
-          const attn = this.status.attentions.find(attn => mentionMatchesUrl(attn, href))
-          if (attn) {
-            event.stopPropagation()
-            event.preventDefault()
-            const link = this.generateUserProfileLink(attn.id, attn.screen_name)
-            this.$router.push(link)
-            return
-          }
-        }
-        if (target.rel.match(/(?:^|\s)tag(?:$|\s)/) || target.className.match(/hashtag/)) {
-          // Extract tag name from link url
-          const tag = extractTagFromUrl(target.href)
-          if (tag) {
-            const link = this.generateTagLink(tag)
-            this.$router.push(link)
-            return
-          }
-        }
-        window.open(target.href, '_blank')
-      }
-    },
     toggleReplying () {
       this.replying = !this.replying
     },
@@ -406,22 +249,8 @@ const Status = {
     toggleUserExpanded () {
       this.userExpanded = !this.userExpanded
     },
-    toggleShowMore () {
-      if (this.mightHideBecauseTall) {
-        this.showingTall = !this.showingTall
-      } else if (this.mightHideBecauseSubject) {
-        this.expandingSubject = !this.expandingSubject
-      }
-    },
     generateUserProfileLink (id, name) {
       return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
-    },
-    generateTagLink (tag) {
-      return `/tag/${tag}`
-    },
-    setMedia () {
-      const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
-      return () => this.$store.dispatch('setMedia', attachments)
     }
   },
   watch: {

src/components/status/status.vue

@@ -94,7 +94,7 @@
         <div class="status-body">
           <UserCard
             v-if="userExpanded"
-            :user="status.user"
+            :user-id="status.user.id"
             :rounded="true"
             :bordered="true"
             class="status-usercard"
@@ -226,118 +226,12 @@
             </div>
           </div>
 
-          <div
+          <StatusContent
-            v-if="longSubject"
+            :status="status"
-            class="status-content-wrapper"
+            :no-heading="noHeading"
-            :class="{ 'tall-status': !showingLongSubject }"
+            :highlight="highlight"
-          >
+            :focused="isFocused"
-            <a
+          />
-              v-if="!showingLongSubject"
-              class="tall-status-hider"
-              :class="{ 'tall-status-hider_focused': isFocused }"
-              href="#"
-              @click.prevent="showingLongSubject=true"
-            >{{ $t("general.show_more") }}</a>
-            <div
-              class="status-content media-body"
-              @click.prevent="linkClicked"
-              v-html="contentHtml"
-            />
-            <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': isFocused }"
-              href="#"
-              @click.prevent="toggleShowMore"
-            >{{ $t("general.show_more") }}</a>
-            <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"
-            />
-            <a
-              v-if="hideSubjectStatus"
-              href="#"
-              class="cw-status-hider"
-              @click.prevent="toggleShowMore"
-            >
-              {{ $t("general.show_more") }}
-              <span
-                v-if="hasImageAttachments"
-                class="icon-picture"
-              />
-              <span
-                v-if="hasVideoAttachments"
-                class="icon-video"
-              />
-              <span
-                v-if="status.card"
-                class="icon-link"
-              />
-            </a>
-            <a
-              v-if="showingMore"
-              href="#"
-              class="status-unhider"
-              @click.prevent="toggleShowMore"
-            >{{ $t("general.show_less") }}</a>
-          </div>
-
-          <div v-if="status.poll && status.poll.options">
-            <poll :base-poll="status.poll" />
-          </div>
-
-          <div
-            v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)"
-            class="attachments media-body"
-          >
-            <attachment
-              v-for="attachment in nonGalleryAttachments"
-              :key="attachment.id"
-              class="non-gallery"
-              :size="attachmentSize"
-              :nsfw="nsfwClickthrough"
-              :attachment="attachment"
-              :allow-play="true"
-              :set-media="setMedia()"
-            />
-            <gallery
-              v-if="galleryAttachments.length > 0"
-              :nsfw="nsfwClickthrough"
-              :attachments="galleryAttachments"
-              :set-media="setMedia()"
-            />
-          </div>
-
-          <div
-            v-if="status.card && !hideSubjectStatus && !noHeading"
-            class="link-preview media-body"
-          >
-            <link-preview
-              :card="status.card"
-              :size="attachmentSize"
-              :nsfw="nsfwClickthrough"
-            />
-          </div>
 
           <transition name="fade">
             <div
@@ -404,7 +298,7 @@
               :status="status"
             />
             <ReactButton
-              :logged-in="loggedIn"
+              v-if="loggedIn"
               :status="status"
             />
             <extra-buttons
@@ -630,105 +524,6 @@ $status-margin: 0.75em;
     }
   }
 
-  .tall-status {
-    position: relative;
-    height: 220px;
-    overflow-x: hidden;
-    overflow-y: hidden;
-    z-index: 1;
-    .status-content {
-      height: 100%;
-      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 */
-      -webkit-mask-composite: xor;
-      mask-composite: exclude;
-    }
-  }
-
-  .tall-status-hider {
-    display: inline-block;
-    word-break: break-all;
-    position: absolute;
-    height: 70px;
-    margin-top: 150px;
-    width: 100%;
-    text-align: center;
-    line-height: 110px;
-    z-index: 2;
-  }
-
-  .status-unhider, .cw-status-hider {
-    width: 100%;
-    text-align: center;
-    display: inline-block;
-    word-break: break-all;
-  }
-
-  .status-content {
-    font-family: var(--postFont, sans-serif);
-    line-height: 1.4em;
-    white-space: pre-wrap;
-
-    a {
-      color: $fallback--link;
-      color: var(--postLink, $fallback--link);
-    }
-
-    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;
-    }
-
-    pre {
-      overflow: auto;
-    }
-
-    code, samp, kbd, var, pre {
-      font-family: var(--postCodeFont, monospace);
-    }
-
-    p {
-      margin: 0 0 1em 0;
-    }
-
-    p:last-child {
-      margin: 0 0 0 0;
-    }
-
-    h1 {
-      font-size: 1.1em;
-      line-height: 1.2em;
-      margin: 1.4em 0;
-    }
-
-    h2 {
-      font-size: 1.1em;
-      margin: 1.0em 0;
-    }
-
-    h3 {
-      font-size: 1em;
-      margin: 1.2em 0;
-    }
-
-    h4 {
-      margin: 1.1em 0;
-    }
-  }
-
   .retweet-info {
     padding: 0.4em $status-margin;
     margin: 0;
@@ -790,11 +585,6 @@ $status-margin: 0.75em;
   }
 }
 
-.greentext {
-  color: $fallback--cGreen;
-  color: var(--cGreen, $fallback--cGreen);
-}
-
 .status-conversation {
   border-left-style: solid;
 }
@@ -866,14 +656,6 @@ a.unmute {
   flex: 1;
 }
 
-.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;
-  }
-}
-
 .favs-repeated-users {
   margin-top: $status-margin;
 

src/components/status_content/status_content.js

@@ -0,0 +1,210 @@
+import Attachment from '../attachment/attachment.vue'
+import Poll from '../poll/poll.vue'
+import Gallery from '../gallery/gallery.vue'
+import LinkPreview from '../link-preview/link-preview.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import fileType from 'src/services/file_type/file_type.service'
+import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js'
+import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
+import { mapGetters, mapState } from 'vuex'
+
+const StatusContent = {
+  name: 'StatusContent',
+  props: [
+    'status',
+    'focused',
+    'noHeading',
+    'fullContent'
+  ],
+  data () {
+    return {
+      showingTall: 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
+    }
+  },
+  computed: {
+    localCollapseSubjectDefault () {
+      return this.mergedConfig.collapseMessageWithSubject
+    },
+    hideAttachments () {
+      return (this.mergedConfig.hideAttachments && !this.inConversation) ||
+        (this.mergedConfig.hideAttachmentsInConv && this.inConversation)
+    },
+    // This is a bit hacky, but we want to approximate post height before rendering
+    // so we count newlines (masto uses <p> for paragraphs, GS uses <br> between them)
+    // as well as approximate line count by counting characters and approximating ~80
+    // per line.
+    //
+    // Using max-height + overflow: auto for status components resulted in false positives
+    // very often with japanese characters, and it was very annoying.
+    tallStatus () {
+      const lengthScore = this.status.statusnet_html.split(/<p|<br/).length + this.status.text.length / 80
+      return lengthScore > 20
+    },
+    longSubject () {
+      return this.status.summary.length > 900
+    },
+    // 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)
+    },
+    mightHideBecauseTall () {
+      return this.tallStatus && (!this.status.summary || !this.localCollapseSubjectDefault)
+    },
+    hideSubjectStatus () {
+      return this.mightHideBecauseSubject && !this.expandingSubject
+    },
+    hideTallStatus () {
+      return this.mightHideBecauseTall && !this.showingTall
+    },
+    showingMore () {
+      return (this.mightHideBecauseTall && this.showingTall) || (this.mightHideBecauseSubject && this.expandingSubject)
+    },
+    nsfwClickthrough () {
+      if (!this.status.nsfw) {
+        return false
+      }
+      if (this.status.summary && this.localCollapseSubjectDefault) {
+        return false
+      }
+      return true
+    },
+    attachmentSize () {
+      if ((this.mergedConfig.hideAttachments && !this.inConversation) ||
+        (this.mergedConfig.hideAttachmentsInConv && this.inConversation) ||
+        (this.status.attachments.length > this.maxThumbnails)) {
+        return 'hide'
+      } else if (this.compact) {
+        return 'small'
+      }
+      return 'normal'
+    },
+    galleryTypes () {
+      if (this.attachmentSize === 'hide') {
+        return []
+      }
+      return this.mergedConfig.playVideosInModal
+        ? ['image', 'video']
+        : ['image']
+    },
+    galleryAttachments () {
+      return this.status.attachments.filter(
+        file => fileType.fileMatchesSomeType(this.galleryTypes, file)
+      )
+    },
+    nonGalleryAttachments () {
+      return this.status.attachments.filter(
+        file => !fileType.fileMatchesSomeType(this.galleryTypes, file)
+      )
+    },
+    hasImageAttachments () {
+      return this.status.attachments.some(
+        file => fileType.fileType(file.mimetype) === 'image'
+      )
+    },
+    hasVideoAttachments () {
+      return this.status.attachments.some(
+        file => fileType.fileType(file.mimetype) === 'video'
+      )
+    },
+    maxThumbnails () {
+      return this.mergedConfig.maxThumbnails
+    },
+    postBodyHtml () {
+      const html = this.status.statusnet_html
+
+      if (this.mergedConfig.greentext) {
+        try {
+          if (html.includes('&gt;')) {
+            // This checks if post has '>' at the beginning, excluding mentions so that @mention >impying works
+            return processHtml(html, (string) => {
+              if (string.includes('&gt;') &&
+                  string
+                    .replace(/<[^>]+?>/gi, '') // remove all tags
+                    .replace(/@\w+/gi, '') // remove mentions (even failed ones)
+                    .trim()
+                    .startsWith('&gt;')) {
+                return `<span class='greentext'>${string}</span>`
+              } else {
+                return string
+              }
+            })
+          } else {
+            return html
+          }
+        } catch (e) {
+          console.err('Failed to process status html', e)
+          return html
+        }
+      } else {
+        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,
+      currentUser: state => state.users.currentUser
+    })
+  },
+  components: {
+    Attachment,
+    Poll,
+    Gallery,
+    LinkPreview
+  },
+  methods: {
+    linkClicked (event) {
+      const target = event.target.closest('.status-content a')
+      if (target) {
+        if (target.className.match(/mention/)) {
+          const href = target.href
+          const attn = this.status.attentions.find(attn => mentionMatchesUrl(attn, href))
+          if (attn) {
+            event.stopPropagation()
+            event.preventDefault()
+            const link = this.generateUserProfileLink(attn.id, attn.screen_name)
+            this.$router.push(link)
+            return
+          }
+        }
+        if (target.rel.match(/(?:^|\s)tag(?:$|\s)/) || target.className.match(/hashtag/)) {
+          // Extract tag name from link url
+          const tag = extractTagFromUrl(target.href)
+          if (tag) {
+            const link = this.generateTagLink(tag)
+            this.$router.push(link)
+            return
+          }
+        }
+        window.open(target.href, '_blank')
+      }
+    },
+    toggleShowMore () {
+      if (this.mightHideBecauseTall) {
+        this.showingTall = !this.showingTall
+      } else if (this.mightHideBecauseSubject) {
+        this.expandingSubject = !this.expandingSubject
+      }
+    },
+    generateUserProfileLink (id, name) {
+      return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
+    },
+    generateTagLink (tag) {
+      return `/tag/${tag}`
+    },
+    setMedia () {
+      const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
+      return () => this.$store.dispatch('setMedia', attachments)
+    }
+  }
+}
+
+export default StatusContent

src/components/status_content/status_content.vue

@@ -0,0 +1,240 @@
+<template>
+  <!-- eslint-disable vue/no-v-html -->
+  <div class="status-body">
+    <slot name="header" />
+    <div
+      v-if="longSubject"
+      class="status-content-wrapper"
+      :class="{ 'tall-status': !showingLongSubject }"
+    >
+      <a
+        v-if="!showingLongSubject"
+        class="tall-status-hider"
+        :class="{ 'tall-status-hider_focused': focused }"
+        href="#"
+        @click.prevent="showingLongSubject=true"
+      >
+        {{ $t("general.show_more") }}
+        <span
+          v-if="hasImageAttachments"
+          class="icon-picture"
+        />
+        <span
+          v-if="hasVideoAttachments"
+          class="icon-video"
+        />
+        <span
+          v-if="status.card"
+          class="icon-link"
+        />
+      </a>
+      <div
+        class="status-content media-body"
+        @click.prevent="linkClicked"
+        v-html="contentHtml"
+      />
+      <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="!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"
+      />
+      <a
+        v-if="hideSubjectStatus"
+        href="#"
+        class="cw-status-hider"
+        @click.prevent="toggleShowMore"
+      >{{ $t("general.show_more") }}</a>
+      <a
+        v-if="showingMore"
+        href="#"
+        class="status-unhider"
+        @click.prevent="toggleShowMore"
+      >{{ $t("general.show_less") }}</a>
+    </div>
+
+    <div v-if="status.poll && status.poll.options">
+      <poll :base-poll="status.poll" />
+    </div>
+
+    <div
+      v-if="status.attachments.length !== 0 && (!hideSubjectStatus || showingLongSubject)"
+      class="attachments media-body"
+    >
+      <attachment
+        v-for="attachment in nonGalleryAttachments"
+        :key="attachment.id"
+        class="non-gallery"
+        :size="attachmentSize"
+        :nsfw="nsfwClickthrough"
+        :attachment="attachment"
+        :allow-play="true"
+        :set-media="setMedia()"
+      />
+      <gallery
+        v-if="galleryAttachments.length > 0"
+        :nsfw="nsfwClickthrough"
+        :attachments="galleryAttachments"
+        :set-media="setMedia()"
+      />
+    </div>
+
+    <div
+      v-if="status.card && !hideSubjectStatus && !noHeading"
+      class="link-preview media-body"
+    >
+      <link-preview
+        :card="status.card"
+        :size="attachmentSize"
+        :nsfw="nsfwClickthrough"
+      />
+    </div>
+    <slot name="footer" />
+  </div>
+  <!-- eslint-enable vue/no-v-html -->
+</template>
+
+<script src="./status_content.js" ></script>
+<style lang="scss">
+@import '../../_variables.scss';
+
+$status-margin: 0.75em;
+
+.status-body {
+  flex: 1;
+  min-width: 0;
+
+  .tall-status {
+    position: relative;
+    height: 220px;
+    overflow-x: hidden;
+    overflow-y: hidden;
+    z-index: 1;
+    .status-content {
+      height: 100%;
+      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 */
+      -webkit-mask-composite: xor;
+      mask-composite: exclude;
+    }
+  }
+
+  .tall-status-hider {
+    display: inline-block;
+    word-break: break-all;
+    position: absolute;
+    height: 70px;
+    margin-top: 150px;
+    width: 100%;
+    text-align: center;
+    line-height: 110px;
+    z-index: 2;
+  }
+
+  .status-unhider, .cw-status-hider {
+    width: 100%;
+    text-align: center;
+    display: inline-block;
+    word-break: break-all;
+  }
+
+  .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;
+    }
+
+    pre {
+      overflow: auto;
+    }
+
+    code, samp, kbd, var, pre {
+      font-family: var(--postCodeFont, monospace);
+    }
+
+    p {
+      margin: 0 0 1em 0;
+    }
+
+    p:last-child {
+      margin: 0 0 0 0;
+    }
+
+    h1 {
+      font-size: 1.1em;
+      line-height: 1.2em;
+      margin: 1.4em 0;
+    }
+
+    h2 {
+      font-size: 1.1em;
+      margin: 1.0em 0;
+    }
+
+    h3 {
+      font-size: 1em;
+      margin: 1.2em 0;
+    }
+
+    h4 {
+      margin: 1.1em 0;
+    }
+  }
+}
+
+.greentext {
+  color: $fallback--cGreen;
+  color: var(--cGreen, $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>

src/components/user_card/user_card.js

@@ -9,7 +9,7 @@ import { mapGetters } from 'vuex'
 
 export default {
   props: [
-    'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered', 'allowZoomingAvatar'
+    'userId', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered', 'allowZoomingAvatar'
   ],
   data () {
     return {
@@ -21,6 +21,12 @@ export default {
     this.$store.dispatch('fetchUserRelationship', this.user.id)
   },
   computed: {
+    user () {
+      return this.$store.getters.findUser(this.userId)
+    },
+    relationship () {
+      return this.$store.getters.relationship(this.userId)
+    },
     classes () {
       return [{
         'user-card-rounded-t': this.rounded === 'top', // set border-top-left-radius and border-top-right-radius

src/components/user_card/user_card.vue

@@ -60,6 +60,7 @@
               <AccountActions
                 v-if="isOtherUser && loggedIn"
                 :user="user"
+                :relationship="relationship"
               />
             </div>
             <div class="bottom-line">
@@ -83,7 +84,7 @@
         </div>
         <div class="user-meta">
           <div
-            v-if="user.follows_you && loggedIn && isOtherUser"
+            v-if="relationship.followed_by && loggedIn && isOtherUser"
             class="following"
           >
             {{ $t('user_card.follows_you') }}
@@ -130,10 +131,10 @@
           class="user-interactions"
         >
           <div class="btn-group">
-            <FollowButton :user="user" />
+            <FollowButton :relationship="relationship" />
-            <template v-if="user.following">
+            <template v-if="relationship.following">
               <ProgressButton
-                v-if="!user.subscribed"
+                v-if="!relationship.subscribing"
                 class="btn btn-default"
                 :click="subscribeUser"
                 :title="$t('user_card.subscribe')"
@@ -152,7 +153,7 @@
           </div>
           <div>
             <button
-              v-if="user.muted"
+              v-if="relationship.muting"
               class="btn btn-default btn-block toggled"
               @click="unmuteUser"
             >

src/components/user_panel/user_panel.vue

@@ -6,7 +6,7 @@
       class="panel panel-default signed-in"
     >
       <UserCard
-        :user="user"
+        :user-id="user.id"
         :hide-bio="true"
         rounded="top"
       />

src/components/user_profile/user_profile.vue

@@ -5,7 +5,7 @@
       class="user-profile panel panel-default"
     >
       <UserCard
-        :user="user"
+        :user-id="userId"
         :switcher="true"
         :selected="timeline.viewing"
         :allow-zooming-avatar="true"

src/i18n/de.json

@@ -1,413 +1,584 @@
 {
-  "chat": {
+    "chat": {
-    "title": "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"
     },
-    "content_warning": "Betreff (optional)",
+    "features_panel": {
-    "default": "Sitze gerade im Hofbräuhaus.",
+        "chat": "Chat",
-    "direct_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
+        "gopher": "Gopher",
-    "posting": "Veröffentlichen",
+        "media_proxy": "Medienproxy",
-    "scope": {
+        "scope_options": "Reichweitenoptionen",
-      "direct": "Direkt - Beitrag nur an erwähnte Profile",
+        "text_limit": "Zeichenlimit",
-      "private": "Nur Follower - Beitrag nur für Follower sichtbar",
+        "title": "Funktionen",
-      "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
+        "who_to_follow": "Wem folgen?"
-      "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",
+    "finder": {
-    "enable_web_push_notifications": "Web-Pushbenachrichtigungen aktivieren",
+        "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",
+            "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": {
+            "switcher": {
-        "keep_color": "Farben beibehalten",
+                "keep_color": "Farben beibehalten",
-        "keep_shadows": "Schatten beibehalten",
+                "keep_shadows": "Schatten beibehalten",
-        "keep_opacity": "Deckkraft beibehalten",
+                "keep_opacity": "Deckkraft beibehalten",
-        "keep_roundness": "Abrundungen beibehalten",
+                "keep_roundness": "Abrundungen beibehalten",
-        "keep_fonts": "Schriften 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.",
+                "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",
+                "reset": "Zurücksetzen",
-        "clear_all": "Alles leeren",
+                "clear_all": "Alles leeren",
-        "clear_opacity": "Deckkraft leeren"
+                "clear_opacity": "Deckkraft leeren"
-      },
+            },
-      "common": {
+            "common": {
-        "color": "Farbe",
+                "color": "Farbe",
-        "opacity": "Deckkraft",
+                "opacity": "Deckkraft",
-        "contrast": {
+                "contrast": {
-          "hint": "Das Kontrastverhältnis ist {ratio}, es {level} {context}",
+                    "hint": "Das Kontrastverhältnis ist {ratio}, es {level} {context}",
-          "level": {
+                    "level": {
-            "aa": "entspricht Level AA Richtlinie (minimum)",
+                        "aa": "entspricht Level AA Richtlinie (minimum)",
-            "aaa": "entspricht Level AAA Richtlinie (empfohlen)",
+                        "aaa": "entspricht Level AAA Richtlinie (empfohlen)",
-            "bad": "entspricht keiner Richtlinien zur Barrierefreiheit"
+                        "bad": "entspricht keiner Richtlinien zur Barrierefreiheit"
-          },
+                    },
-          "context": {
+                    "context": {
-            "18pt": "für großen (18pt+) Text",
+                        "18pt": "für großen (18pt+) Text",
-            "text": "für Text"
+                        "text": "für Text"
-          }
+                    }
-        }
+                }
-      },
+            },
-      "common_colors": {
+            "common_colors": {
-        "_tab_label": "Allgemein",
+                "_tab_label": "Allgemein",
-        "main": "Allgemeine Farben",
+                "main": "Allgemeine Farben",
-        "foreground_hint": "Siehe Reiter \"Erweitert\" für eine detailliertere Einstellungen",
+                "foreground_hint": "Siehe Reiter \"Erweitert\" für eine detailliertere Einstellungen",
-        "rgbo": "Symbole, Betonungen, Kennzeichnungen"
+                "rgbo": "Symbole, Betonungen, Kennzeichnungen"
-      },
+            },
-      "advanced_colors": {
+            "advanced_colors": {
-        "_tab_label": "Erweitert",
+                "_tab_label": "Erweitert",
-        "alert": "Warnhinweis-Hintergrund",
+                "alert": "Warnhinweis-Hintergrund",
-        "alert_error": "Fehler",
+                "alert_error": "Fehler",
-        "badge": "Kennzeichnungs-Hintergrund",
+                "badge": "Kennzeichnungs-Hintergrund",
-        "badge_notification": "Benachrichtigung",
+                "badge_notification": "Benachrichtigung",
-        "panel_header": "Panel-Kopf",
+                "panel_header": "Panel-Kopf",
-        "top_bar": "Obere Leiste",
+                "top_bar": "Obere Leiste",
-        "borders": "Rahmen",
+                "borders": "Rahmen",
-        "buttons": "Schaltflächen",
+                "buttons": "Schaltflächen",
-        "inputs": "Eingabefelder",
+                "inputs": "Eingabefelder",
-        "faint_text": "Verblasster Text"
+                "faint_text": "Verblasster Text"
-      },
+            },
-      "radii": {
+            "radii": {
-        "_tab_label": "Abrundungen"
+                "_tab_label": "Abrundungen"
-      },
+            },
-      "shadows": {
+            "shadows": {
-        "_tab_label": "Schatten und Beleuchtung",
+                "_tab_label": "Schatten und Beleuchtung",
-        "component": "Komponente",
+                "component": "Komponente",
-        "override": "Überschreiben",
+                "override": "Überschreiben",
-        "shadow_id": "Schatten #{value}",
+                "shadow_id": "Schatten #{value}",
-        "blur": "Unschärfe",
+                "blur": "Unschärfe",
-        "spread": "Streuung",
+                "spread": "Streuung",
-        "inset": "Einsatz",
+                "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.",
+                "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": {
+                "filter_hint": {
-          "always_drop_shadow": "Achtung, dieser Schatten verwendet immer {0}, wenn der Browser dies unterstützt.",
+                    "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.",
+                    "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.",
+                    "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"
+                    "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"
+            }
         },
-        "components": {
+        "app_name": "Anwendungsname",
-          "panel": "Panel",
+        "mfa": {
-          "panelHeader": "Panel-Kopf",
+            "otp": "OTP",
-          "topBar": "Obere Leiste",
+            "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.",
-          "avatar": "Benutzer-Avatar (in der Profilansicht)",
+            "recovery_codes": "Wiederherstellungs-Codes.",
-          "avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
+            "warning_of_generate_new_codes": "Wenn du neue Wiederherstellungs-Codes generierst, werden die alten Codes nicht mehr funktionieren.",
-          "popup": "Dialogfenster und Hinweistexte",
+            "generate_new_recovery_codes": "Generiere neue Wiederherstellungs-Codes",
-          "button": "Schaltfläche",
+            "title": "Zwei-Faktor Authentifizierung",
-          "buttonHover": "Schaltfläche (hover)",
+            "waiting_a_recovery_codes": "Erhalte Wiederherstellungscodes...",
-          "buttonPressed": "Schaltfläche (gedrückt)",
+            "authentication_methods": "Authentifizierungsmethoden",
-          "buttonPressedHover": "Schaltfläche (gedrückt+hover)",
+            "scan": {
-          "input": "Input field"
+                "title": "Scan",
-        }
+                "secret_code": "Schlüssel",
-      },
+                "desc": "Wenn du deine 2FA App verwendest, scanne diesen QR Code oder gebe den Schlüssel ein:"
-      "fonts": {
+            },
-        "_tab_label": "Schriften",
+            "verify": {
-        "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.",
+                "desc": "Um 2FA zu aktivieren, gib den Code von deiner 2FA-App ein:"
-        "components": {
+            }
-          "interface": "Oberfläche",
-          "input": "Eingabefelder",
-          "post": "Beitragstext",
-          "postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
         },
-        "family": "Schriftname",
+        "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
-        "size": "Größe (in px)",
+        "security": "Sicherheit",
-        "weight": "Gewicht (Dicke)",
+        "allow_following_move": "Erlaube automatisches Folgen, sobald ein gefolgter Nutzer umzieht",
-        "custom": "Benutzerdefiniert"
+        "blocks_imported": "Blocks importiert! Die Verarbeitung wird einen Moment brauchen.",
-      },
+        "block_import_error": "Fehler beim Importieren der Blocks",
-      "preview": {
+        "block_import": "Block Import",
-        "header": "Vorschau",
+        "block_export_button": "Exportiere deine Blocks in eine csv Datei",
-        "content": "Inhalt",
+        "block_export": "Block Export",
-        "error": "Beispielfehler",
+        "emoji_reactions_on_timeline": "Zeige Emoji-Reaktionen auf der Zeitleiste",
-        "button": "Schaltfläche",
+        "domain_mutes": "Domains",
-        "text": "Ein Haufen mehr von {0} und {1}",
+        "changed_email": "Email Adresse erfolgreich geändert!",
-        "mono": "Inhalt",
+        "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.",
-        "input": "Sitze gerade im Hofbräuhaus.",
+        "change_email": "Ändere Email",
-        "faint_link": "Hilfreiche Anleitung",
+        "notification_setting_non_followers": "Nutzer, die dir nicht folgen",
-        "fine_print": "Lies unser {0}, um nichts Nützliches zu lernen!",
+        "notification_setting_followers": "Nutzer, die dir folgen",
-        "header_faint": "Das ist in Ordnung",
+        "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei",
-        "checkbox": "Ich habe die Allgemeinen Geschäftsbedingungen überflogen",
+        "accent": "Akzent"
-        "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": {
+    "timeline": {
-      "B": "B",
+        "collapse": "Einklappen",
-      "KiB": "KiB",
+        "conversation": "Unterhaltung",
-      "MiB": "MiB",
+        "error_fetching": "Fehler beim Laden",
-      "GiB": "GiB",
+        "load_older": "Lade ältere Beiträge",
-      "TiB": "TiB"
+        "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."
     }
-  },
-  "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."
-  }
 }

src/i18n/en.json

@@ -284,7 +284,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",
@@ -408,11 +408,14 @@
     "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",
@@ -433,7 +436,7 @@
         "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.",
+          "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.",
@@ -620,7 +623,8 @@
     "replies_list": "Replies:",
     "mute_conversation": "Mute conversation",
     "unmute_conversation": "Unmute conversation",
-    "status_unavailable": "Status unavailable"
+    "status_unavailable": "Status unavailable",
+    "copy_link": "Copy link to status"
   },
   "user_card": {
     "approve": "Approve",

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 ?",
+        "follows": "Nouveaux suivis",
-        "load_older": "Chargez d'anciennes interactions"
+        "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_email": "Similaire au courriel : « re : sujet »",
-        "subject_line_mastodon": "Comme mastodon: copier tel quel",
+        "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."
     }
 }

src/i18n/it.json

@@ -1,206 +1,323 @@
 {
-  "general": {
+    "general": {
-    "submit": "Invia",
+        "submit": "Invia",
-    "apply": "Applica"
+        "apply": "Applica",
-  },
+        "more": "Altro",
-  "nav": {
+        "generic_error": "Errore",
-    "mentions": "Menzioni",
+        "optional": "facoltativo",
-    "public_tl": "Sequenza temporale pubblica",
+        "show_more": "Mostra tutto",
-    "timeline": "Sequenza temporale",
+        "show_less": "Ripiega",
-    "twkn": "L'intera rete conosciuta",
+        "dismiss": "Chiudi",
-    "chat": "Chat Locale",
+        "cancel": "Annulla",
-    "friend_requests": "Richieste di Seguirti"
+        "disable": "Disabilita",
-  },
+        "enable": "Abilita",
-  "notifications": {
+        "confirm": "Conferma",
-    "followed_you": "ti segue",
+        "verify": "Verifica"
-    "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)",
+    "nav": {
-    "default": "Appena atterrato in L.A.",
+        "mentions": "Menzioni",
-    "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
+        "public_tl": "Sequenza pubblica",
-    "posting": "Pubblica",
+        "timeline": "Sequenza personale",
-    "scope": {
+        "twkn": "Sequenza globale",
-      "direct": "Diretto - Pubblicato solo per gli utenti menzionati",
+        "chat": "Chat della stanza",
-      "private": "Solo per chi ti segue - Visibile solo da chi ti segue",
+        "friend_requests": "Vogliono seguirti",
-      "public": "Pubblico - Visibile sulla sequenza temporale pubblica",
+        "about": "Informazioni",
-      "unlisted": "Non elencato - Non visibile sulla sequenza temporale pubblica"
+        "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"
+    },
+    "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 nascosti",
+        "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": "Descrizioni/avvisi",
+        "values": {
+            "false": "no",
+            "true": "sì"
+        }
+    },
+    "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"
+        },
+        "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"
+        }
+    },
+    "registration": {
+        "bio": "Introduzione",
+        "email": "Email",
+        "fullname": "Nome visualizzato",
+        "password_confirm": "Conferma password",
+        "registration": "Registrazione",
+        "token": "Codice d'invito"
+    },
+    "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"
+    },
+    "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"
     }
-  },
-  "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"
-  }
 }

src/i18n/ru.json

@@ -1,414 +1,478 @@
 {
-  "chat": {
+    "chat": {
-    "title": "Чат"
+        "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": "Этот пост не будет виден в публичной и федеративной ленте"
     },
-    "scope": {
+    "finder": {
-      "direct": "Личное - этот пост видят только те кто в нём упомянут",
+        "error_fetching_user": "Пользователь не найден",
-      "private": "Для подписчиков - этот пост видят только подписчики",
+        "find_user": "Найти пользователя"
-      "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": "Прикреплённые файлы",
+    "general": {
-    "attachments": "Вложения",
+        "apply": "Применить",
-    "autoload": "Включить автоматическую загрузку при прокрутке вниз",
+        "submit": "Отправить",
-    "avatar": "Аватар",
+        "cancel": "Отмена",
-    "avatarAltRadius": "Аватары в уведомлениях",
+        "disable": "Оключить",
-    "avatarRadius": "Аватары",
+        "enable": "Включить",
-    "background": "Фон",
+        "confirm": "Подтвердить",
-    "bio": "Описание",
+        "verify": "Проверить",
-    "btnRadius": "Кнопки",
+        "more": "Больше",
-    "cBlue": "Ответить, читать",
+        "generic_error": "Произошла ошибка",
-    "cGreen": "Повторить",
+        "optional": "не обязательно",
-    "cOrange": "Нравится",
+        "show_less": "Показать меньше",
-    "cRed": "Отменить",
+        "show_more": "Показать больше"
-    "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": {
+    "login": {
-      "switcher": {
+        "login": "Войти",
-        "keep_color": "Оставить цвета",
+        "logout": "Выйти",
-        "keep_shadows": "Оставить тени",
+        "password": "Пароль",
-        "keep_opacity": "Оставить прозрачность",
+        "placeholder": "e.c. lain",
-        "keep_roundness": "Оставить скругление",
+        "register": "Зарегистрироваться",
-        "keep_fonts": "Оставить шрифты",
+        "username": "Имя пользователя",
-        "save_load_hint": "Опции \"оставить...\" позволяют сохранить текущие настройки при выборе другой темы или импорта её из файла. Так же они влияют на то какие компоненты будут сохранены при экспорте темы. Когда все галочки сняты все компоненты будут экспортированы.",
+        "authentication_code": "Код аутентификации",
-        "reset": "Сбросить",
+        "enter_recovery_code": "Ввести код восстановления",
-        "clear_all": "Очистить всё",
+        "enter_two_factor_code": "Ввести код аутентификации",
-        "clear_opacity": "Очистить прозрачность"
+        "recovery_code": "Код восстановления",
-      },
+        "heading": {
-      "common": {
+            "TotpForm": "Двухфакторная аутентификация",
-        "color": "Цвет",
+            "RecoveryForm": "Two-factor recovery"
-        "opacity": "Прозрачность",
-        "contrast": {
-          "hint": "Уровень контраста: {ratio}, что {level} {context}",
-          "level": {
-            "aa": "соответствует гайдлайну Level AA (минимальный)",
-            "aaa": "соответствует гайдлайну Level AAA (рекомендуемый)",
-            "bad": "не соответствует каким либо гайдлайнам"
-          },
-          "context": {
-            "18pt": "для крупного (18pt+) текста",
-            "text": "для текста"
-          }
         }
-      },
+    },
-      "common_colors": {
+    "nav": {
-        "_tab_label": "Общие",
+        "back": "Назад",
-        "main": "Общие цвета",
+        "chat": "Локальный чат",
-        "foreground_hint": "См. вкладку \"Дополнительно\" для более детального контроля",
+        "mentions": "Упоминания",
-        "rgbo": "Иконки, акценты, ярылки"
+        "interactions": "Взаимодействия",
-      },
+        "public_tl": "Публичная лента",
-      "advanced_colors": {
+        "timeline": "Лента",
-        "_tab_label": "Дополнительно",
+        "twkn": "Федеративная лента",
-        "alert": "Фон уведомлений",
+        "search": "Поиск",
-        "alert_error": "Ошибки",
+        "friend_requests": "Запросы на чтение"
-        "badge": "Фон значков",
+    },
-        "badge_notification": "Уведомления",
+    "notifications": {
-        "panel_header": "Заголовок панели",
+        "broken_favorite": "Неизвестный статус, ищем...",
-        "top_bar": "Верняя полоска",
+        "favorited_you": "нравится ваш статус",
-        "borders": "Границы",
+        "followed_you": "начал(а) читать вас",
-        "buttons": "Кнопки",
+        "load_older": "Загрузить старые уведомления",
-        "inputs": "Поля ввода",
+        "notifications": "Уведомления",
-        "faint_text": "Маловажный текст"
+        "read": "Прочесть",
-      },
+        "repeated_you": "повторил(а) ваш статус",
-      "radii": {
+        "follow_request": "хочет читать вас"
-        "_tab_label": "Скругление"
+    },
-      },
+    "interactions": {
-      "shadows": {
+        "favs_repeats": "Повторы и фавориты",
-        "_tab_label": "Светотень",
+        "follows": "Новые подписки",
-        "component": "Компонент",
+        "load_older": "Загрузить старые взаимодействия"
-        "override": "Переопределить",
+    },
-        "shadow_id": "Тень №{value}",
+    "post_status": {
-        "blur": "Размытие",
+        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может начать читать вас чтобы видеть посты только для подписчиков.",
-        "spread": "Разброс",
+        "account_not_locked_warning_link": "залочен",
-        "inset": "Внутренняя",
+        "attachments_sensitive": "Вложения содержат чувствительный контент",
-        "hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
+        "content_warning": "Тема (не обязательно)",
-        "filter_hint": {
+        "default": "Что нового?",
-          "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это",
+        "direct_warning": "Этот пост будет виден только упомянутым пользователям",
-          "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}",
+        "posting": "Отправляется",
-          "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете",
+        "scope_notice": {
-          "spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
+            "public": "Этот пост будет виден всем",
-          "inset_classic": "Внутренние тени будут использовать {0}"
+            "private": "Этот пост будет виден только вашим подписчикам",
+            "unlisted": "Этот пост не будет виден в публичной и федеративной ленте"
         },
-        "components": {
+        "scope": {
-          "panel": "Панель",
+            "direct": "Личное - этот пост видят только те кто в нём упомянут",
-          "panelHeader": "Заголовок панели",
+            "private": "Для подписчиков - этот пост видят только подписчики",
-          "topBar": "Верхняя полоска",
+            "public": "Публичный - этот пост виден всем",
-          "avatar": "Аватарка (профиль)",
+            "unlisted": "Непубличный - этот пост не виден на публичных лентах"
-          "avatarStatus": "Аватарка (в ленте)",
-          "popup": "Всплывающие подсказки",
-          "button": "Кнопки",
-          "buttonHover": "Кнопки (наведен курсор)",
-          "buttonPressed": "Кнопки (нажата)",
-          "buttonPressedHover": "Кнопки (нажата+наведен курсор)",
-          "input": "Поля ввода"
         }
-      },
+    },
-      "fonts": {
+    "registration": {
-        "_tab_label": "Шрифты",
+        "bio": "Описание",
-        "help": "Выберите тип шрифта для использования в интерфейсе. При выборе варианта \"другой\" надо ввести название шрифта в точности как он называется в системе.",
+        "email": "Email",
-        "components": {
+        "fullname": "Отображаемое имя",
-          "interface": "Интерфейс",
+        "password_confirm": "Подтверждение пароля",
-          "input": "Поля ввода",
+        "registration": "Регистрация",
-          "post": "Текст постов",
+        "token": "Код приглашения",
-          "postCode": "Моноширинный текст в посте (форматирование)"
+        "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": "Шрифт",
+        "attachmentRadius": "Прикреплённые файлы",
-        "size": "Размер (в пикселях)",
+        "attachments": "Вложения",
-        "weight": "Ширина",
+        "autoload": "Включить автоматическую загрузку при прокрутке вниз",
-        "custom": "Другой"
+        "avatar": "Аватар",
-      },
+        "avatarAltRadius": "Аватары в уведомлениях",
-      "preview": {
+        "avatarRadius": "Аватары",
-        "header": "Пример",
+        "background": "Фон",
-        "content": "Контент",
+        "bio": "Описание",
-        "error": "Ошибка стоп 000",
+        "btnRadius": "Кнопки",
-        "button": "Кнопка",
+        "cBlue": "Ответить, читать",
-        "text": "Еще немного {0} и масенькая {1}",
+        "cGreen": "Повторить",
-        "mono": "контента",
+        "cOrange": "Нравится",
-        "input": "Что нового?",
+        "cRed": "Отменить",
-        "faint_link": "Его придется убрать",
+        "change_email": "Сменить email",
-        "fine_print": "Если проблемы остались — ваш гуртовщик мыши плохо стоит. {0}.",
+        "change_email_error": "Произошла ошибка при попытке изменить email.",
-        "header_faint": "Все идет по плану",
+        "changed_email": "Email изменён успешно!",
-        "checkbox": "Я подтверждаю что не было ни единого разрыва",
+        "change_password": "Сменить пароль",
-        "link": "ссылка"
+        "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": "Отклонить запрос на чтение"
     }
-  },
-  "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вяжитесь с администратором вашего сервера."
-  }
 }

src/modules/instance.js

@@ -4,52 +4,55 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
-  // Stuff from static/config.json and apiConfig
+  // Stuff from apiConfig
   name: 'Pleroma FE',
   registrationOpen: true,
-  safeDM: true,
-  textlimit: 5000,
   server: 'http://localhost:4040/',
-  theme: 'pleroma-dark',
+  textlimit: 5000,
   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,
+  // Stuff from static/config.json
-  minimalScopesMode: false,
+  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',
+  logoMargin: '.2em',
+  logoMask: true,
+  minimalScopesMode: false,
+  nsfwCensorImage: undefined,
+  postContentType: 'text/plain',
+  redirectRootLogin: '/main/friends',
+  redirectRootNoLogin: '/main/all',
+  scopeCopy: true,
+  showFeaturesPanel: true,
+  showInstanceSpecificPanel: false,
+  sidebarRight: false,
+  subjectLineBehavior: 'email',
+  theme: 'pleroma-dark',
 
   // 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,
   gopherAvailable: false,
+  mediaProxyAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',
 

src/modules/users.js

@@ -48,6 +48,11 @@ const unblockUser = (store, id) => {
 }
 
 const muteUser = (store, id) => {
+  const predictedRelationship = store.state.relationships[id] || { id }
+  predictedRelationship.muting = true
+  store.commit('updateUserRelationship', [predictedRelationship])
+  store.commit('addMuteId', id)
+
   return store.rootState.api.backendInteractor.muteUser({ id })
     .then((relationship) => {
       store.commit('updateUserRelationship', [relationship])
@@ -56,6 +61,10 @@ const muteUser = (store, id) => {
 }
 
 const unmuteUser = (store, id) => {
+  const predictedRelationship = store.state.relationships[id] || { id }
+  predictedRelationship.muting = false
+  store.commit('updateUserRelationship', [predictedRelationship])
+
   return store.rootState.api.backendInteractor.unmuteUser({ id })
     .then((relationship) => store.commit('updateUserRelationship', [relationship]))
 }
@@ -83,10 +92,6 @@ const unmuteDomain = (store, domain) => {
 }
 
 export const mutations = {
-  setMuted (state, { user: { id }, muted }) {
-    const user = state.usersObject[id]
-    set(user, 'muted', muted)
-  },
   tagUser (state, { user: { id }, tag }) {
     const user = state.usersObject[id]
     const tags = user.tags || []
@@ -146,26 +151,18 @@ export const mutations = {
     }
   },
   addNewUsers (state, users) {
-    each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
+    each(users, (user) => {
+      if (user.relationship) {
+        set(state.relationships, user.relationship.id, user.relationship)
+      }
+      mergeOrAdd(state.users, state.usersObject, user)
+    })
   },
   updateUserRelationship (state, relationships) {
     relationships.forEach((relationship) => {
-      const user = state.usersObject[relationship.id]
+      set(state.relationships, relationship.id, relationship)
-      if (user) {
-        user.follows_you = relationship.followed_by
-        user.following = relationship.following
-        user.muted = relationship.muting
-        user.statusnet_blocking = relationship.blocking
-        user.subscribed = relationship.subscribing
-        user.showing_reblogs = relationship.showing_reblogs
-      }
     })
   },
-  updateBlocks (state, blockedUsers) {
-    // Reset statusnet_blocking of all fetched users
-    each(state.users, (user) => { user.statusnet_blocking = false })
-    each(blockedUsers, (user) => mergeOrAdd(state.users, state.usersObject, user))
-  },
   saveBlockIds (state, blockIds) {
     state.currentUser.blockIds = blockIds
   },
@@ -174,11 +171,6 @@ export const mutations = {
       state.currentUser.blockIds.push(blockId)
     }
   },
-  updateMutes (state, mutedUsers) {
-    // Reset muted of all fetched users
-    each(state.users, (user) => { user.muted = false })
-    each(mutedUsers, (user) => mergeOrAdd(state.users, state.usersObject, user))
-  },
   saveMuteIds (state, muteIds) {
     state.currentUser.muteIds = muteIds
   },
@@ -244,6 +236,10 @@ export const getters = {
       return state.usersObject[query.toLowerCase()]
     }
     return result
+  },
+  relationship: state => id => {
+    const rel = id && state.relationships[id]
+    return rel || { id, loading: true }
   }
 }
 
@@ -254,7 +250,8 @@ export const defaultState = {
   users: [],
   usersObject: {},
   signUpPending: false,
-  signUpErrors: []
+  signUpErrors: [],
+  relationships: {}
 }
 
 const users = {
@@ -279,7 +276,7 @@ const users = {
       return store.rootState.api.backendInteractor.fetchBlocks()
         .then((blocks) => {
           store.commit('saveBlockIds', map(blocks, 'id'))
-          store.commit('updateBlocks', blocks)
+          store.commit('addNewUsers', blocks)
           return blocks
         })
     },
@@ -298,8 +295,8 @@ const users = {
     fetchMutes (store) {
       return store.rootState.api.backendInteractor.fetchMutes()
         .then((mutes) => {
-          store.commit('updateMutes', mutes)
           store.commit('saveMuteIds', map(mutes, 'id'))
+          store.commit('addNewUsers', mutes)
           return mutes
         })
     },
@@ -416,7 +413,7 @@ const users = {
     },
     addNewNotifications (store, { notifications }) {
       const users = map(notifications, 'from_profile')
-      const targetUsers = map(notifications, 'target')
+      const targetUsers = map(notifications, 'target').filter(_ => _)
       const notificationIds = notifications.map(_ => _.id)
       store.commit('addNewUsers', users)
       store.commit('addNewUsers', targetUsers)
@@ -431,7 +428,7 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers (store, query) {
+    searchUsers (store, { query }) {
       return store.rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
           store.commit('addNewUsers', users)

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 : ''
@@ -971,6 +973,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}`
 

src/services/entity_normalizer/entity_normalizer.service.js

@@ -75,13 +75,7 @@ export const parseUser = (data) => {
       output.token = data.pleroma.chat_token
 
       if (relationship) {
-        output.follows_you = relationship.followed_by
+        output.relationship = relationship
-        output.requested = relationship.requested
-        output.following = relationship.following
-        output.statusnet_blocking = relationship.blocking
-        output.muted = relationship.muting
-        output.showing_reblogs = relationship.showing_reblogs
-        output.subscribed = relationship.subscribing
       }
 
       output.allow_following_move = data.pleroma.allow_following_move
@@ -138,16 +132,10 @@ export const parseUser = (data) => {
 
     output.statusnet_profile_url = data.statusnet_profile_url
 
-    output.statusnet_blocking = data.statusnet_blocking
-
     output.is_local = data.is_local
     output.role = data.role
     output.show_role = data.show_role
 
-    output.follows_you = data.follows_you
-
-    output.muted = data.muted
-
     if (data.rights) {
       output.rights = {
         moderator: data.rights.delete_others_notice,
@@ -161,10 +149,16 @@ export const parseUser = (data) => {
     output.hide_follows_count = data.hide_follows_count
     output.hide_followers_count = data.hide_followers_count
     output.background_image = data.background_image
-    // on mastoapi this info is contained in a "relationship"
-    output.following = data.following
     // Websocket token
     output.token = data.token
+
+    // Convert relationsip data to expected format
+    output.relationship = {
+      muting: data.muted,
+      blocking: data.statusnet_blocking,
+      followed_by: data.follows_you,
+      following: data.following
+    }
   }
 
   output.created_at = new Date(data.created_at)

src/services/follow_manipulate/follow_manipulate.js

@@ -1,24 +1,27 @@
-const fetchUser = (attempt, user, store) => new Promise((resolve, reject) => {
+const fetchRelationship = (attempt, userId, store) => new Promise((resolve, reject) => {
   setTimeout(() => {
-    store.state.api.backendInteractor.fetchUser({ id: user.id })
+    store.state.api.backendInteractor.fetchUserRelationship({ id: userId })
-      .then((user) => store.commit('addNewUsers', [user]))
+      .then((relationship) => {
-      .then(() => resolve([user.following, user.requested, user.locked, attempt]))
+        store.commit('updateUserRelationship', [relationship])
+        return relationship
+      })
+      .then((relationship) => resolve([relationship.following, relationship.requested, relationship.locked, attempt]))
       .catch((e) => reject(e))
   }, 500)
 }).then(([following, sent, locked, attempt]) => {
   if (!following && !(locked && sent) && attempt <= 3) {
     // If we BE reports that we still not following that user - retry,
     // increment attempts by one
-    fetchUser(++attempt, user, store)
+    fetchRelationship(++attempt, userId, store)
   }
 })
 
-export const requestFollow = (user, store) => new Promise((resolve, reject) => {
+export const requestFollow = (userId, store) => new Promise((resolve, reject) => {
-  store.state.api.backendInteractor.followUser({ id: user.id })
+  store.state.api.backendInteractor.followUser({ id: userId })
     .then((updated) => {
       store.commit('updateUserRelationship', [updated])
 
-      if (updated.following || (user.locked && user.requested)) {
+      if (updated.following || (updated.locked && updated.requested)) {
         // If we get result immediately or the account is locked, just stop.
         resolve()
         return
@@ -31,15 +34,15 @@ export const requestFollow = (user, store) => new Promise((resolve, reject) => {
       // don't know that yet.
       // Recursive Promise, it will call itself up to 3 times.
 
-      return fetchUser(1, user, store)
+      return fetchRelationship(1, updated, store)
         .then(() => {
           resolve()
         })
     })
 })
 
-export const requestUnfollow = (user, store) => new Promise((resolve, reject) => {
+export const requestUnfollow = (userId, store) => new Promise((resolve, reject) => {
-  store.state.api.backendInteractor.unfollowUser({ id: user.id })
+  store.state.api.backendInteractor.unfollowUser({ id: userId })
     .then((updated) => {
       store.commit('updateUserRelationship', [updated])
       resolve({

static/config.json

@@ -1,23 +1,28 @@
 {
-  "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,
+  "disableChat": false,
+  "greentext": false,
+  "hideFilteredStatuses": false,
+  "hideMutedPosts": false,
   "hidePostStats": false,
+  "hideSitename": false,
   "hideUserStats": false,
   "loginMethod": "password",
-  "webPushNotifications": false,
+  "logo": "/static/logo.png",
-  "noAttachmentLinks": false,
+  "logoMargin": ".1em",
+  "logoMask": true,
+  "minimalScopesMode": false,
   "nsfwCensorImage": "",
+  "postContentType": "text/plain",
+  "redirectRootLogin": "/main/friends",
+  "redirectRootNoLogin": "/main/all",
+  "scopeCopy": true,
   "showFeaturesPanel": true,
-  "minimalScopesMode": false
+  "showInstanceSpecificPanel": false,
+  "sidebarRight": false,
+  "subjectLineBehavior": "email",
+  "theme": "pleroma-dark",
+  "webPushNotifications": false
 }

static/fontello.json

@@ -346,6 +346,12 @@
       "code": 59427,
       "src": "fontawesome"
     },
+    {
+      "uid": "4aad6bb50b02c18508aae9cbe14e784e",
+      "css": "share",
+      "code": 61920,
+      "src": "fontawesome"
+    },
     {
       "uid": "8b80d36d4ef43889db10bc1f0dc9a862",
       "css": "user",

test/unit/specs/components/user_profile.spec.js

@@ -19,6 +19,7 @@ const actions = {
 
 const testGetters = {
   findUser: state => getters.findUser(state.users),
+  relationship: state => getters.relationship(state.users),
   mergedConfig: state => ({
     colors: '',
     highlight: {},
@@ -96,7 +97,8 @@ const externalProfileStore = new Vuex.Store({
         credentials: ''
       },
       usersObject: { 100: extUser },
-      users: [extUser]
+      users: [extUser],
+      relationships: {}
     }
   }
 })
@@ -164,7 +166,8 @@ const localProfileStore = new Vuex.Store({
         credentials: ''
       },
       usersObject: { 100: localUser, 'testuser': localUser },
-      users: [localUser]
+      users: [localUser],
+      relationships: {}
     }
   }
 })

test/unit/specs/modules/users.spec.js

@@ -18,20 +18,6 @@ describe('The users module', () => {
       expect(state.users).to.eql([user])
       expect(state.users[0].name).to.eql('Dude')
     })
-
-    it('sets a mute bit on users', () => {
-      const state = cloneDeep(defaultState)
-      const user = { id: '1', name: 'Guy' }
-
-      mutations.addNewUsers(state, [user])
-      mutations.setMuted(state, { user, muted: true })
-
-      expect(user.muted).to.eql(true)
-
-      mutations.setMuted(state, { user, muted: false })
-
-      expect(user.muted).to.eql(false)
-    })
   })
 
   describe('findUser', () => {