Merge pull request 'Make animated emojis in reactions pause' (#378) from sarayalth/akkoma-fe:pause-animated-reaction into develop

Reviewed-on: #378

.tool-versions

@@ -0,0 +1 @@
+nodejs 20.12.2

.woodpecker.yml

@@ -1,9 +1,12 @@
-pipeline:
+labels:
+  platform: linux/amd64
+
+steps:
   lint:
     when:
       event:
       - pull_request
-    image: node:18
+    image: node:20
     commands:
     - yarn
     - yarn lint
@@ -13,11 +16,11 @@ pipeline:
     when:
       event:
       - pull_request
-    image: node:18
+    image: node:20
     commands:
     - apt update
     - apt install firefox-esr -y --no-install-recommends
-    - yarn 
+    - yarn
     - yarn unit
 
   build:
@@ -27,7 +30,7 @@ pipeline:
       branch:
       - develop
       - stable
-    image: node:18
+    image: node:20
     commands:
     - yarn
     - yarn build
@@ -39,7 +42,7 @@ pipeline:
       branch:
       - develop
       - stable
-    image: node:18
+    image: node:20
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY

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)
 
@@ -8,7 +8,7 @@ This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkom
 
 # 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 +22,7 @@ To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/ad
 
 ``` bash
 # install dependencies
-npm install -g yarn
+corepack enable
 yarn
 
 # serve with hot reload at localhost:8080
@@ -37,7 +37,7 @@ npm run unit
 
 # For Contributors:
 
-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:
+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:
 
 * `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 +52,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.

config/local.example.json

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

docs/docs/CONFIGURATION.md

@@ -1,15 +1,15 @@
-# Pleroma-FE configuration and customization for instance administrators
+# Akkoma-FE configuration and customization for instance administrators
 
-* *For user configuration, see [Pleroma-FE user guide](../user_guide)*
+* *For user configuration, see [Akkoma-FE user guide](../user_guide)*
 * *For local development server configuration, see [Hacking, tweaking, contributing](HACKING.md)*
 
 ## Where configuration is stored
 
-PleromaFE gets its configuration from several sources, in order of preference (the one above overrides ones below it)
+Akkoma-FE 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, 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)
+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/pleroma-fe/src/branch/develop/static/config.json).
+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/pleroma-fe/src/branch/develop/src/modules/instance.js) )
+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) )
 
 ## 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 PleromaFE.
+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.
 
 ### `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. 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.
+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.
 
 ### `subjectLineBehavior`
 How to handle subject line (CW) when replying to a post.

docs/docs/HACKING.md

@@ -1,8 +1,8 @@
 # Hacking, tweaking, contributing
 
-## What PleromaFE even is, how it works
+## What Akkoma-FE even is, how it works
 
-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.
+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.
 
 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 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.
+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.
 
-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.
+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.
 
-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.
+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.
 
-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.
+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.
 
 TODO: Refactor API code and document it here
 
 ### Themes
 
-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.
+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.
 
 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

@@ -0,0 +1,24 @@
+<?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

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

docs/docs/stickers.md

@@ -1,13 +1,13 @@
 # Adding stickers
 
-Pleroma-fe supports stickers, which are essentially little images stored server-side
+Akkoma-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 pleroma-fe from your instance's `instance/static/` directory - 
+You're probably serving Akkoma-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 pleroma-fe that allows you to attach stickers.
+Now you should find that there's a sticky note icon on the emoji picker on Akkoma-FE that allows you to attach stickers.

docs/docs/user_guide/index.md

@@ -8,13 +8,13 @@
 >
 > --Catbag
 
-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.
+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.
 
 ### 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 Pleroma-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 Akkoma-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 `:pleroma:` emoji defined on an instance. That means  
+Let's say there's a `:akkoma:` emoji defined on an instance. That means
-> First time using :pleroma: pleroma!  
+> First time using :akkoma: akkoma!
 
-will become  
+will become
-> First time using ![pleroma](../assets/example_emoji.png) pleroma!  
+> First time using ![akkoma](../assets/example_emoji.png) akkoma!
 
-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 PleromaFE, 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 Akkoma-FE, 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
 
-The akkoma version of pleroma-fe includes support for writing and rendering
+Akkoma-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 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.
+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.
 
 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 PleromaFE 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 Akkoma-FE 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: Pleroma-FE Documentation
+site_name: Akkoma-FE Documentation
 theme:
-  favicon: 'images/pleroma_logo_vector_bg_32.png'
+  favicon: 'images/akkoma_logo_vector_bg_32.png'
   name: 'material'
   custom_dir: 'theme'
   # Disable google fonts
   font: false
-  logo: 'images/pleroma_logo_vector_nobg.svg'
+  logo: 'images/akkoma_logo_vector_nobg.svg'
   features:
     - tabs
   palette:
@@ -14,8 +14,8 @@ theme:
 
 extra_css:
   - css/extra.css
-repo_name: 'AkkomaGang/pleroma-fe'
+repo_name: 'AkkomaGang/akkoma-fe'
-repo_url: 'https://akkoma.dev/AkkomaGang/pleroma-fe'
+repo_url: 'https://akkoma.dev/AkkomaGang/akkoma-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://git.pleroma.social/pleroma/pleroma" %}
+  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma" %}
-  {% set repo_name = "pleroma/pleroma" %}
+  {% set repo_name = "AkkomaGang/akkoma" %}
 {% elif page and page.url.startswith('frontend') %}
-  {% set repo_url = "https://git.pleroma.social/pleroma/pleroma-fe" %}
+  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma-fe" %}
-  {% set repo_name = "pleroma/pleroma-fe" %}
+  {% set repo_name = "AkkomaGang/akkoma-fe" %}
 {% else %}
   {% set repo_url = config.repo_url %}
   {% set repo_name = config.repo_name %}

index.html

@@ -4,8 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
     <title>Akkoma</title>
-    <link rel="stylesheet" href="/static/font/css/fontello.css">
-    <link rel="stylesheet" href="/static/font/css/animation.css">
     <link rel="stylesheet" href="/static/font/tiresias.css">
     <link rel="stylesheet" href="/static/font/css/lato.css">
     <link rel="stylesheet" href="/static/mfm.css">

package.json

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

src/App.js

@@ -64,6 +64,11 @@ 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 () {
@@ -71,7 +76,7 @@ export default {
         ? null
         : this.$store.state.instance.background
     },
-    background () { return this.userBackground || this.instanceBackground },
+    background () { return this.pageBackground || this.userBackground || this.instanceBackground },
     bgStyle () {
       if (this.background) {
         return {

src/App.scss

@@ -8,7 +8,7 @@
 }
 
 html {
-  font-size: 14px;
+  font-size: 0.875rem;
   // 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(--inputFont, sans-serif);
+  font-family: var(--interfaceFont, sans-serif);
   font-size: 1em;
   margin: 0;
   box-sizing: border-box;

src/boot/after_store.js

@@ -322,6 +322,9 @@ const getNodeInfo = async ({ store }) => {
           : federation.enabled
       })
 
+      store.dispatch('setInstanceOption', { name: 'publicTimelineVisibility', value: metadata.publicTimelineVisibility })
+      store.dispatch('setInstanceOption', { name: 'federatedTimelineAvailable', value: metadata.federatedTimelineAvailable })
+
       const accountActivationRequired = metadata.accountActivationRequired
       store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })
 
@@ -396,9 +399,6 @@ const afterStoreSetup = async ({ store, i18n }) => {
   ])
 
   // Start fetching things that don't need to block the UI
-  store.dispatch('fetchMutes')
-  store.dispatch('startFetchingAnnouncements')
-  store.dispatch('startFetchingReports')
   getTOS({ store })
   getStickers({ store })
 

src/components/attachment/attachment.scss

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

src/components/desktop_nav/desktop_nav.js

@@ -1,6 +1,11 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  publicTimelineVisible,
+  federatedTimelineVisible,
+  bubbleTimelineVisible,
+} from '../../lib/timeline_visibility'
 import {
   faSignInAlt,
   faSignOutAlt,
@@ -19,6 +24,7 @@ import {
   faInfoCircle,
   faUserTie
 } from '@fortawesome/free-solid-svg-icons'
+import { mapState } from 'vuex'
 
 library.add(
   faSignInAlt,
@@ -103,7 +109,12 @@ export default {
     },
     showBubbleTimeline () {
       return this.$store.state.instance.localBubbleInstances.length > 0
-    }
+    },
+    ...mapState({
+      publicTimelineVisible,
+      federatedTimelineVisible,
+      bubbleTimelineVisible,
+    })
   },
   methods: {
     scrollToTop () {

src/components/desktop_nav/desktop_nav.vue

@@ -46,6 +46,7 @@
           <router-link
             :to="{ name: 'public-timeline' }"
             class="nav-icon"
+            v-if="publicTimelineVisible"
           >
             <FAIcon
               fixed-width
@@ -55,7 +56,7 @@
             />
           </router-link>
           <router-link
-            v-if="currentUser && showBubbleTimeline"
+            v-if="bubbleTimelineVisible"
             :to="{ name: 'bubble-timeline' }"
             class="nav-icon"
           >
@@ -69,6 +70,7 @@
           <router-link
             :to="{ name: 'public-external-timeline' }"
             class="nav-icon"
+            v-if="federatedTimelineVisible"
           >
             <FAIcon
               fixed-width

src/components/emoji_grid/emoji_grid.js

@@ -0,0 +1,133 @@
+const EMOJI_SIZE = 32 + 8
+const GROUP_TITLE_HEIGHT = 24
+const BUFFER_SIZE = 3 * EMOJI_SIZE
+
+const EmojiGrid = {
+  props: {
+    groups: {
+      required: true,
+      type: Array
+    }
+  },
+  data () {
+    return {
+      containerWidth: 0,
+      containerHeight: 0,
+      scrollPos: 0,
+      resizeObserver: null
+    }
+  },
+  mounted () {
+    const rect = this.$refs.container.getBoundingClientRect()
+    this.containerWidth = rect.width
+    this.containerHeight = rect.height
+    this.resizeObserver = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        this.containerWidth = entry.contentRect.width
+        this.containerHeight = entry.contentRect.height
+      }
+    })
+    this.resizeObserver.observe(this.$refs.container)
+  },
+  beforeUnmount () {
+    this.resizeObserver.disconnect()
+    this.resizeObserver = null
+  },
+  watch: {
+    groups () {
+      // Scroll to top when grid content changes
+      if (this.$refs.container) {
+        this.$refs.container.scrollTo(0, 0)
+      }
+    },
+    activeGroup (group) {
+      this.$emit('activeGroup', group)
+    }
+  },
+  methods: {
+    onScroll () {
+      this.scrollPos = this.$refs.container.scrollTop
+    },
+    onEmoji (emoji) {
+      this.$emit('emoji', emoji)
+    },
+    scrollToItem (itemId) {
+      const container = this.$refs.container
+      if (!container) return
+
+      for (const item of this.itemList) {
+        if (item.id === itemId) {
+          container.scrollTo(0, item.position.y)
+          return
+        }
+      }
+    }
+  },
+  computed: {
+    // Total height of scroller content
+    gridHeight () {
+      if (this.itemList.length === 0) return 0
+      const lastItem = this.itemList[this.itemList.length - 1]
+      return (
+        lastItem.position.y +
+        ('title' in lastItem ? GROUP_TITLE_HEIGHT : EMOJI_SIZE)
+      )
+    },
+    activeGroup () {
+      const items = this.itemList
+      for (let i = items.length - 1; i >= 0; i--) {
+        const item = items[i]
+        if ('title' in item && item.position.y <= this.scrollPos) {
+          return item.id
+        }
+      }
+      return null
+    },
+    itemList () {
+      const items = []
+      let x = 0
+      let y = 0
+      for (const group of this.groups) {
+        items.push({ position: { x, y }, id: group.id, title: group.text })
+        if (group.text.length) {
+          y += GROUP_TITLE_HEIGHT
+        }
+        for (const emoji of group.emojis) {
+          items.push({
+            position: { x, y },
+            id: `${group.id}-${emoji.displayText}`,
+            emoji
+          })
+          x += EMOJI_SIZE
+          if (x + EMOJI_SIZE > this.containerWidth) {
+            y += EMOJI_SIZE
+            x = 0
+          }
+        }
+        if (x > 0) {
+          y += EMOJI_SIZE
+          x = 0
+        }
+      }
+      return items
+    },
+    visibleItems () {
+      const startPos = this.scrollPos - BUFFER_SIZE
+      const endPos = this.scrollPos + this.containerHeight + BUFFER_SIZE
+      return this.itemList.filter((i) => {
+        return i.position.y >= startPos && i.position.y < endPos
+      })
+    },
+    scrolledClass () {
+      if (this.scrollPos <= 5) {
+        return 'scrolled-top'
+      } else if (this.scrollPos >= this.gridHeight - this.containerHeight - 5) {
+        return 'scrolled-bottom'
+      } else {
+        return 'scrolled-middle'
+      }
+    }
+  }
+}
+
+export default EmojiGrid

src/components/emoji_grid/emoji_grid.scss

@@ -0,0 +1,60 @@
+.emoji {
+  &-grid {
+    flex: 1 1 1px;
+    position: relative;
+    overflow: auto;
+    user-select: none;
+    mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+          linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+          linear-gradient(to top, white, white);
+    transition: mask-size 150ms;
+    mask-size: 100% 20px, 100% 20px, auto;
+    // Autoprefixed seem to ignore this one, and also syntax is different
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;
+    &.scrolled {
+      &-top {
+        mask-size: 100% 20px, 100% 0, auto;
+      }
+      &-bottom {
+        mask-size: 100% 0, 100% 20px, auto;
+      }
+    }
+    margin-left: 5px;
+    min-height: 200px;
+  }
+
+  &-group-title {
+    position: absolute;
+    font-size: 0.85em;
+    width: 100%;
+    margin: 0;
+    height: 24px;
+    display: flex;
+    align-items: end;
+
+    &.disabled {
+        display: none;
+    }
+  }
+
+  &-item {
+    position: absolute;
+    width: 32px;
+    height: 32px;
+    box-sizing: border-box;
+    display: flex;
+    font-size: 32px;
+    align-items: center;
+    justify-content: center;
+    margin: 4px;
+
+    cursor: pointer;
+
+    img {
+      object-fit: contain;
+      max-width: 100%;
+      max-height: 100%;
+    }
+  }
+}

src/components/emoji_grid/emoji_grid.vue

@@ -0,0 +1,48 @@
+<template>
+  <div
+    ref="container"
+    class="emoji-grid"
+    :class="scrolledClass"
+    @scroll.passive="onScroll"
+  >
+    <div
+      :style="{
+        height: `${gridHeight}px`,
+      }"
+    >
+      <template v-for="item in visibleItems">
+        <h6
+          v-if="'title' in item && item.title.length"
+          :key="'title-' + item.id"
+          class="emoji-group-title"
+          :style="{
+            top: item.position.y + 'px',
+            left: item.position.x + 'px'
+          }"
+        >
+          {{ item.title }}
+        </h6>
+        <span
+          v-else-if="'emoji' in item"
+          :key="'emoji-' + item.id"
+          class="emoji-item"
+          :title="item.emoji.displayText"
+          :style="{
+            top: item.position.y + 'px',
+            left: item.position.x + 'px'
+          }"
+          @click.stop.prevent="onEmoji(item.emoji)"
+        >
+          <span v-if="!item.emoji.imageUrl">{{ item.emoji.replacement }}</span>
+          <img
+            v-else
+            :src="item.emoji.imageUrl"
+          >
+        </span>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script src="./emoji_grid.js"></script>
+<style lang="scss" src="./emoji_grid.scss"></style>

src/components/emoji_input/emoji_input.js

