Merge branch 'develop' into fedi-absturztau-be

This patch removes Ruffle completely, significantly speeding up the
loading of the frontend, making it a little more responsive,
and reducing its compressed size.

.woodpecker.yml

@@ -1,4 +1,3 @@
-platform: linux/amd64
 pipeline:
   lint:
     when:

README.md

@@ -1,4 +1,4 @@
-# Akkoma-FE
+# Akkoma-FE 
 
 ![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)
 
@@ -6,9 +6,22 @@ This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkom
 - MFM support via [marked-mfm](https://akkoma.dev/sfr/marked-mfm)
 - Custom emoji reactions
 
+# Changes in this Fork
+
+* script tag in index.html for [pleroma-mod-loader](https://git.pleroma.social/absturztaube/pleroma-mod-loader)
+* ability to move notifications to a seperate column
+* insert zero width space when padding of emojis is disabled
+* add custom language "English (Nyan)"
+* pointing version links to my gitlab repos
+* optional compact styles provided by craftplacer
+* tags as buttons bellow a post
+* [pinch and pan media](https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403)
+* swap of react and favorite button in status
+* adding __vueComponent__ to DOM nodes to make new mods work
+
 # For Translators
 
-The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE.
+The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE. 
 
 Alternatively, edit/create `src/i18n/$LANGUAGE_CODE.json` (where `$LANGUAGE_CODE` is the [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language), then add your language to [src/i18n/messages.js](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/i18n/messages.js) if it doesn't already exist there.
 
@@ -22,7 +35,7 @@ To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/ad
 
 ``` bash
 # install dependencies
-corepack enable
+npm install -g yarn
 yarn
 
 # serve with hot reload at localhost:8080
@@ -37,7 +50,7 @@ npm run unit
 
 # For Contributors:
 
-You can create file `/config/local.json` (see [example](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/config/local.example.json)) to enable some convenience dev options:
+You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/config/local.example.json)) to enable some convenience dev options:
 
 * `target`: makes local dev server redirect to some existing instance's BE instead of local BE, useful for testing things in near-production environment and searching for real-life use-cases.
 * `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/statusnet/config.json`. Only works in dev mode.
@@ -52,4 +65,4 @@ Edit config.json for configuration.
 
 ### Login methods
 
-```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. 

build/dev-server.js

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

config/local.example.json

@@ -1,4 +1,4 @@
 {
-  "target": "https://otp.akkoma.dev/",
+  "target": "https://pleroma.soykaf.com/",
   "staticConfigPreference": false
 }

docs/docs/CONFIGURATION.md

@@ -1,15 +1,15 @@
-# Akkoma-FE configuration and customization for instance administrators
+# Pleroma-FE configuration and customization for instance administrators
 
-* *For user configuration, see [Akkoma-FE user guide](../user_guide)*
+* *For user configuration, see [Pleroma-FE user guide](../user_guide)*
 * *For local development server configuration, see [Hacking, tweaking, contributing](HACKING.md)*
 
 ## Where configuration is stored
 
-Akkoma-FE gets its configuration from several sources, in order of preference (the one above overrides ones below it)
+PleromaFE gets its configuration from several sources, in order of preference (the one above overrides ones below it)
 
-1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, Akkoma-FE uses `pleromafe` field of it. For more info on changing config on BE, look [here](https://docs.akkoma.dev/stable/configuration/cheatsheet.md#frontend_configurations)
-2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/static/config.json).
-3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/src/modules/instance.js) )
+1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, PleromaFE uses `pleromafe` field of it. For more info on changing config on BE, look [here](https://docs.akkoma.dev/stable/configuration/cheatsheet.md#frontend_configurations)
+2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/static/config.json).
+3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/modules/instance.js) )
 
 ## Instance-defaults
 
@@ -59,7 +59,7 @@ Instance `logo`, could be any image, including svg. By default it assumes logo u
 `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 Akkoma-FE.
+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
@@ -77,7 +77,7 @@ Change alignment of sidebar and panels to the right. Defaults to `false`.
 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. Akkoma-FE 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.
+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.
 
 ### `subjectLineBehavior`
 How to handle subject line (CW) when replying to a post.

docs/docs/HACKING.md

@@ -1,8 +1,8 @@
 # Hacking, tweaking, contributing
 
-## What Akkoma-FE even is, how it works
+## What PleromaFE even is, how it works
 
-Akkoma-FE is an SPA (Single-Page Application) backed by [Vue](https://vuejs.org/) framework. It means that it's just a nearly-empty HTML page with bunch of JavaScript that actually generates and controls DOM (i.e. html elements) in Runtime. Currently, there's no way around it - you have to have Javascript enabled in the browser to make it work, there is a theoretical possibility to generate some HTML server-side but it's not implemented yet.
+PleromaFE is an SPA (Single-Page Application) backed by [Vue](https://vuejs.org/) framework. It means that it's just a nearly-empty HTML page with bunch of JavaScript that actually generates and controls DOM (i.e. html elements) in Runtime. Currently, there's no way around it - you have to have Javascript enabled in the browser to make it work, there is a theoretical possibility to generate some HTML server-side but it's not implemented yet.
 
 You can serve static html page and everything from any HTTP(S) server but currently it will try to access /api/ path at same domain it's running on, meaning that as of right now you cannot put it on one domain and access the other without proxying requests.
 
@@ -67,19 +67,19 @@ server {
 
 ### API, Data, Operations
 
-In 99% cases Akkoma-FE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](https://docs.akkoma.dev/stable/differences_in_mastoapi_responses.md) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure.
+In 99% cases PleromaFE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](https://docs.akkoma.dev/stable/differences_in_mastoapi_responses.md) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure.
 
-Akkoma-FE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.
+PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.
 
-For most part, Akkoma-FE tries to store all the info it can get in global vuex store - every user and post are passed trough updating mechanism where data is either added or merged with existing data, reactively updating the information throughout UI, so if in newest request user's post counter increased, it will be instantly updated in open user profile cards. This is also used to find users, posts and sometimes to build timelines and/or request parameters.
+For most part, PleromaFE tries to store all the info it can get in global vuex store - every user and post are passed trough updating mechanism where data is either added or merged with existing data, reactively updating the information throughout UI, so if in newest request user's post counter increased, it will be instantly updated in open user profile cards. This is also used to find users, posts and sometimes to build timelines and/or request parameters.
 
-Akkoma-FE also tries to persist this store, however only stable data is stored, such as user authentication and preferences, user highlights. Persistence is performed by saving and loading chunk of vuex store in browser's LocalStorage/IndexedDB.
+PleromaFE also tries to persist this store, however only stable data is stored, such as user authentication and preferences, user highlights. Persistence is performed by saving and loading chunk of vuex store in browser's LocalStorage/IndexedDB.
 
 TODO: Refactor API code and document it here
 
 ### Themes
 
-Akkoma-FE uses custom theme "framework" which is pretty much just a style tag rendered by vue which only contains CSS3 variables. Every color used in UI should be derived from theme. Theme is stored in a JSON object containing color, opacity, shadow and font information, with most of it being optional.
+PleromaFE uses custom theme "framework" which is pretty much just a style tag rendered by vue which only contains CSS3 variables. Every color used in UI should be derived from theme. Theme is stored in a JSON object containing color, opacity, shadow and font information, with most of it being optional.
 
 The most basic theme can consist of 4 to 8 "basic colors", which is also what previous version of themes allowed, with all other colors being derived from those basic colors, i.e. "light background" will be "background" color lightened/darkened, "panel header" will be same as "foreground". The idea is that you can specify just basic color palette and everything else will be generated automatically, but if you really need to tweak some specific color - you can.
 

docs/docs/images/akkoma_logo_vector_nobg.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 362.83 362.83">
-  <defs>
-    <style>
-      .cls-1, .cls-2 {
-        fill: #fff;
-      }
-
-      .cls-2 {
-        stroke: #fff;
-        stroke-miterlimit: 10;
-      }
-    </style>
-  </defs>
-  <g id="Layer_6" data-name="Layer 6">
-    <path class="cls-1" d="M115.2,131.89c6.26-6.54,20.19-20.63,42.39-26.14,15.79-3.92,28.51-1.28,33.51,0,83.72,21.41,116.03,201.78,77.79,226.32-10.28,6.6-26.86,2.7-36.77-3.3-32.63-19.78-29.3-72.87-44.44-73.73-5.11-.29-7.15,5.8-20.91,24.94-19.63,27.3-31.49,43.44-49.21,50.87-2.53,1.06-26.91,12.07-41.84,1.23-38.55-28-2.96-155.84,39.49-200.18Zm56.31,10.45c-27.39-.52-46.38,38.21-37.98,54.55,10.09,19.62,65.5,18.26,74.77-3.3,7.21-16.78-11.38-50.77-36.79-51.24Z"/>
-  </g>
-  <g id="Layer_4" data-name="Layer 4">
-    <path class="cls-1" d="M68.93,86.51c-6.55,27.74,252.45,113.97,267.56,89.66,9.24-14.87-64.9-83.62-163.53-97.57-39.06-5.52-100.95-5.14-104.03,7.91Z"/>
-  </g>
-  <g id="Layer_5" data-name="Layer 5">
-    <path class="cls-2" d="M138.96,93.76c.41-5.25,6.51-5.74,28.85-19.42,26.97-16.51,28.85-22.38,56.86-40.83,30.07-19.81,48.46-31.94,54.82-26.61,9.72,8.15-25.18,43.33-21.31,99.35,.87,12.61,3.12,17.79-.86,23.01-18.25,23.95-120.07-13.68-118.35-35.5Z"/>
-  </g>
-</svg>

docs/docs/images/pleroma_logo_vector_nobg.svg

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg4485"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="pleroma_logo_vector_nobg.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4489" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     id="namedview4487"
+     showgrid="false"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="26.131594"
+     inkscape:cy="235.37499"
+     inkscape:window-x="1912"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4485" />
+  <g
+     id="g4612">
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4495"
+       d="M 235,89 V 423 H 152 V 115 l 26,-26 z"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <circle
+       r="26"
+       cx="178"
+       cy="115"
+       id="path4497"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <circle
+       r="26"
+       cx="335"
+       cy="230"
+       id="path4497-0"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4516"
+       d="M 277,256 V 89 l 84,3e-6 L 361.00002,230 335,256 Z"
+       style="fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       r="26"
+       cx="335"
+       cy="397"
+       id="path4497-0-6"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4516-5"
+       d="m 277,423 v -83 h 84 l 2e-5,57 L 335,423 Z"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

docs/docs/index.md

@@ -1,8 +1,8 @@
-# Introduction to Akkoma-FE
-## What is Akkoma-FE?
+# Introduction to Pleroma-FE
+## What is Pleroma-FE?
 
-Akkoma-FE is the default user-facing frontend for Pleroma. It's user interface is modeled after Qvitter which is modeled after an older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options.
+Pleroma-FE is the default user-facing frontend for Pleroma. It's user interface is modeled after Qvitter which is modeled after an older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options.
 
 ## How can I use it?
 
-If your instance uses Akkoma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Akkoma-FE User Guide](./user_guide/). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).
+If your instance uses Pleroma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Pleroma-FE User Guide](./user_guide/). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).

docs/docs/stickers.md

@@ -1,13 +1,13 @@
 # Adding stickers
 
-Akkoma-FE supports stickers, which are essentially little images stored server-side
+Pleroma-fe supports stickers, which are essentially little images stored server-side
 which can be selected by a user to automatically attach them to a post.
 
 There's no explicit setting for these, they just rely on the existence of certain files.
 
 ## Initialising the sticker config file
 
-You're probably serving Akkoma-FE from your instance's `instance/static/` directory -
+You're probably serving pleroma-fe from your instance's `instance/static/` directory - 
 this directy can also override files served at a given path.
 
 The first thing we need to do is set up our `stickers.json` file. At `instance/static/static/stickers.json`,
@@ -50,4 +50,4 @@ The `tabIcon` will appear on the sticker picker itself as a representative of th
 
 You can add as many stickers as you like. They should all be in the same directory as your `pack.json`.
 
-Now you should find that there's a sticky note icon on the emoji picker on Akkoma-FE that allows you to attach stickers.
+Now you should find that there's a sticky note icon on the emoji picker on pleroma-fe that allows you to attach stickers.

docs/docs/user_guide/index.md

@@ -8,13 +8,13 @@
 >
 > --Catbag
 
-Akkoma-FE is the default user-facing frontend for Pleroma. If your instance uses Akkoma-FE, you can access it by going to your instance (e.g. <https://pleroma.soykaf.com>). After logging in you will have two columns in front of you. Here we're going to keep it to the default behaviour, but some instances swap the left and right columns. If you're on such an instance what we refer to as the left column will be on your right and vice versa.
+Pleroma-FE is the default user-facing frontend for Pleroma. If your instance uses Pleroma-FE, you can access it by going to your instance (e.g. <https://pleroma.soykaf.com>). After logging in you will have two columns in front of you. Here we're going to keep it to the default behaviour, but some instances swap the left and right columns. If you're on such an instance what we refer to as the left column will be on your right and vice versa.
 
 ### Left column
 
 - first block: This section is dedicated to [posting](posting_reading_basic_functions.md)
 - second block: Here you can switch between the different views for the right column.
-- Optional third block: This is the Instance panel that can be activated, but is deactivated by default. It's fully customisable by instance admins and by default has links to the Akkoma-FE and Mastodon-FE.
+- Optional third block: This is the Instance panel that can be activated, but is deactivated by default. It's fully customisable by instance admins and by default has links to the Pleroma-FE and Mastodon-FE.
 - fourth block: This is the Notifications block, here you will get notified whenever somebody mentions you, follows you, repeats or favorites one of your statuses
 
 ### Right column

docs/docs/user_guide/posting_reading_basic_functions.md

@@ -15,13 +15,13 @@ Posts will contain the text you are posting, but some content will be modified:
 Let's clear up some basic stuff. When you post something it's called a **post** or it could be called a **status** or even a **toot** or a **prööt** depending on whom you ask. Post has body/content but it also has some other stuff in it - from attachments, visibility scope, subject line...
 
 **Emoji** are small images embedded in text, there are two major types of emoji: [unicode emoji](https://en.wikipedia.org/wiki/Emoji) and custom emoji. While unicode emoji are universal and standardized, they can appear differently depending on where you are using them or may not appear at all on older systems. Custom emoji are a more *fun* kind - instance administrator can define many images as *custom emoji* for their users. This works very simple - custom emoji is defined by its *shortcode* and an image, so that any shortcode enclosed in colons get replaced with image if such shortcode exist.
-Let's say there's a `:akkoma:` emoji defined on an instance. That means
-> First time using :akkoma: akkoma!
+Let's say there's a `:pleroma:` emoji defined on an instance. That means  
+> First time using :pleroma: pleroma!  
 
-will become
-> First time using ![akkoma](../assets/example_emoji.png) akkoma!
+will become  
+> First time using ![pleroma](../assets/example_emoji.png) pleroma!  
 
-Note that you can only use emoji defined on your instance, you cannot "copy" someone else's emoji, and will have to ask your administrator to copy emoji from other instance to yours.
+Note that you can only use emoji defined on your instance, you cannot "copy" someone else's emoji, and will have to ask your administrator to copy emoji from other instance to yours.  
 Lastly, there's two convenience options for emoji: an emoji picker (smiley face to the right of "submit" button) and autocomplete suggestions - when you start typing :shortcode: it will automatically try to suggest you emoji and complete the shortcode for you if you select one. If emoji doesn't show up in suggestions nor in emoji picker it means there's no such emoji on your instance, if shortcode doesn't match any defined emoji it will appear as text.
 
 **Attachments** are fairly simple - you can attach any file to a post as long as the file is within maximum size limits. If you're uploading explicit material you can mark all of your attachments as sensitive (or add the `#nsfw` tag) - it will hide the images and videos behind a warning so that it won't be displayed instantly.
@@ -42,7 +42,7 @@ A few things to consider about the security and usage of these scopes:
 - Changing scopes during a thread or adding people to a direct message will not retroactively make them see the whole conversation. If you add someone to a direct message conversation, they will not see the post that happened before they were mentioned.
 * **Reply-to** if you are replying to someone, your post will also contain a note that your post is referring to the post you're replying to. Person you're replying to will receive a notification *even* if you remove them from mentioned people. You won't receive notifications when replying to your own posts, but it's useful to reply to your own posts to provide people some context if it's a follow-up to a previous post. There's a small "Reply to ..." label under post author's name which you can hover on to see what post it's referring to.
 
-Sometimes you may encounter posts that seem different than what they are supposed to. For example, you might see a direct message without any mentions in the text. This can happen because internally, the Fediverse has a different addressing mechanism similar to email, with `to` and `cc` fields. While these are not directly accessible in Akkoma-FE, other software in the Fediverse might generate those posts. Do not worry in these cases, these are normal and not a bug.
+Sometimes you may encounter posts that seem different than what they are supposed to. For example, you might see a direct message without any mentions in the text. This can happen because internally, the Fediverse has a different addressing mechanism similar to email, with `to` and `cc` fields. While these are not directly accessible in PleromaFE, other software in the Fediverse might generate those posts. Do not worry in these cases, these are normal and not a bug.
 
 ## Rich text
 
@@ -51,7 +51,7 @@ By default new posts you make are plaintext, meaning you can't make text **bold*
 Here is a small example of some text in markdown.
 
 ```
-This is an example of markdown text using **bold** and *cursive* text.
+This is an example of markdown text using **bold** and *cursive* text.  
 To get a newline we add two spaces at the end of the previous line.
 
 Let's also add a list
@@ -67,7 +67,7 @@ If you set the input-method to Markdown, and post this, it will look something l
 
 ## Misskey markdown
 
-Akkoma-FE includes support for writing and rendering
+The akkoma version of pleroma-fe includes support for writing and rendering
 misskey markdown (MFM). To write this you will need to select "MFM" from
 the content type dropdown (if supported), and then you can format text
 [in MFM](https://akkoma.dev/sfr/marked-mfm/src/branch/master/docs/syntax.md).

docs/docs/user_guide/settings.md

@@ -83,7 +83,7 @@ Here you can change your password, revoke access tokens, configure 2-factor auth
 
 ## Theme
 
-Here you can change the look and feel of Akkoma-FE. You can choose from several instance-provided presets and you can load one from file and save current theme to file. Before you apply new theme you can see what it will look like approximately in preview section.
+Here you can change the look and feel of Pleroma-FE. You can choose from several instance-provided presets and you can load one from file and save current theme to file. Before you apply new theme you can see what it will look like approximately in preview section.
 
 The themes engine was made to be easy to use while giving an option for powerful in-depth customization - you can just tweak colors on "Common" tab and leave everything else as is.
 

docs/docs/user_guide/users_follow_mute_block.md

@@ -4,7 +4,7 @@ When you see someone, you can click on their user picture to view their profile,
 
 **Following** is self-explanatory, it adds them to your Home Timeline, lists you as a follower and gives you access to follower-only posts if they have any.
 
-**Muting** collapses posts and notifications made by them, giving you an option to see the post if you're curious. Clients other than Akkoma-FE may completely remove their posts.
+**Muting** collapses posts and notifications made by them, giving you an option to see the post if you're curious. Clients other than PleromaFE may completely remove their posts.
 
 **Blocking** a user removes them from your timeline and notifications and prevents them from following you (automatically unfollows them from you).
 

docs/mkdocs.yml

@@ -1,11 +1,11 @@
-site_name: Akkoma-FE Documentation
+site_name: Pleroma-FE Documentation
 theme:
-  favicon: 'images/akkoma_logo_vector_bg_32.png'
+  favicon: 'images/pleroma_logo_vector_bg_32.png'
   name: 'material'
   custom_dir: 'theme'
   # Disable google fonts
   font: false
-  logo: 'images/akkoma_logo_vector_nobg.svg'
+  logo: 'images/pleroma_logo_vector_nobg.svg'
   features:
     - tabs
   palette:
@@ -14,8 +14,8 @@ theme:
 
 extra_css:
   - css/extra.css
-repo_name: 'AkkomaGang/akkoma-fe'
-repo_url: 'https://akkoma.dev/AkkomaGang/akkoma-fe'
+repo_name: 'AkkomaGang/pleroma-fe'
+repo_url: 'https://akkoma.dev/AkkomaGang/pleroma-fe'
 
 extra:
   repo_icon: gitea

docs/theme/partials/source.html

@@ -38,11 +38,11 @@
 {% endif %}
 
 {% if page and page.url.startswith('backend') %}
-  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma" %}
-  {% set repo_name = "AkkomaGang/akkoma" %}
+  {% set repo_url = "https://git.pleroma.social/pleroma/pleroma" %}
+  {% set repo_name = "pleroma/pleroma" %}
 {% elif page and page.url.startswith('frontend') %}
-  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma-fe" %}
-  {% set repo_name = "AkkomaGang/akkoma-fe" %}
+  {% set repo_url = "https://git.pleroma.social/pleroma/pleroma-fe" %}
+  {% set repo_name = "pleroma/pleroma-fe" %}
 {% else %}
   {% set repo_url = config.repo_url %}
   {% set repo_name = config.repo_name %}

index.html

@@ -18,5 +18,6 @@
     <div id="app"></div>
     <div id="modal"></div>
     <!-- built files will be auto injected -->
+    <script type="text/javascript" src="/instance/pleroma-mod-loader.js"></script>
   </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "3.10.0",
+  "version": "3.5.0",
   "description": "A frontend for Akkoma instances",
   "author": "Roger Braun <roger@rogerbraun.net>",
   "private": true,

src/App.js

@@ -64,11 +64,6 @@ export default {
         '-' + this.layoutType
       ]
     },
-    pageBackground () {
-      return this.mergedConfig.displayPageBackgrounds
-        ? this.$store.state.users.displayBackground
-        : null
-    },
     currentUser () { return this.$store.state.users.currentUser },
     userBackground () { return this.currentUser.background_image },
     instanceBackground () {
@@ -76,7 +71,7 @@ export default {
         ? null
         : this.$store.state.instance.background
     },
-    background () { return this.pageBackground || this.userBackground || this.instanceBackground },
+    background () { return this.userBackground || this.instanceBackground },
     bgStyle () {
       if (this.background) {
         return {

src/App.scss

@@ -8,7 +8,7 @@
 }
 
 html {
-  font-size: 0.875rem;
+  font-size: 14px;
   // overflow-x: clip causes my browser's tab to crash with SIGILL lul
 }
 
@@ -469,7 +469,7 @@ textarea,
   color: $fallback--lightText;
   color: var(--inputText, $fallback--lightText);
   font-family: sans-serif;
-  font-family: var(--interfaceFont, sans-serif);
+  font-family: var(--inputFont, sans-serif);
   font-size: 1em;
   margin: 0;
   box-sizing: border-box;

src/boot/after_store.js

@@ -18,6 +18,8 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
 import FaviconService from '../services/favicon_service/favicon_service.js'
 
+import DomNodeToComponent from '../modules/domNodeToComponent.js'
+
 let staticInitialResults = null
 
 const parsedInitialResults = () => {
@@ -422,6 +424,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
 
   app.use(vClickOutside)
   app.use(VBodyScrollLock)
+  app.use(DomNodeToComponent)
 
   app.component('FAIcon', FontAwesomeIcon)
   app.component('FALayers', FontAwesomeLayers)

src/components/attachment/attachment.js

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

src/components/attachment/attachment.scss

@@ -37,7 +37,7 @@
       white-space: pre-line;
       word-break: break-word;
       text-overflow: ellipsis;
-      overflow: auto;
+      overflow: scroll;
     }
 
     &.-static {

src/components/chat/chat_layout.js

@@ -0,0 +1,108 @@
+const ChatLayout = {
+  methods: {
+    setChatLayout () {
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.overscrollBehavior = 'none'
+      }
+      if (this.isMobileLayout) {
+        this.setMobileChatLayout()
+      }
+    },
+    unsetChatLayout () {
+      this.unsetMobileChatLayout()
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.overscrollBehavior = 'unset'
+      }
+    },
+    setMobileChatLayout () {
+      // This is a hacky way to adjust the global layout to the mobile chat (without modifying the rest of the app).
+      // This layout prevents empty spaces from being visible at the bottom
+      // of the chat on iOS Safari (`safe-area-inset`) when
+      // - the on-screen keyboard appears and the user starts typing
+      // - the user selects the text inside the input area
+      // - the user selects and deletes the text that is multiple lines long
+      // TODO: unify the chat layout with the global layout.
+
+      let html = document.querySelector('html')
+      if (html) {
+        html.style.overflow = 'hidden'
+        html.style.height = '100%'
+      }
+
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.height = '100%'
+      }
+
+      let app = document.getElementById('app')
+      if (app) {
+        app.style.height = '100%'
+        app.style.overflow = 'hidden'
+        app.style.minHeight = 'auto'
+      }
+
+      let appBgWrapper = window.document.getElementById('app_bg_wrapper')
+      if (appBgWrapper) {
+        appBgWrapper.style.overflow = 'hidden'
+      }
+
+      let main = document.getElementsByClassName('main')[0]
+      if (main) {
+        main.style.overflow = 'hidden'
+        main.style.height = '100%'
+      }
+
+      let content = document.getElementById('content')
+      if (content) {
+        content.style.paddingTop = '0'
+        content.style.height = '100%'
+        content.style.overflow = 'visible'
+      }
+
+      this.$nextTick(() => {
+        this.updateSize()
+      })
+    },
+    unsetMobileChatLayout () {
+      let html = document.querySelector('html')
+      if (html) {
+        html.style.overflow = 'visible'
+        html.style.height = 'unset'
+      }
+
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.height = 'unset'
+      }
+
+      let app = document.getElementById('app')
+      if (app) {
+        app.style.height = '100%'
+        app.style.overflow = 'visible'
+        app.style.minHeight = '100vh'
+      }
+
+      let appBgWrapper = document.getElementById('app_bg_wrapper')
+      if (appBgWrapper) {
+        appBgWrapper.style.overflow = 'visible'
+      }
+
+      let main = document.getElementsByClassName('main')[0]
+      if (main) {
+        main.style.overflow = 'visible'
+        main.style.height = 'unset'
+      }
+
+      let content = document.getElementById('content')
+      if (content) {
+        content.style.paddingTop = '60px'
+        content.style.height = 'unset'
+        content.style.overflow = 'unset'
+      }
+    }
+  }
+}
+
+export default ChatLayout

src/components/chat_avatar/chat_avatar.js

@@ -0,0 +1,34 @@
+import StillImage from '../still-image/still-image.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { mapState } from 'vuex'
+
+const ChatAvatar = {
+  props: ['users', 'fallbackUser', 'width', 'height'],
+  components: {
+    StillImage
+  },
+  methods: {
+    getUserProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name)
+    }
+  },
+  computed: {
+    firstUser () {
+      return this.users[0] || this.fallbackUser
+    },
+    secondUser () {
+      return this.users[1]
+    },
+    thirdUser () {
+      return this.users[2]
+    },
+    fourthUser () {
+      return this.users[3]
+    },
+    ...mapState({
+      betterShadow: state => state.interface.browserSupport.cssFilter
+    })
+  }
+}
+
+export default ChatAvatar

src/components/chat_avatar/chat_avatar.vue

@@ -0,0 +1,130 @@
+<template>
+  <div
+    v-if="firstUser && secondUser"
+    class="direct-conversation-multi-user-avatar"
+    :style="{ 'width': width, 'height': height }"
+  >
+    <StillImage
+      v-if="fourthUser"
+      class="avatar avatar-fourth direct-conversation-avatar"
+      :alt="fourthUser.screen_name"
+      :title="fourthUser.screen_name"
+      :src="fourthUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+    />
+    <StillImage
+      v-if="thirdUser"
+      class="avatar avatar-third direct-conversation-avatar"
+      :alt="thirdUser.screen_name"
+      :title="thirdUser.screen_name"
+      :src="thirdUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+    />
+    <StillImage
+      class="avatar avatar-second direct-conversation-avatar"
+      :alt="secondUser.screen_name"
+      :title="secondUser.screen_name"
+      :src="secondUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+      :style="{ 'height': fourthUser ? '50%' : '100%' }"
+    />
+    <StillImage
+      class="avatar avatar-first direct-conversation-avatar"
+      :alt="firstUser.screen_name"
+      :title="firstUser.screen_name"
+      :src="firstUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+      :style="{ 'height': thirdUser ? '50%' : '100%' }"
+    />
+  </div>
+  <router-link
+    v-else
+    :to="getUserProfileLink(firstUser)"
+  >
+    <StillImage
+      :style="{ 'width': width, 'height': height }"
+      class="avatar direct-conversation-avatar single-user"
+      :alt="firstUser.screen_name"
+      :title="firstUser.screen_name"
+      :src="firstUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+    />
+  </router-link>
+</template>
+
+<script src="./chat_avatar.js"></script>
+<style lang="scss">
+@import '../../_variables.scss';
+
+.direct-conversation-multi-user-avatar {
+  position: relative;
+  cursor: pointer;
+  width: 48px;
+  height: 48px;
+  border-radius: 50%;
+  overflow: hidden;
+
+  .avatar.still-image {
+    width: 50%;
+    height: 50%;
+    border-radius: 0;
+    img, canvas {
+      object-fit: cover;
+    }
+
+    &.avatar-first {
+      float: right;
+      position: absolute;
+      bottom: 0;
+    }
+
+    &.avatar-second {
+      float: right;
+    }
+
+    &.avatar-third {
+      float: right;
+      position: absolute;
+    }
+
+    &.avatar-fourth {
+      float: right;
+      position: absolute;
+      bottom: 0;
+      right: 0;
+    }
+  }
+}
+
+.direct-conversation-avatar {
+  display: inline-block;
+  vertical-align: middle;
+
+  &.single-user {
+    border-radius: $fallback--avatarAltRadius;
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+  }
+
+  .avatar.still-image {
+    width: 48px;
+    height: 48px;
+
+    box-shadow: var(--avatarStatusShadow);
+    border-radius: 0;
+
+    &.better-shadow {
+      box-shadow: var(--avatarStatusShadowInset);
+      filter: var(--avatarStatusShadowFilter)
+    }
+
+    &.animated::before {
+      display: none;
+    }
+  }
+}
+</style>

src/components/chat_message_date/chat_message_date.vue

@@ -18,7 +18,7 @@ export default {
       if (this.date.getTime() === today.getTime()) {
         return this.$t('display_date.today')
       } else {
-        return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale), { day: 'numeric', month: 'long' })
+        return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale.split('_')[0]), { day: 'numeric', month: 'long' })
       }
     }
   }

src/components/emoji_input/emoji_input.js

@@ -249,8 +249,8 @@ const EmojiInput = {
        * them, masto seem to be rendering :emoji::emoji: correctly now so why not
        */
       const isSpaceRegex = /\s/
-      const spaceBefore = (surroundingSpace && !isSpaceRegex.exec(before.slice(-1)) && before.length && this.padEmoji > 0) ? ' ' : ''
-      const spaceAfter = (surroundingSpace && !isSpaceRegex.exec(after[0]) && this.padEmoji) ? ' ' : ''
+      const spaceBefore = (surroundingSpace && !isSpaceRegex.exec(before.slice(-1)) && before.length && this.padEmoji > 0) ? ' ' : '​'
+      const spaceAfter = (surroundingSpace && !isSpaceRegex.exec(after[0]) && this.padEmoji) ? ' ' : '​'
 
       const newValue = [
         before,

src/components/emoji_picker/emoji_picker.js

@@ -7,7 +7,7 @@ import {
   faStickyNote,
   faSmileBeam
 } from '@fortawesome/free-solid-svg-icons'
-import { trim, escapeRegExp, startCase, debounce } from 'lodash'
+import { trim, escapeRegExp, startCase } from 'lodash'
 
 library.add(
   faBoxOpen,
@@ -42,9 +42,6 @@ const EmojiPicker = {
     EmojiGrid
   },
   methods: {
-    debouncedSearch: debounce(function (e) {
-      this.keyword = e.target.value
-    }, 500),
     onStickerUploaded (e) {
       this.$emit('sticker-uploaded', e)
     },
@@ -88,6 +85,17 @@ const EmojiPicker = {
     activeGroupView () {
       return this.showingStickers ? '' : this.activeGroup
     },
+    stickersAvailable () {
+      if (this.$store.state.instance.stickers) {
+        return this.$store.state.instance.stickers.length > 0
+      }
+      return 0
+    },
+    filteredEmoji () {
+      return this.filterByKeyword(
+        this.$store.state.instance.customEmoji || []
+      )
+    },
     emojis () {
       const recentEmojis = this.$store.getters.recentEmojis
       const standardEmojis = this.$store.state.instance.emoji || []

src/components/emoji_picker/emoji_picker.vue

@@ -44,10 +44,11 @@
       >
         <div class="emoji-search">
           <input
+            v-model="keyword"
             type="text"
             class="form-control"
             :placeholder="$t('emoji.search_emoji')"
-            @input="debouncedSearch"
+            @input="$event.target.composing = false"
           >
         </div>
         <EmojiGrid

src/components/emoji_reactions/emoji_reactions.js

@@ -1,6 +1,5 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserListPopover from '../user_list_popover/user_list_popover.vue'
-import StillImage from '../still-image/still-image.vue'
 
 const EMOJI_REACTION_COUNT_CUTOFF = 12
 
@@ -13,8 +12,7 @@ const EmojiReactions = {
   name: 'EmojiReactions',
   components: {
     UserAvatar,
-    UserListPopover,
-    StillImage
+    UserListPopover
   },
   props: ['status'],
   data: () => ({

src/components/emoji_reactions/emoji_reactions.vue

@@ -14,13 +14,12 @@
         <span
           v-if="reaction.url !== null"
         >
-          <StillImage
+          <img
             :src="reaction.url"
             :title="reaction.name"
-            :alt="reaction.name"
             class="reaction-emoji"
             height="2.55em"
-          />
+          >
           {{ reaction.count }}
         </span>
         <span v-else>

src/components/extra_buttons/extra_buttons.js

@@ -136,26 +136,18 @@ const ExtraButtons = {
     },
     doRedraftStatus () {
       this.$store.dispatch('fetchStatusSource', { id: this.status.id })
-        .then(data => {
-          let repliedUserId = this.status.in_reply_to_user_id;
-          let repliedUser = this.status.attentions.filter(user =>
-            user.id === repliedUserId);
-          this.$store.dispatch('openPostStatusModal', {
-            isRedraft: true,
-            attentions: this.status.attentions,
-            statusId: this.status.id,
-            subject: data.spoiler_text,
-            statusText: data.text,
-            statusIsSensitive: this.status.nsfw,
-            statusPoll: this.status.poll,
-            statusFiles: [...this.status.attachments],
-            statusScope: this.status.visibility,
-            statusLanguage: this.status.language,
-            statusContentType: data.content_type,
-            replyTo: this.status.in_reply_to_status_id,
-            repliedUser: repliedUser
-          })
-        })
+        .then(data => this.$store.dispatch('openPostStatusModal', {
+          isRedraft: true,
+          statusId: this.status.id,
+          subject: data.spoiler_text,
+          statusText: data.text,
+          statusIsSensitive: this.status.nsfw,
+          statusPoll: this.status.poll,
+          statusFiles: [...this.status.attachments],
+          statusScope: this.status.visibility,
+          statusLanguage: this.status.language,
+          statusContentType: data.content_type
+        }))
       this.doDeleteStatus()
     },
     showRedraftStatusConfirmDialog () {

src/components/favorite_button/favorite_button.vue

@@ -55,9 +55,6 @@
 
   .interactive {
     .svg-inline--fa {
-      @media (prefers-reduced-motion: reduce) {
-        animation: unset;
-      }
       animation-duration: 0.6s;
     }
 

src/components/flash/flash.js

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

src/components/flash/flash.vue

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

src/components/list/list.vue

@@ -1,13 +1,9 @@
 <template>
-  <div
-    class="list"
-    role="list"
-  >
+  <div class="list">
     <div
       v-for="item in items"
       :key="getKey(item)"
       class="list-item"
-      role="listitem"
     >
       <slot
         name="item"

src/components/media_modal/media_modal.js

@@ -4,7 +4,6 @@ import Modal from '../modal/modal.vue'
 import PinchZoom from '../pinch_zoom/pinch_zoom.vue'
 import SwipeClick from '../swipe_click/swipe_click.vue'
 import GestureService from '../../services/gesture_service/gesture_service'
-import Flash from 'src/components/flash/flash.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -27,8 +26,7 @@ const MediaModal = {
     VideoAttachment,
     PinchZoom,
     SwipeClick,
-    Modal,
-    Flash
+    Modal
   },
   data () {
     return {

src/components/media_modal/media_modal.vue

@@ -48,13 +48,6 @@
       :title="currentMedia.description"
       controls
     />
-    <Flash
-      v-if="type === 'flash'"
-      class="modal-image"
-      :src="currentMedia.url"
-      :alt="currentMedia.description"
-      :title="currentMedia.description"
-    />
     <button
       v-if="canNavigate"
       :title="$t('media_modal.previous')"

src/components/mention_link/mention_link.js

@@ -93,6 +93,9 @@ const MentionLink = {
         this.highlightType
       ]
     },
+    useAtIcon () {
+      return this.mergedConfig.useAtIcon
+    },
     isRemote () {
       return this.userName !== this.userNameFull
     },

src/components/mobile_nav/mobile_nav.vue

@@ -157,9 +157,6 @@
     box-shadow: var(--panelShadow);
     transition-property: transform;
     transition-duration: 0.25s;
-    @media (prefers-reduced-motion: reduce) {
-      transition: unset;
-    }
     transform: translateX(0);
     z-index: 1001;
     -webkit-overflow-scrolling: touch;

src/components/nav_panel/nav_panel.js

@@ -47,6 +47,9 @@ const NavPanel = {
     }
   },
   computed: {
+    compactNavPanel () {
+      return this.$store.getters.mergedConfig.compactNavPanel || false
+    },
     ...mapState({
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,

src/components/nav_panel/nav_panel.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="NavPanel">
+  <div
+    class="NavPanel"
+    :class="{ compact: compactNavPanel }"
+  >
     <div class="panel panel-default">
       <ul>
         <li v-if="currentUser || !privateMode">
@@ -211,5 +214,83 @@
     right: 0.6rem;
     top: 1.25em;
   }
+
+  &.compact {
+    .panel {
+      overflow: visible;
+
+      ul > li:hover > a:not(.router-link-active) > .button-icon {
+        color: var(--selectedMenuText,#b9b9ba);
+      }
+
+      ul > li > .router-link-active > .button-icon {
+        color: var(--selectedMenuLightText);
+      }
+
+      ul {
+        display: flex;
+        height: 100%;
+        padding: 0;
+      }
+
+      li {
+        width: -moz-available;
+        width: -webkit-fill-available;
+        border-bottom: none;
+
+        a {
+          border-radius: 0 !important;
+        }
+      }
+
+      .timelines-chevron {
+        display: none;
+      }
+
+      .timelines-background {
+        position: absolute;
+        z-index: 10000;
+      }
+
+      a, button {
+        font-size: 0;
+        height: 100%;
+        display: flex;
+        position: relative;
+        padding-top: 7px;
+        padding-bottom: 7px;
+      }
+
+      .button-icon, svg.svg-inline--fa {
+        margin: auto;
+        font-size: 20px;
+        color: var(--link,#d8a070);
+      }
+
+      .badge {
+        position: absolute;
+        right: 0;
+        background-color: red;
+        background-color: var(--badgeNotification,red);
+        color: #fff;
+        color: var(--badgeNotificationText,#fff);
+
+        // remove layout
+        padding: 0;
+        margin: 0;
+        box-shadow: black 0 1px 5px;
+        display: inline-block;
+        border-radius: 99px;
+        min-width: 22px;
+        line-height: 22px;
+        min-height: 22px;
+        max-height: 22px;
+        font-size: 14px;
+        font-weight: normal;
+        font-style: normal;
+        font-family: inherit;
+      }
+    }
+  }
 }
 </style>

src/components/notification/notification.js

@@ -1,9 +1,9 @@
-import StatusContent from '../status_content/status_content.vue'
 import { mapState } from 'vuex'
 import Status from '../status/status.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
+import StatusContent from '../status_content/status_content.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'

src/components/notification/notification.vue

@@ -151,6 +151,7 @@
             >
               <Timeago
                 :time="notification.created_at"
+                :with-direction="true"
                 :auto-update="240"
               />
             </router-link>

src/components/notifications/notifications.scss

@@ -105,12 +105,9 @@
     flex: 1;
     padding-left: 0.8em;
     min-width: 0;
-  }
 
-  .heading-right, .notification-right {
     .timeago {
-      display: inline-block;
-      min-width: 6em;
+      min-width: 3em;
       text-align: right;
     }
   }

src/components/popover/popover.vue

@@ -114,7 +114,7 @@
       svg {
         width: 22px;
         margin-right: 0.75rem;
-        color: var(--popoverIcon, $fallback--icon)
+        color: var(--menuPopoverIcon, $fallback--icon)
       }
     }
 

src/components/post_status_form/post_status_form.js

@@ -138,7 +138,7 @@ const PostStatusForm = {
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage } = this.$store.getters.mergedConfig
 
     let statusParams = {
       spoilerText: this.subject || '',
@@ -199,10 +199,6 @@ const PostStatusForm = {
       }
     }
 
-    // When first loading the form, hide the subject (CW) field if it's disabled or doesn't have a starting value.
-    // "disableSubject" seems to take priority over "alwaysShowSubjectInput".
-    const showSubject = !this.disableSubject && (statusParams.spoilerText || alwaysShowSubjectInput)
-
     return {
       dropFiles: [],
       uploadingFiles: false,
@@ -217,10 +213,7 @@ const PostStatusForm = {
       preview: null,
       previewLoading: false,
       emojiInputShown: false,
-      idempotencyKey: '',
-      activeEmojiInput: undefined,
-      activeTextInput: undefined,
-      subjectVisible: showSubject
+      idempotencyKey: ''
     }
   },
   computed: {
@@ -496,6 +489,7 @@ const PostStatusForm = {
       }
     },
     addMediaFile (fileInfo) {
+      this.$emit('resize')
       this.newStatus.files.push(fileInfo)
 
       if (this.$store.getters.mergedConfig.sensitiveIfSubject && this.newStatus.spoilerText !== '') {
@@ -504,6 +498,7 @@ const PostStatusForm = {
       this.$emit('resize', { delayed: true })
     },
     removeMediaFile (fileInfo) {
+      this.$emit('resize')
       let index = this.newStatus.files.indexOf(fileInfo)
       this.newStatus.files.splice(index, 1)
       this.$emit('resize')
@@ -681,33 +676,8 @@ const PostStatusForm = {
       this.$refs['emoji-input'].resize()
     },
     showEmojiPicker () {
-      if (!this.activeEmojiInput || !this.activeTextInput)
-        this.focusStatusInput()
-
-      this.$refs[this.activeTextInput].focus()
-      this.$refs[this.activeEmojiInput].triggerShowPicker()
-    },
-    focusStatusInput() {
-      this.activeEmojiInput = 'emoji-input'
-      this.activeTextInput = 'textarea'
-    },
-    focusSubjectInput() {
-      this.activeEmojiInput = 'subject-emoji-input'
-      this.activeTextInput = 'subject-input'
-    },
-    toggleSubjectVisible() {
-      // If hiding CW, then we need to clear the subject and reset focus
-      if (this.subjectVisible)
-      {
-        this.focusStatusInput()
-
-        // "nsfw" property is normally set by the @change listener, but this bypasses it.
-        // We need to clear it manually instead.
-        this.newStatus.spoilerText = ''
-        this.newStatus.nsfw = false
-      }
-
-      this.subjectVisible = !this.subjectVisible
+      this.$refs['textarea'].focus()
+      this.$refs['emoji-input'].triggerShowPicker()
     },
     clearError () {
       this.error = null

src/components/post_status_form/post_status_form.vue

@@ -118,16 +118,13 @@
           />
         </div>
         <EmojiInput
-          ref="subject-emoji-input"
-          v-if="subjectVisible"
+          v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
           v-model="newStatus.spoilerText"
           enable-emoji-picker
-          hide-emoji-button
           :suggest="emojiSuggestor"
           class="form-control"
         >
           <input
-            ref="subject-input"
             v-model="newStatus.spoilerText"
             type="text"
             :placeholder="$t('post_status.content_warning')"
@@ -135,7 +132,6 @@
             size="1"
             class="form-post-subject"
             @input="onSubjectInput"
-            @focus="focusSubjectInput()"
           >
         </EmojiInput>
         <i18n-t
@@ -177,7 +173,6 @@
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
-            @focus="focusStatusInput()"
           />
           <p
             v-if="hasStatusLengthLimit"
@@ -281,15 +276,6 @@
           >
             <FAIcon icon="poll-h" />
           </button>
-          <button
-            v-if="!disableSubject"
-            class="spoiler-icon button-unstyled"
-            :class="{ selected: subjectVisible }"
-            :title="$t('post_status.toggle_content_warning')"
-            @click="toggleSubjectVisible"
-          >
-            <FAIcon icon="eye-slash" />
-          </button>
         </div>
         <button
           v-if="posting"
@@ -305,14 +291,12 @@
         >
           {{ $t('post_status.post') }}
         </button>
-        <!-- To keep the OSK at the same position after a message send, -->
-        <!-- @touchstart.stop.prevent was used. But while OSK position is -->
-        <!-- quirky, accidental mobile posts caused by the workaround -->
-        <!-- when people tried to scroll were a more serious bug. -->
+        <!-- touchstart is used to keep the OSK at the same position after a message send -->
         <button
           v-else
           :disabled="uploadingFiles || disableSubmit"
           class="btn button-default"
+          @touchstart.stop.prevent="postStatus($event, newStatus)"
           @click.stop.prevent="postStatus($event, newStatus)"
         >
           {{ $t('post_status.post') }}
@@ -470,7 +454,7 @@
     }
   }
 
-  .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
+  .media-upload-icon, .poll-icon, .emoji-icon {
     font-size: 1.85em;
     line-height: 1.1;
     flex: 1;
@@ -513,11 +497,6 @@
 
   .poll-icon {
     order: 3;
-    justify-content: center;
-  }
-
-  .spoiler-icon {
-    order: 4;
     justify-content: right;
   }
 
@@ -637,4 +616,5 @@
     border: 2px dashed var(--text, $fallback--text);
   }
 }
+
 </style>

src/components/retweet_button/retweet_button.vue

@@ -74,9 +74,6 @@
 
   .interactive {
     .svg-inline--fa {
-      @media (prefers-reduced-motion: reduce) {
-        animation: unset;
-      }
       animation-duration: 0.6s;
     }
 

src/components/select/select.vue

@@ -38,7 +38,7 @@ label.Select {
     margin: 0;
     padding: 0 2em 0 .2em;
     font-family: sans-serif;
-    font-family: var(--interfaceFont, sans-serif);
+    font-family: var(--inputFont, sans-serif);
     font-size: 1em;
     width: 100%;
     z-index: 1;

src/components/settings_modal/tabs/general_tab.vue

@@ -21,6 +21,7 @@
             >
               {{ $t('settings.settings_profile_force_sync') }}
             </button>
+
           </p>
           <div
             @click="toggleExpandedSettings"
@@ -101,11 +102,41 @@
             {{ $t('settings.hide_isp') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="showThirdColumn">
+            {{ $t('settings.show_third_column') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="sidebarRight">
+            {{ $t('settings.right_sidebar') }}
+          </BooleanSetting>
+        </li>
         <li v-if="instanceWallpaperUsed">
           <BooleanSetting path="hideInstanceWallpaper">
             {{ $t('settings.hide_wallpaper') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="compactNavPanel">
+            {{ $t('settings.compact_nav_panel') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="compactUserPanel">
+            {{ $t('settings.compact_user_panel') }}
+          </BooleanSetting>
+        </li>
+        <li v-if="instanceShoutboxPresent">
+          <BooleanSetting path="hideShoutbox">
+            {{ $t('settings.hide_shoutbox') }}
+          </BooleanSetting>
+        </li>
+      </ul>
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('nav.timeline') }}</h2>
+      <ul class="setting-list">
         <li>
           <BooleanSetting
             path="hideSiteFavicon"
@@ -146,11 +177,6 @@
             {{ $t('settings.show_wider_shortcuts') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting path="displayPageBackgrounds">
-            {{ $t('settings.show_page_backgrounds') }}
-          </BooleanSetting>
-        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
@@ -488,6 +514,14 @@
             </BooleanSetting>
           </li>
         </ul>
+        <li>
+          <BooleanSetting
+            path="useAtIcon"
+            expert="1"
+          >
+            {{ $t('settings.use_at_icon') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="mentionLinkShowAvatar">
             {{ $t('settings.mention_link_show_avatar') }}

src/components/settings_modal/tabs/mutes_and_blocks_tab.js

@@ -10,20 +10,17 @@ import SelectableList from 'src/components/selectable_list/selectable_list.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 import withSubscription from 'src/components/../hocs/with_subscription/with_subscription'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
-import withLoadMore from 'src/components/../hocs/with_load_more/with_load_more'
 
-const BlockList = withLoadMore({
+const BlockList = withSubscription({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
   select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
-  childPropName: 'items',
-  destroy: () => {}
+  childPropName: 'items'
 })(SelectableList)
 
-const MuteList = withLoadMore({
+const MuteList = withSubscription({
   fetch: (props, $store) => $store.dispatch('fetchMutes'),
   select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
-  childPropName: 'items',
-  destroy: () => {}
+  childPropName: 'items'
 })(SelectableList)
 
 const DomainMuteList = withSubscription({

src/components/settings_modal/tabs/profile_tab.js

@@ -12,7 +12,6 @@ import InterfaceLanguageSwitcher from 'src/components/interface_language_switche
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import localeService from 'src/services/locale/locale.service.js'
-import ChoiceSetting from '../helpers/choice_setting.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -33,7 +32,6 @@ const ProfileTab = {
       newName: this.$store.state.users.currentUser.name_unescaped,
       newBio: unescape(this.$store.state.users.currentUser.description),
       newLocked: this.$store.state.users.currentUser.locked,
-      newPermitFollowback: this.$store.state.users.currentUser.permit_followback,
       newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
       showRole: this.$store.state.users.currentUser.show_role,
       role: this.$store.state.users.currentUser.role,
@@ -48,16 +46,9 @@ const ProfileTab = {
       emailLanguage: this.$store.state.users.currentUser.language || '',
       newPostTTLDays: this.$store.state.users.currentUser.status_ttl_days,
       expirePosts: this.$store.state.users.currentUser.status_ttl_days !== null,
-      userAcceptsDirectMessagesFrom: this.$store.state.users.currentUser.accepts_direct_messages_from,
-      userAcceptsDirectMessagesFromOptions: ["everybody", "nobody", "people_i_follow"].map(mode => ({
-        key: mode,
-        value: mode,
-        label: this.$t(`settings.user_accepts_direct_messages_from_${mode}`)
-      }))
     }
   },
   components: {
-    ChoiceSetting,
     ScopeSelector,
     ImageCropper,
     EmojiInput,
@@ -135,9 +126,7 @@ const ProfileTab = {
         fields_attributes: this.newFields.filter(el => el != null),
         bot: this.bot,
         show_role: this.showRole,
-        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
-        permit_followback: this.permit_followback,
-        accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
+        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1
         /* eslint-enable camelcase */
       }
 

src/components/settings_modal/tabs/profile_tab.vue

@@ -89,15 +89,6 @@
           {{ $t('settings.bot') }}
         </Checkbox>
       </p>
-      <p>
-        <ChoiceSetting
-          id="userAcceptsDirectMessagesFrom"
-          path="userAcceptsDirectMessagesFrom"
-          :options="userAcceptsDirectMessagesFromOptions"
-        >
-          {{ $t('settings.user_accepts_direct_messages_from') }}
-        </ChoiceSetting>
-      </p>
       <p>
         <Checkbox v-model="expirePosts">
           {{ $t('settings.expire_posts_enabled') }}
@@ -111,9 +102,6 @@
           class="expire-posts-days"
           :placeholder="$t('settings.expire_posts_input_placeholder')"
         />
-      </p>
-      <p>
-
       </p>
       <p>
         <interface-language-switcher
@@ -259,19 +247,6 @@
           <BooleanSetting path="serverSide_locked">
             {{ $t('settings.lock_account_description') }}
           </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !serverSide_locked}]"
-          >
-            <li>
-              <BooleanSetting
-                path="serverSide_permitFollowback"
-                :disabled="!serverSide_locked"
-              >
-                {{ $t('settings.permit_followback_description') }}
-              </BooleanSetting>
-            </li>
-          </ul>
         </li>
         <li>
           <BooleanSetting path="serverSide_discoverable">

src/components/settings_modal/tabs/security_tab/security_tab.js

@@ -48,7 +48,7 @@ const SecurityTab = {
         return {
           id: oauthToken.id,
           appName: oauthToken.app_name,
-          validUntil: new Date(oauthToken.valid_until).toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale))
+          validUntil: new Date(oauthToken.valid_until).toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale.split('_')[0]))
         }
       })
     }

src/components/settings_modal/tabs/theme_tab/theme_tab.scss

@@ -89,10 +89,6 @@
     margin: 1em 1em 0;
   }
 
-  .presets {
-    text-align: center;
-  }
-
   .tab-header {
     display: flex;
     justify-content: space-between;

src/components/settings_modal/tabs/version_tab.js

@@ -1,7 +1,7 @@
 import { extractCommit } from 'src/services/version/version.service'
 
-const pleromaFeCommitUrl = 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/'
-const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/'
+const pleromaFeCommitUrl = 'https://akkoma.dev/puniko/pleroma-fe/commit/'
+const pleromaBeCommitUrl = 'https://akkoma.dev/puniko/akkoma/commits/'
 
 const VersionTab = {
   data () {

src/components/side_drawer/side_drawer.vue

@@ -268,10 +268,6 @@
 .side-drawer {
   overflow-x: hidden;
   transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
-  @media (prefers-reduced-motion: reduce) {
-    transition-timing-function: unset;
-    transition: unset;
-  }
   transition: 0.35s;
   transition-property: transform;
   margin: 0 0 0 -100px;

src/components/status/status.js

@@ -20,7 +20,6 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import { muteWordHits } from '../../services/status_parser/status_parser.js'
 import { unescape, uniqBy } from 'lodash'
-import StillImage from '../still-image/still-image.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -118,8 +117,7 @@ const Status = {
     RichContent,
     MentionLink,
     MentionsLine,
-    QuoteButton,
-    StillImage
+    QuoteButton
   },
   props: [
     'statusoid',

src/components/status/status.vue

@@ -174,12 +174,12 @@
                   >
                     @{{ status.user.screen_name_ui }}
                   </router-link>
-                  <StillImage
+                  <img
                     v-if="!!(status.user && status.user.favicon)"
                     class="status-favicon"
                     :src="status.user.favicon"
                     :title="faviconAlt(status)"
-                  />
+                  >
                 </span>
               </div>
 
@@ -190,7 +190,7 @@
                 >
                   <Timeago
                     :time="status.created_at"
-                    :with-direction="!compact"
+                    :with-direction="true"
                     :auto-update="60"
                   />
                 </router-link>
@@ -466,12 +466,16 @@
               :logged-in="loggedIn"
               :status="status"
             />
+            <ReactButton
+              v-if="swapReacts && loggedIn"
+              :status="status"
+            />
             <favorite-button
               :logged-in="loggedIn"
               :status="status"
             />
             <ReactButton
-              v-if="loggedIn"
+              v-if="!swapReacts && loggedIn"
               :status="status"
             />
             <extra-buttons

src/components/status_body/status_body.scss

@@ -17,9 +17,6 @@
 
   .emoji:hover {
     transform: scale(1.4);
-    @media (prefers-reduced-motion: reduce) {
-      transition: unset;
-    }
     transition: 0.05s;
   }
 

src/components/still-image/still-image.js

@@ -11,9 +11,8 @@ const StillImage = {
   ],
   data () {
     return {
-      stopGifs: this.$store.getters.mergedConfig.stopGifs || window.matchMedia('(prefers-reduced-motion: reduce)').matches,
-      isAnimated: false,
-      imageTypeLabel: ''
+      stopGifs: this.$store.getters.mergedConfig.stopGifs,
+      isAnimated: false
     }
   },
   computed: {
@@ -40,24 +39,14 @@ const StillImage = {
       this.imageLoadError && this.imageLoadError()
     },
     detectAnimation (image) {
-      const mediaProxyAvailable = this.$store.state.instance.mediaProxyAvailable
-
-      if (!mediaProxyAvailable) {
-        // It's a bit aggressive to assume all images we can't find the mimetype of is animated, but necessary for
-        // people in need of reduced motion accessibility. As such, we'll consider those images animated if the user
-        // agent is set to prefer reduced motion. Otherwise, it'll just be used as an early exit.
-        if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
-          // Since the canvas and images are not pixel-perfect matching (due to scaling),
-          // It makes the images jiggle on hover, which is not ideal for accessibility, methinks
-          this.isAnimated = true
-          return
-        }
-        this.detectWithoutMediaProxy(image)
-      } else {
-        this.detectWithMediaProxy(image)
+      if (this.mimetype === 'image/gif' || this.src.endsWith('.gif')) {
+        this.isAnimated = true
+        return
       }
-    },
-    detectAnimationWithFetch (image) {
+      // harmless CORS errors without-- clean console with
+      if (!this.$store.state.instance.mediaProxyAvailable) return
+      // Animated JPEGs?
+      if (!(this.src.endsWith('.webp') || this.src.endsWith('.png'))) return
       // Browser Cache should ensure image doesn't get loaded twice if cache exists
       fetch(image.src, {
         referrerPolicy: 'same-origin'
@@ -66,20 +55,12 @@ const StillImage = {
           // We don't need to read the whole file so only call it once
           data.body.getReader().read()
             .then(reader => {
-              // Ordered from least to most intensive
-              if (this.isGIF(reader.value)) {
+              if (this.src.endsWith('.webp') && this.isAnimatedWEBP(reader.value)) {
                 this.isAnimated = true
-                this.setLabel('GIF')
                 return
               }
-              if (this.isAnimatedWEBP(reader.value)) {
+              if (this.src.endsWith('.png') && this.isAnimatedPNG(reader.value)) {
                 this.isAnimated = true
-                this.setLabel('WEBP')
-                return
-              }
-              if (this.isAnimatedPNG(reader.value)) {
-                this.isAnimated = true
-                this.setLabel('APNG')
               }
             })
         })
@@ -87,53 +68,6 @@ const StillImage = {
           // this.imageLoadError && this.imageLoadError()
         })
     },
-    detectWithMediaProxy (image) {
-      this.detectAnimationWithFetch(image)
-    },
-    detectWithoutMediaProxy (image) {
-      // We'll just assume that gifs and webp are animated
-      const extension = image.src.split('.').pop().toLowerCase()
-
-      if (extension === 'gif') {
-        this.isAnimated = true
-        this.setLabel('GIF')
-        return
-      }
-      if (extension === 'webp') {
-        this.isAnimated = true
-        this.setLabel('WEBP')
-        return
-      }
-      // Beware the apng! use this if ye dare
-      // if (extension === 'png') {
-      //  this.isAnimated = true
-      //  this.setLabel('PNG')
-      //  return
-      // }
-      
-      // Hail mary for extensionless
-      if (extension.includes('/')) {
-        // Don't mind the CORS error barrage
-        this.detectAnimationWithFetch(image)
-      }
-    },
-    setLabel (name) {
-      this.imageTypeLabel = name;
-    },
-    isGIF (data) {
-      // I am a perfectly sane individual
-      //
-      // GIF HEADER CHUNK
-      // === START HEADER ===
-      // 47 49 46 38 ("GIF8")
-      const gifHeader = [0x47, 0x49, 0x46];
-      for (let i = 0; i < 3; i++) {
-        if (data[i] !== gifHeader[i]) {
-          return false;
-        }
-      }
-      return true
-    },
     isAnimatedWEBP (data) {
       /**
        * WEBP HEADER CHUNK
@@ -167,55 +101,16 @@ const StillImage = {
       const idatPos = str.indexOf('IDAT')
       return (str.substring(0, idatPos > 0 ? idatPos : 0).indexOf('acTL') > 0)
     },
-    drawThumbnail() {
-      const canvas = this.$refs.canvas;
-      if (!canvas) return;
-    
-      const context = canvas.getContext('2d');
-      const image = this.$refs.src;
-      const parentElement = canvas.parentElement;
-    
-      // Draw the quick, unscaled version first
-      context.drawImage(image, 0, 0, parentElement.clientWidth, parentElement.clientHeight);
-    
-      // Use requestAnimationFrame to schedule the scaling to the next frame
-      requestAnimationFrame(() => {
-        // Compute scaling ratio between the natural dimensions of the image and its display dimensions
-        const scalingRatioWidth = parentElement.clientWidth / image.naturalWidth;
-        const scalingRatioHeight = parentElement.clientHeight / image.naturalHeight;
-
-        // Adjust for high-DPI displays
-        const ratio = window.devicePixelRatio || 1;
-        canvas.width = image.naturalWidth * scalingRatioWidth * ratio;
-        canvas.height = image.naturalHeight * scalingRatioHeight * ratio;
-        canvas.style.width = `${parentElement.clientWidth}px`;
-        canvas.style.height = `${parentElement.clientHeight}px`;
-        context.scale(ratio, ratio);
-    
-        // Maintain the aspect ratio of the image
-        const imgAspectRatio = image.naturalWidth / image.naturalHeight;
-        const canvasAspectRatio = parentElement.clientWidth / parentElement.clientHeight;
-    
-        let drawWidth, drawHeight;
-    
-        if (imgAspectRatio > canvasAspectRatio) {
-          drawWidth = parentElement.clientWidth;
-          drawHeight = parentElement.clientWidth / imgAspectRatio;
-        } else {
-          drawHeight = parentElement.clientHeight;
-          drawWidth = parentElement.clientHeight * imgAspectRatio;
-        }
-    
-        context.clearRect(0, 0, canvas.width, canvas.height);  // Clear the previous unscaled image
-        context.imageSmoothingEnabled = true;
-        context.imageSmoothingQuality = 'high';
-
-        // Draw the good one for realsies
-        const dx = (parentElement.clientWidth - drawWidth) / 2;
-        const dy = (parentElement.clientHeight - drawHeight) / 2;
-        context.drawImage(image, dx, dy, drawWidth, drawHeight);
-      });
-    }    
+    drawThumbnail () {
+      const canvas = this.$refs.canvas
+      if (!this.$refs.canvas) return
+      const image = this.$refs.src
+      const width = image.naturalWidth
+      const height = image.naturalHeight
+      canvas.width = width
+      canvas.height = height
+      canvas.getContext('2d').drawImage(image, 0, 0, width, height)
+    }
   },
   updated () {
     // On computed animated change

src/components/still-image/still-image.vue

@@ -1,15 +1,9 @@
 <template>
   <div
-    ref="still-image"
     class="still-image"
     :class="{ animated: animated }"
     :style="style"
   >
-    <div
-      v-if="animated && imageTypeLabel"
-      class="image-type-label">
-        {{ imageTypeLabel }}
-    </div>
     <canvas
       v-if="animated"
       ref="canvas"
@@ -63,26 +57,30 @@
     }
   }
 
-  .image-type-label {
-    position: absolute;
-    top: 0.25em;
-    left: 0.25em;
-    line-height: 1;
-    font-size: 0.6em;
-    background: rgba(127, 127, 127, 0.5);
-    color: #fff;
-    padding: 2px 4px;
-    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-    z-index: 2;
-    visibility: var(--_still-image-label-visibility, visible);
-  }
-
   &.animated {
+    &::before {
+      zoom: var(--_still_image-label-scale, 1);
+      content: 'gif';
+      position: absolute;
+      line-height: 1;
+      font-size: 0.7em;
+      top: 0.5em;
+      left: 0.5em;
+      background: rgba(127, 127, 127, 0.5);
+      color: #fff;
+      display: block;
+      padding: 2px 4px;
+      border-radius: $fallback--tooltipRadius;
+      border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+      z-index: 2;
+      visibility: var(--_still-image-label-visibility, visible);
+    }
+
     &:hover canvas {
       display: none;
     }
 
-    &:hover .image-type-label {
+    &:hover::before {
       visibility: var(--_still-image-label-visibility, hidden);
     }
 

src/components/timeago/timeago.vue

@@ -34,7 +34,7 @@ export default {
   },
   computed: {
     localeDateString () {
-      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
+      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale).split('_')[0]
       return typeof this.time === 'string'
         ? new Date(Date.parse(this.time)).toLocaleString(browserLocale)
         : this.time.toLocaleString(browserLocale)

src/components/timeline_menu/timeline_menu.vue

@@ -62,9 +62,6 @@
     border-top-right-radius: 0;
     border-top-left-radius: 0;
     transform: translateY(-100%);
-    @media (prefers-reduced-motion: reduce) {
-      transition: unset;
-    }
     transition: transform 100ms;
   }
 
@@ -92,9 +89,6 @@
 
     svg {
       margin-left: 0.6em;
-      @media (prefers-reduced-motion: reduce) {
-        transition: unset;
-      }
       transition: transform 100ms;
     }
 

src/components/timeline_menu/timeline_menu_content.vue

@@ -16,22 +16,6 @@
         >{{ $t("nav.home_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="publicTimelineVisible">
-      <router-link
-        class="menu-item"
-        :to="{ name: 'public-timeline' }"
-      >
-        <FAIcon
-          fixed-width
-          class="fa-scale-110 fa-old-padding "
-          icon="users"
-        />
-        <span
-          :title="$t('nav.public_timeline_description')"
-          :aria-label="$t('nav.public_timeline_description')"
-        >{{ $t("nav.public_tl") }}</span>
-      </router-link>
-    </li>
     <li v-if="bubbleTimelineVisible">
       <router-link
         class="menu-item"
@@ -48,6 +32,22 @@
         >{{ $t("nav.bubble_timeline") }}</span>
       </router-link>
     </li>
+    <li v-if="publicTimelineVisible">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'public-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="users"
+        />
+        <span
+          :title="$t('nav.public_timeline_description')"
+          :aria-label="$t('nav.public_timeline_description')"
+        >{{ $t("nav.public_tl") }}</span>
+      </router-link>
+    </li>
     <li v-if="federatedTimelineVisible">
       <router-link
         class="menu-item"

src/components/user_avatar/user_avatar.vue

@@ -33,7 +33,7 @@
   --_avatarShadowBox: var(--avatarStatusShadow);
   --_avatarShadowFilter: var(--avatarStatusShadowFilter);
   --_avatarShadowInset: var(--avatarStatusShadowInset);
-  // --_still-image-label-visibility: hidden;
+  --_still-image-label-visibility: hidden;
 
   display: inline-block;
   position: relative;

src/components/user_panel/user_panel.js

@@ -6,6 +6,9 @@ import { mapState } from 'vuex'
 const UserPanel = {
   computed: {
     signedIn () { return this.user },
+    compactUserPanel () {
+      return this.$store.getters.mergedConfig.compactUserPanel || false
+    },
     ...mapState({ user: state => state.users.currentUser })
   },
   components: {

src/components/user_panel/user_panel.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="user-panel">
+  <div
+    class="user-panel"
+    :class="{ compact: compactUserPanel }"
+  >
     <div
       v-if="signedIn"
       key="user-panel-signed"
@@ -26,4 +29,22 @@
   overflow: visible;
   z-index: 10;
 }
+
+.user-panel.compact {
+  .background-image {
+    mask: unset; -webkit-mask: unset;
+    background-position: center;
+  }
+
+  .user-info .Avatar { width: 24px; height: 24px; }
+
+  .user-summary { margin-left: 1em; font-weight: bold; }
+
+  .user-info .container { padding-top: 6px; padding-bottom: 0; }
+
+  .bottom-line { display: none; }
+
+  .form-group .visibility-notice { margin: 0; }
+}
+
 </style>

src/components/user_profile/user_profile.js

@@ -145,12 +145,10 @@ const UserProfile = {
       if (user) {
         loadById(user.id)
         this.note = user.relationship.note
-        this.$store.dispatch('setDisplayBackground', user.background_image)
       } else {
         this.$store.dispatch('fetchUser', userNameOrId)
-          .then(({ id, relationship, background_image }) => {
+          .then(({ id, relationship }) => {
             this.note = relationship.note
-            this.$store.dispatch('setDisplayBackground', background_image)
             return loadById(id)
           })
           .catch((reason) => {
@@ -227,9 +225,6 @@ const UserProfile = {
     Conversation,
     RichContent,
     FollowedTagList
-  },
-  beforeRouteLeave(to, from) {
-    this.$store.dispatch('setDisplayBackground', null)
   }
 }
 

src/directives/body_scroll_lock.js

@@ -3,13 +3,11 @@ import * as bodyScrollLock from 'body-scroll-lock'
 let previousNavPaddingRight
 let previousAppBgWrapperRight
 const lockerEls = new Set([])
-const allowedScrollableClasses = ['emoji-tabs-item', 'emoji-item']
 
 const disableBodyScroll = (el) => {
   const scrollBarGap = window.innerWidth - document.documentElement.clientWidth
   bodyScrollLock.disableBodyScroll(el, {
-    reserveScrollBarGap: true,
-    allowTouchMove: el => allowedScrollableClasses.includes(el.parentElement.className),
+    reserveScrollBarGap: true
   })
   lockerEls.add(el)
   setTimeout(() => {

src/i18n/ca.json

@@ -884,6 +884,7 @@
         "upload_a_photo": "Pujar una foto",
         "useStreamingApi": "Rebre apunts i notificacions en temps real",
         "useStreamingApiWarning": "És genial emprar-lo. Si es trenca, refresca, suposo?",
+        "use_at_icon": "Mostra el símbol {'@'} com a icona enlloc de text",
         "use_contain_fit": "No retallar els adjunts en miniatures",
         "use_one_click_nsfw": "Obre els adjunts NSFW amb només un clic",
         "user_mutes": "Usuaris",

src/i18n/de.json

@@ -916,6 +916,7 @@
         "upload_a_photo": "Lade ein Foto hoch",
         "useStreamingApi": "Empfange Posts und Benachrichtigungen in Echtzeit",
         "useStreamingApiWarning": "(Nicht empfohlen, experimentell, bekannt dafür, Posts zu überspringen)",
+        "use_at_icon": "{'@'}-Symbol als Icon und nicht als Text anzeigen",
         "use_blurhash": "Blurhash für NSFW-Vorschauen verwenden",
         "use_contain_fit": "Vorschaubilder nicht zuschneiden",
         "use_one_click_nsfw": "Heikle Anhänge mit nur einem Klick öffnen",

src/i18n/el.json

@@ -1,215 +0,0 @@
-{
-    "about": {
-        "mrf": {
-            "keyword": {
-                "keyword_policies": "Πολιτικές λέξεων-κλειδιών",
-                "reject": "Απόρριψη",
-                "replace": "Αντικατάσταση"
-            },
-            "mrf_policies": "Ενεργοποιημένες πολιτικές MRF",
-            "mrf_policies_desc": "",
-            "simple": {
-                "accept": "Αποδοχή",
-                "accept_desc": "Αυτό το instance αποδέχεται μηνύματα μόνο από τα ακόλουθα instances:",
-                "ftl_removal": "Αφαίρεση από το χρονολόγιο \"Γνωστού Δίκτυου\"",
-                "ftl_removal_desc": "Αυτό το instance αφαιρεί αυτά τα instances από το χρονολόγιο \"Γνωστού Δικτύου\":",
-                "quarantine": "Καραντίνα",
-                "quarantine_desc": "Αυτό το instance δε θα στέλνει αναρτήσεις στα ακόλουθα instances:",
-                "reason": "Λόγος",
-                "simple_policies": "Πολιτικές του instance"
-            }
-        }
-    },
-    "announcements": {
-        "all_day_prompt": "Αυτό είναι ένα ολοήμερο συμβάν",
-        "cancel_edit_action": "Ακύρωση",
-        "close_error": "Κλείσιμο",
-        "delete_action": "Διαγραφή",
-        "edit_action": "Επεξεργασία",
-        "end_time_display": "Λήγει στις {time}",
-        "page_header": "Ανακοινώσεις",
-        "title": "Ανακοίνωση"
-    },
-    "chats": {
-        "empty_message_error": "Δε μπορεί να σταλεί κενό μήνυμα",
-        "error_sending_message": "Κάτι πήγε λάθος κατά την αποστολή του μηνύματος.",
-        "message_user": "Στείλε μήνυμα στον/στην {nickname}",
-        "more": "Περισσότερα",
-        "new": "Νέο Chat",
-        "you": "Εσείς:"
-    },
-    "display_date": {
-        "today": "Σήμερα"
-    },
-    "domain_mute_card": {
-        "mute": "Σίγαση"
-    },
-    "emoji": {
-        "add_emoji": "Εισαγωγή emoji",
-        "load_all": "Φόρτωση όλων των {emojiAmount} emoji",
-        "recent": "Χρησιμοποιήθηκαν πρόσφατα",
-        "search_emoji": "Αναζήτηση για ένα emoji",
-        "stickers": "Αυτοκόλλητα"
-    },
-    "errors": {
-        "storage_unavailable": "Το Pleroma δε μπόρεσε να προσπελάσει τον αποθηκευτικό χώρο του browser. Η σύνδεσή σας ή οι τοπικές ρυθμίσεις σας δε θα αποθηκευτούν και μπορεί να αντιμετωπίσετε απρόοπτα θέματα. Προσπαθήστε να ενεργοποιήσετε τα cookies."
-    },
-    "exporter": {
-        "export": "Εξαγωγή"
-    },
-    "features_panel": {
-        "text_limit": "Όριο κειμένου"
-    },
-    "file_type": {
-        "audio": "Ήχος",
-        "file": "Αρχείο",
-        "image": "Εικόνα",
-        "video": "Βίντεο"
-    },
-    "general": {
-        "apply": "Εφαρμογή",
-        "cancel": "Ακύρωση",
-        "close": "Κλείσιμο",
-        "disable": "Απενεργοποίηση",
-        "enable": "Ενεργοποίηση",
-        "error_retry": "Παρακαλώ δοκιμάστε ξανά",
-        "flash_content": "Κάντε κλικ για την εμφάνιση Flash περιεχομένου με τη χρήση του Ruffle (Πειραματικό, μπορεί να μη λειτουργεί).",
-        "loading": "Φόρτωση…",
-        "more": "Περισσότερα",
-        "optional": "προαιρετικό",
-        "retry": "Δοκιμάστε ξανά",
-        "role": {
-            "admin": "Διαχειριστής",
-            "moderator": "Συντονιστής"
-        },
-        "scope_in_timeline": {
-            "direct": "Άμεσο",
-            "local": "Τοπικό",
-            "private": "Μόνο για ακόλουθους",
-            "public": "Δημόσιο",
-            "unlisted": "Εκτός Λίστας"
-        },
-        "show_less": "Δείξε λιγότερα",
-        "show_more": "Δείξε περισσότερα"
-    },
-    "image_cropper": {
-        "cancel": "Ακύρωση",
-        "crop_picture": "Περικοπή εικόνας",
-        "save": "Αποθήκευση",
-        "save_without_cropping": "Αποθήκευση χωρίς περικοπή"
-    },
-    "importer": {
-        "success": "Εισήχθη επιτυχώς."
-    },
-    "languages": {
-        "ar": "Αραβικά",
-        "az": "Αζερικά",
-        "bg": "Βουλγαρικά",
-        "cs": "Τσεχικά",
-        "da": "Δανικά",
-        "de": "Γερμανικά",
-        "el": "Ελληνικά",
-        "en": "Αγγλικά",
-        "eo": "Εσπεράντο",
-        "es": "Ισπανικά",
-        "fa": "Περσικά",
-        "fi": "Φινλανδικά",
-        "fr": "Γαλλικά",
-        "ga": "Ιρλανδικά",
-        "he": "Εβραϊκά",
-        "hi": "Χίντι",
-        "hu": "Ουγγρικά",
-        "id": "Ινδονησιακά",
-        "it": "Ιταλικά",
-        "ja": "Ιαπωνικά",
-        "ko": "Κορεατικά",
-        "lt": "Λιθουανικά",
-        "lv": "Λετονικά",
-        "nl": "Ολλανδικά",
-        "pl": "Πολωνικά",
-        "pt": "Πορτογαλικά",
-        "ru": "Ρωσικά",
-        "sk": "Σλοβακικά",
-        "sv": "Σουηδικά",
-        "tr": "Τουρκικά",
-        "translated_from": {
-            "ar": "Μεταφράστηκε από τα @:languages.ar",
-            "az": "Μεταφράστηκε από τα @:languages.az",
-            "bg": "Μεταφράστηκε από τα @:languages.bg",
-            "cs": "Μεταφράστηκε από τα @:languages.cs",
-            "da": "Μεταφράστηκε από τα @:languages.da",
-            "de": "Μεταφράστηκε από τα @:languages.de",
-            "el": "Μεταφράστηκε από τα @:languages.el",
-            "en": "Μεταφράστηκε από τα @:languages.en",
-            "eo": "Μεταφράστηκε από τα @:languages.eo",
-            "es": "Μεταφράστηκε από τα @:languages.es",
-            "fa": "Μεταφράστηκε από τα @:languages.fa",
-            "fi": "Μεταφράστηκε από τα @:languages.fi",
-            "fr": "Μεταφράστηκε από τα @:languages.fr",
-            "ga": "Μεταφράστηκε από τα @:languages.ga",
-            "he": "Μεταφράστηκε από τα @:languages.he",
-            "hi": "Μεταφράστηκε από τα @:languages.hi",
-            "hu": "Μεταφράστηκε από τα @:languages.hu",
-            "id": "Μεταφράστηκε από τα @:languages.id",
-            "it": "Μεταφράστηκε από τα @:languages.it",
-            "ja": "Μεταφράστηκε από τα @:languages.ja",
-            "ko": "Μεταφράστηκε από τα @:languages.ko",
-            "lt": "Μεταφράστηκε από τα @:languages.lt",
-            "lv": "Μεταφράστηκε από τα @:languages.lv",
-            "nl": "Μεταφράστηκε από τα @:languages.nl",
-            "pl": "Μεταφράστηκε από τα @:languages.pl",
-            "pt": "Μεταφράστηκε από τα @:languages.pt",
-            "ru": "Μεταφράστηκε από τα @:languages.ru",
-            "sk": "Μεταφράστηκε από τα @:languages.sk",
-            "sv": "Μεταφράστηκε από τα @:languages.sv",
-            "tr": "tr",
-            "uk": "Μεταφράστηκε από τα @:languages.uk",
-            "zh": "Μεταφράστηκε από τα @:languages.zh"
-        },
-        "uk": "Ουκρανικά",
-        "zh": "Κινεζικά"
-    },
-    "lists": {
-        "create": "Δημιουργία",
-        "delete": "Διαγραφή λίστας",
-        "lists": "Λίστες",
-        "new": "Νέα Λίστα",
-        "save": "Αποθήκευση αλλαγών",
-        "search": "Αναζήτηση χρηστών",
-        "title": "Τίτλος λίστας"
-    },
-    "login": {
-        "authentication_code": "Κωδικός επαλήθευσης",
-        "description": "Σύνδεση με OAuth",
-        "enter_recovery_code": "Εισάγετε τον κωδικό ανάκτησης",
-        "hint": "Συνδεθείτε για να μπείτε στη συζήτηση",
-        "login": "Σύνδεση",
-        "logout": "Αποσύνδεση",
-        "logout_confirm": "Θέλετε σίγουρα να αποσυνδεθείτε;",
-        "logout_confirm_accept_button": "Αποσύνδεση",
-        "logout_confirm_cancel_button": "Ακύρωση",
-        "logout_confirm_title": "Αποσύνδεση",
-        "password": "Κωδικός πρόσβασης",
-        "placeholder": "τοονομαχρηστημου",
-        "recovery_code": "Κωδικός ανάκτησης",
-        "register": "Εγγραφή",
-        "username": "Όνομα χρήστη"
-    },
-    "media_modal": {
-        "next": "Επόμενο",
-        "previous": "Προηγούμενο"
-    },
-    "moderation": {
-        "reports": {
-            "add_note": "Προσθήκη σημείωσης",
-            "close": "Κλείσιμο",
-            "delete_note": "Διαγραφή",
-            "delete_note_accept": "Ναι, διάγραψέ το",
-            "delete_note_cancel": "Όχι, κράτα το",
-            "delete_note_confirm": "Θέλετε σίγουρα να διαγράψετε αυτήν τη σημείωση;",
-            "note_placeholder": "Αφήστε μια σημείωση",
-            "notes": "{ count } σημείωση | { count } σημειώσεις",
-            "statuses": "{ count } ανάρτηση| { count } αναρτήσεις"
-        }
-    }
-}

src/i18n/en.json

@@ -380,7 +380,6 @@
             "text/x.misskeymarkdown": "MFM"
         },
         "content_warning": "Content Warning (optional)",
-        "toggle_content_warning": "Toggle content warning",
         "default": "Just arrived at Luna Nova Academy",
         "direct_warning_to_all": "This post will be visible to all the mentioned users.",
         "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
@@ -601,7 +600,6 @@
         "list_aliases_error": "Error fetching aliases: {error}",
         "list_backups_error": "Error fetching backup list: {error}",
         "lock_account_description": "Restrict your account to approved followers only",
-        "permit_followback_description": "Automatically approve requests from already followed users",
         "loop_video": "Loop videos",
         "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
         "mascot": "Mastodon FE Mascot",
@@ -751,7 +749,6 @@
         "show_nav_shortcuts": "Show extra navigation shortcuts in top panel",
         "show_panel_nav_shortcuts": "Show timeline navigation shortcuts at the top of the panel",
         "show_scrollbars": "Show side column's scrollbars",
-        "show_page_backgrounds": "Show page-specific backgrounds, e.g. for user profiles",
         "show_wider_shortcuts": "Show wider gap between top panel shortcuts",
         "show_yous": "Show (You)s",
         "stop_gifs": "Pause animated images until you hover on them",
@@ -925,16 +922,13 @@
         "upload_a_photo": "Upload a photo",
         "useStreamingApi": "Receive posts and notifications real-time",
         "useStreamingApiWarning": "It's cool use it. If it breaks refresh I guess?",
+        "use_at_icon": "Display {'@'} symbol as an icon instead of text",
         "use_contain_fit": "Don't crop the attachment in thumbnails",
         "use_one_click_nsfw": "Open NSFW attachments with just one click",
         "user_mutes": "Users",
         "user_profile_default_tab": "Default Tab on User Profile",
         "user_profiles": "User Profiles",
         "user_settings": "User Settings",
-        "user_accepts_direct_messages_from": "Accept DMs From",
-        "user_accepts_direct_messages_from_everybody": "Everybody",
-        "user_accepts_direct_messages_from_nobody": "Nobody",
-        "user_accepts_direct_messages_from_people_i_follow": "People I follow",
         "valid_until": "Valid until",
         "values": {
             "false": "no",

src/i18n/en_nyan.json

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

src/i18n/fr.json

@@ -425,8 +425,6 @@
         "reason_placeholder": "Cette instance modère les inscriptions manuellement.\nExpliquer ce qui motive votre inscription à l'administration.",
         "register": "Enregistrer",
         "registration": "Inscription",
-        "request_sent": "Votre demande d'enregistrement est en attente d'approbation. Vous recevrez un courriel lorsque votre compte sera approuvé.",
-        "request_sent_title": "Demande d'abonnement envoyée",
         "token": "Jeton d'invitation",
         "username_placeholder": "ex : misato",
         "validations": {
@@ -920,6 +918,7 @@
         "upload_a_photo": "Envoyer une photo",
         "useStreamingApi": "Recevoir les messages et notifications en temps réel",
         "useStreamingApiWarning": "(Non recommandé, expérimental, connu pour rater des messages)",
+        "use_at_icon": "Afficher le symbol {'@'} comme une image",
         "use_contain_fit": "Ne pas rogner les miniatures des pièces-jointes",
         "use_one_click_nsfw": "Ouvrir les pièces-jointes sensibles avec un seul clic",
         "user_mutes": "Comptes",

src/i18n/id.json

@@ -1,15 +1,11 @@
 {
     "about": {
-        "bubble_instances": "Instance Bubble Lokal",
-        "bubble_instances_description": "Instansi yang dipilih oleh admin untuk mewakili instance ini",
         "mrf": {
             "federation": "Federasi",
             "keyword": {
                 "ftl_removal": "Penghapusan dari Linimasa \"Jaringan Yang Dikenal\"",
                 "is_replaced_by": "→",
-                "keyword_policies": "Kebijakan Kata Kunci",
-                "reject": "Tolak",
-                "replace": "Ganti"
+                "reject": "Tolak"
             },
             "mrf_policies": "Kebijakan MRF yang diaktifkan",
             "mrf_policies_desc": "Kebijakan MRF memanipulasi federasi yang terjadi pada instansi ini.  Kebijakan berikut adalah yang aktif:",
@@ -84,7 +80,6 @@
         "keep_open": "Tetap buka pemilih",
         "load_all": "Memuat semua {emojiAmount} emoji",
         "load_all_hint": "Memuat {saneAmount} emoji pertama, memuat semua emoji dapat menyebabkan masalah performa.",
-        "recent": "Baru-baru ini digunakan",
         "search_emoji": "Cari emoji",
         "stickers": "Stiker",
         "unicode": "Emoji Unicode"
@@ -98,11 +93,9 @@
     },
     "features_panel": {
         "media_proxy": "Proxy media",
-        "scope_options": "Opsi cakupan",
         "text_limit": "Batas teks",
         "title": "Fitur-fitur",
-        "upload_limit": "Batas unggahan",
-        "who_to_follow": "Siapa untuk diikuti"
+        "upload_limit": "Batas unggahan"
     },
     "file_type": {
         "audio": "Audio",
@@ -120,7 +113,6 @@
         "close": "Tutup",
         "confirm": "Konfirmasi",
         "disable": "Nonaktifkan",
-        "dismiss": "Tutup",
         "enable": "Aktifkan",
         "error_retry": "Harap coba lagi",
         "flash_content": "Klik untuk menampilkan konten Flash menggunakan Ruffle (Eksperimental, mungkin tidak bekerja).",
@@ -140,8 +132,7 @@
             "direct": "Langsung",
             "local": "Lokal - hanya instansi kamu yang dapat melihat postingan ini",
             "private": "Hanya pengikut",
-            "public": "Publik",
-            "unlisted": "Tidak Tercantum"
+            "public": "Publik"
         },
         "show_less": "Tampilkan lebih sedikit",
         "show_more": "Tampilkan lebih banyak",
@@ -236,7 +227,6 @@
     "lists": {
         "create": "Buat",
         "delete": "Hapus daftar",
-        "following_only": "Batas mengikuti",
         "lists": "Daftar",
         "new": "Buat Daftar",
         "save": "Simpan perubahan",
@@ -286,7 +276,6 @@
             "note_placeholder": "Tinggalkan catatan",
             "notes": "{ count } catatan",
             "reopen": "Buka kembali",
-            "report": "Laporan di",
             "reports": "Laporan",
             "resolve": "Selesaikan",
             "show_closed": "Tampilkan yang telah ditutup",
@@ -302,8 +291,6 @@
         "administration": "Administrasi",
         "announcements": "Pengumuman",
         "back": "Kembali",
-        "bookmarks": "Bookmark",
-        "bubble_timeline": "Timeline Bubble",
         "bubble_timeline_description": "Postingan dari instansi yang dekat dengan instansimu, yang direkomendasikan oleh admin kamu",
         "chats": "Obrolan",
         "dms": "Pesan langsung",
@@ -322,8 +309,7 @@
         "timelines": "Linimasa",
         "twkn": "Jaringan Yang Dikenal",
         "twkn_timeline_description": "Postingan dari seluruh jaringan",
-        "user_search": "Penelusuran Pengguna",
-        "who_to_follow": "Siapa untuk diikuti"
+        "user_search": "Penelusuran Pengguna"
     },
     "notifications": {
         "broken_favorite": "Postingan tak dikenal, mencarinya…",
@@ -399,8 +385,7 @@
             "direct": "Langsung - posting hanya kepada pengguna yang disebut",
             "local": "Lokal - postingan tidak akan difederasi",
             "private": "Hanya-pengikut - posting hanya kepada pengikut",
-            "public": "Publik - posting ke linimasa publik",
-            "unlisted": "Tidak Tercantum - Tidak memposting ke timeline publik"
+            "public": "Publik - posting ke linimasa publik"
         },
         "scope_notice": {
             "local": "Postingan ini tidak akan terlihat di instansi lain",
@@ -417,7 +402,6 @@
         "captcha": "CAPTCHA",
         "email": "Surel",
         "email_language": "Dalam bahasa apa kamu ingin menerima surel dari server ini?",
-        "fullname": "Tampilan Nama",
         "fullname_placeholder": "cth. Atsuko Kagari",
         "new_captcha": "Klik gambarnya untuk mendapatkan captcha baru",
         "password_confirm": "Konfirmasi kata sandi",
@@ -440,7 +424,6 @@
     },
     "remote_user_resolver": {
         "error": "Tidak ditemukan.",
-        "remote_user_resolver": "Pencarian pengguna jarak jauh",
         "searching_for": "Mencari"
     },
     "search": {
@@ -454,22 +437,16 @@
         "select_all": "Pilih semua"
     },
     "settings": {
-        "accent": "Aksen",
-        "account_alias": "Akun alias",
         "account_backup": "Pencadangan akun",
         "account_backup_description": "Ini memungkinkan kamu untuk mengunduh arsip yang berisi informasi tentang akun dan postingan kamu, namun belum bisa diimpor ke akun Pleroma.",
         "account_privacy": "Privasi",
-        "add_alias_error": "Gagal menambahkan alias: {error}",
         "add_backup": "Buat cadangan baru",
         "add_backup_error": "Gagal menambahkan cadangan baru: {error}",
-        "added_alias": "Alias telah ditambahkan.",
         "added_backup": "Cadangan baru ditambahkan.",
         "allow_following_move": "Ikuti otomatis apabila akun yang diikuti pindah",
-        "always_show_post_button": "Selalu tampilkan tombol posting baru yang mengambang",
         "app_name": "Nama aplikasi",
         "attachmentRadius": "Lampiran",
         "attachments": "Lampiran",
-        "autohide_floating_post_button": "Sembunyikan tombol buat posting secara otomatis (Ponsel)",
         "avatar": "Avatar",
         "avatarAltRadius": "Avatar (notifikasi)",
         "avatarRadius": "Avatar",
@@ -497,8 +474,6 @@
         "changed_password": "Kata sandi berhasil diubah!",
         "chatMessageRadius": "Pesan obrolan",
         "checkboxRadius": "Kotak centang",
-        "collapse_subject": "Tampilkan post dengan peringatan",
-        "columns": "Kolum",
         "composing": "Menulis",
         "confirm_dialogs": "Perlukan konfirmasi sebelum:",
         "confirm_dialogs_approve_follow": "Menerima permintaan mengikuti",
@@ -509,23 +484,17 @@
         "confirm_dialogs_repeat": "Mengulangi postingan",
         "confirm_dialogs_unfollow": "Berhenti mengikuti seseorang",
         "confirm_new_password": "Konfirmasi kata sandi baru",
-        "confirmation_dialogs": "Opsi Konfirmasi",
         "conversation_display": "Gaya tampilan percakapan",
-        "conversation_display_linear": "Gaya Linier",
         "conversation_display_tree": "Bercabang",
-        "conversation_other_replies_button": "Tampilkan tombol \"Balasan lainnya\"",
         "conversation_other_replies_button_below": "Di bawah postingan",
         "conversation_other_replies_button_inside": "Di postingan",
         "current_avatar": "Avatarmu saat ini",
-        "current_mascot": "Maskot utamamu",
         "current_password": "Kata sandi saat ini",
         "data_import_export_tab": "Impor / ekspor data",
-        "default_vis": "Cakupan visibilitas default",
         "delete_account": "Hapus akun",
         "delete_account_description": "Hapus data kamu secara permanen dan nonaktifkan akunmu.",
         "delete_account_error": "Ada masalah ketika menghapus akun kamu. Jika ini terus terjadi harap hubungi adminstrator instansi kamu.",
         "delete_account_instructions": "Ketik kata sandi kamu pada input di bawah untuk mengonfirmasi penghapusan akun.",
-        "disable_sticky_headers": "Jangan tempel tajuk kolom ke bagian atas layar",
         "discoverable": "Izinkan penelusuran akun ini pada hasil pencarian dan layanan lainnya",
         "domain_mutes": "Domain",
         "download_backup": "Unduh",
@@ -536,7 +505,6 @@
         "expert_mode": "Tampilkan pengaturan lanjutan",
         "expire_posts_enabled": "Hapus postingan setelah jumlah hari yang ditentukan",
         "expire_posts_input_placeholder": "Jumlah hari",
-        "export_theme": "Simpan preset",
         "file_export_import": {
             "backup_restore": "Pencadangan pengaturan",
             "backup_settings": "Cadangkan pengaturan ke berkas",
@@ -551,11 +519,7 @@
         },
         "filtering": "Penyaringan",
         "filtering_explanation": "Semua postingan yang mengandung kata-kata ini akan dibisukan, satu kata per baris",
-        "follow_export": "Ekspor Follow",
-        "follow_export_button": "Export yang kamu ikuti ke dalam file csv",
-        "follow_import": "Import pengikut",
         "follow_import_error": "Terjadi kesalahan ketika mengimpor pengikut",
-        "follows_imported": "Pengguna yang diikuti telak diimpor! Proses mungkin membutuhkan beberapa saat.",
         "fun": "Seru",
         "general": "Umum",
         "greentext": "Panah meme",

src/i18n/ja_easy.json

@@ -4,8 +4,6 @@
         "mrf": {
             "federation": "フェデレーション",
             "keyword": {
-                "ftl_removal": "「せつぞくしているすべてのネットワーク」タイムラインからのぞく",
-                "is_replaced_by": "→",
                 "keyword_policies": "キーワードポリシー",
                 "reject": "おことわり",
                 "replace": "おきかえ"
@@ -121,7 +119,7 @@
         "error_retry": "もういちど、ためしてください",
         "flash_content": "クリックすると、Ruffle をつかって、フラッシュさくひんをひょうじします。(うまくうごかないかもしれません)",
         "flash_fail": "フラッシュさくひんのロードに、しっぱいしました。コンソールに、くわしいことがかかれています。",
-        "flash_security": "フラッシュさくひんは、あなたのコンピューターに、あぶないことをしてくるかもしれないので、ちゅういしてください。",
+        "flash_security": "フラッシュさくひんは、あぶないことをしてくるかもしれないので、ちゅういしてください。",
         "generic_error": "エラーになりました",
         "loading": "ロードしています…",
         "more": "つづき",
@@ -534,7 +532,7 @@
         "expert_mode": "こまかいせっていをひょうじ",
         "export_theme": "セーブ",
         "filtering": "フィルタリング",
-        "filtering_explanation": "これらのことばをふくむすべてのとうこうがミュートされます。1ぎょうに1つのことばをかいてください",
+        "filtering_explanation": "これらのことばをふくむすべてのものがミュートされます。1ぎょうに1つのことばをかいてください",
         "follow_export": "フォローのエクスポート",
         "follow_export_button": "エクスポート",
         "follow_import": "フォローインポート",
@@ -888,7 +886,6 @@
         "media": "メディア",
         "mention": "メンション",
         "mute": "ミュート",
-        "mute_domain": "ドメインをブロック",
         "mute_progress": "ミュートしています…",
         "muted": "ミュートしています！",
         "per_day": "/日",
@@ -899,7 +896,6 @@
         "subscribe": "サブスクライブ",
         "unblock": "ブロックをやめる",
         "unblock_progress": "ブロックをとりけしています…",
-        "unfollow_confirm": "{user}のフォローをやめますか?",
         "unmute": "ミュートをやめる",
         "unmute_progress": "ミュートをとりけしています…",
         "unsubscribe": "サブスクライブをやめる"

src/i18n/ja_pedantic.json

@@ -921,6 +921,7 @@
         "upload_a_photo": "画像をアップロード",
         "useStreamingApi": "投稿と通知を、すぐに受け取る",
         "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）",
+        "use_at_icon": "{'@'}マークをアイコンにする",
         "use_contain_fit": "画像のサムネイルを、切り抜かない",
         "use_one_click_nsfw": "NSFWなファイルを1クリックで開く",
         "user_mutes": "ユーザー",

src/i18n/messages.js

@@ -8,6 +8,7 @@
 // There's only problem that apostrophe character ' gets replaced by \\ so you have to fix it manually, sorry.
 
 const loaders = {
+  en_nyan: () => import('./en_nyan.json'),
   ar: () => import('./ar.json'),
   ca: () => import('./ca.json'),
   cs: () => import('./cs.json'),
@@ -21,7 +22,6 @@ const loaders = {
   ga: () => import('./ga.json'),
   he: () => import('./he.json'),
   hu: () => import('./hu.json'),
-  id: () => import('./id.json'),
   it: () => import('./it.json'),
   ja: () => import('./ja_pedantic.json'),
   ja_easy: () => import('./ja_easy.json'),
@@ -36,7 +36,6 @@ const loaders = {
   sk: () => import('./sk.json'),
   te: () => import('./te.json'),
   uk: () => import('./uk.json'),
-  vi: () => import('./vi.json'),
   zh: () => import('./zh.json'),
   zh_Hant: () => import('./zh_Hant.json')
 }

src/i18n/nl.json

@@ -918,6 +918,7 @@
         "upload_a_photo": "Foto uploaden",
         "useStreamingApi": "Berichten en meldingen in real-time ontvangen",
         "useStreamingApiWarning": "Iets experimenteels met berichten streamen uwu miss kun je beter uit laten ofzo?",
+        "use_at_icon": "{'@'} symbool als icoon tonen in plaats van tekst",
         "use_blurhash": "Waas tonen over NSFW-miniaturen",
         "use_contain_fit": "Bijlage in miniaturen niet bijsnijden",
         "use_one_click_nsfw": "Gevoelige bijlagen met slechts één klik openen",

src/i18n/pl.json

@@ -1,7 +1,5 @@
 {
     "about": {
-        "bubble_instances": "Instancje lokalnej bańki",
-        "bubble_instances_description": "Instancje wybrane przez administratorów w celu przedstawienia okolicy tej instancji",
         "mrf": {
             "federation": "Federacja",
             "keyword": {
@@ -18,15 +16,12 @@
                 "accept_desc": "Ta instancja akceptuje tylko posty z wymienionych instancji:",
                 "ftl_removal": "Usunięcie z „Całej znanej sieci”",
                 "ftl_removal_desc": "Ta instancja usuwa wymienionych instancje z „Całej znanej sieci”:",
-                "instance": "Instacja",
                 "media_nsfw": "Multimedia ustawione jako wrażliwe",
                 "media_nsfw_desc": "Ta instancja wymusza, by multimedia z wymienionych instancji były ustawione jako wrażliwe:",
                 "media_removal": "Usuwanie multimediów",
                 "media_removal_desc": "Ta instancja usuwa multimedia z postów od wymienionych instancji:",
-                "not_applicable": "N/A",
                 "quarantine": "Kwarantanna",
-                "quarantine_desc": "Ta instancja nie wysyła postów do wymienionych instancji:",
-                "reason": "Powód",
+                "quarantine_desc": "Ta instancja wysyła tylko publiczne posty do wymienionych instancji:",
                 "reject": "Odrzucanie",
                 "reject_desc": "Ta instancja odrzuca posty z wymienionych instancji:",
                 "simple_policies": "Zasady specyficzne dla instancji"
@@ -34,27 +29,6 @@
         },
         "staff": "Administracja"
     },
-    "announcements": {
-        "all_day_prompt": "Jest to całodzienne wydarzenie",
-        "cancel_edit_action": "Anuluj",
-        "close_error": "Zamknij",
-        "delete_action": "Usuń",
-        "edit_action": "Edytuj",
-        "end_time_display": "Kończy się o: {time}",
-        "end_time_prompt": "Koniec: ",
-        "inactive_message": "To ogłoszenie jest nieaktywne",
-        "mark_as_read_action": "Oznacz jako przeczytane",
-        "page_header": "Ogłoszenia",
-        "post_action": "Wyślij",
-        "post_error": "Błąd: {error}",
-        "post_form_header": "Wyślij ogłoszenie",
-        "post_placeholder": "Zawartość ogłoszenia",
-        "published_time_display": "Opublikowano o {time}",
-        "start_time_display": "Zaczyna się o: {time}",
-        "start_time_prompt": "Początek: ",
-        "submit_edit_action": "Wyślij",
-        "title": "Ogłoszenie"
-    },
     "chats": {
         "chats": "Czaty",
         "delete": "Usuń",
@@ -84,7 +58,6 @@
         "keep_open": "Zostaw selektor otwarty",
         "load_all": "Ładuję wszystkie {emojiAmount} emoji",
         "load_all_hint": "Załadowano pierwsze {saneAmount} emoji, Załadowanie wszystkich emoji może spowodować problemy z wydajnością.",
-        "recent": "Ostatnio używane",
         "search_emoji": "Wyszukaj emoji",
         "stickers": "Naklejki",
         "unicode": "Emoji unicode"
@@ -864,4 +837,4 @@
         "more": "Więcej",
         "who_to_follow": "Propozycje obserwacji"
     }
-}
+}

src/i18n/pt.json

@@ -30,7 +30,7 @@
                 "simple_policies": "Políticas especificas do domínio"
             }
         },
-        "staff": "Equipe"
+        "staff": "Staff"
     },
     "announcements": {
         "all_day_prompt": "Este evento dura o dia inteiro",
@@ -167,7 +167,7 @@
         "password": "Palavra-passe",
         "placeholder": "ex. lain",
         "recovery_code": "Código de recuperação",
-        "register": "Registrar",
+        "register": "Registar",
         "username": "Nome de Utilizador"
     },
     "media_modal": {
@@ -244,7 +244,7 @@
             "text/plain": "Texto puro"
         },
         "content_warning": "Assunto (opcional)",
-        "default": "Acabei de chegar em",
+        "default": "Acabei de chegar a Lisboa.",
         "direct_warning_to_all": "Esta publicação será visível para todos os utilizadores mencionados.",
         "direct_warning_to_first_only": "Esta publicação só será visível para os utilizadores mencionados no início da mensagem.",
         "empty_status_error": "Não consegues publicar um post vazio e sem ficheiros",
@@ -268,7 +268,7 @@
     },
     "registration": {
         "bio": "Biografia",
-        "bio_placeholder": "Ex.:\nBem-vindo a minha bio.\nEu amo assistir anime e jogar. Eu espero que possamos ser amigos!",
+        "bio_placeholder": "ex.\nOlá, sou a Lain\nSou uma menina de anime que vive no Japão suburbano. Devem conhecer-me do \"the Wired\".",
         "captcha": "CAPTCHA",
         "email": "Endereço de e-mail",
         "fullname": "Nome para exibição",
@@ -401,7 +401,7 @@
             "scan": {
                 "desc": "Utilizando a sua aplicação de dois fatores, faça scan deste código QR ou insira a chave de texto:",
                 "secret_code": "Chave",
-                "title": "Escanear"
+                "title": "Scan"
             },
             "setup_otp": "Configurar palavra-passe de utilização única",
             "title": "Autenticação de Dois Fatores",
@@ -566,7 +566,7 @@
                 "fine_print": "Leia nosso {0} para não aprender nada!",
                 "header": "Pré-visualizar",
                 "header_faint": "Isto está bem",
-                "input": "Acabei de chegar na Lua",
+                "input": "Acabei de chegar a Lisboa.",
                 "link": "um belo link",
                 "mono": "conteúdo",
                 "text": "Vários {0} e {1}"
@@ -648,7 +648,7 @@
         "type_domains_to_mute": "Pesquisar domínios para silenciar",
         "upload_a_photo": "Enviar uma foto",
         "useStreamingApi": "Receber publicações e notificações em tempo real",
-        "useStreamingApiWarning": "É legal usar isso. Se der algum problema, atualize, eu acho?",
+        "useStreamingApiWarning": "(não recomendado, experimental, pode omitir publicações)",
         "use_contain_fit": "Não cortar o anexo na miniatura",
         "use_one_click_nsfw": "Abrir anexos sensíveis com um clique",
         "user_mutes": "Utilizadores",

src/i18n/th.json

@@ -1,34 +0,0 @@
-{
-    "about": {
-        "bubble_instances": "เซิร์ฟเวอร์เพื่อนบ้าน",
-        "bubble_instances_description": "เซิร์ฟเวอร์ที่แอดมินตั้งค่าไว้เพื่อแสดงเป็นเพื่อนบ้าน",
-        "mrf": {
-            "keyword": {
-                "keyword_policies": "นโยบายของคีย์เวิร์ดค้นหา",
-                "reject": "ไม่อนุมัติ",
-                "replace": "แทนที่"
-            },
-            "simple": {
-                "accept": "ยอมรับ",
-                "accept_desc": "เซิร์ฟเวอร์นี้จะรับข้อความเฉพาะเซิฟร์เวอร์ต่อไปนี้:",
-                "instance": "เซิฟเวอร์",
-                "media_nsfw": "มีเดียถูกบังคับตั้งให้เป็น NSFW",
-                "not_applicable": "ไม่สามารถใช้ได้",
-                "quarantine": "คัดกรอง",
-                "reason": "เหตุผล",
-                "reject": "ปฎิเสธ"
-            }
-        },
-        "staff": "ผู้ดูแล"
-    },
-    "announcements": {
-        "cancel_edit_action": "ยกเลิก",
-        "close_error": "ปิด",
-        "delete_action": "ลบประกาศ",
-        "edit_action": "แก้ไขประกาศ",
-        "end_time_prompt": "เวลาสิ้นสุด: ",
-        "mark_as_read_action": "ตั้งเป็นอ่านแล้ว",
-        "page_header": "ประกาศ",
-        "post_action": "โพสต์"
-    }
-}

src/i18n/tr.json

@@ -1,134 +0,0 @@
-{
-    "about": {
-        "bubble_instances": "Yerel Balon Örnekleri",
-        "bubble_instances_description": "Yöneticiler tarafından bu örneğin yerel alanını temsil etmesi için seçilen örnekler",
-        "mrf": {
-            "federation": "Federasyon",
-            "keyword": {
-                "ftl_removal": "\"Bilinen Tüm Ağ\" Zaman Çizelgesinden Kaldırma",
-                "is_replaced_by": "→",
-                "keyword_policies": "Anahtar kelime politikaları",
-                "reject": "Reddetmek",
-                "replace": "Yer değiştirmek"
-            },
-            "mrf_policies": "Etkinleştirilmiş MRF politikaları",
-            "mrf_policies_desc": "MRF ilkeleri, örneğin federasyon davranışını manipüle eder. Aşağıdaki politikalar etkinleştirildi:",
-            "simple": {
-                "accept": "Kabul etmek",
-                "accept_desc": "Bu örnek yalnızca aşağıdaki örneklerden gelen mesajları kabul eder:",
-                "ftl_removal": "\"Bilinen Ağ\" Zaman Çizelgesinden Kaldırma",
-                "ftl_removal_desc": "Bu örnek, şu örnekleri \"Bilinen Ağ\" zaman çizelgesinden kaldırır:",
-                "instance": "Örnek",
-                "media_nsfw": "Medya hassas olarak ayarlandı",
-                "media_nsfw_desc": "Bu örnek, medyayı aşağıdaki örneklerdeki gönderilerde hassas olarak ayarlanmasına zorlar:",
-                "media_removal": "Medya Kaldırma",
-                "media_removal_desc": "Bu örnek, aşağıdaki örneklerdeki yayınlardan medyayı kaldırır:",
-                "not_applicable": "Yok",
-                "quarantine": "Karantina",
-                "quarantine_desc": "Bu örnek, aşağıdaki örneklere gönderi göndermeyecek:",
-                "reason": "Sebep",
-                "reject": "Reddetmek",
-                "reject_desc": "Bu örnek, aşağıdaki örneklerden gelen mesajları kabul etmeyecektir:",
-                "simple_policies": "Örneğe özgü politikalar"
-            }
-        },
-        "staff": "Kadro"
-    },
-    "announcements": {
-        "all_day_prompt": "Bu tüm gün süren bir etkinlik",
-        "cancel_edit_action": "İptal etmek",
-        "close_error": "Kapalı",
-        "delete_action": "Sil",
-        "edit_action": "Düzenle",
-        "end_time_display": "{time} saatinde biter",
-        "end_time_prompt": "Bitiş zamanı: ",
-        "inactive_message": "Bu duyuru etkin değil",
-        "mark_as_read_action": "Okundu olarak işaretle",
-        "page_header": "Duyurular",
-        "post_action": "Post",
-        "post_error": "Hata: {error}",
-        "post_form_header": "Post sonrası",
-        "post_placeholder": "Duyuru içeriği",
-        "published_time_display": "{time} tarihinde yayınlandı",
-        "start_time_display": "{time} saatinde başlar",
-        "start_time_prompt": "Başlangıç saati: ",
-        "submit_edit_action": "Gönder",
-        "title": "Duyuru"
-    },
-    "chats": {
-        "chats": "Sohbetler",
-        "delete": "Sil",
-        "delete_confirm": "Bu mesajı gerçekten silmek istiyor musun?",
-        "empty_chat_list_placeholder": "Henüz hiç sohbetiniz yok. Yeni bir sohbet başlatın!",
-        "empty_message_error": "Boş mesaj gönderilemiyor",
-        "error_loading_chat": "Sohbet yüklenirken bir şeyler ters gitti.",
-        "error_sending_message": "Mesajı gönderirken bir şeyler ters gitti.",
-        "message_user": "{nickname} mesajı",
-        "more": "Daha",
-        "new": "Yeni Sohbet",
-        "you": "Sen:"
-    },
-    "display_date": {
-        "today": "Bugün"
-    },
-    "domain_mute_card": {
-        "mute": "Sesini kapat",
-        "mute_progress": "Ses kapatılıyor…",
-        "unmute": "Sesini aç",
-        "unmute_progress": "Sessize alınıyor…"
-    },
-    "emoji": {
-        "add_emoji": "Emoji ekle",
-        "custom": "Özel emoji",
-        "emoji": "Emoji",
-        "keep_open": "Seçiciyi açık tut",
-        "load_all": "Tüm {emojiAmount} emoji yükleniyor",
-        "load_all_hint": "İlk {saneAmount} emoji yüklendi, tüm emojilerin yüklenmesi performans sorunlarına neden olabilir.",
-        "recent": "Son zamanlarda kullanılmış",
-        "search_emoji": "Emoji ara",
-        "stickers": "Çıkartmalar",
-        "unicode": "Unicode emojisi"
-    },
-    "errors": {
-        "storage_unavailable": "Pleroma, tarayıcı depolama alanına erişemedi. Oturum açma bilgileriniz veya yerel ayarlarınız kaydedilmeyecek ve beklenmeyen sorunlarla karşılaşabilirsiniz. Çerezleri etkinleştirmeyi deneyin."
-    },
-    "exporter": {
-        "export": "Dışa aktar",
-        "processing": "İşleniyor, yakında dosyanızı indirmeniz istenecek"
-    },
-    "features_panel": {
-        "media_proxy": "Medya proxy'si",
-        "scope_options": "Kapsam seçenekleri",
-        "text_limit": "Metin sınırı",
-        "title": "Özellikler",
-        "upload_limit": "Yükleme sınırı",
-        "who_to_follow": "Kimi takip etmeli"
-    },
-    "file_type": {
-        "audio": "Ses",
-        "file": "Dosya",
-        "image": "Resim",
-        "video": "Video"
-    },
-    "finder": {
-        "error_fetching_user": "Kullanıcı getirilirken hata oluştu",
-        "find_user": "Kullanıcı bul"
-    },
-    "general": {
-        "apply": "Uygula",
-        "cancel": "İptal",
-        "close": "Kapalı",
-        "confirm": "Onayla",
-        "disable": "Devre dışı bırak",
-        "dismiss": "Reddetmek",
-        "enable": "Etkinleştir",
-        "error_retry": "Lütfen tekrar deneyin",
-        "flash_content": "Ruffle kullanarak Flash içeriğini göstermek için tıklayın (Deneysel, çalışmayabilir).",
-        "flash_fail": "Flash içeriği yüklenemedi, ayrıntılar için konsola bakın.",
-        "flash_security": "Flash içeriği hala isteğe bağlı kod olduğundan, bunun potansiyel olarak tehlikeli olabileceğini unutmayın.",
-        "generic_error": "Bir hata oluştu",
-        "loading": "Yükleniyor…",
-        "more": "Daha",
-        "optional": "Seçenek"
-    }
-}

src/i18n/uk.json

@@ -23,7 +23,6 @@
                 "media_nsfw_desc": "Сервер примусово позначає дражливими медіа з таких серверів:",
                 "media_removal": "Видалення медіа",
                 "media_removal_desc": "Сервер вилучає медіа в дописах із таких серверів:",
-                "not_applicable": "Не застосовується",
                 "quarantine": "Карантин",
                 "quarantine_desc": "Сервер не надсилатиме дописів таким серверам:",
                 "reason": "Підстава",
@@ -32,7 +31,7 @@
                 "simple_policies": "Відносно цілих серверів"
             }
         },
-        "staff": "Команда"
+        "staff": "Адміністрація"
     },
     "announcements": {
         "all_day_prompt": "Триває весь день",
@@ -72,10 +71,10 @@
         "today": "Сьогодні"
     },
     "domain_mute_card": {
-        "mute": "Приглушити",
-        "mute_progress": "Глушіння…",
-        "unmute": "Відновити",
-        "unmute_progress": "Відновлення…"
+        "mute": "Ігнорувати",
+        "mute_progress": "Вимикаю…",
+        "unmute": "Вимкнути заглушення",
+        "unmute_progress": "Вмикаю…"
     },
     "emoji": {
         "add_emoji": "Додати емоджі",
@@ -84,7 +83,6 @@
         "keep_open": "Тримати панель відкритою",
         "load_all": "Всі {emojiAmount} емоджі завантажуються",
         "load_all_hint": "Завантажено {saneAmount} емоджі, більша кількість може спричинити гальмування.",
-        "recent": "Нещодавно вжиті",
         "search_emoji": "Пошук емоджі",
         "stickers": "Наліпки",
         "unicode": "Стандартні емоджі"
@@ -133,19 +131,19 @@
         "peek": "Глянути",
         "retry": "Спробуйте ще раз",
         "role": {
-            "admin": "Адміністрація",
-            "moderator": "Модерування"
+            "admin": "Адмініструє",
+            "moderator": "Модерує"
         },
         "scope_in_timeline": {
             "direct": "Особисто",
             "local": "Місцево — допис видно тільки на вашому сервері",
             "private": "Приватно",
             "public": "Загальнодоступно",
-            "unlisted": "Приховано"
+            "unlisted": "Непублічно"
         },
         "show_less": "Показати менше",
         "show_more": "Показати більше",
-        "submit": "Надіслати",
+        "submit": "Відправити",
         "verify": "Перевірити"
     },
     "image_cropper": {
@@ -156,7 +154,7 @@
     },
     "importer": {
         "error": "Під час імпортування файлу сталася помилка.",
-        "submit": "Надіслати",
+        "submit": "Відправити",
         "success": "Імпортовано успішно."
     },
     "interactions": {
@@ -166,72 +164,8 @@
         "moves": "Переїзди користувач_ок"
     },
     "languages": {
-        "ar": "арабська",
-        "az": "азербайджанська",
-        "bg": "болгарська",
-        "cs": "чеська",
-        "da": "данська",
-        "de": "німецька",
-        "el": "грецька",
         "en": "англійська",
-        "eo": "есперанто",
-        "es": "іспанська",
-        "fa": "перська",
-        "fi": "фінська",
-        "fr": "французька",
-        "ga": "ірландська",
-        "he": "іврит",
-        "hi": "гінді",
-        "hu": "угорська",
-        "id": "індонезійська",
-        "it": "італійська",
-        "ja": "японська",
-        "ko": "корейська",
-        "lt": "литовська",
-        "lv": "латвійська",
-        "nl": "нідерландська",
-        "pl": "польська",
-        "pt": "португальська",
-        "ru": "російська",
-        "sk": "словацька",
-        "sv": "шведська",
-        "tr": "турецька",
-        "translated_from": {
-            "ar": "Перекладено з арабської",
-            "az": "Перекладено з азербайджанської",
-            "bg": "Перекладено з болгарської",
-            "cs": "Перекладено з чеської",
-            "da": "Перекладено з данської",
-            "de": "Перекладено з німецької",
-            "el": "Перекладено з грецької",
-            "en": "Перекладено з англійської",
-            "eo": "Перекладено з есперанто",
-            "es": "Перекладено з іспанської",
-            "fa": "Перекладено з перської",
-            "fi": "Перекладено з фінської",
-            "fr": "Перекладено з французької",
-            "ga": "Перекладено з ірландської",
-            "he": "Перекладено з івриту",
-            "hi": "Перекладено з гінді",
-            "hu": "Перекладено з угорської",
-            "id": "Перекладено з індонезійської",
-            "it": "Перекладено з італійської",
-            "ja": "Перекладено з японської",
-            "ko": "Перекладено з корейської",
-            "lt": "Перекладено з литовської",
-            "lv": "Перекладено з латвійської",
-            "nl": "Перекладено з нідерландської",
-            "pl": "Перекладено з польської",
-            "pt": "Перекладено з португальської",
-            "ru": "Перекладено з російської",
-            "sk": "Перекладено зі словацької",
-            "sv": "Перекладено зі словенської",
-            "tr": "Перекладено з турецької",
-            "uk": "Перекладено з української",
-            "zh": "Перекладено з китайської"
-        },
-        "uk": "українська",
-        "zh": "китайська"
+        "uk": "українська"
     },
     "lists": {
         "create": "Створити",
@@ -239,7 +173,6 @@
         "following_only": "Лише за ким ви стежите",
         "lists": "Списки",
         "new": "Новий список",
-        "save": "Зберегти зміни",
         "search": "Знайти користувач_ок",
         "title": "Назва списку"
     },
@@ -266,7 +199,6 @@
         "username": "Логін"
     },
     "media_modal": {
-        "counter": "{current} / {total}",
         "hide": "Закрити медіаперегляд",
         "next": "Наступна",
         "previous": "Попередня"
@@ -290,9 +222,7 @@
             "reports": "Скарги",
             "resolve": "Вирішено",
             "show_closed": "Показати закриті",
-            "statuses": "Дописів: { count } | Дописів: { count }",
-            "tag_policy_notice": "Увімкніть MRF TagPolicy, щоб обмежувати окремі обліковки",
-            "tags": "Обмежити обліковку"
+            "statuses": "Дописів: { count } | Дописів: { count }"
         },
         "statuses": "Дописи",
         "users": "Користувач_ки"
@@ -312,21 +242,21 @@
         "home_timeline_description": "Дописи від тих, на кого ви підписані",
         "interactions": "Взаємодії",
         "lists": "Списки",
-        "mentions": "Згадки",
+        "mentions": "Згадування",
         "moderation": "Модерування",
         "preferences": "Налаштування",
         "public_timeline_description": "Загальнодоступні дописи всіх на цьому сервері",
         "public_tl": "Спільна стрічка",
         "search": "Пошук",
-        "timeline": "Стрічка",
+        "timeline": "Домашня стрічка",
         "timelines": "Стрічки",
         "twkn": "Уся відома мережа",
         "twkn_timeline_description": "Дописи з усієї мережі",
         "user_search": "Пошук користувач_ок",
-        "who_to_follow": "На кого підписатись"
+        "who_to_follow": "Кого відстежувати"
     },
     "notifications": {
-        "broken_favorite": "Допис невідомий, пошук триває…",
+        "broken_favorite": "Невідомий допис, шукаю його…",
         "error": "Помилка при оновленні сповіщень: {0}",
         "favorited_you": "вподобує",
         "follow_request": "хоче підписатись",
@@ -355,12 +285,12 @@
     "polls": {
         "add_option": "Додати варіант",
         "add_poll": "Додати опитування",
-        "expired": "Завершено {0} тому",
-        "expires_in": "До кінця {0}",
+        "expired": "Опитування закінчилось {0} тому",
+        "expires_in": "Опитування закінчується через {0}",
         "expiry": "Термін опитування",
         "multiple_choices": "Декілька варіантів",
         "not_enough_options": "Замало унікальних варіантів в опитуванні",
-        "option": "Варіант",
+        "option": "Відповідь",
         "people_voted_count": "Осіб: {count} | Осіб: {count}",
         "single_choice": "Один варіант",
         "type": "Тип опитування",
@@ -392,7 +322,7 @@
         "media_not_sensitive_warning": "Ви вказали засторогу, але не позначили вкладення дражливими!",
         "new_status": "Новий допис",
         "post": "Розмістити",
-        "posting": "Розміщення",
+        "posting": "Відправляється",
         "preview": "Попередній перегляд",
         "preview_empty": "Порожньо",
         "scope": {
@@ -410,13 +340,11 @@
         }
     },
     "registration": {
-        "awaiting_email_confirmation": "Вам надіслано лист підтвердження створення обліковки. Перевірте е-пошту, щоб завершити реєстрацію.",
-        "awaiting_email_confirmation_title": "Очікування підтвердження поштою",
         "bio": "Опис",
         "bio_placeholder": "як-от:\nВолинянка. Подорожую.\nДемократична соціалістка. Пишу драматичні поеми. Жити хочу! Геть, думи сумні!",
         "captcha": "CAPTCHA",
         "email": "Е-пошта",
-        "email_language": "Мова листів сервера",
+        "email_language": "Якою мовою отримувати листи з сервера?",
         "fullname": "Ім'я",
         "fullname_placeholder": "як-от Лариса Косач",
         "new_captcha": "Натисніть на зображення, щоб оновити код, якщо він нерозбірливий",
@@ -425,8 +353,6 @@
         "reason_placeholder": "Запити на реєстрацію підтверджуються вручну.\nРозкажіть адміністрації, чому хочете зареєструватися.",
         "register": "Зареєструватися",
         "registration": "Реєстрація",
-        "request_sent": "Ваш запит на реєстрацію надіслано на розгляд. Ви отримаєте лист, коли вашу реєстрацію схвалять.",
-        "request_sent_title": "Запит на реєстрацію надіслано",
         "token": "Ключ запрошення",
         "username_placeholder": "як-от lesia",
         "validations": {
@@ -444,7 +370,7 @@
         "searching_for": "Шукаю"
     },
     "search": {
-        "hashtags": "Теги",
+        "hashtags": "Хештеги",
         "no_results": "Немає результатів",
         "people": "Люди",
         "people_talking": "{count} людей говорять про це",
@@ -456,34 +382,34 @@
     "settings": {
         "accent": "Акцент",
         "account_alias": "Інші обліковки",
-        "account_alias_table_head": "Попередня обліковка",
+        "account_alias_table_head": "Нова обліковка",
         "account_backup": "Резервне копіювання обліковки",
         "account_backup_description": "Можете завантажити архів даних і дописів своєї обліковки. Але імпортувати їх на іншу обліковку поки неможливо.",
         "account_backup_table_head": "Резервна копія",
         "account_privacy": "Приватність",
-        "add_alias_error": "Помилка додання обліковки: {error}",
+        "add_alias_error": "Помилка додання нової обліковки: {error}",
         "add_backup": "Створити резервну копію",
         "add_backup_error": "Помилка резервного копіювання: {error}",
-        "added_alias": "Обліковку додано.",
+        "added_alias": "Нову обліковку додано.",
         "added_backup": "Резервну копію створено.",
         "allow_following_move": "Дозволити автостеження при переміщенні на інший інстанс",
         "always_show_post_button": "Завжди показувати кнопку «Новий допис»",
         "app_name": "Назва програми",
         "attachmentRadius": "Вкладення",
         "attachments": "Вкладення",
-        "autohide_floating_post_button": "Автоматично ховати кнопку «Новий допис» (на мобільному)",
+        "autohide_floating_post_button": "Автоматично ховати кнопку \"Новий допис\" (в мобільній версії)",
         "avatar": "Аватар",
         "avatarAltRadius": "Аватари у сповіщеннях",
         "avatarRadius": "Аватари",
         "avatar_size_instruction": "Рекомендований мінімальний розмір для зображень аватара становить 150x150 пікселів.",
-        "background": "Тло",
+        "background": "Обкладинка",
         "backup_not_ready": "Резервна копія ще не готова.",
         "bio": "Опис",
         "block_export": "Експорт блокувань",
-        "block_export_button": "Експорт блокувань у CSV-файл",
+        "block_export_button": "Експорт блокувань у файл CSV",
         "block_import": "Імпорт блокувань",
-        "block_import_error": "Помилка імпорту блокувань",
-        "blocks_imported": "Блокування імпортовано! Їх буде застосовано поступово.",
+        "block_import_error": "Помилка імпортування блокувань",
+        "blocks_imported": "Блокування імпортовані! Їх обробка триватиме певний час.",
         "blocks_tab": "Блокування",
         "bot": "Це обліковка бота",
         "btnRadius": "Кнопки",
@@ -515,11 +441,6 @@
         "conversation_display": "Стиль показу розмови",
         "conversation_display_linear": "Колонка",
         "conversation_display_tree": "Дерево",
-        "conversation_other_replies_button": "Кнопка «Переглянути ще»",
-        "conversation_other_replies_button_below": "Під дописами",
-        "conversation_other_replies_button_inside": "Всередині дописів",
-        "current_avatar": "Ваш поточний аватар",
-        "current_mascot": "Ваш поточний маскот",
         "current_password": "Поточний пароль",
         "data_import_export_tab": "Імпорт/експорт даних",
         "default_vis": "Типовий рівень приватності",
@@ -540,24 +461,24 @@
         "expire_posts_input_placeholder": "Скільки днів",
         "export_theme": "Завантажити",
         "file_export_import": {
-            "backup_restore": "Копія налаштувань",
+            "backup_restore": "Резервне копіювання налаштувань",
             "backup_settings": "Завантажити файл налаштувань",
             "backup_settings_theme": "Завантажити налаштування й тему",
             "errors": {
-                "file_slightly_new": "Файл призначено для трохи новішої версії й може спрацювати не повністю",
-                "file_too_new": "Версія {fileMajor} новіша, ніж ця AkkomaFE ({feMajor}) може обробити",
-                "file_too_old": "Версія {fileMajor} більше не підтримується (треба {feMajor} чи новіше)",
+                "file_slightly_new": "Другорядна версія файлу відрізняється, деякі налаштування можуть бути не прийняті",
+                "file_too_new": "Несумісна основна версія: {fileMajor}, ця версія PleromaFE ({feMajor}) занадто стара для його обробки",
+                "file_too_old": "Несумісна основна версія: {fileMajor}, версія файлу занадто стара і не підтримується (мінімальна версія налаштувань {feMajor})",
                 "invalid_file": "Вибраний файл не є резервною копією налаштувань Pleroma. Ніяких змін не було зроблено."
             },
             "restore_settings": "Відновити налаштування з файлу"
         },
         "filtering": "Фільтр",
         "filtering_explanation": "Усі дописи з цими словами буде сховано. Пишіть кожне слово з нового рядка",
-        "follow_export": "Експорт підписок",
-        "follow_export_button": "Експорт підписок до CSV-файлу",
-        "follow_import": "Імпорт підписок",
-        "follow_import_error": "Помилка імпорту підписок",
-        "follows_imported": "Підписки імпортовано! Їх буде застосовано поступово.",
+        "follow_export": "Експортувати відстежуваних",
+        "follow_export_button": "Експортувати відстежуваних до csv файлу",
+        "follow_import": "Імпортувати відстежуваних",
+        "follow_import_error": "Помилка імпортування відстежуваних",
+        "follows_imported": "Відстежуваних імпортовано! Їхня обробка потребує часу.",
         "foreground": "Передній план",
         "fun": "Іграшки",
         "general": "Загальні",
@@ -576,7 +497,7 @@
         "hide_list_aliases_error_action": "Закрити",
         "hide_media_previews": "Приховати попередній перегляд медіа",
         "hide_muted_posts": "Ховати повідомлення приглушених користувач_ок",
-        "hide_muted_threads": "Ховати приглушені гілки",
+        "hide_muted_threads": "Ховати заглушені гілки",
         "hide_post_stats": "Ховати статистику дописів (скільки вподобань тощо)",
         "hide_shoutbox": "Приховати оголошення сервера",
         "hide_site_favicon": "Вилучити значок сервера з шапки",
@@ -585,9 +506,9 @@
         "hide_user_stats": "Ховати користувацьку статистику (скільки підписок тощо)",
         "hide_wallpaper": "Сховати шпалери сервера",
         "hide_wordfiltered_statuses": "Ховати дописи зі словами з фільтру",
-        "import_blocks_from_a_csv_file": "Імпортуйте CSV-файл блокувань",
-        "import_followers_from_a_csv_file": "Імпортуйте CSV-файл підписок",
-        "import_mutes_from_a_csv_file": "Імпортуйте CSV-файл приглушень",
+        "import_blocks_from_a_csv_file": "Імпортувати заблокованих з csv файлу",
+        "import_followers_from_a_csv_file": "Імпортувати відстежуваних з csv файлу",
+        "import_mutes_from_a_csv_file": "Імпорт заглушених з csv файлу",
         "import_theme": "Вивантажити",
         "inputRadius": "Поля вводу",
         "instance_default": "(усталено: {value})",
@@ -597,16 +518,13 @@
         "invalid_theme_imported": "Вибраний файл не є темою Pleroma. У вашу тему не внесено жодних змін.",
         "limited_availability": "Недоступно у вашому браузері",
         "links": "Посилання",
-        "list_aliases_error": "Помилка завантаження обліковок: {error}",
+        "list_aliases_error": "Помилка завантаження нових обліковок: {error}",
         "list_backups_error": "Помилка завантаження переліку копій: {error}",
         "lock_account_description": "Показувати лише схваленим підписни_цям",
         "loop_video": "Зациклити відео",
         "loop_video_silent_only": "Зациклити відео без звуку (напр. Mastodon \"gifs\")",
-        "mascot": "Маскот Mastodon FE",
-        "max_depth_in_thread": "Максимальна кількість типово показаних рівнів гілки обговорення",
         "max_thumbnails": "Максимальна кількість мініатюр на повідомлення",
-        "mention_link_bolden_you": "Підсвічувати посилання, коли вас згадують",
-        "mention_link_display": "Формат посилань згадок",
+        "mention_link_display": "Показувати згадування",
         "mention_link_display_full": "завжди повністю (як-от {'@'}lesia{'@'}example.org)",
         "mention_link_display_full_for_remote": "повністю, якщо це інший сервер (як-от {'@'}lesia{'@'}example.org)",
         "mention_link_display_short": "завжди коротко (як-от {'@'}lesia)",
@@ -639,37 +557,34 @@
         "more_settings": "Більше налаштувань",
         "move_account": "Переїхати",
         "move_account_error": "Помилка переїзду обліковки: {error}",
-        "move_account_notes": "Щоб переїхати з цієї обліковки на іншу, додайте в її налаштуваннях цю обліковку як попередню.",
-        "move_account_target": "Нова обліковка (як-от {example})",
-        "moved_account": "Переїзд обліковки виконано.",
+        "move_account_notes": "Щоб переїхати з цієї обліковки на іншу, вкажіть у її налаштуваннях цю облікову як нову.",
         "mute_bot_posts": "Сховати дописи ботів",
-        "mute_export": "Експорт приглушень",
-        "mute_export_button": "Експорт приглушених у csv файл",
-        "mute_import": "Імпорт приглушень",
-        "mute_import_error": "Під час імпорту приглушених сталася помилка",
-        "mutes_and_blocks": "Приглушення та блокування",
-        "mutes_imported": "Приглушення імпортовано! Їх буде застосовано поступово.",
-        "mutes_tab": "Приглушення",
+        "mute_export": "Експорт ігнорувань",
+        "mute_export_button": "Експорт заглушених у csv файл",
+        "mute_import": "Імпорт ігнорувань",
+        "mute_import_error": "Під час імпорту заглушених сталася помилка",
+        "mutes_and_blocks": "Заглушення та блокування",
+        "mutes_imported": "Заглушені імпортовані! Їх обробка триватиме певний час.",
+        "mutes_tab": "Заглушені",
         "name": "Ім'я",
         "name_bio": "Особисті дані",
-        "new_alias_target": "Додайте стару обліковку ({example})",
+        "new_alias_target": "Вкажіть нову обліковку (як-от {example})",
         "new_email": "Нова е-пошта",
         "new_password": "Новий пароль",
-        "no_blocks": "Нікого не заблоковано",
-        "no_mutes": "Нікого не приглушено",
+        "no_blocks": "Блокування відсутні",
+        "no_mutes": "Заглушені відсутні",
         "no_rich_text_description": "Видалення всього форматування тексту з усіх дописів",
-        "notification_blocks": "Щоб не отримувати сповіщень від когось і вилучити їх із підписни_ць, заблокуйте їх.",
-        "notification_mutes": "Щоб просто не отримувати сповіщень від когось, приглушіть їх.",
+        "notification_blocks": "Блокування користувача зупиняє всі сповіщення від нього, а також скасовує його відстеження.",
+        "notification_mutes": "Щоб перестати отримувати сповіщення від певного користувача, заглушіть його.",
         "notification_setting_block_from_strangers": "Блокувати сповіщення від тих, на кого ви не підписані",
         "notification_setting_filters": "Фільтри",
-        "notification_setting_hide_if_cw": "Ховати вміст push-сповіщення за наявності застороги",
         "notification_setting_hide_notification_contents": "Ховати відправника та вміст push-сповіщень",
         "notification_setting_privacy": "Приватність",
         "notification_visibility": "Сповіщати про такі події",
         "notification_visibility_emoji_reactions": "Реакції",
         "notification_visibility_follows": "Підписни_ці",
         "notification_visibility_likes": "Вподобане",
-        "notification_visibility_mentions": "Згадки",
+        "notification_visibility_mentions": "Згадування",
         "notification_visibility_moves": "Переїзди користувач_ок",
         "notification_visibility_polls": "Результати голосувань",
         "notification_visibility_repeats": "Поширення",
@@ -678,7 +593,7 @@
         "oauth_tokens": "OAuth-ключі",
         "pad_emoji": "Автоматично додавати простір з обидвох сторін емоджі",
         "panelRadius": "Панелі",
-        "pause_on_unfocused": "Лише коли вкладка активна",
+        "pause_on_unfocused": "Призупинити трансляцію, коли вкладка неактивна",
         "play_videos_in_modal": "Відтворювати відео у спливаючій рамці",
         "post_look_feel": "Вигляд дописів",
         "post_status_content_type": "Типова розмітка тексту",
@@ -696,7 +611,7 @@
         "profile_tab": "Профіль",
         "radii_help": "Радіус заокруглення кутів інтерфейсу (в пікселях)",
         "refresh_token": "Оновити ключ",
-        "remove_alias": "Вилучити обліковку",
+        "remove_alias": "Вилучити нову обліковку",
         "remove_backup": "Вилучити",
         "render_mfm": "Показувати розмітку Misskey",
         "render_mfm_on_hover": "Анімувати MFM лише при наведенні",
@@ -718,14 +633,13 @@
         "saving_err": "Помилка при збереженні налаштувань",
         "saving_ok": "Налаштування збережені",
         "scope_copy": "Відповідати на тому ж рівні приватності (завжди ввімкнено для особистих повідомлень)",
-        "search_user_to_block": "Шукайте, кого слід заблокувати",
-        "search_user_to_mute": "Шукайте, кого слід приглушити",
+        "search_user_to_block": "Шукайте кого ви хочете заблокувати",
+        "search_user_to_mute": "Шукайте кого ви хочете заглушити",
         "security": "Безпека",
         "security_tab": "Безпека",
         "sensitive_by_default": "Одразу позначати дописи дражливими",
-        "sensitive_if_subject": "Позначати зображення дражливими, якщо вказано засторогу",
+        "sensitive_if_subject": "Позначати зображення дражливими, якщо вказано застереження",
         "set_new_avatar": "Встановити новий аватар",
-        "set_new_mascot": "Встановити нового маскота",
         "set_new_profile_background": "Встановити нову обкладинку профілю",
         "set_new_profile_banner": "Встановити новий банер",
         "setting_changed": "Конфігурація відрізняється від типової",
@@ -750,7 +664,6 @@
         "show_panel_nav_shortcuts": "Ярлики стрічок у заголовку панелі",
         "show_scrollbars": "Смуги прокрутки в бокових панелях",
         "show_wider_shortcuts": "Більша відстань між ярликами в заголовку",
-        "show_yous": "Показувати «(ви)»",
         "stop_gifs": "Анімувати GIF лише при наведенні",
         "streaming": "Автоматично показувати нові дописи вгорі стрічки",
         "style": {
@@ -831,10 +744,10 @@
                 "faint_link": "корисний підручник",
                 "fine_print": "Прочитайте наш {0} аби нічого нового не дізнатись!",
                 "header": "Попередній перегляд",
-                "header_faint": "Усе гаразд",
+                "header_faint": "Все гаразд",
                 "input": "Що нового?",
                 "link": "невеличке посилання",
-                "mono": "вмісту",
+                "mono": "змісту",
                 "text": "Трохи більше {0} та {1}"
             },
             "radii": {
@@ -906,7 +819,7 @@
         "subject_line_noop": "не копіювати",
         "text": "Текст",
         "theme": "Тема",
-        "theme_help": "Замініть кольори теми своїми в форматі #rrggbb.",
+        "theme_help": "Замініть кольори теми своїми в форматі (#rrggbb).",
         "theme_help_v2_1": "Деякі кольори й прозорості розраховуються автоматично. Позначайте їх пташками, щоб замінити їх вручну. Кнопка «Очистити все» видаляє всі такі заміни.",
         "theme_help_v2_2": "Значки під кольорами показують, наскільки добре видно текст на тлі. При наведенні побачите деталі. Якщо використовуєте прозорість, буде оцінено найгірший варіант.",
         "third_column_mode": "Третя панель, якщо достатньо місця",
@@ -915,20 +828,13 @@
         "third_column_mode_postform": "Новий допис і меню",
         "token": "Ключ",
         "tooltipRadius": "Підказки/попередження",
-        "translation_language": "Мова автоматичного перекладу",
-        "tree_advanced": "Показувати додаткові кнопки відкриття й закриття ланцюгів відповідей у гілках",
-        "tree_fade_ancestors": "Показувати менш виразно дописи, що передують поточному",
-        "type_domains_to_mute": "Шукайте домени, які слід приглушити",
+        "type_domains_to_mute": "Пошук доменів для заглушення",
         "upload_a_photo": "Вивантажити фото",
         "useStreamingApi": "Отримувати дописи та сповіщення наживо",
-        "useStreamingApiWarning": "Загалом працює. Якщо не зовсім, спробуєте оновити сторінку?",
-        "use_blurhash": "Показувати дражливі мініатюри (як розмиті кольори)",
+        "useStreamingApiWarning": "(Не рекомендується, експериментально, повідомлення можуть зникати)",
+        "use_at_icon": "Значок {'@'} замість символа",
         "use_contain_fit": "Не обрізати краї мініатюр",
         "use_one_click_nsfw": "Відкривати NSFW вкладення одним кліком миші",
-        "user_accepts_direct_messages_from": "Приймати особисті повідомлення",
-        "user_accepts_direct_messages_from_everybody": "Будь-чиї",
-        "user_accepts_direct_messages_from_nobody": "Нічиї",
-        "user_accepts_direct_messages_from_people_i_follow": "Від тих, на кого я підписуюсь",
         "user_mutes": "Користувач_ки",
         "user_profile_default_tab": "Типова вкладка профілів",
         "user_profiles": "Користувацькі профілі",
@@ -947,18 +853,8 @@
         "word_filter": "Фільтр слів",
         "wordfilter": "Фільтр слів"
     },
-    "settings_profile": {
-        "creating": "Створення профілю налаштувань «{profile}»…",
-        "synchronization_error": "Не вдалося синхронізувати налаштування: {err}",
-        "synchronized": "Налаштування синхронізовано!",
-        "synchronizing": "Синхронізація профілю налаштувань «{profile}»…"
-    },
     "status": {
-        "ancestor_follow": "Переглянути ще {numReplies} під цим дописом | Переглянути ще {numReplies} під цим дописом",
-        "ancestor_follow_with_icon": "{icon} {text}",
-        "attachment_stop_flash": "Зупинити Flash-плеєр",
         "bookmark": "Додати до закладок",
-        "collapse_attachments": "Згорнути вкладення",
         "copy_link": "Скопіювати посилання на допис",
         "delete": "Видалити допис",
         "delete_confirm": "Точно видалити допис?",
@@ -972,17 +868,11 @@
         "expand": "Розгорнути",
         "external_source": "Зовнішнє джерело",
         "favorites": "Вподобане",
-        "hide_attachment": "Сховати вкладення",
         "hide_content": "Сховати вміст",
-        "hide_full_subject": "Згорнути засторогу",
-        "many_attachments": "Вкладень: {number} | Вкладень: {number}",
-        "mentions": "Згадки",
-        "move_down": "Посунути вкладення праворуч",
-        "move_up": "Посунути вкладення ліворуч",
-        "mute_conversation": "Приглушити розмову",
+        "hide_full_subject": "Сховати всю тему",
+        "mute_conversation": "Заглушити розмову",
         "nsfw": "Дражливий вміст",
         "open_gallery": "Відкрити галерею",
-        "override_translation_source_language": "Замістити початкову мову",
         "pin": "Закріпити в профілі",
         "pinned": "Закріплено",
         "plus_more": "ще {number}",
@@ -991,33 +881,21 @@
         "redraft_confirm_accept_button": "Так, видалити й переписати",
         "redraft_confirm_cancel_button": "Ні, лишити оригінал",
         "redraft_confirm_title": "Підтвердьте видалення й переписання",
-        "remove_attachment": "Видалити вкладення",
-        "repeat_confirm": "Точно поширити допис?",
-        "repeat_confirm_accept_button": "Так, поширити",
-        "repeat_confirm_cancel_button": "Ні, не поширювати",
-        "repeat_confirm_title": "Підтвердьте поширення",
+        "remove_attachment": "Видалити долучення",
         "repeats": "Поширення",
         "replies_list": "Відповіді:",
-        "replies_list_with_others": "Ще відповідей: {numReplies} | Ще відповідей: {numReplies}",
         "reply_to": "Відповідь",
         "show_all_attachments": "Показати всі вкладення",
-        "show_all_conversation": "Показати всю розмову (ще дописів: {numStatus}) | Показати всю розмову (ще дописів: {numStatus})",
-        "show_all_conversation_with_icon": "{icon} {text}",
         "show_attachment_description": "Переглянути опис (натисніть саме вкладення, якщо опис не вміщається)",
         "show_attachment_in_modal": "Показати вкладення у вікні",
         "show_content": "Показати вміст",
         "show_full_subject": "Показати всю засторогу",
-        "show_only_conversation_under_this": "Показати відповіді лише до цього допису",
         "status_deleted": "Цей допис був видалений",
         "status_unavailable": "Допис недоступний",
-        "thread_follow": "Ще відповідей: {numStatus} | Ще відповідей: {numStatus}",
-        "thread_follow_with_icon": "{icon} {text}",
         "thread_hide": "Сховати гілку",
         "thread_muted": "Гілку приглушено",
         "thread_muted_and_words": ", має слова:",
         "thread_show": "Показати гілку",
-        "thread_show_full": "Показати відповіді: {numStatus} | Показати відповіді: {numStatus}",
-        "thread_show_full_with_icon": "{icon} {text}",
         "translate": "Перекласти",
         "translated_from": "В оригіналі: {language}",
         "unbookmark": "Видалити із закладок",
@@ -1051,7 +929,6 @@
         "collapse": "Згорнути",
         "conversation": "Розмова",
         "error": "Помилка завантаження стрічки: {0}",
-        "follow_tag": "Підписатись на тег",
         "load_older": "Завантажити давніші дописи",
         "no_more_statuses": "Більше немає дописів",
         "no_retweet_hint": "Допис приватний чи особистий, тож його не можна поширити чи цитувати",
@@ -1061,12 +938,8 @@
         "show_new": "Показати нові",
         "socket_broke": "Втрачено з'єднання у реальному часі: код {0}",
         "socket_reconnected": "Встановлено з'єднання у реальному часі",
-        "unfollow_tag": "Відписатись від тегу",
         "up_to_date": "Оновлено"
     },
-    "toast": {
-        "no_translation_target_set": "Не обрано цільової мови перекладу — може не вдатися. Оберіть у налаштуваннях, на яку мову перекладати."
-    },
     "tool_tip": {
         "accept_follow_request": "Дозволити підписатись",
         "add_reaction": "Додати реакцію",
@@ -1105,14 +978,14 @@
             "disable_remote_subscription": "Заборонити підписуватись користувач_кам з інших серверів",
             "force_nsfw": "Позначити всі дописи дражливими",
             "force_unlisted": "Не показувати дописи в стрічці",
-            "grant_admin": "Дозволити адміністрування",
-            "grant_moderator": "Дозволити модерування",
+            "grant_admin": "Надати права адміністратора",
+            "grant_moderator": "Надати права модератора",
             "moderation": "Модерування",
             "quarantine": "Не розповсюджувати дописи на інших інстансах",
-            "revoke_admin": "Позбавити прав адміністрування",
-            "revoke_moderator": "Позбавити прав модерування",
+            "revoke_admin": "Позбавити прав адміністратора",
+            "revoke_moderator": "Позбавити прав модератора",
             "sandbox": "Показувати дописи лише підписни_цям",
-            "strip_media": "Вилучити медіа з дописів"
+            "strip_media": "Вилучити медіа з дописів користувача"
         },
         "approve": "Дозволити",
         "approve_confirm": "Точно дозволити користувач_ці на вас підписатись?",
@@ -1133,18 +1006,13 @@
         "deny_confirm": "Точно відхилити запит на підписку?",
         "deny_confirm_accept_button": "Так, відхилити",
         "deny_confirm_cancel_button": "Ні, скасувати",
-        "deny_confirm_title": "Відхилити запит на підписку",
-        "domain_muted": "Розблокувати домен",
         "edit_profile": "Редагувати профіль",
         "favorites": "Вподобання",
         "follow": "Підписатись",
         "follow_cancel": "Скасувати запит",
-        "follow_progress": "Надсилання…",
-        "follow_sent": "Запит надіслано!",
-        "follow_tag": "Підписатись на тег",
+        "follow_progress": "Запитую…",
+        "follow_sent": "Запит відправлено!",
         "follow_unfollow": "Відписатись",
-        "followed_tags": "Підписки на теги",
-        "followed_users": "Підписки на користувач_ок",
         "followees": "Підписки",
         "followers": "Підписни_ці",
         "following": "Ви підписані!",
@@ -1168,8 +1036,7 @@
         "mute_confirm_title": "Приглушення",
         "mute_domain": "Заблокувати домен",
         "mute_progress": "Глушимо…",
-        "muted": "Приглушено",
-        "not_following_any_hashtags": "У вас нема підписок на теги",
+        "muted": "Заглушено",
         "note": "Приватна нотатка",
         "per_day": "на день",
         "remote_follow": "Підписатись",
@@ -1186,9 +1053,8 @@
         "unfollow_confirm_accept_button": "Так, відписатись",
         "unfollow_confirm_cancel_button": "Ні, не відписуватись",
         "unfollow_confirm_title": "Відписка",
-        "unfollow_tag": "Відписатись від тегу",
-        "unmute": "Відновити",
-        "unmute_progress": "Відновлення…",
+        "unmute": "Зняти глушення",
+        "unmute_progress": "Знімаємо глушення…",
         "unsubscribe": "Відписатись"
     },
     "user_profile": {
@@ -1203,7 +1069,7 @@
         "forward_description": "Це обліковка з іншого сервера. Надіслати його адміністрації копію скарги?",
         "forward_to": "Переслати до {0}",
         "generic_error": "Виникла помилка під час обробки вашого запиту.",
-        "submit": "Надіслати",
+        "submit": "Відправити",
         "title": "Поскаржитись на {0}"
     },
     "who_to_follow": {

src/i18n/zh.json

@@ -84,7 +84,6 @@
         "keep_open": "选择器保持打开",
         "load_all": "加载全部 {emojiAmount} 个表情符号中",
         "load_all_hint": "已加载前 {saneAmount} 个表情符号，加载全部表情符号可能会带来性能问题。",
-        "recent": "最近使用",
         "search_emoji": "搜索表情符号",
         "stickers": "贴纸",
         "unicode": "Unicode 表情符号"
@@ -733,7 +732,7 @@
         "settings": "设置",
         "settings_profile": "设置配置文件",
         "settings_profile_creation": "创建新的配置文件",
-        "settings_profile_creation_new_name_label": "名称",
+        "settings_profile_creation_new_name_label": "名字",
         "settings_profile_creation_submit": "创建",
         "settings_profile_currently": "目前使用 {name}（版本：{version}）",
         "settings_profile_delete": "删除",
@@ -921,14 +920,11 @@
         "type_domains_to_mute": "搜索需要静音的域名",
         "upload_a_photo": "上传照片",
         "useStreamingApi": "实时接收帖文和通知",
-        "useStreamingApiWarning": "十分炫酷推荐使用。要是崩了试试刷新？",
+        "useStreamingApiWarning": "（不推荐使用，试验性，已知会跳过一些帖文）",
+        "use_at_icon": "将 {'@'} 符号显示为图标而不是文本",
         "use_blurhash": "对NSFW的缩略图使用模糊处理",
         "use_contain_fit": "生成缩略图时不要裁剪附件",
         "use_one_click_nsfw": "点击一次以打开工作场所不适宜（NSFW）的附件",
-        "user_accepts_direct_messages_from": "允许私信自",
-        "user_accepts_direct_messages_from_everybody": "所有人",
-        "user_accepts_direct_messages_from_nobody": "没有人",
-        "user_accepts_direct_messages_from_people_i_follow": "我关注的人",
         "user_mutes": "用户",
         "user_profile_default_tab": "用户资料中的默认标签页",
         "user_profiles": "用户资料",

src/modules/config.js

@@ -27,6 +27,9 @@ export const defaultState = {
   colors: {},
   theme: undefined,
   customTheme: undefined,
+  showThirdColumn: false,
+  compactNavPanel: false,
+  compactUserPanel: false,
   customThemeSource: undefined,
   hideISP: false,
   hideInstanceWallpaper: false,
@@ -38,6 +41,7 @@ export const defaultState = {
   muteBotStatuses: undefined, // instance default
   collapseMessageWithSubject: true, // instance default
   padEmoji: true,
+  swapReacts: true,
   showNavShortcuts: undefined, // instance default
   showPanelNavShortcuts: undefined, // instance default
   showWiderShortcuts: undefined, // instance default
@@ -55,7 +59,6 @@ export const defaultState = {
   alwaysShowNewPostButton: false,
   autohideFloatingPostButton: false,
   pauseOnUnfocused: true,
-  displayPageBackgrounds: true,
   stopGifs: undefined,
   replyVisibility: 'all',
   thirdColumnMode: 'notifications',
@@ -96,6 +99,7 @@ export const defaultState = {
   disableStickyHeaders: false,
   showScrollbars: false,
   greentext: undefined, // instance default
+  useAtIcon: undefined, // instance default
   mentionLinkDisplay: undefined, // instance default
   mentionLinkShowTooltip: undefined, // instance default
   mentionLinkShowAvatar: undefined, // instance default
@@ -229,7 +233,7 @@ const config = {
           break
         case 'interfaceLanguage':
           messages.setLanguage(this.getters.i18n, value)
-          Cookies.set(BACKEND_LANGUAGE_COOKIE_NAME, localeService.internalToBackendLocale(value), {sameSite: 'Lax'})
+          Cookies.set(BACKEND_LANGUAGE_COOKIE_NAME, localeService.internalToBackendLocale(value))
           dispatch('setInstanceOption', { name: 'interfaceLanguage', value })
           break
         case 'thirdColumnMode':

src/modules/domNodeToComponent.js

@@ -0,0 +1,9 @@
+export default {
+  install: (Vue, options) => {
+    Vue.mixin({
+      mounted () {
+        this.$el.__vueComponent__ = this
+      }
+    })
+  }
+}

src/modules/instance.js

@@ -21,6 +21,7 @@ const defaultState = {
   background: '/static/aurora_borealis.jpg',
   collapseMessageWithSubject: true,
   greentext: false,
+  useAtIcon: false,
   mentionLinkDisplay: 'short',
   mentionLinkShowTooltip: true,
   mentionLinkShowAvatar: false,

src/modules/recentEmojis.js

@@ -37,18 +37,11 @@ const recentEmojis = {
 
   getters: {
     recentEmojis: (state, getters, rootState) => state.emojis.reduce((objects, displayText) => {
-      let comparator = emoji => emoji.displayText === displayText
-
-      let emojiObject = rootState.instance.emoji.find(comparator)
+      const allEmojis = rootState.instance.emoji.concat(rootState.instance.customEmoji)
+      let emojiObject = allEmojis.find(emoji => emoji.displayText === displayText)
       if (emojiObject !== undefined) {
         objects.push(emojiObject)
-      } else {
-        emojiObject = rootState.instance.customEmoji.find(comparator)
-        if (emojiObject !== undefined) {
-          objects.push(emojiObject)
-        }
       }
-
       return objects
     }, []),
   },

src/modules/serverSideConfig.js

@@ -47,10 +47,6 @@ export const settingsMap = {
   },
   // Privacy
   'locked': 'locked',
-  'permitFollowback': {
-    get: 'akkoma.permit_followback',
-    set: 'permit_followback'
-  },
   'allowFollowingMove': {
     get: 'pleroma.allow_following_move',
     set: 'allow_following_move'

src/modules/statuses.js

@@ -717,6 +717,14 @@ const statuses = {
       commit('dismissNotification', { id })
       rootState.api.backendInteractor.dismissNotification({ id })
     },
+    markMultipleNotificationsAsSeen ({ rootState, commit }, { finder }) {
+      const notifications = rootState.statuses.notifications.data.filter(finder)
+
+      notifications.forEach(n => {
+        commit('markSingleNotificationAsSeen', { id: n.id })
+        rootState.api.backendInteractor.markNotificationsAsSeen({ id: n.id, single: true })
+      })
+    },
     updateNotification ({ rootState, commit }, { id, updater }) {
       commit('updateNotification', { id, updater })
     },

src/modules/users.js

@@ -135,10 +135,6 @@ export const mutations = {
     const user = state.usersObject[id]
     user['deactivated'] = deactivated
   },
-  setDisplayBackground(state, url) {
-    console.log("Commiting user profile bg mutation")
-    state.displayBackground = url
-  },
   setCurrentUser (state, user) {
     state.lastLoginName = user.screen_name
     state.currentUser = mergeWith(state.currentUser || {}, user, mergeArrayLength)
@@ -203,28 +199,21 @@ export const mutations = {
     })
   },
   saveBlockIds (state, blockIds) {
-    console.log("ADDING BLOCK IDS", blockIds);
-    state.currentUser.blockIds = uniq(concat(state.currentUser.blockIds || [], blockIds))
+    state.currentUser.blockIds = blockIds
   },
   addBlockId (state, blockId) {
     if (state.currentUser.blockIds.indexOf(blockId) === -1) {
       state.currentUser.blockIds.push(blockId)
     }
   },
-  setBlockIdsMaxId (state, blockIdsMaxId) {
-    state.currentUser.blockIdsMaxId = blockIdsMaxId
-  },
   saveMuteIds (state, muteIds) {
-    state.currentUser.muteIds = uniq(concat(state.currentUser.muteIds || [], muteIds))
+    state.currentUser.muteIds = muteIds
   },
   addMuteId (state, muteId) {
     if (state.currentUser.muteIds.indexOf(muteId) === -1) {
       state.currentUser.muteIds.push(muteId)
     }
   },
-  setMuteIdsMaxId (state, muteIdsMaxId) {
-    state.currentUser.muteIdsMaxId = muteIdsMaxId
-  },
   updateMascot (state, mascotUrl) {
     state.currentUser.mascot = mascotUrl
   },
@@ -311,7 +300,6 @@ export const defaultState = {
   currentUser: false,
   users: [],
   usersObject: {},
-  displayBackground: null,
   signUpPending: false,
   signUpErrors: [],
   relationships: {},
@@ -324,10 +312,6 @@ const users = {
   mutations,
   getters,
   actions: {
-    setDisplayBackground (store, url) {
-      console.log("Performing user profile bg action...")
-      store.commit('setDisplayBackground', url)
-    },
     fetchUserIfMissing (store, id) {
       if (!store.getters.findUser(id)) {
         store.dispatch('fetchUser', id)
@@ -346,21 +330,10 @@ const users = {
           .then((relationships) => store.commit('updateUserRelationship', relationships))
       }
     },
-    fetchBlocks (store, args) {
-      const { reset } = args || {}
-
-      const maxId = store.state.currentUser.blockIdsMaxId
-      return store.rootState.api.backendInteractor.fetchBlocks({ maxId })
+    fetchBlocks (store) {
+      return store.rootState.api.backendInteractor.fetchBlocks()
         .then((blocks) => {
           store.commit('saveBlockIds', map(blocks, 'id'))
-          if (reset) {
-            store.commit('saveBlockIds', map(blocks, 'id'))
-          } else {
-            map(blocks, 'id').map(id => store.commit('addBlockId', id))
-          }
-          if (blocks.length) {
-            store.commit('setBlockIdsMaxId', last(blocks).id)
-          }
           store.commit('addNewUsers', blocks)
           return blocks
         })
@@ -380,22 +353,10 @@ const users = {
     unblockUsers (store, ids = []) {
       return Promise.all(ids.map(id => unblockUser(store, id)))
     },
-    fetchMutes (store, args) {
-      const { reset } = args || {}
-
-      const maxId = store.state.currentUser.muteIdsMaxId
-      return store.rootState.api.backendInteractor.fetchMutes({ maxId })
+    fetchMutes (store) {
+      return store.rootState.api.backendInteractor.fetchMutes()
         .then((mutes) => {
           store.commit('saveMuteIds', map(mutes, 'id'))
-          if (reset) {
-            store.commit('saveMuteIds', map(mutes, 'id'))
-          } else {
-            map(mutes, 'id').map(id => store.commit('addMuteId', id))
-          }
-          if (mutes.length) {
-            store.commit('setMuteIdsMaxId', last(mutes).id)
-          }
-
           store.commit('addNewUsers', mutes)
           return mutes
         })

src/services/api/api.service.js

@@ -1166,13 +1166,8 @@ const generateMfaBackupCodes = ({ credentials }) => {
   }).then((data) => data.json())
 }
 
-const fetchMutes = ({ maxId, credentials }) => {
-  const query = new URLSearchParams({ with_relationships: true })
-  if (maxId) {
-    query.append('max_id', maxId)
-  }
-
-  return promisedRequest({ url: `${MASTODON_USER_MUTES_URL}?${query.toString()}`, credentials })
+const fetchMutes = ({ credentials }) => {
+  return promisedRequest({ url: MASTODON_USER_MUTES_URL, credentials })
     .then((users) => users.map(parseUser))
 }
 
@@ -1218,12 +1213,8 @@ const unsubscribeUser = ({ id, credentials }) => {
   return promisedRequest({ url: MASTODON_UNSUBSCRIBE_USER(id), credentials, method: 'POST' })
 }
 
-const fetchBlocks = ({ maxId, credentials }) => {
-  const query = new URLSearchParams({ with_relationships: true })
-  if (maxId) {
-    query.append('max_id', maxId)
-  }
-  return promisedRequest({ url: `${MASTODON_USER_BLOCKS_URL}?${query.toString()}`, credentials })
+const fetchBlocks = ({ credentials }) => {
+  return promisedRequest({ url: MASTODON_USER_BLOCKS_URL, credentials })
     .then((users) => users.map(parseUser))
 }