@@ -205,7 +205,6 @@ const EmojiInput = {
     },
     triggerShowPicker () {
       this.showPicker = true
-      this.$refs.picker.startEmojiLoad()
       this.$nextTick(() => {
         this.scrollIntoView()
         this.focusPickerInput()
@@ -223,7 +222,6 @@ const EmojiInput = {
       this.showPicker = !this.showPicker
       if (this.showPicker) {
         this.scrollIntoView()
-        this.$refs.picker.startEmojiLoad()
         this.$nextTick(this.focusPickerInput)
       }
     },

src/components/emoji_picker/emoji_picker.js

@@ -1,12 +1,13 @@
 import { defineAsyncComponent } from 'vue'
 import Checkbox from '../checkbox/checkbox.vue'
+import EmojiGrid from '../emoji_grid/emoji_grid.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBoxOpen,
   faStickyNote,
   faSmileBeam
 } from '@fortawesome/free-solid-svg-icons'
-import { trim, escapeRegExp, startCase } from 'lodash'
+import { trim, escapeRegExp, startCase, debounce } from 'lodash'
 
 library.add(
   faBoxOpen,
@@ -14,13 +15,6 @@ library.add(
   faSmileBeam
 )
 
-// At widest, approximately 20 emoji are visible in a row,
-// loading 3 rows, could be overkill for narrow picker
-const LOAD_EMOJI_BY = 60
-
-// When to start loading new batch emoji, in pixels
-const LOAD_EMOJI_MARGIN = 64
-
 const EmojiPicker = {
   props: {
     enableStickerPicker: {
@@ -39,18 +33,18 @@ const EmojiPicker = {
       keyword: '',
       activeGroup: 'standard',
       showingStickers: false,
-      groupsScrolledClass: 'scrolled-top',
+      keepOpen: false
-      keepOpen: false,
-      customEmojiBufferSlice: LOAD_EMOJI_BY,
-      customEmojiTimeout: null,
-      customEmojiLoadAllConfirmed: false
     }
   },
   components: {
     StickerPicker: defineAsyncComponent(() => import('../sticker_picker/sticker_picker.vue')),
-    Checkbox
+    Checkbox,
+    EmojiGrid
   },
   methods: {
+    debouncedSearch: debounce(function (e) {
+      this.keyword = e.target.value
+    }, 500),
     onStickerUploaded (e) {
       this.$emit('sticker-uploaded', e)
     },
@@ -60,12 +54,7 @@ const EmojiPicker = {
     onEmoji (emoji) {
       const value = emoji.imageUrl ? `:${emoji.displayText}:` : emoji.replacement
       this.$emit('emoji', { insertion: value, keepOpen: this.keepOpen })
-    },
+      this.$store.commit('emojiUsed', emoji)
-    onScroll (e) {
-      const target = (e && e.target) || this.$refs['emoji-groups']
-      this.updateScrolledClass(target)
-      this.scrolledGroup(target)
-      this.triggerLoadMore(target)
     },
     onWheel (e) {
       e.preventDefault()
@@ -74,68 +63,12 @@ const EmojiPicker = {
     highlight (key) {
       this.setShowStickers(false)
       this.activeGroup = key
-    },
+      if (this.keyword.length) {
-    updateScrolledClass (target) {
+        this.$refs.emojiGrid.scrollToItem(key)
-      if (target.scrollTop <= 5) {
-        this.groupsScrolledClass = 'scrolled-top'
-      } else if (target.scrollTop >= target.scrollTopMax - 5) {
-        this.groupsScrolledClass = 'scrolled-bottom'
-      } else {
-        this.groupsScrolledClass = 'scrolled-middle'
       }
     },
-    triggerLoadMore (target) {
+    onActiveGroup (group) {
-      const ref = this.$refs['group-end-custom']
+      this.activeGroup = group
-      if (!ref) return
-      const bottom = ref.offsetTop + ref.offsetHeight
-
-      const scrollerBottom = target.scrollTop + target.clientHeight
-      const scrollerTop = target.scrollTop
-      const scrollerMax = target.scrollHeight
-
-      // Loads more emoji when they come into view
-      const approachingBottom = bottom - scrollerBottom < LOAD_EMOJI_MARGIN
-      // Always load when at the very top in case there's no scroll space yet
-      const atTop = scrollerTop < 5
-      // Don't load when looking at unicode category or at the very bottom
-      const bottomAboveViewport = bottom < scrollerTop || scrollerBottom === scrollerMax
-      if (!bottomAboveViewport && (approachingBottom || atTop)) {
-        this.loadEmoji()
-      }
-    },
-    scrolledGroup (target) {
-      const top = target.scrollTop + 5
-      this.$nextTick(() => {
-        this.emojisView.forEach(group => {
-          const ref = this.$refs['group-' + group.id]
-          if (ref.offsetTop <= top) {
-            this.activeGroup = group.id
-          }
-        })
-      })
-    },
-    loadEmoji () {
-      const allLoaded = this.customEmojiBuffer.length === this.filteredEmoji.length
-
-      if (allLoaded) {
-        return
-      }
-
-      this.customEmojiBufferSlice += LOAD_EMOJI_BY
-    },
-    startEmojiLoad (forceUpdate = false) {
-      if (!forceUpdate) {
-        this.keyword = ''
-      }
-      this.$nextTick(() => {
-        this.$refs['emoji-groups'].scrollTop = 0
-      })
-      const bufferSize = this.customEmojiBuffer.length
-      const bufferPrefilledAll = bufferSize === this.filteredEmoji.length
-      if (bufferPrefilledAll && !forceUpdate) {
-        return
-      }
-      this.customEmojiBufferSlice = LOAD_EMOJI_BY
     },
     toggleStickers () {
       this.showingStickers = !this.showingStickers
@@ -151,32 +84,12 @@ const EmojiPicker = {
       })
     }
   },
-  watch: {
-    keyword () {
-      this.customEmojiLoadAllConfirmed = false
-      this.onScroll()
-      this.startEmojiLoad(true)
-    }
-  },
   computed: {
     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 || []
-      )
-    },
-    customEmojiBuffer () {
-      return this.filteredEmoji.slice(0, this.customEmojiBufferSlice)
-    },
     emojis () {
+      const recentEmojis = this.$store.getters.recentEmojis
       const standardEmojis = this.$store.state.instance.emoji || []
       const customEmojis = this.sortedEmoji
       const emojiPacks = []
@@ -189,6 +102,15 @@ const EmojiPicker = {
         })
       })
       return [
+        {
+          id: 'recent',
+          text: this.$t('emoji.recent'),
+          first: {
+            imageUrl: '',
+            replacement: '🕒',
+          },
+          emojis: this.filterByKeyword(recentEmojis)
+        },
         {
           id: 'standard',
           text: this.$t('emoji.unicode'),

src/components/emoji_picker/emoji_picker.scss

@@ -85,10 +85,6 @@
     flex-grow: 1;
   }
 
-  .emoji-groups {
-    min-height: 200px;
-  }
-
   .additional-tabs {
     border-left: 1px solid;
     border-left-color: $fallback--icon;
@@ -167,76 +163,12 @@
     }
   }
 
-  .emoji {
+  .emoji-search {
-    &-search {
+    padding: 5px;
-      padding: 5px;
+    flex: 0 0 auto;
-      flex: 0 0 auto;
 
-      input {
+    input {
-        width: 100%;
+      width: 100%;
-      }
     }
-
-    &-groups {
-      flex: 1 1 1px;
-      position: relative;
-      overflow: auto;
-      user-select: none;
-      mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
-            linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
-            linear-gradient(to top, white, white);
-      transition: mask-size 150ms;
-      mask-size: 100% 20px, 100% 20px, auto;
-      // Autoprefixed seem to ignore this one, and also syntax is different
-      -webkit-mask-composite: xor;
-      mask-composite: exclude;
-      &.scrolled {
-        &-top {
-          mask-size: 100% 20px, 100% 0, auto;
-        }
-        &-bottom {
-          mask-size: 100% 0, 100% 20px, auto;
-        }
-      }
-    }
-
-    &-group {
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-      padding-left: 5px;
-      justify-content: left;
-
-      &-title {
-        font-size: 0.85em;
-        width: 100%;
-        margin: 0;
-
-        &.disabled {
-          display: none;
-        }
-      }
-    }
-
-    &-item {
-      width: 32px;
-      height: 32px;
-      box-sizing: border-box;
-      display: flex;
-      font-size: 32px;
-      align-items: center;
-      justify-content: center;
-      margin: 4px;
-
-      cursor: pointer;
-
-      img {
-        object-fit: contain;
-        max-width: 100%;
-        max-height: 100%;
-      }
-    }
-
   }
-
 }

src/components/emoji_picker/emoji_picker.vue

@@ -2,9 +2,9 @@
   <div class="emoji-picker panel panel-default panel-body">
     <div class="heading">
       <span
+        ref="emoji-tabs"
         class="emoji-tabs"
         @wheel="onWheel"
-        ref="emoji-tabs"
       >
         <span
           v-for="group in emojis"
@@ -44,46 +44,18 @@
       >
         <div class="emoji-search">
           <input
-            v-model="keyword"
             type="text"
             class="form-control"
             :placeholder="$t('emoji.search_emoji')"
-            @input="$event.target.composing = false"
+            @input="debouncedSearch"
           >
         </div>
-        <div
+        <EmojiGrid
-          ref="emoji-groups"
+          ref="emojiGrid"
-          class="emoji-groups"
+          :groups="emojisView"
-          :class="groupsScrolledClass"
+          @emoji="onEmoji"
-          @scroll="onScroll"
+          @active-group="onActiveGroup"
-        >
+        />
-          <div
-            v-for="group in emojisView"
-            :key="group.id"
-            class="emoji-group"
-          >
-            <h6
-              :ref="'group-' + group.id"
-              class="emoji-group-title"
-            >
-              {{ group.text }}
-            </h6>
-            <span
-              v-for="emoji in group.emojis"
-              :key="group.id + emoji.displayText"
-              :title="emoji.displayText"
-              class="emoji-item"
-              @click.stop.prevent="onEmoji(emoji)"
-            >
-              <span v-if="!emoji.imageUrl">{{ emoji.replacement }}</span>
-              <img
-                v-else
-                :src="emoji.imageUrl"
-              >
-            </span>
-            <span :ref="'group-end-' + group.id" />
-          </div>
-        </div>
         <div
           v-if="showKeepOpen"
           class="keep-open"

src/components/emoji_reactions/emoji_reactions.js

@@ -1,13 +1,20 @@
 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
 
+const findEmojiByReplacement = (state, replacement) => {
+  const allEmojis = state.instance.emoji.concat(state.instance.customEmoji)
+  return allEmojis.find(emoji => emoji.replacement === replacement)
+}
+
 const EmojiReactions = {
   name: 'EmojiReactions',
   components: {
     UserAvatar,
-    UserListPopover
+    UserListPopover,
+    StillImage
   },
   props: ['status'],
   data: () => ({
@@ -54,6 +61,8 @@ const EmojiReactions = {
     },
     reactWith (emoji) {
       this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
+      const emojiObject = findEmojiByReplacement(this.$store.state, emoji)
+      this.$store.commit('emojiUsed', emojiObject)
     },
     unreact (emoji) {
       this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })

src/components/emoji_reactions/emoji_reactions.vue

@@ -14,12 +14,13 @@
         <span
           v-if="reaction.url !== null"
         >
-          <img
+          <StillImage
             :src="reaction.url"
             :title="reaction.name"
+            :alt="reaction.name"
             class="reaction-emoji"
-            width="2.55em"
+            height="2.55em"
-          >
+          />
           {{ reaction.count }}
         </span>
         <span v-else>
@@ -49,6 +50,7 @@
   display: flex;
   margin-top: 0.25em;
   flex-wrap: wrap;
+  container-type: inline-size;
 }
 
 .unicode-emoji {
@@ -64,7 +66,9 @@
   justify-content: center;
   box-sizing: border-box;
   .reaction-emoji {
-    width: 2.55em !important;
+    width: auto;
+    max-width: 96cqw;
+    height: 2.55em !important;
     margin-right: 0.25em;
   }
   &:focus {

src/components/extra_buttons/extra_buttons.js

@@ -15,6 +15,7 @@ import {
   faBookmark as faBookmarkReg,
   faFlag
 } from '@fortawesome/free-regular-svg-icons'
+import { mapState } from 'vuex'
 
 library.add(
   faEllipsisH,
@@ -135,18 +136,26 @@ const ExtraButtons = {
     },
     doRedraftStatus () {
       this.$store.dispatch('fetchStatusSource', { id: this.status.id })
-        .then(data => this.$store.dispatch('openPostStatusModal', {
+        .then(data => {
-          isRedraft: true,
+          let repliedUserId = this.status.in_reply_to_user_id;
-          statusId: this.status.id,
+          let repliedUser = this.status.attentions.filter(user =>
-          subject: data.spoiler_text,
+            user.id === repliedUserId);
-          statusText: data.text,
+          this.$store.dispatch('openPostStatusModal', {
-          statusIsSensitive: this.status.nsfw,
+            isRedraft: true,
-          statusPoll: this.status.poll,
+            attentions: this.status.attentions,
-          statusFiles: [...this.status.attachments],
+            statusId: this.status.id,
-          statusScope: this.status.visibility,
+            subject: data.spoiler_text,
-          statusLanguage: this.status.language,
+            statusText: data.text,
-          statusContentType: data.content_type
+            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
+          })
+        })
       this.doDeleteStatus()
     },
     showRedraftStatusConfirmDialog () {
@@ -191,7 +200,7 @@ const ExtraButtons = {
     isEdited () {
       return this.status.edited_at !== null
     },
-    editingAvailable () { return this.$store.state.instance.editingAvailable }
+    editingAvailable () { return this.$store.state.instance.editingAvailable },
   }
 }
 

src/components/favorite_button/favorite_button.vue

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

src/components/follow_request_card/follow_request_card.js

@@ -43,6 +43,7 @@ const FollowRequestCard = {
     doApprove () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
+      this.$store.dispatch('decrementFollowRequestsCount')
 
       const notifId = this.findFollowRequestNotificationId()
       this.$store.dispatch('markSingleNotificationAsSeen', { id: notifId })
@@ -66,6 +67,7 @@ const FollowRequestCard = {
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: notifId })
+          this.$store.dispatch('decrementFollowRequestsCount')
           this.$store.dispatch('removeFollowRequest', this.user)
         })
       this.hideDenyConfirmDialog()
@@ -80,6 +82,11 @@ const FollowRequestCard = {
     },
     shouldConfirmDeny () {
       return this.mergedConfig.modalOnDenyFollow
+    },
+    show () {
+      const notifId = this.$store.state.api.followRequests.find(req => req.id === this.user.id)
+
+      return notifId !== undefined
     }
   }
 }

src/components/follow_request_card/follow_request_card.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-user-card :user="user">
+  <basic-user-card :user="user" v-if="show">
     <div class="follow-request-card-content-container">
       <button
         class="btn button-default"

src/components/follow_requests/follow_requests.js

@@ -1,10 +1,26 @@
 import FollowRequestCard from '../follow_request_card/follow_request_card.vue'
+import withLoadMore from '../../hocs/with_load_more/with_load_more'
+import List from '../list/list.vue'
+import get from 'lodash/get'
+
+const FollowRequestList = withLoadMore({
+  fetch: (props, $store) => $store.dispatch('fetchFollowRequests'),
+  select: (props, $store) => get($store.state.api, 'followRequests', []).map(req => $store.getters.findUser(req.id)),
+  destroy: (props, $store) => $store.dispatch('clearFollowRequests'),
+  childPropName: 'items',
+  additionalPropNames: ['userId']
+})(List);
+
 
 const FollowRequests = {
   components: {
-    FollowRequestCard
+    FollowRequestCard,
+    FollowRequestList
   },
   computed: {
+    userId () {
+      return this.$store.state.users.currentUser.id
+    },
     requests () {
       return this.$store.state.api.followRequests
     }

src/components/follow_requests/follow_requests.vue

@@ -6,12 +6,11 @@
       </div>
     </div>
     <div class="panel-body">
-      <FollowRequestCard
+      <FollowRequestList :user-id="userId">
-        v-for="request in requests"
+        <template #item="{item}">
-        :key="request.id"
+          <FollowRequestCard :user="item" />
-        :user="request"
+        </template>
-        class="list-item"
+      </FollowRequestList>
-      />
     </div>
   </div>
 </template>

src/components/list/list.vue

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

src/components/mention_link/mention_link.js

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

src/components/mobile_nav/mobile_nav.vue

@@ -157,6 +157,9 @@
     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

@@ -33,11 +33,6 @@ library.add(
 )
 
 const NavPanel = {
-  created () {
-    if (this.currentUser && this.currentUser.locked) {
-      this.$store.dispatch('startFetchingFollowRequests')
-    }
-  },
   components: {
     TimelineMenuContent
   },
@@ -54,11 +49,13 @@ const NavPanel = {
   computed: {
     ...mapState({
       currentUser: state => state.users.currentUser,
-      followRequestCount: state => state.api.followRequests.length,
       privateMode: state => state.instance.private,
-      federating: state => state.instance.federating
+      federating: state => state.instance.federating,
     }),
-    ...mapGetters(['unreadAnnouncementCount'])
+    ...mapGetters(['unreadAnnouncementCount']),
+    followRequestCount () {
+      return this.$store.state.users.currentUser.follow_requests_count
+    }
   }
 }
 

src/components/notification/notification.js

@@ -6,6 +6,7 @@ import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
+import StillImage from '../still-image/still-image.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -50,7 +51,8 @@ const Notification = {
     Timeago,
     Status,
     RichContent,
-    ConfirmModal
+    ConfirmModal,
+    StillImage
   },
   methods: {
     toggleUserExpanded () {

src/components/notification/notification.vue

@@ -116,12 +116,13 @@
                   scope="global"
                   keypath="notifications.reacted_with"
                 >
-                  <img
+                  <still-image
                     v-if="notification.emoji_url !== null"
                     class="notification-reaction-emoji"
                     :src="notification.emoji_url"
-                    :name="notification.emoji"
+                    :title="notification.emoji"
-                  >
+                    :alt="notification.emoji"
+                  />
                   <span
                     v-else
                     class="emoji-reaction-emoji"
@@ -151,7 +152,6 @@
             >
               <Timeago
                 :time="notification.created_at"
-                :with-direction="true"
                 :auto-update="240"
               />
             </router-link>

src/components/notifications/notifications.scss

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

src/components/poll/poll_form.js

@@ -103,9 +103,9 @@ export default {
     convertExpiryFromUnit (unit, amount) {
       // Note: we want seconds and not milliseconds
       switch (unit) {
-        case 'minutes': return 0.001 * amount * DateUtils.MINUTE
+        case 'minutes': return amount * DateUtils.MINUTE / 1000
-        case 'hours': return 0.001 * amount * DateUtils.HOUR
+        case 'hours': return amount * DateUtils.HOUR / 1000
-        case 'days': return 0.001 * amount * DateUtils.DAY
+        case 'days': return amount * DateUtils.DAY / 1000
       }
     },
     expiryAmountChange () {

src/components/popover/popover.vue

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

src/components/post_status_form/post_status_form.js

@@ -9,11 +9,12 @@ import StatusContent from '../status_content/status_content.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 import { reject, map, uniqBy, debounce } from 'lodash'
+import { usePostLanguageOptions } from 'src/lib/post_language'
 import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
 import Select from '../select/select.vue'
-import iso6391 from 'iso-639-1'
+
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -54,6 +55,21 @@ const pxStringToNumber = (str) => {
   return Number(str.substring(0, str.length - 2))
 }
 
+const deleteDraft = (draftKey) => {
+	const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
+
+	delete draftData[draftKey];
+
+	localStorage.setItem('drafts', JSON.stringify(draftData));
+}
+
+const interfaceToISOLanguage = (ilang) => {
+    const sep = ilang.indexOf("_");
+    return sep < 0 ?
+        ilang :
+        ilang.substr(0, sep);
+}
+
 const PostStatusForm = {
   props: [
     'statusId',
@@ -121,6 +137,13 @@ const PostStatusForm = {
       this.$refs.textarea.focus()
     }
   },
+  setup() {
+    const {postLanguageOptions} = usePostLanguageOptions()
+
+    return {
+      postLanguageOptions,
+    }
+  },
   data () {
     const preset = this.$route.query.message
     let statusText = preset || ''
@@ -130,7 +153,10 @@ const PostStatusForm = {
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
+    const postLanguage = defaultPostLanguage || interfaceLanguage
+
+    const isoLanguage = interfaceToISOLanguage(interfaceLanguage)
 
     let statusParams = {
       spoilerText: this.subject || '',
@@ -141,7 +167,7 @@ const PostStatusForm = {
       poll: {},
       mediaDescriptions: {},
       visibility: this.suggestedVisibility(),
-      language: interfaceLanguage,
+      language: postLanguage,
       contentType
     }
 
@@ -156,11 +182,45 @@ const PostStatusForm = {
         poll: this.statusPoll || {},
         mediaDescriptions: this.statusMediaDescriptions || {},
         visibility: this.statusScope || this.suggestedVisibility(),
-        language: this.statusLanguage || interfaceLanguage,
+        language: this.statusLanguage || postLanguage,
         contentType: statusContentType
       }
     }
 
+    if (!this.statusId) {
+      let draftKey = 'status';
+      if (this.replyTo) {
+        draftKey = 'reply:' + this.replyTo;
+      } else if (this.quoteId) {
+        draftKey = 'quote:' + this.quoteId;
+      }
+
+      const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[draftKey];
+
+      if (draft) {
+        statusParams = {
+          spoilerText: draft.data.spoilerText,
+          status: draft.data.status,
+          sensitiveIfSubject,
+          nsfw: draft.data.nsfw,
+          files: draft.data.files,
+          poll: draft.data.poll,
+          mediaDescriptions: draft.data.mediaDescriptions,
+          visibility: draft.data.visibility,
+          language: draft.data.language,
+          contentType: draft.data.contentType
+        }
+
+        if (draft.data.poll) {
+          this.togglePollForm();
+        }
+      }
+    }
+
+    // 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,
@@ -175,7 +235,10 @@ const PostStatusForm = {
       preview: null,
       previewLoading: false,
       emojiInputShown: false,
-      idempotencyKey: ''
+      idempotencyKey: '',
+      activeEmojiInput: undefined,
+      activeTextInput: undefined,
+      subjectVisible: showSubject
     }
   },
   computed: {
@@ -264,9 +327,6 @@ const PostStatusForm = {
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
     }),
-    isoLanguages () {
-      return iso6391.getAllCodes();
-    }
   },
   watch: {
     'newStatus': {
@@ -280,6 +340,7 @@ const PostStatusForm = {
     statusChanged () {
       this.autoPreview()
       this.updateIdempotencyKey()
+      this.saveDraft()
     },
     clearStatus () {
       const newStatus = this.newStatus
@@ -401,8 +462,38 @@ const PostStatusForm = {
       }).finally(() => {
         this.previewLoading = false
       })
+
+      let draftKey = 'status';
+      if (this.replyTo) {
+        draftKey = 'reply:' + this.replyTo;
+      } else if (this.quoteId) {
+        draftKey = 'quote:' + this.quoteId;
+      }
+      deleteDraft(draftKey)
     },
     debouncePreviewStatus: debounce(function () { this.previewStatus() }, 500),
+    saveDraft() {
+      const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
+
+      let draftKey = 'status';
+      if (this.replyTo) {
+        draftKey = 'reply:' + this.replyTo;
+      } else if (this.quoteId) {
+        draftKey = 'quote:' + this.quoteId;
+      }
+
+      if (this.newStatus.status || this.newStatus.spoilerText || this.newStatus.files.length > 0 || this.newStatus.poll.length > 0) {
+          draftData[draftKey] = {
+          updatedAt: new Date(),
+          data: this.newStatus,
+        };
+
+        localStorage.setItem('drafts', JSON.stringify(draftData));
+
+      } else {
+        deleteDraft(draftKey);
+      }
+    },
     autoPreview () {
       if (!this.preview) return
       this.previewLoading = true
@@ -605,8 +696,33 @@ const PostStatusForm = {
       this.$refs['emoji-input'].resize()
     },
     showEmojiPicker () {
-      this.$refs['textarea'].focus()
+      if (!this.activeEmojiInput || !this.activeTextInput)
-      this.$refs['emoji-input'].triggerShowPicker()
+        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
     },
     clearError () {
       this.error = null

src/components/post_status_form/post_status_form.vue

@@ -118,13 +118,16 @@
           />
         </div>
         <EmojiInput
-          v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
+          ref="subject-emoji-input"
+          v-if="subjectVisible"
           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')"
@@ -132,6 +135,7 @@
             size="1"
             class="form-post-subject"
             @input="onSubjectInput"
+            @focus="focusSubjectInput()"
           >
         </EmojiInput>
         <i18n-t
@@ -173,6 +177,7 @@
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
+            @focus="focusStatusInput()"
           />
           <p
             v-if="hasStatusLengthLimit"
@@ -203,11 +208,11 @@
               class="form-control"
             >
               <option
-                v-for="language in isoLanguages"
+                v-for="language in postLanguageOptions"
-                :key="language"
+                :key="language.key"
-                :value="language"
+                :value="language.value"
               >
-                {{ language }}
+                {{ language.label }}
               </option>
             </Select>
           </div>
@@ -276,6 +281,15 @@
           >
             <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"
@@ -291,12 +305,14 @@
         >
           {{ $t('post_status.post') }}
         </button>
-        <!-- touchstart is used to keep the OSK at the same position after a message send -->
+        <!-- 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. -->
         <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') }}
@@ -454,7 +470,7 @@
     }
   }
 
-  .media-upload-icon, .poll-icon, .emoji-icon {
+  .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
     font-size: 1.85em;
     line-height: 1.1;
     flex: 1;
@@ -497,6 +513,11 @@
 
   .poll-icon {
     order: 3;
+    justify-content: center;
+  }
+
+  .spoiler-icon {
+    order: 4;
     justify-content: right;
   }
 

src/components/retweet_button/retweet_button.vue

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

src/components/rich_content/rich_content.jsx

@@ -188,7 +188,7 @@ export default {
               break
             }
           case 'span':
-            if (this.handleLinks && attrs['class'] && attrs['class'].includes('h-card')) {
+            if (this.handleLinks && attrs?.['class']?.includes?.('h-card')) {
               return ['', children.map(processItem), '']
             }
         }

src/components/rich_content/rich_content.scss

@@ -50,7 +50,6 @@
 
   .emoji {
     display: inline-block;
-    width: var(--emoji-size, 32px);
     height: var(--emoji-size, 32px);
   }
 

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(--inputFont, sans-serif);
+    font-family: var(--interfaceFont, sans-serif);
     font-size: 1em;
     width: 100%;
     z-index: 1;

src/components/settings_modal/tabs/general_tab.js

@@ -4,6 +4,7 @@ import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
+import { usePostLanguageOptions } from 'src/lib/post_language'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import ServerSideIndicator from '../helpers/server_side_indicator.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -17,6 +18,11 @@ library.add(
 )
 
 const GeneralTab = {
+  setup() {
+    const {postLanguageOptions} = usePostLanguageOptions()
+
+    return {postLanguageOptions}
+  },
   data () {
     return {
       subjectLineOptions: ['email', 'noop', 'masto'].map(mode => ({
@@ -118,6 +124,12 @@ const GeneralTab = {
         this.$store.dispatch('setOption', { name: 'translationLanguage', value: val })
       }
     },
+    postLanguage: {
+      get: function () { return this.$store.getters.mergedConfig.postLanguage },
+      set: function (val) {
+        this.$store.dispatch('setOption', { name: 'postLanguage', value: val })
+      }
+    },
     ...SharedComputedObject()
   },
   methods: {

src/components/settings_modal/tabs/general_tab.vue

@@ -21,7 +21,6 @@
             >
               {{ $t('settings.settings_profile_force_sync') }}
             </button>
-
           </p>
           <div
             @click="toggleExpandedSettings"
@@ -147,6 +146,11 @@
             {{ $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') }}
@@ -484,14 +488,6 @@
             </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') }}
@@ -589,6 +585,15 @@
             {{ $t('settings.post_status_content_type') }}
           </ChoiceSetting>
         </li>
+        <li>
+          <ChoiceSetting
+            id="postLanguage"
+            path="postLanguage"
+            :options="postLanguageOptions"
+          >
+            {{ $t('settings.post_language') }}
+          </ChoiceSetting>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"

src/components/settings_modal/tabs/mutes_and_blocks_tab.js

@@ -10,17 +10,20 @@ 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 = withSubscription({
+const BlockList = withLoadMore({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
   select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
-  childPropName: 'items'
+  childPropName: 'items',
+  destroy: () => {}
 })(SelectableList)
 
-const MuteList = withSubscription({
+const MuteList = withLoadMore({
   fetch: (props, $store) => $store.dispatch('fetchMutes'),
   select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
-  childPropName: 'items'
+  childPropName: 'items',
+  destroy: () => {}
 })(SelectableList)
 
 const DomainMuteList = withSubscription({

src/components/settings_modal/tabs/profile_tab.js

@@ -12,6 +12,7 @@ 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 {
@@ -32,6 +33,7 @@ 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,
@@ -46,9 +48,16 @@ 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,
@@ -126,7 +135,9 @@ 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
+        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
+        permit_followback: this.permit_followback,
+        accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
         /* eslint-enable camelcase */
       }
 

src/components/settings_modal/tabs/profile_tab.vue

@@ -89,6 +89,15 @@
           {{ $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') }}
@@ -102,6 +111,9 @@
           class="expire-posts-days"
           :placeholder="$t('settings.expire_posts_input_placeholder')"
         />
+      </p>
+      <p>
+
       </p>
       <p>
         <interface-language-switcher
@@ -247,6 +259,19 @@
           <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/theme_tab/theme_tab.scss

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

src/components/side_drawer/side_drawer.vue

@@ -268,6 +268,10 @@
 .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,6 +20,7 @@ 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 {
@@ -117,7 +118,8 @@ const Status = {
     RichContent,
     MentionLink,
     MentionsLine,
-    QuoteButton
+    QuoteButton,
+    StillImage
   },
   props: [
     'statusoid',

src/components/status/status.vue

@@ -174,12 +174,12 @@
                   >
                     @{{ status.user.screen_name_ui }}
                   </router-link>
-                  <img
+                  <StillImage
                     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="true"
+                    :with-direction="!compact"
                     :auto-update="60"
                   />
                 </router-link>

src/components/status_body/status_body.scss

@@ -17,26 +17,26 @@
 
   .emoji:hover {
     transform: scale(1.4);
+    @media (prefers-reduced-motion: reduce) {
+      transition: unset;
+    }
     transition: 0.05s;
   }
 
   ._mfm_x2_ {
     .emoji {
-      width: 100px;
       height: 100px;
     }
   }
 
   ._mfm_x3_ {
     .emoji {
-      width: 150px;
       height: 150px;
     }
   }
 
   ._mfm_x4_ {
     .emoji {
-      width: 200px;
       height: 200px;
     }
   }

src/components/status_content/status_content.vue

@@ -71,7 +71,7 @@
 
   img, video {
     &.emoji {
-      width: 50px;
+      max-width: 100%;
       height: 50px;
     }
   }
@@ -89,7 +89,6 @@
       animation: none !important;
     }
     .emoji {
-      width: 32px !important;
       height: 32px !important;
     }
   }

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

@@ -11,8 +11,9 @@ const StillImage = {
   ],
   data () {
     return {
-      stopGifs: this.$store.getters.mergedConfig.stopGifs,
+      stopGifs: this.$store.getters.mergedConfig.stopGifs || window.matchMedia('(prefers-reduced-motion: reduce)').matches,
-      isAnimated: false
+      isAnimated: false,
+      imageTypeLabel: ''
     }
   },
   computed: {
@@ -39,14 +40,24 @@ const StillImage = {
       this.imageLoadError && this.imageLoadError()
     },
     detectAnimation (image) {
-      if (this.mimetype === 'image/gif' || this.src.endsWith('.gif')) {
+      const mediaProxyAvailable = this.$store.state.instance.mediaProxyAvailable
-        this.isAnimated = true
+
-        return
+      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)
       }
-      // harmless CORS errors without-- clean console with
+    },
-      if (!this.$store.state.instance.mediaProxyAvailable) return
+    detectAnimationWithFetch (image) {
-      // 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'
@@ -55,12 +66,20 @@ const StillImage = {
           // We don't need to read the whole file so only call it once
           data.body.getReader().read()
             .then(reader => {
-              if (this.src.endsWith('.webp') && this.isAnimatedWEBP(reader.value)) {
+              // Ordered from least to most intensive
+              if (this.isGIF(reader.value)) {
                 this.isAnimated = true
+                this.setLabel('GIF')
                 return
               }
-              if (this.src.endsWith('.png') && this.isAnimatedPNG(reader.value)) {
+              if (this.isAnimatedWEBP(reader.value)) {
                 this.isAnimated = true
+                this.setLabel('WEBP')
+                return
+              }
+              if (this.isAnimatedPNG(reader.value)) {
+                this.isAnimated = true
+                this.setLabel('APNG')
               }
             })
         })
@@ -68,6 +87,53 @@ 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
@@ -101,16 +167,55 @@ const StillImage = {
       const idatPos = str.indexOf('IDAT')
       return (str.substring(0, idatPos > 0 ? idatPos : 0).indexOf('acTL') > 0)
     },
-    drawThumbnail () {
+    drawThumbnail() {
-      const canvas = this.$refs.canvas
+      const canvas = this.$refs.canvas;
-      if (!this.$refs.canvas) return
+      if (!canvas) return;
-      const image = this.$refs.src
+    
-      const width = image.naturalWidth
+      const context = canvas.getContext('2d');
-      const height = image.naturalHeight
+      const image = this.$refs.src;
-      canvas.width = width
+      const parentElement = canvas.parentElement;
-      canvas.height = height
+    
-      canvas.getContext('2d').drawImage(image, 0, 0, width, height)
+      // 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);
+      });
+    }    
   },
   updated () {
     // On computed animated change

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

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

src/components/timeline_menu/timeline_menu.vue

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

src/components/timeline_menu/timeline_menu_content.js

@@ -8,6 +8,7 @@ import {
   faHome,
   faCircle
 } from '@fortawesome/free-solid-svg-icons'
+import { federatedTimelineVisible, publicTimelineVisible, bubbleTimelineVisible } from '../../lib/timeline_visibility'
 
 library.add(
   faUsers,
@@ -24,7 +25,9 @@ const TimelineMenuContent = {
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating,
-      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0)
+      publicTimelineVisible,
+      federatedTimelineVisible,
+      bubbleTimelineVisible,
     })
   }
 }

src/components/timeline_menu/timeline_menu_content.vue

@@ -16,23 +16,7 @@
         >{{ $t("nav.home_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="currentUser && showBubbleTimeline">
+    <li v-if="publicTimelineVisible">
-      <router-link
-        class="menu-item"
-        :to="{ name: 'bubble-timeline' }"
-      >
-        <FAIcon
-          fixed-width
-          class="fa-scale-110 fa-old-padding "
-          icon="circle"
-        />
-        <span
-          :title="$t('nav.bubble_timeline_description')"
-          :aria-label="$t('nav.bubble_timeline_description')"
-        >{{ $t("nav.bubble_timeline") }}</span>
-      </router-link>
-    </li>
-    <li v-if="currentUser || !privateMode">
       <router-link
         class="menu-item"
         :to="{ name: 'public-timeline' }"
@@ -48,7 +32,23 @@
         >{{ $t("nav.public_tl") }}</span>
       </router-link>
     </li>
-    <li v-if="federating && (currentUser || !privateMode)">
+    <li v-if="bubbleTimelineVisible">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'bubble-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="circle"
+        />
+        <span
+          :title="$t('nav.bubble_timeline_description')"
+          :aria-label="$t('nav.bubble_timeline_description')"
+        >{{ $t("nav.bubble_timeline") }}</span>
+      </router-link>
+    </li>
+    <li v-if="federatedTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'public-external-timeline' }"
@@ -62,6 +62,7 @@
           :title="$t('nav.twkn_timeline_description')"
           :aria-label="$t('nav.twkn_timeline_description')"
         >{{ $t("nav.twkn") }}</span>
+
       </router-link>
     </li>
     <li v-if="currentUser">

src/components/timeline_menu_tabs/timeline_menu_content.js

@@ -8,6 +8,7 @@ import {
   faHome
 } from '@fortawesome/free-solid-svg-icons'
 import { faCircle } from '@fortawesome/free-regular-svg-icons'
+import { federatedTimelineVisible, publicTimelineVisible, bubbleTimelineVisible } from '../../lib/timeline_visibility'
 library.add(
   faUsers,
   faGlobe,
@@ -22,7 +23,10 @@ const TimelineMenuContent = {
     ...mapState({
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,
-      federating: state => state.instance.federating
+      federating: state => state.instance.federating,
+      publicTimelineVisible,
+      federatedTimelineVisible,
+      bubbleTimelineVisible,
     })
   }
 }

src/components/timeline_menu_tabs/timeline_menu_content.vue

@@ -16,7 +16,7 @@
         >{{ $t("nav.home_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="currentUser">
+    <li v-if="bubbleTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'bubble-timeline' }"
@@ -32,7 +32,7 @@
         >{{ $t("nav.bubble_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="currentUser || !privateMode">
+    <li v-if="publicTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'public-timeline' }"
@@ -48,7 +48,7 @@
         >{{ $t("nav.public_tl") }}</span>
       </router-link>
     </li>
-    <li v-if="federating && (currentUser || !privateMode)">
+    <li v-if="federatedTimelineVisible">
       <router-link
         class="menu-item"
         :to="{ name: 'public-external-timeline' }"

src/components/timeline_menu_tabs/timeline_menu_tabs.js

@@ -4,6 +4,12 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faChevronDown
 } from '@fortawesome/free-solid-svg-icons'
+import { mapState } from 'vuex'
+import {
+  publicTimelineVisible,
+  federatedTimelineVisible,
+  bubbleTimelineVisible,
+} from '../../lib/timeline_visibility'
 
 library.add(faChevronDown)
 
@@ -36,12 +42,15 @@ const TimelineMenuTabs = {
     }
   },
   computed: {
-    currentUser () {
-      return this.$store.state.users.currentUser
-    },
     privateMode () {
       return this.$store.state.instance.private
-    }
+    },
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      publicTimelineVisible,
+      federatedTimelineVisible,
+      bubbleTimelineVisible,
+    })
   },
   methods: {
     timelineName () {

src/components/timeline_menu_tabs/timeline_menu_tabs.vue

@@ -18,6 +18,7 @@
     <router-link
       :to="{ name: 'public-timeline' }"
       class="nav-icon"
+      v-if="publicTimelineVisible"
     >
       <FAIcon
         fixed-width
@@ -27,7 +28,7 @@
       />
     </router-link>
     <router-link
-      v-if="currentUser"
+      v-if="bubbleTimelineVisible"
       :to="{ name: 'bubble-timeline' }"
       class="nav-icon"
     >
@@ -41,6 +42,7 @@
     <router-link
       :to="{ name: 'public-external-timeline' }"
       class="nav-icon"
+      v-if="federatedTimelineVisible"
     >
       <FAIcon
         fixed-width

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_profile/user_profile.js

@@ -145,10 +145,12 @@ 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 }) => {
+          .then(({ id, relationship, background_image }) => {
             this.note = relationship.note
+            this.$store.dispatch('setDisplayBackground', background_image)
             return loadById(id)
           })
           .catch((reason) => {
@@ -224,7 +226,10 @@ const UserProfile = {
     TabSwitcher,
     Conversation,
     RichContent,
-    FollowedTagList,
+    FollowedTagList
+  },
+  beforeRouteLeave(to, from) {
+    this.$store.dispatch('setDisplayBackground', null)
   }
 }
 

src/directives/body_scroll_lock.js

@@ -3,11 +3,13 @@ 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
+    reserveScrollBarGap: true,
+    allowTouchMove: el => allowedScrollableClasses.includes(el.parentElement.className),
   })
   lockerEls.add(el)
   setTimeout(() => {

src/i18n/ca.json

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

@@ -252,6 +252,10 @@
         "hint": "Anmelden um an der Diskussion teilzunehmen",
         "login": "Anmelden",
         "logout": "Abmelden",
+        "logout_confirm": "Willst du dich wirklich abmelden?",
+        "logout_confirm_accept_button": "Abmelden",
+        "logout_confirm_cancel_button": "Abbrechen",
+        "logout_confirm_title": "Abmelden",
         "password": "Passwort",
         "placeholder": "meinbenutzername",
         "recovery_code": "Wiederherstellungscode",
@@ -264,6 +268,32 @@
         "next": "Weiter",
         "previous": "Zurück"
     },
+    "moderation": {
+        "moderation": "Moderation",
+        "reports": {
+            "add_note": "Notiz hinzufügen",
+            "close": "Schließen",
+            "delete_note": "Löschen",
+            "delete_note_accept": "Ja, löschen",
+            "delete_note_cancel": "Nein, behalten",
+            "delete_note_confirm": "Soll diese Notiz wirklich gelöscht werden?",
+            "delete_note_title": "Löschen bestätigen",
+            "no_content": "Keine Beschreibung angegeben",
+            "no_reports": "Keine Meldungen verfügbar",
+            "note_placeholder": "Hinterlasse eine Notiz",
+            "notes": "{ count } Notiz | { count } Notizen",
+            "reopen": "Wieder öffnen",
+            "report": "Meldung über",
+            "reports": "Meldungen",
+            "resolve": "Lösen",
+            "show_closed": "Geschlossene anzeigen",
+            "statuses": "{ count } Post| { count } Posts",
+            "tag_policy_notice": "Schalte die TagPolicy-MRF ein, um Post-Beschränkungen einzustellen",
+            "tags": "Post-Einschränkungen einstellen"
+        },
+        "statuses": "Posts",
+        "users": "Benutzer"
+    },
     "nav": {
         "about": "Über",
         "administration": "Administration",
@@ -278,6 +308,7 @@
         "interactions": "Interaktionen",
         "lists": "Listen",
         "mentions": "Erwähnungen",
+        "moderation": "Moderation",
         "preferences": "Voreinstellungen",
         "public_timeline_description": "Öffentliche Beiträge von dieser Instanz",
         "public_tl": "Öffentliche Zeitleiste",
@@ -374,6 +405,8 @@
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Dein Account wurde registriert und eine E-Mail wurde an deine Adresse gesendet. Bitte lies die E-Mail, um die Registrierung abzuschließen.",
+        "awaiting_email_confirmation_title": "Warte auf E-Mail-Bestätigung",
         "bio": "Bio",
         "bio_placeholder": "z. B.\nHallo! Willkommen auf meinem Profil.\nIch mag Anime und Spiele. Hoffentlich können wir Freunde sein!",
         "captcha": "CAPTCHA",
@@ -387,6 +420,8 @@
         "reason_placeholder": "Diese Instanz bestätigt Registrierungen manuell. \nLass die Admins wissen warum du dich registrieren willst.",
         "register": "Registrierung",
         "registration": "Registrierung",
+        "request_sent": "Deine Bitte zur Registrierung wurde weitergeleitet. Du erhälst eine E-Mail, wenn deiner Registrierung zugestimmt wurde.",
+        "request_sent_title": "Bitte zur Registrierung gesendet",
         "token": "Einladungsschlüssel",
         "username_placeholder": "z. B. akko",
         "validations": {
@@ -496,6 +531,8 @@
         "enable_web_push_notifications": "Web-Pushbenachrichtigungen aktivieren",
         "enter_current_password_to_confirm": "Gib dein aktuelles Passwort ein, um deine Identität zu bestätigen",
         "expert_mode": "Erweiterte Einstellungen anzeigen",
+        "expire_posts_enabled": "Posts löschen, die älter als eine Anzahl an Tagen sind",
+        "expire_posts_input_placeholder": "Anzahl an Tagen",
         "export_theme": "Farbschema speichern",
         "file_export_import": {
             "backup_restore": "Einstellungen backuppen",
@@ -688,6 +725,19 @@
         "setting_changed": "Einstellungen weichen von den Standardeinstellungen ab",
         "setting_server_side": "Diese Einstellung hängt an deinem Profil und gilt für alle Sitzungen und Clients",
         "settings": "Einstellungen",
+        "settings_profile": "Einstellungs-Profile",
+        "settings_profile_creation": "Neues Profil erstellen",
+        "settings_profile_creation_new_name_label": "Name",
+        "settings_profile_creation_submit": "Erstellen",
+        "settings_profile_currently": "Benutze Profil {name} (version: {version})",
+        "settings_profile_delete": "Löschen",
+        "settings_profile_delete_confirm": "Dieses Profil wirklich löschen?",
+        "settings_profile_force_sync": "Synchronisieren",
+        "settings_profile_in_use": "In Benutzung",
+        "settings_profile_use": "Verwenden",
+        "settings_profiles_refresh": "Einstellungs-Profile neu laden",
+        "settings_profiles_show": "Alle Einstellungs-Profile anzeigen",
+        "settings_profiles_unshow": "Alle Einstellungs-Profile verbergen",
         "show_admin_badge": "Zeige Admin-Abzeichen auf meinem Profil",
         "show_moderator_badge": "Zeige Moderator-Abzeichen auf meinem Profil",
         "show_nav_shortcuts": "Zusätzliche Schnellnavigation im Top-Panel anzeigen",
@@ -866,7 +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",
         "user_mutes": "User",
@@ -887,6 +937,12 @@
         "word_filter": "Wortfilter",
         "wordfilter": "Wortfilter"
     },
+    "settings_profile": {
+        "creating": "Erstelle ein neues Einstellungs-Profil \"{profile}\"...",
+        "synchronization_error": "Konnte Einstellungen nicht synchronisieren: {err}",
+        "synchronized": "Einstellungen synchronisiert!",
+        "synchronizing": "Synchronisiere Einstellungs-Profil \"{profile}\"..."
+    },
     "status": {
         "ancestor_follow": "Zeige {numReplies} andere Antwort unter dieser Nachricht | Zeige {numReplies} andere Antworten unter dieser Nachricht",
         "ancestor_follow_with_icon": "{icon} {text}",
@@ -920,6 +976,11 @@
         "pin": "An Profil anheften",
         "pinned": "Angeheftet",
         "plus_more": "+{number} mehr",
+        "redraft": "Löschen & neu erstellen",
+        "redraft_confirm": "Diesen Post wirklich löschen und neu erstellen? Interaktionen des ursprünglichen Posts werden nicht erhalten.",
+        "redraft_confirm_accept_button": "Ja, löschen und neu erstellen",
+        "redraft_confirm_cancel_button": "Nein, das Original behalten",
+        "redraft_confirm_title": "Löschen und neu erstellen bestätigen",
         "remove_attachment": "Anhang entfernen",
         "repeat_confirm": "Nachricht wirklich wiederholen?",
         "repeat_confirm_accept_button": "Ja, wiederholen",
@@ -948,6 +1009,7 @@
         "thread_show_full": "Zeige {numStatus} Antwort | Zeige {numStatus} Antworten",
         "thread_show_full_with_icon": "{icon} {text}",
         "translate": "Übersetzen",
+        "translated_from": "Übersetzt von {language}",
         "unbookmark": "Lesezeichen entfernen",
         "unmute_conversation": "Konversation nicht mehr stummstellen",
         "unpin": "Nicht mehr an Profil anheften",
@@ -979,6 +1041,7 @@
         "collapse": "Einklappen",
         "conversation": "Unterhaltung",
         "error": "Fehler beim Lesen der Timeline: {0}",
+        "follow_tag": "Hashtag folgen",
         "load_older": "Lade ältere Nachrichten",
         "no_more_statuses": "Keine weiteren Nachrichten",
         "no_retweet_hint": "Die Nachricht ist als nur-für-Follower oder Direktnachricht markiert und kann nicht wiederholt oder zitiert werden",
@@ -988,8 +1051,12 @@
         "show_new": "Zeige Neuere",
         "socket_broke": "Netzverbindung verloren: CloseEvent code {0}",
         "socket_reconnected": "Netzverbindung hergestellt",
+        "unfollow_tag": "Hashtag entfolgen",
         "up_to_date": "Aktuell"
     },
+    "toast": {
+        "no_translation_target_set": "Keine Zielsprache für Übersetzungen eingestellt - das könnte schiefgehen. Bitte stell eine Zielsprache in deinen Einstellungen ein."
+    },
     "tool_tip": {
         "accept_follow_request": "Folgeanfrage annehmen",
         "add_reaction": "Emoji-Reaktion hinzufügen",
@@ -1049,6 +1116,7 @@
         "block_confirm_title": "Benutzer blockieren",
         "block_progress": "Blocken…",
         "blocked": "Blockiert!",
+        "blocks_you": "Blockt dich!",
         "bot": "Bot",
         "deactivated": "Deaktiviert",
         "deny": "Ablehnen",
@@ -1063,7 +1131,10 @@
         "follow_cancel": "Anfrage ablehnen",
         "follow_progress": "Anfragen…",
         "follow_sent": "Anfrage gesendet!",
+        "follow_tag": "Hashtag folgen",
         "follow_unfollow": "Folgen beenden",
+        "followed_tags": "Gefolgte Hashtags",
+        "followed_users": "Gefolgte Benutzer",
         "followees": "Folgt",
         "followers": "Folgende",
         "following": "Folgst du!",
@@ -1088,11 +1159,14 @@
         "mute_domain": "Domain blockieren",
         "mute_progress": "Stummschalten erfolgt…",
         "muted": "Stummgeschaltet",
+        "not_following_any_hashtags": "Du folgst keinen Hashtags",
         "note": "Private Notiz",
         "per_day": "pro Tag",
         "remote_follow": "Folgen",
+        "remove_follower": "Nicht mehr folgen",
         "replies": "Mit Antworten",
         "report": "Melden",
+        "requested_by": "Möchte dir gern folgen",
         "show_repeats": "Geteilte Beiträge anzeigen",
         "statuses": "Nachrichten",
         "subscribe": "Folgen",
@@ -1102,11 +1176,13 @@
         "unfollow_confirm_accept_button": "Ja, nicht mehr folgen",
         "unfollow_confirm_cancel_button": "Nein, weiter folgen",
         "unfollow_confirm_title": "Benutzer nicht mehr folgen",
+        "unfollow_tag": "Hashtag nicht mehr folgen",
         "unmute": "Stummschalten aufheben",
         "unmute_progress": "Aufhebung erfolgt…",
         "unsubscribe": "Entfolgen"
     },
     "user_profile": {
+        "field_validated": "Link verifiziert",
         "profile_does_not_exist": "Profil nicht vorhanden.",
         "profile_loading_error": "Beim Laden dieses Profils ist ein Fehler aufgetreten.",
         "timeline_title": "Beiträge"

src/i18n/el.json

@@ -0,0 +1,215 @@
+{
+    "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

@@ -86,7 +86,8 @@
         "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
         "search_emoji": "Search for an emoji",
         "stickers": "Stickers",
-        "unicode": "Unicode emoji"
+        "unicode": "Unicode emoji",
+        "recent": "Recently used"
     },
     "errors": {
         "storage_unavailable": "Pleroma could not access browser storage. Your login or your local settings won't be saved and you might encounter unexpected issues. Try enabling cookies."
@@ -379,6 +380,7 @@
             "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.",
@@ -599,6 +601,7 @@
         "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",
@@ -681,6 +684,7 @@
         "play_videos_in_modal": "Play videos in a popup frame",
         "post_look_feel": "Posts Look & Feel",
         "post_status_content_type": "Default post content type",
+        "post_language": "Default post language",
         "posts": "Posts",
         "preload_images": "Preload images",
         "presets": "Presets",
@@ -748,6 +752,7 @@
         "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",
@@ -921,13 +926,16 @@
         "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/es.json

@@ -282,18 +282,18 @@
             "delete_note_title": "Confirma la eliminación",
             "no_content": "Sin descripción dada",
             "no_reports": "No hay informes que mostrar",
-            "note_placeholder": "Dejar una nota...",
+            "note_placeholder": "Dejar una nota",
             "notes": "{ count } nota | { count } notas",
             "reopen": "Reabrir",
             "report": "Reportar",
             "reports": "Reportes",
             "resolve": "Resolver",
             "show_closed": "Mostrar cerrados",
-            "statuses": "{ count } estado | { count } estados",
+            "statuses": "{ count } publicación | { count } publicaciones",
             "tag_policy_notice": "Habilitar TagPolicy MRF para establecer restricciones de publicación",
             "tags": "Establecer restricciones de publicación"
         },
-        "statuses": "Estados",
+        "statuses": "Publicaciones",
         "users": "Usuarios"
     },
     "nav": {
@@ -535,6 +535,8 @@
         "enable_web_push_notifications": "Habilitar las notificiaciones en el navegador",
         "enter_current_password_to_confirm": "Introduce la contraseña actual para confirmar tu identidad",
         "expert_mode": "Mostrar avanzados",
+        "expire_posts_enabled": "Eliminar publicaciones después de una cantidad determinada de días",
+        "expire_posts_input_placeholder": "Número de días",
         "export_theme": "Exportar tema",
         "file_export_import": {
             "backup_restore": "Copia de seguridad de la configuración",
@@ -696,6 +698,7 @@
         "remove_alias": "Eliminar este alias",
         "remove_backup": "Eliminar",
         "render_mfm": "Renderizar Markdown de Misskey",
+        "render_mfm_on_hover": "Pausa las animaciones MFM hasta que se desplace el mensaje",
         "replies_in_timeline": "Réplicas en la línea temporal",
         "reply_visibility_all": "Mostrar todas las réplicas",
         "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
@@ -719,6 +722,7 @@
         "security": "Seguridad",
         "security_tab": "Seguridad",
         "sensitive_by_default": "Identificar las publicaciones como sensibles de forma predeterminada",
+        "sensitive_if_subject": "Marcar automáticamente las imágenes como confidenciales si se especifica una advertencia de contenido",
         "set_new_avatar": "Cambiar avatar",
         "set_new_mascot": "Fijar nueva mascota",
         "set_new_profile_background": "Cambiar el fondo del perfil",
@@ -736,10 +740,16 @@
         "settings_profile_force_sync": "Sincronizar",
         "settings_profile_in_use": "En uso",
         "settings_profile_use": "Usar",
+        "settings_profiles_refresh": "Recargar perfiles de configuración",
         "settings_profiles_show": "Mostrar todos los perfiles de configuración",
         "settings_profiles_unshow": "Ocultar todos los perfiles de configuración",
         "show_admin_badge": "Mostrar la insignia de \"Administrador/a\" en mi perfil",
         "show_moderator_badge": "Mostrar la insignia de \"Moderador/a\" en mi perfil",
+        "show_nav_shortcuts": "Mostrar accesos directos de navegación adicionales en el panel superior",
+        "show_panel_nav_shortcuts": "Mostrar accesos directos de navegación de la línea de tiempo en la parte superior del panel",
+        "show_scrollbars": "Mostrar las barras de desplazamiento de la columna lateral",
+        "show_wider_shortcuts": "Mostrar una brecha más amplia entre los accesos directos del panel superior",
+        "show_yous": "Mostrar (Tú)s",
         "stop_gifs": "Iniciar GIFs al pasar el ratón",
         "streaming": "Habilitar la transmisión automática de nuevas publicaciones cuando se desplaza hacia la parte superior",
         "style": {
@@ -888,9 +898,9 @@
                 "use_source": "Nueva versión"
             }
         },
-        "subject_input_always_show": "Mostrar siempre el campo del tema",
+        "subject_input_always_show": "Mostrar siempre el campo de advertencia de contenido",
-        "subject_line_behavior": "Copiar el tema en las respuestas",
+        "subject_line_behavior": "Copiar el campo de advertencia en las respuestas",
-        "subject_line_email": "Como email: \"re: tema\"",
+        "subject_line_email": "Como email: \"re: advertencia\"",
         "subject_line_mastodon": "Como mastodon: copiar como es",
         "subject_line_noop": "No copiar",
         "text": "Texto",
@@ -898,8 +908,13 @@
         "theme_help": "Use códigos de color hexadecimales (#rrggbb) para personalizar su tema de colores.",
         "theme_help_v2_1": "También puede invalidar los colores y la opacidad de ciertos componentes si activa la casilla de verificación. Use el botón \"Borrar todo\" para deshacer los cambios.",
         "theme_help_v2_2": "Los iconos debajo de algunas publicaciones son indicadores de contraste de fondo/texto, desplace el ratón por encima para obtener información más detallada. Tenga en cuenta que cuando se utilizan indicadores de contraste de transparencia se muestra el peor caso posible.",
+        "third_column_mode": "Cuando haya suficiente espacio, muestre la tercera columna",
+        "third_column_mode_none": "No mostrar la tercera columna en absoluto",
+        "third_column_mode_notifications": "Columna de notificaciones",
+        "third_column_mode_postform": "Formulario principal de publicación y navegación",
         "token": "Token",
         "tooltipRadius": "Información/alertas",
+        "translation_language": "Idioma de traducción automática",
         "type_domains_to_mute": "Buscar dominios para silenciar",
         "upload_a_photo": "Subir una foto",
         "useStreamingApi": "Recibir publicaciones y notificaciones en tiempo real",

src/i18n/fr.json

@@ -84,6 +84,7 @@
         "keep_open": "Garder ouvert",
         "load_all": "Charger tout les {emojiAmount} émojis",
         "load_all_hint": "{saneAmount} émojis chargé, charger tout les émojis peuvent causer des problèmes de performances.",
+        "recent": "Utilisé récemment",
         "search_emoji": "Rechercher un émoji",
         "stickers": "Stickers",
         "unicode": "émoji unicode"
@@ -254,6 +255,10 @@
         "hint": "Connectez-vous pour rejoindre la discussion",
         "login": "Connexion",
         "logout": "Déconnexion",
+        "logout_confirm": "Voulez-vous vraiment vous déconnecter ?",
+        "logout_confirm_accept_button": "Déconnexion",
+        "logout_confirm_cancel_button": "Annuler",
+        "logout_confirm_title": "Déconnexion",
         "password": "Mot de passe",
         "placeholder": "mon nom d'utilisateur",
         "recovery_code": "Code de récupération",
@@ -266,6 +271,32 @@
         "next": "Suivant",
         "previous": "Précédent"
     },
+    "moderation": {
+        "moderation": "Modération",
+        "reports": {
+            "add_note": "Ajouter une note",
+            "close": "Fermer",
+            "delete_note": "Supprimer",
+            "delete_note_accept": "Oui, supprimer",
+            "delete_note_cancel": "Non, abandonner",
+            "delete_note_confirm": "Voulez-vous vraiment supprimer cette note ?",
+            "delete_note_title": "Confirmer la suppression",
+            "no_content": "Description vide",
+            "no_reports": "Aucun rapport",
+            "note_placeholder": "Laisser une note",
+            "notes": "{ count } note | { count } notes",
+            "reopen": "Rouvrir",
+            "report": "Signaler",
+            "reports": "Rapports",
+            "resolve": "Résoudre",
+            "show_closed": "Afficher les rapports classés",
+            "statuses": "{ count } statut| { count } statuts",
+            "tag_policy_notice": "Activer la politique MRF pour établir les restrictions de publication",
+            "tags": "Établir les restrictions de publication"
+        },
+        "statuses": "Statuts",
+        "users": "Utilisateurs"
+    },
     "nav": {
         "about": "À propos",
         "administration": "Administration",
@@ -282,6 +313,7 @@
         "interactions": "Interactions",
         "lists": "Listes",
         "mentions": "Mentions",
+        "moderation": "Moderation",
         "preferences": "Préférences",
         "public_timeline_description": "Tous les statuts publics de cette instance",
         "public_tl": "Flux publique",
@@ -378,6 +410,8 @@
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Votre compte a été enregistré et un courriel envoyé à votre adresse. Veuillez consulter votre boîte mail pour terminer la registration.",
+        "awaiting_email_confirmation_title": "En attente de confirmation par courriel",
         "bio": "Biographie",
         "bio_placeholder": "ex :\nSalut, je me présente ici !\nJ’adore les animés et les jeux vidéos. J’espère qu'on peut être amis⋅ies !",
         "captcha": "CAPTCHA",
@@ -391,6 +425,8 @@
         "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": {
@@ -884,7 +920,6 @@
         "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,13 +1,18 @@
 {
     "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": "→",
-                "reject": "Tolak"
+                "keyword_policies": "Kebijakan Kata Kunci",
+                "reject": "Tolak",
+                "replace": "Ganti"
             },
             "mrf_policies": "Kebijakan MRF yang diaktifkan",
+            "mrf_policies_desc": "Kebijakan MRF memanipulasi federasi yang terjadi pada instansi ini.  Kebijakan berikut adalah yang aktif:",
             "simple": {
                 "accept": "Terima",
                 "accept_desc": "Instansi ini hanya menerima pesan dari instansi-instansi berikut:",
@@ -79,6 +84,7 @@
         "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"
@@ -92,9 +98,11 @@
     },
     "features_panel": {
         "media_proxy": "Proxy media",
+        "scope_options": "Opsi cakupan",
         "text_limit": "Batas teks",
         "title": "Fitur-fitur",
-        "upload_limit": "Batas unggahan"
+        "upload_limit": "Batas unggahan",
+        "who_to_follow": "Siapa untuk diikuti"
     },
     "file_type": {
         "audio": "Audio",
@@ -112,6 +120,7 @@
         "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).",
@@ -131,7 +140,8 @@
             "direct": "Langsung",
             "local": "Lokal - hanya instansi kamu yang dapat melihat postingan ini",
             "private": "Hanya pengikut",
-            "public": "Publik"
+            "public": "Publik",
+            "unlisted": "Tidak Tercantum"
         },
         "show_less": "Tampilkan lebih sedikit",
         "show_more": "Tampilkan lebih banyak",
@@ -181,15 +191,44 @@
         "lv": "Latvia",
         "nl": "Belanda",
         "pl": "Polandia",
-        "pt": "Portugal",
+        "pt": "Portugis",
         "ru": "Rusia",
         "sk": "Slovakia",
         "sv": "Swedia",
         "tr": "Turki",
         "translated_from": {
-            "ar": "Diterjemahkan dari @:languages.ar",
+            "ar": "Diterjemahkan dari bahasa @:languages.ar",
-            "bg": "Diterjemahkan dari @:languages.bg",
+            "az": "Diterjemahkan dari bahasa @:languages.az",
-            "en": "Diterjemahkan dari @:languages.en"
+            "bg": "Diterjemahkan dari bahasa @:languages.bg",
+            "cs": "Diterjemahkan dari bahasa @:languages.cs",
+            "da": "Diterjemahkan dari bahasa @:languages.da",
+            "de": "Diterjemahkan dari bahasa @:languages.de",
+            "el": "Diterjemahkan dari bahasa @:languages.el",
+            "en": "Diterjemahkan dari bahasa @:languages.en",
+            "eo": "Diterjemahkan dari bahasa @:languages.eo",
+            "es": "Diterjemahkan dari bahasa @:languages.es",
+            "fa": "Diterjemahkan dari bahasa @:languages.fa",
+            "fi": "Diterjemahkan dari bahasa @:languages.fi",
+            "fr": "Diterjemahkan dari bahasa @:languages.fr",
+            "ga": "Diterjemahkan dari bahasa @:languages.ga",
+            "he": "Diterjemahkan dari bahasa @:languages.he",
+            "hi": "Diterjemahkan dari bahasa @:languages.hi",
+            "hu": "Diterjemahkan dari bahasa @:languages.hu",
+            "id": "Diterjemahkan dari bahasa @:languages.id",
+            "it": "Diterjemahkan dari bahasa @:languages.it",
+            "ja": "Diterjemahkan dari bahasa @:languages.ja",
+            "ko": "Diterjemahkan dari bahasa @:languages.ko",
+            "lt": "Diterjemahkan dari bahasa @:languages.lt",
+            "lv": "Diterjemahkan dari bahasa @:languages.lv",
+            "nl": "Diterjemahkan dari bahasa @:languages.nl",
+            "pl": "Diterjemahkan dari bahasa @:languages.pl",
+            "pt": "Diterjemahkan dari bahasa @:languages.pt",
+            "ru": "Diterjemahkan dari bahasa @:languages.ru",
+            "sk": "Diterjemahkan dari bahasa @:languages.sk",
+            "sv": "Diterjemahkan dari bahasa @:languages.sv",
+            "tr": "Diterjemahkan dari bahasa @:languages.tr",
+            "uk": "Diterjemahkan dari bahasa @:languages.uk",
+            "zh": "Diterjemahkan dari bahasa @:languages.zh"
         },
         "uk": "Ukraina",
         "zh": "Tionghoa"
@@ -197,6 +236,7 @@
     "lists": {
         "create": "Buat",
         "delete": "Hapus daftar",
+        "following_only": "Batas mengikuti",
         "lists": "Daftar",
         "new": "Buat Daftar",
         "save": "Simpan perubahan",
@@ -243,13 +283,18 @@
             "delete_note_title": "Konfirmasi penghapusan",
             "no_content": "Tak diberikan keterangan",
             "no_reports": "Tak ada laporan",
-            "note_placeholder": "Tinggalkan catatan...",
+            "note_placeholder": "Tinggalkan catatan",
+            "notes": "{ count } catatan",
             "reopen": "Buka kembali",
+            "report": "Laporan di",
             "reports": "Laporan",
             "resolve": "Selesaikan",
-            "show_closed": "Tampilkan yang telah ditutup"
+            "show_closed": "Tampilkan yang telah ditutup",
+            "statuses": "{ count } postingan",
+            "tag_policy_notice": "Aktifkan MRF TagPolicy untuk mengatur pembatasan postingan",
+            "tags": "Atur pembatasan postingan"
         },
-        "statuses": "Status",
+        "statuses": "Postingan",
         "users": "Pengguna"
     },
     "nav": {
@@ -257,6 +302,8 @@
         "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",
@@ -275,7 +322,8 @@
         "timelines": "Linimasa",
         "twkn": "Jaringan Yang Dikenal",
         "twkn_timeline_description": "Postingan dari seluruh jaringan",
-        "user_search": "Penelusuran Pengguna"
+        "user_search": "Penelusuran Pengguna",
+        "who_to_follow": "Siapa untuk diikuti"
     },
     "notifications": {
         "broken_favorite": "Postingan tak dikenal, mencarinya…",
@@ -310,10 +358,11 @@
         "expired": "Japat berakhir {0} yang lalu",
         "expires_in": "Japat berakhir dalam {0}",
         "expiry": "Usia japat",
+        "multiple_choices": "Lebih dari satu opsi dapat dipilih",
         "not_enough_options": "Terlalu sedikit opsi yang unik pada japat",
         "option": "Opsi",
         "people_voted_count": "{count} orang memilih | {count} orang memilih",
-        "single_choice": "",
+        "single_choice": "Hanya satu opsi dapat dipilih",
         "type": "Jenis japat",
         "vote": "Pilih",
         "votes": "suara",
@@ -350,7 +399,8 @@
             "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"
+            "public": "Publik - posting ke linimasa publik",
+            "unlisted": "Tidak Tercantum - Tidak memposting ke timeline publik"
         },
         "scope_notice": {
             "local": "Postingan ini tidak akan terlihat di instansi lain",
@@ -367,6 +417,7 @@
         "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",
@@ -389,6 +440,7 @@
     },
     "remote_user_resolver": {
         "error": "Tidak ditemukan.",
+        "remote_user_resolver": "Pencarian pengguna jarak jauh",
         "searching_for": "Mencari"
     },
     "search": {
@@ -402,15 +454,22 @@
         "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",
@@ -438,6 +497,8 @@
         "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",
@@ -448,13 +509,23 @@
         "confirm_dialogs_repeat": "Mengulangi postingan",
         "confirm_dialogs_unfollow": "Berhenti mengikuti seseorang",
         "confirm_new_password": "Konfirmasi kata sandi baru",
-        "conversation_display": "Gaya tampilan obrolan",
+        "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",
@@ -462,24 +533,41 @@
         "emoji_reactions_on_timeline": "Tampilkan reaksi emoji pada linimasa",
         "enable_web_push_notifications": "Aktifkan notifikasi push web",
         "enter_current_password_to_confirm": "Masukkan kata sandi kamu saat ini untuk mengonfirmasi identitas kamu",
+        "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",
             "backup_settings_theme": "Cadangkan pengaturan dan tema ke berkas",
             "errors": {
-                "file_slightly_new": "Versi minor berkas berbeda, beberapa pengaturan mungkin tidak termuat"
+                "file_slightly_new": "Versi minor berkas berbeda, beberapa pengaturan mungkin tidak termuat",
-            }
+                "file_too_new": "Versi major tidak kompatibel: {fileMajor}, PleromaFE ini (versi {feMajor}) terlalu lama untuk menanganinya",
+                "file_too_old": "Versi major tidak kompatibel: {fileMajor}, versi berkas terlalu lama dan tidak lagi didukung (min. versi {feMajor})",
+                "invalid_file": "Berkas yang dipilih bukan cadangan pengaturan Pleroma yang didukung. Tidak dibuat perubahan."
+            },
+            "restore_settings": "Pulihkan pengaturan dari berkas"
         },
         "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",
+        "hide_all_muted_posts": "Sembunyikan postingan yang dibisukan",
+        "hide_attachments_in_convo": "Sembunyikan lampiran pada percakapan",
+        "hide_attachments_in_tl": "Sembunyikan lampiran di linimasa",
+        "hide_bot_indication": "Sembunyikan tanda bot pada postingan",
+        "hide_filtered_statuses": "Sembunyikan semua postingan yang tersaring",
         "hide_followers_count_description": "Jangan tampilkan jumlah pengikut",
-        "hide_followers_description": "Jangan tampilkan siapa yang mengikuti saya",
+        "hide_followers_description": "Jangan tampilkan siapa yang mengikutiku",
         "hide_follows_count_description": "Jangan tampilkan jumlah mengikuti",
-        "hide_follows_description": "Jangan tampilkan siapa yang saya ikuti",
+        "hide_follows_description": "Jangan tampilkan siapa yang aku ikuti",
         "hide_muted_posts": "Sembunyikan postingan-postingan dari pengguna yang dibisukan",
         "hide_post_stats": "Sembunyikan statistik postingan (seperti jumlah favorit)",
         "hide_shoutbox": "Sembunyikan kotak suara instansi",
@@ -493,9 +581,16 @@
         "invalid_theme_imported": "Berkas yang dipilih bukan sebuah tema yang didukung Pleroma. Tidak ada perubahan yang dibuat pada tema kamu.",
         "limited_availability": "Tidak tersedia di browser kamu",
         "links": "Tautan",
+        "lock_account_description": "Batasi akunmu kepada pengikut yang sudah disetujui saja",
         "loop_video": "Ulang-ulang video",
         "loop_video_silent_only": "Ulang-ulang video tanpa suara (seperti \"gif\" Mastodon)",
-        "max_thumbnails": "Jumlah thumbnail maksimum per postingan",
+        "max_thumbnails": "Jumlah thumbnail maksimum per postingan (kosong = tidak terbatas)",
+        "mention_link_bolden_you": "Sorot sebutan kamu apabila kamu disebut",
+        "mention_link_display": "Tampilkan tautan sebutan",
+        "mention_link_display_full": "selalu sebagai nama lengkap (cth. {'@'}foo{'@'}example.org)",
+        "mention_link_display_full_for_remote": "sebagai nama lengkap hanya untuk pengguna di instansi lain (cth. {'@'}foo{'@'}example.org)",
+        "mention_link_display_short": "selalu sebagai nama pendek (cth. {'@'}foo)",
+        "mention_link_show_avatar": "Tampilkan avatar pengguna di samping tautan",
         "mfa": {
             "authentication_methods": "Metode otentikasi",
             "confirm_and_enable": "Konfirmasi & aktifkan OTP",
@@ -541,9 +636,9 @@
         },
         "profile_tab": "Profil",
         "reply_visibility_all": "Tampilkan semua balasan",
-        "reply_visibility_following": "Hanya tampilkan balasan yang ditujukan kepada saya atau orang yang saya ikuti",
+        "reply_visibility_following": "Hanya tampilkan balasan yang ditujukan kepadaku atau orang yang aku ikuti",
-        "reply_visibility_following_short": "Tampilkan balasan ke orang yang saya ikuti",
+        "reply_visibility_following_short": "Tampilkan balasan ke orang yang aku ikuti",
-        "reply_visibility_self": "Hanya tampilkan balasan yang ditujukan kepada saya",
+        "reply_visibility_self": "Hanya tampilkan balasan yang ditujukan kepadaku",
         "save": "Simpan perubahan",
         "saving_err": "Terjadi kesalahan ketika menyimpan pengaturan",
         "saving_ok": "Pengaturan disimpan",
@@ -554,8 +649,8 @@
         "set_new_avatar": "Tetapkan avatar baru",
         "set_new_profile_background": "Tetapkan latar belakang profil baru",
         "settings": "Pengaturan",
-        "show_admin_badge": "Tampilkan lencana \"Admin\" di profil saya",
+        "show_admin_badge": "Tampilkan lencana \"Admin\" di profilku",
-        "show_moderator_badge": "Tampilkan lencana \"Moderator\" di profil saya",
+        "show_moderator_badge": "Tampilkan lencana \"Moderator\" di profilku",
         "style": {
             "advanced_colors": {
                 "_tab_label": "Lanjutan",
@@ -598,7 +693,7 @@
             },
             "preview": {
                 "button": "Tombol",
-                "checkbox": "Saya telah membaca sekilas syarat dan ketentuan",
+                "checkbox": "Aku telah membaca sekilas syarat dan ketentuan",
                 "error": "Contoh kesalahan",
                 "faint_link": "manual berguna",
                 "fine_print": "Baca {0} kami untuk belajar sesuatu yang tak ada gunanya!",

src/i18n/ja_easy.json

@@ -1,20 +1,31 @@
 {
     "about": {
+        "bubble_instances": "ローカルバブルインスタンス",
         "mrf": {
             "federation": "フェデレーション",
+            "keyword": {
+                "ftl_removal": "「せつぞくしているすべてのネットワーク」タイムラインからのぞく",
+                "is_replaced_by": "→",
+                "keyword_policies": "キーワードポリシー",
+                "reject": "おことわり",
+                "replace": "おきかえ"
+            },
             "mrf_policies": "ゆうこうなMRFポリシー",
             "mrf_policies_desc": "MRFポリシーは、このインスタンスのフェデレーションのふるまいを、いじります。これらのMRFポリシーがゆうこうになっています:",
             "simple": {
                 "accept": "うけいれ",
                 "accept_desc": "このインスンスは、これらのインスタンスからのメッセージのみをうけいれます:",
                 "ftl_removal": "「つながっているすべてのネットワーク」タイムラインからのぞく",
-                "ftl_removal_desc": "このインスタンスは、つながっているすべてのネットワーク」タイムラインから、これらのインスタンスを、とりのぞきます:",
+                "ftl_removal_desc": "このインスタンスは、「つながっているすべてのネットワーク」タイムラインから、これらのインスタンスを、とりのぞきます:",
+                "instance": "インスタンス",
                 "media_nsfw": "メディアをすべてセンシティブにする",
                 "media_nsfw_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、すべて、センシティブにマークします:",
                 "media_removal": "メディアをのぞく",
                 "media_removal_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、とりのぞきます:",
+                "not_applicable": "なし",
                 "quarantine": "けんえき",
-                "quarantine_desc": "このインスタンスは、これらのインスタンスに、パブリックなとうこうのみを、おくります:",
+                "quarantine_desc": "このインスタンスは、これらのインスタンスに、とうこうをおくりません:",
+                "reason": "りゆう",
                 "reject": "おことわり",
                 "reject_desc": "このインスタンスは、これらのインスタンスからのメッセージをうけいれません:",
                 "simple_policies": "インスタンスのポリシー"
@@ -22,6 +33,49 @@
         },
         "staff": "スタッフ"
     },
+    "announcements": {
+        "all_day_prompt": "いちにちじゅう",
+        "cancel_edit_action": "キャンセル",
+        "close_error": "とじる",
+        "delete_action": "けす",
+        "edit_action": "へんしゅう",
+        "end_time_display": "{time} におわります",
+        "end_time_prompt": "おわるじかん: ",
+        "inactive_message": "このおしらせは、アクティブではありません",
+        "mark_as_read_action": "よんだ！",
+        "page_header": "おしらせ",
+        "post_action": "とうこう",
+        "post_error": "エラーになりました: {error}",
+        "post_form_header": "おしらせする",
+        "post_placeholder": "おしらせのほんぶん",
+        "published_time_display": "{time} に、おしらせされました",
+        "start_time_display": "{time} から、はじまります",
+        "start_time_prompt": "はじまるじかん: ",
+        "submit_edit_action": "そうしん",
+        "title": "おしらせ"
+    },
+    "chats": {
+        "chats": "チャット",
+        "delete": "けす",
+        "delete_confirm": "ほんとうに、このメッセージを、けしてもいいですか？",
+        "empty_chat_list_placeholder": "チャットはありません。あたらしく、チャットをはじみてみましょう！",
+        "empty_message_error": "からっぽのメッセージは、おくれません",
+        "error_loading_chat": "チャットをよみこむことが、できなかったかもしれません。",
+        "error_sending_message": "メッセージをおくることが、できなかったかもしれません。",
+        "message_user": "{nickname} にメッセージ",
+        "more": "つづき",
+        "new": "あたらしいチャット",
+        "you": "あなた:"
+    },
+    "display_date": {
+        "today": "きょう"
+    },
+    "domain_mute_card": {
+        "mute": "ミュート",
+        "mute_progress": "ミュートしています…",
+        "unmute": "ミュートをやめる",
+        "unmute_progress": "ミュートをとりけしています…"
+    },
     "emoji": {
         "add_emoji": "えもじをうちこむ",
         "custom": "カスタムえもじ",
@@ -29,6 +83,7 @@
         "keep_open": "ピッカーをあけたままにする",
         "load_all": "すべてのえもじをロード ({emojiAmount} こあります)",
         "load_all_hint": "はじめの {saneAmount} このえもじだけがロードされています。すべてのえもじをロードすると、パフォーマンスがわるくなるかもしれません。",
+        "recent": "さいきんつかった",
         "search_emoji": "えもじをさがす",
         "stickers": "ステッカー",
         "unicode": "ユニコードえもじ"
@@ -42,8 +97,15 @@
         "scope_options": "こうかいはんいせんたく",
         "text_limit": "もじのかず",
         "title": "ゆうこうなきのう",
+        "upload_limit": "ファイルのおおきさのじょうげん",
         "who_to_follow": "おすすめユーザー"
     },
+    "file_type": {
+        "audio": "おんせい",
+        "file": "ファイル",
+        "image": "がぞう",
+        "video": "ビデオ"
+    },
     "finder": {
         "error_fetching_user": "ユーザーけんさくがエラーになりました",
         "find_user": "ユーザーをさがす"
@@ -51,12 +113,32 @@
     "general": {
         "apply": "てきよう",
         "cancel": "キャンセル",
+        "close": "とじる",
         "confirm": "たしかめる",
         "disable": "なし",
+        "dismiss": "わすれる",
         "enable": "あり",
+        "error_retry": "もういちど、ためしてください",
+        "flash_content": "クリックすると、Ruffle をつかって、フラッシュさくひんをひょうじします。(うまくうごかないかもしれません)",
+        "flash_fail": "フラッシュさくひんのロードに、しっぱいしました。コンソールに、くわしいことがかかれています。",
+        "flash_security": "フラッシュさくひんは、あなたのコンピューターに、あぶないことをしてくるかもしれないので、ちゅういしてください。",
         "generic_error": "エラーになりました",
+        "loading": "ロードしています…",
         "more": "つづき",
         "optional": "かかなくてもよい",
+        "peek": "かくす",
+        "retry": "もういちど、ためしてください",
+        "role": {
+            "admin": "アドミン",
+            "moderator": "モデレーター"
+        },
+        "scope_in_timeline": {
+            "direct": "ダイレクト",
+            "local": "ローカル: このとうこうは、このインスタンスのユーザーだけが、みることができます",
+            "private": "フォロワーげんてい",
+            "public": "パブリック",
+            "unlisted": "アンリステッド"
+        },
         "show_less": "たたむ",
         "show_more": "つづきをみる",
         "submit": "そうしん",
@@ -76,7 +158,86 @@
     "interactions": {
         "favs_repeats": "リピートとおきにいり",
         "follows": "あたらしいフォロー",
-        "load_older": "ふるいやりとりをみる"
+        "load_older": "ふるいやりとりをみる",
+        "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": "@: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": "@:languages.tr から、ほんやくされました",
+            "uk": "@:languages.uk から、ほんやくされました",
+            "zh": "@:languages.zh から、ほんやくされました"
+        },
+        "uk": "ウクライナご",
+        "zh": "ちゅうごくご"
+    },
+    "lists": {
+        "create": "つくる",
+        "delete": "けす",
+        "following_only": "フォローしているユーザーのみ",
+        "lists": "リスト",
+        "new": "リストをつくる",
+        "save": "セーブ",
+        "search": "ユーザーをさがす",
+        "title": "リストのなまえ"
     },
     "login": {
         "authentication_code": "にんしょうコード",
@@ -90,41 +251,90 @@
         "hint": "はなしあいにくわわるには、ログインしてください",
         "login": "ログイン",
         "logout": "ログアウト",
+        "logout_confirm": "ほんとうに、ログアウトしてもいいですか？",
+        "logout_confirm_accept_button": "ログアウト",
+        "logout_confirm_cancel_button": "キャンセル",
+        "logout_confirm_title": "ログアウト",
         "password": "パスワード",
-        "placeholder": "れい: lain",
+        "placeholder": "ユーザーめい",
         "recovery_code": "リカバリーコード",
         "register": "はじめる",
         "username": "ユーザーめい"
     },
     "media_modal": {
+        "counter": "{current} / {total}",
+        "hide": "とじる",
         "next": "つぎ",
         "previous": "まえ"
     },
+    "moderation": {
+        "moderation": "モデレーション",
+        "reports": {
+            "add_note": "メモする",
+            "close": "とじる",
+            "delete_note": "けす",
+            "delete_note_accept": "けす",
+            "delete_note_cancel": "キャンセル",
+            "delete_note_confirm": "ほんとうに、このメモをけしてもいいですか？",
+            "delete_note_title": "かくにんしてください",
+            "no_content": "せつめいはありません",
+            "no_reports": "つうほうはありません",
+            "note_placeholder": "メモする",
+            "notes": "{ count }こ",
+            "reopen": "ひらきなおす",
+            "report": "つうほう:",
+            "reports": "つうほう",
+            "resolve": "かいけつ",
+            "show_closed": "かいけつしたつうほうをみる",
+            "statuses": "{ count } こ",
+            "tag_policy_notice": "とうこうをせいげんするには、TagPolicy MRF をゆうこうにしてください",
+            "tags": "とうこうをせいげんする"
+        },
+        "statuses": "とうこう",
+        "users": "ユーザー"
+    },
     "nav": {
         "about": "これはなに？",
         "administration": "アドミニストレーション",
+        "announcements": "おしらせ",
         "back": "もどる",
+        "bookmarks": "ブックマーク",
+        "bubble_timeline": "バブルタイムライン",
+        "bubble_timeline_description": "アドミンがおすすめするインスタンスからのとうこう",
+        "chats": "チャット",
         "dms": "ダイレクトメッセージ",
         "friend_requests": "フォローリクエスト",
+        "home_timeline": "ホームタイムライン",
+        "home_timeline_description": "フォローしているユーザーのとうこう",
         "interactions": "やりとり",
+        "lists": "リスト",
         "mentions": "メンション",
+        "moderation": "モデレーション",
         "preferences": "せってい",
+        "public_timeline_description": "このインスタンスからの、パブリックなとうこう",
         "public_tl": "パブリックタイムライン",
         "search": "さがす",
         "timeline": "タイムライン",
+        "timelines": "タイムライン",
         "twkn": "つながっているすべてのネットワーク",
+        "twkn_timeline_description": "つながっているすべてのネットワークからのとうこう",
         "user_search": "ユーザーをさがす",
         "who_to_follow": "おすすめユーザー"
     },
     "notifications": {
-        "broken_favorite": "ステータスがみつかりません。さがしています…",
+        "broken_favorite": "とうこうがみつかりません。さがしています…",
-        "favorited_you": "あなたのステータスがおきにいりされました",
+        "error": "つうちのしゅとくがエラーになりました: {0}",
+        "favorited_you": "あなたのとうこうが、おきにいりされました",
+        "follow_request": "フォローリクエストされました",
         "followed_you": "フォローされました",
         "load_older": "ふるいつうちをみる",
+        "migrated_to": "インスタンスをひっこしました",
         "no_more_notifications": "つうちはありません",
         "notifications": "つうち",
+        "poll_ended": "いれふだがおわりました",
+        "reacted_with": "{0} でリアクションされました",
         "read": "よんだ！",
-        "repeated_you": "あなたのステータスがリピートされました"
+        "repeated_you": "あなたのとうこうが、リピートされました"
     },
     "password_reset": {
         "check_email": "パスワードをリセットするためのリンクがかかれたメールが、とどいているかどうか、みてください。",
@@ -147,49 +357,72 @@
         "multiple_choices": "いくつでもえらべる",
         "not_enough_options": "ユニークなオプションが、たりません",
         "option": "オプション",
+        "people_voted_count": "{count} にんが、ふだをいれています",
         "single_choice": "ひとつえらぶ",
         "type": "いれふだのかた",
         "vote": "ふだをいれる",
-        "votes": "いれふだ"
+        "votes": "いれふだ",
+        "votes_count": "{count} ふだ"
     },
     "post_status": {
-        "account_not_locked_warning": "あなたのアカウントは {0} ではありません。あなたをフォローすれば、だれでも、フォロワーげんていのステータスをよむことができます。",
+        "account_not_locked_warning": "あなたのアカウントは {0} ではありません。あなたをフォローすれば、だれでも、フォロワーげんていのとうこうをよむことができます。",
         "account_not_locked_warning_link": "ロックされたアカウント",
         "attachments_sensitive": "ファイルをNSFWにする",
         "content_type": {
             "text/bbcode": "BBCode",
             "text/html": "HTML",
             "text/markdown": "Markdown",
-            "text/plain": "プレーンテキスト"
+            "text/plain": "プレーンテキスト",
+            "text/x.misskeymarkdown": "MFM"
         },
-        "content_warning": "せつめい (かかなくてもよい)",
+        "content_warning": "ちゅういがき (かかなくてもよい)",
         "default": "はねだくうこうに、つきました。",
         "direct_warning_to_all": "このとうこうは、メンションされたすべてのユーザーが、みることができます。",
         "direct_warning_to_first_only": "このとうこうは、メッセージのはじめでメンションされたユーザーだけが、みることができます。",
+        "edit_remote_warning": "へんしゅうしたとうこうは、ほかのインスタンスに、はんえいされないことがあります！",
+        "edit_status": "へんしゅう",
+        "edit_unsupported_warning": "いれふだとメンションは、へんしゅうでかえることができません。",
+        "empty_status_error": "からっぽのとうこうは、おくることができません",
+        "media_description": "メディアのせつめい",
+        "media_description_error": "メディアのアップデートにしっぱいしました。もういちど、ためしてください",
+        "media_not_sensitive_warning": "ちゅういがきがついていますが、NSFWはついていません！",
         "new_status": "とうこうする",
+        "post": "とうこう",
         "posting": "とうこう",
+        "preview": "プレビュー",
+        "preview_empty": "からっぽです",
         "scope": {
             "direct": "ダイレクト: メンションされたユーザーのみにとどきます",
+            "local": "ローカル: パブリックタイムラインにとどきますが、ほかのインスタンスにはとどきません",
             "private": "フォロワーげんてい: フォロワーのみにとどきます",
             "public": "パブリック: パブリックタイムラインにとどきます",
             "unlisted": "アンリステッド: パブリックタイムラインにとどきません"
         },
         "scope_notice": {
+            "local": "このとうこうは、このインスタンスのユーザーだけが、みることができます",
             "private": "このとうこうは、あなたのフォロワーだけが、みることができます",
             "public": "このとうこうは、だれでもみることができます",
             "unlisted": "このとうこうは、パブリックタイムラインと、つながっているすべてのネットワークでは、みることができません"
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "あなたのメールアドレスに、メールをおくりました。メールをかくにんして、とうろくをかんりょうさせてください。",
+        "awaiting_email_confirmation_title": "メールをかくにんするのをまっています",
         "bio": "プロフィール",
         "bio_placeholder": "れい:\nごきげんよう。わたしはれいん。\nわたしはアニメのおんなのこで、にほんのベッドタウンにすんでいます。ワイヤードで、わたしにあったことが、あるかもしれませんね。",
         "captcha": "CAPTCHA",
         "email": "Eメール",
+        "email_language": "サーバーからのメールは、どのことばで、かいてほしいですか？",
         "fullname": "スクリーンネーム",
         "fullname_placeholder": "れい: いわくら れいん",
         "new_captcha": "もじがよめないときは、がぞうをクリックすると、あたらしいがぞうになります",
         "password_confirm": "パスワードのかくにん",
+        "reason": "とうろくしたいりゆう",
+        "reason_placeholder": "このインスタンスは、しゅどうで、とうろくをうけつけています。\nとうろくしたいりゆうを、アドミニストレーターにおしえてください。",
+        "register": "はじめる",
         "registration": "はじめる",
+        "request_sent": "とうろくリクエストをおくりました。とうろくがうけいれられると、メールがとどきます。",
+        "request_sent_title": "とうろくリクエストをおくりました",
         "token": "しょうたいトークン",
         "username_placeholder": "れい: lain",
         "validations": {
@@ -217,6 +450,20 @@
         "select_all": "すべてえらぶ"
     },
     "settings": {
+        "accent": "アクセント",
+        "account_alias": "アカウントのエイリアス",
+        "account_alias_table_head": "エイリアス",
+        "account_backup": "アカウントのバックアップ",
+        "account_backup_description": "あなたのアカウントのじょうほうと、とうこうの、アーカイブをダウンロードできます。しかし、いまのところは、バックアップを Pleromaのアカウントにインポートすることはできません。",
+        "account_backup_table_head": "バックアップ",
+        "account_privacy": "プライバシー",
+        "add_alias_error": "エイリアスのついかがエラーになりました: {error}",
+        "add_backup": "あたらしいバックアップをつくる",
+        "add_backup_error": "バックアップのついかがエラーになりました: {error}",
+        "added_alias": "エイリアスをついかしました。",
+        "added_backup": "バックアップをつくりました。",
+        "allow_following_move": "フォローしているアカウントがひっこしたときに、じどうでフォローしてもよい",
+        "always_show_post_button": "みぎしたのとうこうボタンをいつでもひょうじする",
         "app_name": "アプリのなまえ",
         "attachmentRadius": "ファイル",
         "attachments": "ファイル",
@@ -226,6 +473,7 @@
         "avatarRadius": "アバター",
         "avatar_size_instruction": "アバターのおおきさは、150×150ピクセルか、それよりもおおきくするといいです。",
         "background": "バックグラウンド",
+        "backup_not_ready": "このバックアップは、まだ、かんせいしていません。",
         "bio": "プロフィール",
         "block_export": "ブロックのエクスポート",
         "block_export_button": "ブロックをCSVファイルにエクスポート",
@@ -233,6 +481,7 @@
         "block_import_error": "ブロックのインポートがエラーになりました",
         "blocks_imported": "ブロックをインポートしました！ じっさいにブロックするまでには、もうしばらくかかります。",
         "blocks_tab": "ブロック",
+        "bot": "これは bot アカウントです",
         "btnRadius": "ボタン",
         "cBlue": "リプライとフォロー",
         "cGreen": "リピート",
@@ -244,11 +493,29 @@
         "change_password_error": "パスワードをかえることが、できなかったかもしれません。",
         "changed_email": "メールアドレスをかえることができました！",
         "changed_password": "パスワードが、かわりました！",
+        "chatMessageRadius": "チャットメッセージ",
         "checkboxRadius": "チェックボックス",
-        "collapse_subject": "せつめいのあるとうこうをたたむ",
+        "collapse_subject": "ちゅういがきのあるとうこうをたたむ",
+        "columns": "カラム",
         "composing": "とうこう",
+        "confirm_dialogs": "いつ、かくにんがめんをひょうじしますか:",
+        "confirm_dialogs_approve_follow": "フォローリクエストをうけいれるとき",
+        "confirm_dialogs_block": "だれかをブロックするとき",
+        "confirm_dialogs_delete": "とうこうをけすとき",
+        "confirm_dialogs_deny_follow": "フォローリクエストをおことわりするとき",
+        "confirm_dialogs_mute": "だれかをミュートするとき",
+        "confirm_dialogs_repeat": "とうこうをリピートするとき",
+        "confirm_dialogs_unfollow": "だれかのフォローをやめるとき",
         "confirm_new_password": "あたらしいパスワードのかくにん",
+        "confirmation_dialogs": "かくにんがめんのせってい",
+        "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": "デフォルトのこうかいはんい",
@@ -256,12 +523,18 @@
         "delete_account_description": "あなたのアカウントとメッセージが、きえます。",
         "delete_account_error": "アカウントをけすことが、できなかったかもしれません。インスタンスのアドミニストレーターに、おといあわせください。",
         "delete_account_instructions": "ほんとうにアカウントをけしてもいいなら、パスワードをかいてください。",
+        "disable_sticky_headers": "カラムヘッダーを、がめんのいちばんうえにくっつけない",
         "discoverable": "けんさくなどのサービスで、このアカウントをみつけてもよい",
+        "domain_mutes": "ドメイン",
+        "download_backup": "ダウンロード",
+        "email_language": "メールのことば",
+        "emoji_reactions_on_timeline": "えもじのリアクションをタイムラインにひょうじする",
         "enable_web_push_notifications": "ウェブプッシュつうちをゆるす",
         "enter_current_password_to_confirm": "あなたのアイデンティティをたしかめるため、あなたのいまのパスワードをかいてください",
+        "expert_mode": "こまかいせっていをひょうじ",
         "export_theme": "セーブ",
         "filtering": "フィルタリング",
-        "filtering_explanation": "これらのことばをふくむすべてのものがミュートされます。1ぎょうに1つのことばをかいてください",
+        "filtering_explanation": "これらのことばをふくむすべてのとうこうがミュートされます。1ぎょうに1つのことばをかいてください",
         "follow_export": "フォローのエクスポート",
         "follow_export_button": "エクスポート",
         "follow_import": "フォローインポート",
@@ -329,6 +602,7 @@
         "no_rich_text_description": "リッチテキストをつかわない",
         "notification_blocks": "ブロックしているユーザーからのつうちは、すべてとまります。",
         "notification_mutes": "あるユーザーからのつうちをとめるには、ミュートしてください。",
+        "notification_setting_hide_if_cw": "ちゅういがきがあるとうこうのないようを、つうちからみえないようにする",
         "notification_visibility": "ひょうじするつうち",
         "notification_visibility_follows": "フォロー",
         "notification_visibility_likes": "おきにいり",
@@ -361,6 +635,7 @@
         "search_user_to_mute": "ミュートしたいひとを、ここでけんさくできます",
         "security": "セキュリティ",
         "security_tab": "セキュリティ",
+        "sensitive_if_subject": "ちゅういがきを、つけたときに、がぞうをじどうてきにNSFWにする",
         "set_new_avatar": "あたらしいアバターをせっていする",
         "set_new_profile_background": "あたらしいプロフィールのバックグラウンドをせっていする",
         "set_new_profile_banner": "あたらしいプロフィールバナーを設定する",
@@ -478,8 +753,8 @@
                 "save_load_hint": "「のこす」オプションをONにすると、テーマをえらんだときとロードしたとき、いまのせっていをのこします。また、テーマをエクスポートするとき、これらのオプションをストアします。すべてのチェックボックスをOFFにすると、テーマをエクスポートしたとき、すべてのせっていをセーブします。"
             }
         },
-        "subject_input_always_show": "サブジェクトフィールドをいつでもひょうじする",
+        "subject_input_always_show": "ちゅういがきフィールドをいつでもひょうじする",
-        "subject_line_behavior": "リプライするときサブジェクトをコピーする",
+        "subject_line_behavior": "リプライするとき、ちゅういがきをコピーする",
         "subject_line_email": "メールふう: \"re: サブジェクト\"",
         "subject_line_mastodon": "マストドンふう: そのままコピー",
         "subject_line_noop": "コピーしない",
@@ -506,8 +781,8 @@
         }
     },
     "status": {
-        "delete": "ステータスをけす",
+        "delete": "とうこうをけす",
-        "delete_confirm": "ほんとうに、このステータスを、けしてもいいですか？",
+        "delete_confirm": "ほんとうに、このとうこうを、けしてもいいですか？",
         "favorites": "おきにいり",
         "mute_conversation": "スレッドをミュートする",
         "pin": "プロフィールにピンどめする",
@@ -515,6 +790,8 @@
         "repeats": "リピート",
         "replies_list": "へんしん:",
         "reply_to": "へんしん:",
+        "translate": "ほんやく",
+        "translated_from": "{language} から、ほんやくされました",
         "unmute_conversation": "スレッドをミュートするのをやめる",
         "unpin": "プロフィールにピンどめするのをやめる"
     },
@@ -543,7 +820,7 @@
     "timeline": {
         "collapse": "たたむ",
         "conversation": "スレッド",
-        "load_older": "ふるいステータス",
+        "load_older": "ふるいとうこう",
         "no_more_statuses": "これでおわりです",
         "no_retweet_hint": "とうこうを「フォロワーのみ」または「ダイレクト」にすると、リピートできなくなります",
         "no_statuses": "ありません",
@@ -611,16 +888,18 @@
         "media": "メディア",
         "mention": "メンション",
         "mute": "ミュート",
+        "mute_domain": "ドメインをブロック",
         "mute_progress": "ミュートしています…",
         "muted": "ミュートしています！",
         "per_day": "/日",
         "remote_follow": "リモートフォロー",
         "report": "つうほう",
         "show_repeats": "リピートをみる",
-        "statuses": "ステータス",
+        "statuses": "とうこう",
         "subscribe": "サブスクライブ",
         "unblock": "ブロックをやめる",
         "unblock_progress": "ブロックをとりけしています…",
+        "unfollow_confirm": "{user}のフォローをやめますか?",
         "unmute": "ミュートをやめる",
         "unmute_progress": "ミュートをとりけしています…",
         "unsubscribe": "サブスクライブをやめる"
@@ -643,4 +922,4 @@
         "more": "くわしく",
         "who_to_follow": "おすすめユーザー"
     }
-}
+}

src/i18n/ja_pedantic.json

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

src/i18n/messages.js

@@ -21,6 +21,7 @@ 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'),
@@ -35,6 +36,7 @@ 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

@@ -254,6 +254,10 @@
         "hint": "Log in om deel te nemen aan de discussie",
         "login": "Inloggen",
         "logout": "Uitloggen",
+        "logout_confirm": "Weet je zeker dat je wilt uitloggen?",
+        "logout_confirm_accept_button": "Uitloggen",
+        "logout_confirm_cancel_button": "Annuleren",
+        "logout_confirm_title": "Uitloggen",
         "password": "Wachtwoord",
         "placeholder": "mijngebruikersnaam",
         "recovery_code": "Herstelcode",
@@ -266,6 +270,30 @@
         "next": "Volgende",
         "previous": "Vorige"
     },
+    "moderation": {
+        "moderation": "Moderatie",
+        "reports": {
+            "add_note": "Notitie toevoegen",
+            "close": "Sluiten",
+            "delete_note": "Verwijderen",
+            "delete_note_accept": "Ja, verwijderen",
+            "delete_note_cancel": "Nee, behouden",
+            "delete_note_confirm": "Weet je zeker dat je deze notitie wilt verwijderen?",
+            "delete_note_title": "Verwijderen bevestigen",
+            "no_content": "Geen omschrijving beschikbaar",
+            "no_reports": "Geen rapporten beschikbaar",
+            "notes": "{ count } notitie | { count } notities",
+            "reopen": "Heropenen",
+            "reports": "Rapporten",
+            "resolve": "Oplossen",
+            "show_closed": "Afgesloten tonen",
+            "statuses": "{ count } bericht| { count } berichten",
+            "tag_policy_notice": "Activeer de TagPolicy MRF om bericht-beperkingen in te stellen",
+            "tags": "Bericht-beperkingen instellen"
+        },
+        "statuses": "Berichten",
+        "users": "Gebruikers"
+    },
     "nav": {
         "about": "Over ons",
         "administration": "Beheer",
@@ -282,6 +310,7 @@
         "interactions": "Interacties",
         "lists": "Lijsten",
         "mentions": "Vermeldingen",
+        "moderation": "Moderatie",
         "preferences": "Voorkeuren",
         "public_timeline_description": "Openbare berichten van deze instantie",
         "public_tl": "Openbare tijdlijn",
@@ -378,6 +407,8 @@
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Je account is geregistreerd en een e-mail verzonden naar je e-mailadres ter bevestiging. Controleer je e-mail inbox om de registratie af te ronden.",
+        "awaiting_email_confirmation_title": "In afwachting van e-mail bevestiging",
         "bio": "Bio",
         "bio_placeholder": "Bijv.\nHallo! Welkom op mijn bio.\nIk vind anime en games leuk. Hopelijk kunnen we vrienden zijn!",
         "captcha": "CAPTCHA",
@@ -391,6 +422,8 @@
         "reason_placeholder": "Deze instantie keurt registraties handmatig goed.\nLaat de beheerder weten waarom je je wilt registreren.",
         "register": "Registreren",
         "registration": "Registratie",
+        "request_sent": "Je registratieverzoek zal worden beoordeeld. Indien je account wordt goed gekeurd, zul je een e-mail ontvangen.",
+        "request_sent_title": "Registratieverzoek verzonden",
         "token": "Uitnodigingstoken",
         "username_placeholder": "bijv. akko",
         "validations": {
@@ -500,6 +533,8 @@
         "enable_web_push_notifications": "Web push meldingen inschakelen",
         "enter_current_password_to_confirm": "Voer je huidige wachtwoord in om je identiteit te bevestigen",
         "expert_mode": "Geavanceerde opties tonen",
+        "expire_posts_enabled": "Berichten ouder dan een ingesteld aantal dagen verwijderen",
+        "expire_posts_input_placeholder": "Aantal dagen",
         "export_theme": "Preset opslaan",
         "file_export_import": {
             "backup_restore": "Instellingen back-up",
@@ -693,6 +728,18 @@
         "setting_changed": "Instelling verschilt van standaard waarde",
         "setting_server_side": "Deze instelling is gebonden aan je profiel en beïnvloed alle sessies en clients",
         "settings": "Instellingen",
+        "settings_profile": "Instellingsprofielen",
+        "settings_profile_creation": "Nieuw profiel aanmaken",
+        "settings_profile_creation_new_name_label": "Naam",
+        "settings_profile_creation_submit": "Aanmaken",
+        "settings_profile_delete": "Verwijderen",
+        "settings_profile_delete_confirm": "Weet je zeker dat je dit profiel wilt verwijderen?",
+        "settings_profile_force_sync": "Synchroniseren",
+        "settings_profile_in_use": "In gebruik",
+        "settings_profile_use": "Gebruiken",
+        "settings_profiles_refresh": "Instellingsprofielen verversen",
+        "settings_profiles_show": "Alle instellingsprofielen tonen",
+        "settings_profiles_unshow": "Alle instellingsprofielen verbergen",
         "show_admin_badge": "\"Beheerder\" badge in mijn profiel tonen",
         "show_moderator_badge": "\"Moderator\" badge in mijn profiel tonen",
         "show_nav_shortcuts": "Extra navigatie snelkoppelingen tonen in top paneel",
@@ -871,7 +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",
         "user_mutes": "Gebruikers",
@@ -892,6 +939,12 @@
         "word_filter": "Woord filter",
         "wordfilter": "Woordfilter"
     },
+    "settings_profile": {
+        "creating": "Bezig met nieuw profiel \"{profile}\" aan te maken...",
+        "synchronization_error": "Instellingen konden niet gesynchroniseerd worden: {err}",
+        "synchronized": "Instellingen gesynchroniseerd!",
+        "synchronizing": "Bezig met profiel \"{profile}\" te synchroniseren..."
+    },
     "status": {
         "ancestor_follow": "{numReplies} ander antwoord onder dit bericht tonen | {numReplies} andere antwoorden onder dit bericht tonen",
         "ancestor_follow_with_icon": "{icon} {text}",
@@ -925,6 +978,11 @@
         "pin": "Aan profiel vastmaken",
         "pinned": "Vastgezet",
         "plus_more": "+{number} meer",
+        "redraft": "Verwijderen & opnieuw opstellen",
+        "redraft_confirm": "Weet je zeker at je dit bericht wilt verwijderen en opnieuw opstellen? Interacties met het originele bericht zullen vervallen.",
+        "redraft_confirm_accept_button": "Ja, verwijderen en opnieuw opstellen",
+        "redraft_confirm_cancel_button": "Nee, origineel bericht behouden",
+        "redraft_confirm_title": "Verwijderen & opnieuw opstellen bevestigen",
         "remove_attachment": "Bijlage verwijderen",
         "repeat_confirm": "Weet je zeker dat je dit bericht wilt herhalen?",
         "repeat_confirm_accept_button": "Ja, herhalen",
@@ -985,6 +1043,7 @@
         "collapse": "Invouwen",
         "conversation": "Gesprek",
         "error": "Fout bij het ophalen van tijdlijn: {0}",
+        "follow_tag": "Hashtag volgen",
         "load_older": "Oudere berichten laden",
         "no_more_statuses": "Geen verdere berichten",
         "no_retweet_hint": "Bericht is gemarkeerd als enkel-volgers of privé en kan niet worden herhaald of geciteerd",
@@ -994,6 +1053,7 @@
         "show_new": "Nieuwe tonen",
         "socket_broke": "Realtime verbinding verloren: CloseEvent code {0}",
         "socket_reconnected": "Realtime verbinding opgezet",
+        "unfollow_tag": "Hashtag ontvolgen",
         "up_to_date": "Up-to-date"
     },
     "toast": {
@@ -1058,6 +1118,7 @@
         "block_confirm_title": "Gebruiker blokkeren",
         "block_progress": "Blokkeren…",
         "blocked": "Geblokkeerd!",
+        "blocks_you": "Blokkeert jou!",
         "bot": "Bot",
         "deactivated": "Gedeactiveerd",
         "deny": "Weigeren",
@@ -1072,7 +1133,10 @@
         "follow_cancel": "Verzoek annuleren",
         "follow_progress": "Aanvragen…",
         "follow_sent": "Verzoek verzonden!",
+        "follow_tag": "Hashtag volgen",
         "follow_unfollow": "Ontvolgen",
+        "followed_tags": "Gevolgde hashtags",
+        "followed_users": "Gevolgde gebruikers",
         "followees": "Volgen",
         "followers": "Volgers",
         "following": "Gevolgd!",
@@ -1097,11 +1161,14 @@
         "mute_domain": "Domein blokkeren",
         "mute_progress": "Negeren…",
         "muted": "Genegeerd",
+        "not_following_any_hashtags": "Je volgt momenteel geen hashtags",
         "note": "Privé notitie",
         "per_day": "per dag",
         "remote_follow": "Van afstand volgen",
+        "remove_follower": "Volger verwijderen",
         "replies": "Met Antwoorden",
         "report": "Rapporteren",
+        "requested_by": "Heeft verzocht je te volgen",
         "show_repeats": "Herhalingen tonen",
         "statuses": "Berichten",
         "subscribe": "Abonneren",
@@ -1111,11 +1178,13 @@
         "unfollow_confirm_accept_button": "Ja, ontvolgen",
         "unfollow_confirm_cancel_button": "Nee, niet ontvolgen",
         "unfollow_confirm_title": "Gebruiker ontvolgen",
+        "unfollow_tag": "Hashtag ontvolgen",
         "unmute": "Negeren opheffen",
         "unmute_progress": "Negeren opheffen…",
         "unsubscribe": "Abonnement opzeggen"
     },
     "user_profile": {
+        "field_validated": "Link geverifieerd",
         "profile_does_not_exist": "Sorry, dit profiel bestaat niet.",
         "profile_loading_error": "Sorry, er is een fout opgetreden bij het laden van dit profiel.",
         "timeline_title": "Gebruikerstijdlijn"

src/i18n/pl.json

@@ -1,5 +1,7 @@
 {
     "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": {
@@ -16,12 +18,15 @@
                 "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 wysyła tylko publiczne posty do wymienionych instancji:",
+                "quarantine_desc": "Ta instancja nie wysyła postów do wymienionych instancji:",
+                "reason": "Powód",
                 "reject": "Odrzucanie",
                 "reject_desc": "Ta instancja odrzuca posty z wymienionych instancji:",
                 "simple_policies": "Zasady specyficzne dla instancji"
@@ -29,6 +34,27 @@
         },
         "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ń",
@@ -58,6 +84,7 @@
         "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"
@@ -837,4 +864,4 @@
         "more": "Więcej",
         "who_to_follow": "Propozycje obserwacji"
     }
-}
+}

src/i18n/pt.json

@@ -16,18 +16,41 @@
                 "accept_desc": "Este domínio aceita apenas mensagens dos seguintes domínios:",
                 "ftl_removal": "Remoção da cronologia da \"Rede conhecida por todos\"",
                 "ftl_removal_desc": "Este domínio remove os seguintes domínios da cronologia \"Rede conhecida por todos\":",
+                "instance": "Domínio",
                 "media_nsfw": "Forçar definição de multimédia como Sensível",
                 "media_nsfw_desc": "Este domínio força a multimédia a ser marcada como sensível nos seguintes domínios:",
                 "media_removal": "Remoção de multimédia",
                 "media_removal_desc": "Este domínio remove multimédia das publicações dos seguintes domínios:",
+                "not_applicable": "N/A",
                 "quarantine": "Quarentena",
                 "quarantine_desc": "Este domínio apenas irá publicar nos seguintes domínios:",
+                "reason": "Razão",
                 "reject": "Rejeitar",
                 "reject_desc": "Este domínio não aceitará mensagens dos seguintes domínios:",
                 "simple_policies": "Políticas especificas do domínio"
             }
         },
-        "staff": "Staff"
+        "staff": "Equipe"
+    },
+    "announcements": {
+        "all_day_prompt": "Este evento dura o dia inteiro",
+        "cancel_edit_action": "Cancelar",
+        "close_error": "Fechar",
+        "delete_action": "Apagar",
+        "edit_action": "Editar",
+        "end_time_display": "Termina às {time}",
+        "inactive_message": "Este anúncio está inativo",
+        "mark_as_read_action": "Marcar como lido",
+        "page_header": "Anúncios",
+        "post_action": "Publicar",
+        "post_error": "Erro: {error}",
+        "post_form_header": "Publicar anúncio",
+        "post_placeholder": "Conteúdo do anúncio",
+        "published_time_display": "Publicado às {time}",
+        "start_time_display": "Começa às {time}",
+        "start_time_prompt": "Hora de início: ",
+        "submit_edit_action": "Enviar",
+        "title": "Anúncio"
     },
     "chats": {
         "chats": "Chats",
@@ -58,6 +81,7 @@
         "keep_open": "Manter o seletor aberto",
         "load_all": "A carregar todos os {emojiAmount} emojis",
         "load_all_hint": "Carregado o primeiro emoji {saneAmount}, carregar todos os emojis pode causar problemas de desempenho.",
+        "recent": "Usado recentemente",
         "search_emoji": "Pesquisar por um emoji",
         "stickers": "Autocolantes",
         "unicode": "Emoji Unicode"
@@ -143,7 +167,7 @@
         "password": "Palavra-passe",
         "placeholder": "ex. lain",
         "recovery_code": "Código de recuperação",
-        "register": "Registar",
+        "register": "Registrar",
         "username": "Nome de Utilizador"
     },
     "media_modal": {
@@ -220,7 +244,7 @@
             "text/plain": "Texto puro"
         },
         "content_warning": "Assunto (opcional)",
-        "default": "Acabei de chegar a Lisboa.",
+        "default": "Acabei de chegar em",
         "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",
@@ -244,7 +268,7 @@
     },
     "registration": {
         "bio": "Biografia",
-        "bio_placeholder": "ex.\nOlá, sou a Lain\nSou uma menina de anime que vive no Japão suburbano. Devem conhecer-me do \"the Wired\".",
+        "bio_placeholder": "Ex.:\nBem-vindo a minha bio.\nEu amo assistir anime e jogar. Eu espero que possamos ser amigos!",
         "captcha": "CAPTCHA",
         "email": "Endereço de e-mail",
         "fullname": "Nome para exibição",
@@ -377,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": "Scan"
+                "title": "Escanear"
             },
             "setup_otp": "Configurar palavra-passe de utilização única",
             "title": "Autenticação de Dois Fatores",
@@ -542,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 a Lisboa.",
+                "input": "Acabei de chegar na Lua",
                 "link": "um belo link",
                 "mono": "conteúdo",
                 "text": "Vários {0} e {1}"
@@ -624,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": "(não recomendado, experimental, pode omitir publicações)",
+        "useStreamingApiWarning": "É legal usar isso. Se der algum problema, atualize, eu acho?",
         "use_contain_fit": "Não cortar o anexo na miniatura",
         "use_one_click_nsfw": "Abrir anexos sensíveis com um clique",
         "user_mutes": "Utilizadores",
@@ -801,4 +825,4 @@
         "more": "Mais",
         "who_to_follow": "Quem seguir"
     }
-}
+}

src/i18n/th.json

@@ -0,0 +1,34 @@
+{
+    "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

@@ -0,0 +1,134 @@
+{
+    "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/lib/persisted_state.js

@@ -19,7 +19,8 @@ const saveImmedeatelyActions = [
   'setOption',
   'setClientData',
   'setToken',
-  'clearToken'
+  'clearToken',
+  'emojiUsed',
 ]
 
 const defaultStorage = (() => {

src/lib/post_language.js

@@ -0,0 +1,16 @@
+import iso6391 from 'iso-639-1'
+import { computed } from 'vue'
+
+export const usePostLanguageOptions = () => {
+  const postLanguageOptions = computed(() => {
+    return iso6391.getAllCodes().map(lang => ({
+      key: lang,
+      value: lang,
+      label: lang,
+    }));
+  })
+
+  return {
+    postLanguageOptions,
+  }
+}

src/lib/timeline_visibility.js

@@ -0,0 +1,23 @@
+const timelineVisibleUnauthenticated =  (state, timeline) => (
+    state.instance.publicTimelineVisibility[timeline] ?? false
+);
+
+const currentUser = (state) => state.users.currentUser;
+
+const currentUserOrTimelineVisibleUnauthenticated = (state, timeline) => (
+  currentUser(state) || timelineVisibleUnauthenticated(state, timeline)
+);
+
+const federatedTimelineAvailable = (state) => state.instance.federatedTimelineAvailable;
+
+export const federatedTimelineVisible = (state) => (
+  federatedTimelineAvailable(state) && currentUserOrTimelineVisibleUnauthenticated(state, 'federated')
+);
+
+export const publicTimelineVisible = (state) => (
+  currentUserOrTimelineVisibleUnauthenticated(state, 'local')
+);
+
+export const bubbleTimelineVisible = (state) => (
+  state.instance.localBubbleInstances.length > 0 && currentUserOrTimelineVisibleUnauthenticated(state, 'bubble')
+);