Merge branch 'develop' into feat/sidebar-alignment

docs/CONFIGURATION.md

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

src/i18n/de.json

@@ -7,8 +7,8 @@
         "gopher": "Gopher",
         "media_proxy": "Medienproxy",
         "scope_options": "Reichweitenoptionen",
-    "text_limit": "Textlimit",
+        "text_limit": "Zeichenlimit",
-    "title": "Features",
+        "title": "Funktionen",
         "who_to_follow": "Wem folgen?"
     },
     "finder": {
@@ -17,7 +17,18 @@
     },
     "general": {
         "apply": "Anwenden",
-    "submit": "Absenden"
+        "submit": "Absenden",
+        "more": "Mehr",
+        "generic_error": "Ein Fehler ist aufgetreten",
+        "optional": "Optional",
+        "show_more": "Zeige mehr",
+        "show_less": "Zeige weniger",
+        "dismiss": "Ablehnen",
+        "cancel": "Abbrechen",
+        "disable": "Deaktivieren",
+        "enable": "Aktivieren",
+        "confirm": "Bestätigen",
+        "verify": "Verifizieren"
     },
     "login": {
         "login": "Anmelden",
@@ -26,7 +37,16 @@
         "password": "Passwort",
         "placeholder": "z.B. lain",
         "register": "Registrieren",
-    "username": "Benutzername"
+        "username": "Benutzername",
+        "authentication_code": "Authentifizierungscode",
+        "enter_recovery_code": "Gebe einen Wiederherstellungscode ein",
+        "recovery_code": "Wiederherstellungscode",
+        "heading": {
+            "totp": "Zwei-Faktor Authentifizierung",
+            "recovery": "Zwei-Faktor Wiederherstellung"
+        },
+        "hint": "Anmelden um an der Diskussion teilzunehmen",
+        "enter_two_factor_code": "Gebe einen Zwei-Faktor-Code ein"
     },
     "nav": {
         "about": "Über",
@@ -41,7 +61,9 @@
         "twkn": "Das gesamte bekannte Netzwerk",
         "user_search": "Benutzersuche",
         "search": "Suche",
-    "preferences": "Voreinstellungen"
+        "preferences": "Voreinstellungen",
+        "administration": "Administration",
+        "who_to_follow": "Wem folgen"
     },
     "notifications": {
         "broken_favorite": "Unbekannte Nachricht, suche danach...",
@@ -50,7 +72,11 @@
         "load_older": "Ältere Benachrichtigungen laden",
         "notifications": "Benachrichtigungen",
         "read": "Gelesen!",
-    "repeated_you": "wiederholte deine Nachricht"
+        "repeated_you": "wiederholte deine Nachricht",
+        "follow_request": "möchte dir folgen",
+        "migrated_to": "migrierte zu",
+        "reacted_with": "reagierte mit {0}",
+        "no_more_notifications": "Keine Benachrichtigungen mehr"
     },
     "post_status": {
         "new_status": "Neuen Status veröffentlichen",
@@ -376,7 +402,7 @@
         "favorite": "Favorisieren",
         "user_settings": "Benutzereinstellungen"
     },
-  "upload":{
+    "upload": {
         "error": {
             "base": "Hochladen fehlgeschlagen.",
             "file_too_big": "Datei ist zu groß [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
@@ -409,5 +435,82 @@
         "password_reset_disabled": "Passwortzurücksetzen deaktiviert. Bitte Administrator kontaktieren.",
         "password_reset_required": "Passwortzurücksetzen erforderlich",
         "password_reset_required_but_mailer_is_disabled": "Passwortzurücksetzen wäre erforderlich, ist aber deaktiviert. Bitte Administrator kontaktieren."
+    },
+    "about": {
+        "mrf": {
+            "federation": "Föderation",
+            "mrf_policies": "Aktivierte MRF Richtlinien",
+            "simple": {
+                "simple_policies": "Instanzspezifische Richtlinien",
+                "accept": "Akzeptieren",
+                "reject": "Ablehnen",
+                "reject_desc": "Diese Instanz akzeptiert keine Nachrichten der folgenden Instanzen:",
+                "quarantine": "Quarantäne",
+                "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen",
+                "media_removal": "Medienentfernung",
+                "media_removal_desc": "Diese Instanz entfernt Medien von den Beiträgen der folgenden Instanzen:",
+                "media_nsfw": "Erzwingen Medien als heikel zu makieren",
+                "media_nsfw_desc": "Diese Instanz makiert die Medien in Beiträgen der folgenden Instanzen als heikel:",
+                "accept_desc": "Diese Instanz akzeptiert nur Nachrichten von den folgenden Instanzen:",
+                "quarantine_desc": "Diese Instanz sendet nur öffentliche Beiträge zu den folgenden Instanzen:",
+                "ftl_removal_desc": "Dieser Instanz entfernt folgende Instanzen von der \"Das gesamte bekannte Netzwerk\" Zeitleiste:"
+            },
+            "keyword": {
+                "keyword_policies": "Keyword Richtlinien",
+                "reject": "Ablehnen",
+                "replace": "Ersetzen",
+                "is_replaced_by": "→",
+                "ftl_removal": "Von der Zeitleiste \"Das gesamte bekannte Netzwerk\" entfernen"
+            },
+            "mrf_policies_desc": "MRF Richtlinien manipulieren das Föderationsverhalten dieser Instanz. Die folgenden Richtlinien sind aktiv:"
+        },
+        "staff": "Mitarbeiter"
+    },
+    "domain_mute_card": {
+        "mute": "Stummschalten",
+        "mute_progress": "Wird stummgeschaltet..",
+        "unmute": "Stummschaltung aufheben",
+        "unmute_progress": "Stummschaltung wird aufgehoben.."
+    },
+    "exporter": {
+        "export": "Exportieren",
+        "processing": "Verarbeitung läuft, bald wird Du dazu aufgefordert, deine Datei herunterzuladen"
+    },
+    "image_cropper": {
+        "crop_picture": "Bild zuschneiden",
+        "save": "Speichern",
+        "cancel": "Abbrechen",
+        "save_without_cropping": "Ohne Zuschneiden speichern"
+    },
+    "importer": {
+        "submit": "Absenden",
+        "success": "Erfolgreich importiert.",
+        "error": "Ein Fehler ist beim Verabeiten der Datei aufgetreten."
+    },
+    "media_modal": {
+        "previous": "Zurück",
+        "next": "Weiter"
+    },
+    "polls": {
+        "add_poll": "Umfrage hinzufügen",
+        "add_option": "Option hinzufügen",
+        "option": "Option",
+        "votes": "Stimmen",
+        "vote": "Abstimmen",
+        "type": "Umfragetyp",
+        "multiple_choices": "Mehrere Auswahlmöglichkeiten",
+        "single_choice": "Eine Auswahlmöglichkeit",
+        "expiry": "Alter der Umfrage",
+        "expired": "Die Umfrage endete vor {0}",
+        "not_enough_options": "Zu wenig einzigartige Auswahlmöglichkeiten in der Umfrage",
+        "expires_in": "Die Umfrage endet in {0}"
+    },
+    "emoji": {
+        "stickers": "Sticker",
+        "emoji": "Emoji",
+        "search_emoji": "Nach einem Emoji suchen",
+        "custom": "Benutzerdefinierter Emoji",
+        "keep_open": "Auswahlfenster offen halten",
+        "add_emoji": "Emoji einfügen"
     }
 }

src/i18n/en.json

@@ -281,7 +281,7 @@
     "data_import_export_tab": "Data Import / Export",
     "default_vis": "Default visibility scope",
     "delete_account": "Delete Account",
-    "delete_account_description": "Permanently delete your account and all your messages.",
+    "delete_account_description": "Permanently delete your data and deactivate your account.",
     "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
     "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
     "discoverable": "Allow discovery of this account in search results and other services",
@@ -433,7 +433,7 @@
         "use_source": "New version",
         "help": {
           "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
-          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsitencies.",
+          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
           "future_version_imported": "File you imported was made in newer version of FE.",
           "older_version_imported": "File you imported was made in older version of FE.",
           "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",

src/i18n/fi.json

@@ -19,7 +19,16 @@
         "apply": "Aseta",
         "submit": "Lähetä",
         "more": "Lisää",
-    "generic_error": "Virhe tapahtui"
+        "generic_error": "Virhe tapahtui",
+        "optional": "valinnainen",
+        "show_more": "Näytä lisää",
+        "show_less": "Näytä vähemmän",
+        "dismiss": "Sulje",
+        "cancel": "Peruuta",
+        "disable": "Poista käytöstä",
+        "confirm": "Hyväksy",
+        "verify": "Varmenna",
+        "enable": "Ota käyttöön"
     },
     "login": {
         "login": "Kirjaudu sisään",
@@ -28,7 +37,16 @@
         "password": "Salasana",
         "placeholder": "esim. Seppo",
         "register": "Rekisteröidy",
-    "username": "Käyttäjänimi"
+        "username": "Käyttäjänimi",
+        "hint": "Kirjaudu sisään liittyäksesi keskusteluun",
+        "authentication_code": "Todennuskoodi",
+        "enter_recovery_code": "Syötä palautuskoodi",
+        "recovery_code": "Palautuskoodi",
+        "heading": {
+            "totp": "Monivaihetodennus",
+            "recovery": "Monivaihepalautus"
+        },
+        "enter_two_factor_code": "Syötä monivaihetodennuskoodi"
     },
     "nav": {
         "about": "Tietoja",
@@ -43,7 +61,9 @@
         "twkn": "Koko Tunnettu Verkosto",
         "user_search": "Käyttäjähaku",
         "who_to_follow": "Seurausehdotukset",
-    "preferences": "Asetukset"
+        "preferences": "Asetukset",
+        "administration": "Ylläpito",
+        "search": "Haku"
     },
     "notifications": {
         "broken_favorite": "Viestiä ei löydetty...",
@@ -54,7 +74,9 @@
         "read": "Lue!",
         "repeated_you": "toisti viestisi",
         "no_more_notifications": "Ei enempää ilmoituksia",
-    "reacted_with": "lisäsi reaktion {0}"
+        "reacted_with": "lisäsi reaktion {0}",
+        "migrated_to": "siirtyi sivulle",
+        "follow_request": "haluaa seurata sinua"
     },
     "polls": {
         "add_poll": "Lisää äänestys",
@@ -68,12 +90,14 @@
         "expiry": "Äänestyksen kesto",
         "expires_in": "Päättyy {0} päästä",
         "expired": "Päättyi {0} sitten",
-    "not_enough_option": "Liian vähän uniikkeja vaihtoehtoja äänestyksessä"
+        "not_enough_option": "Liian vähän uniikkeja vaihtoehtoja äänestyksessä",
+        "not_enough_options": "Liian vähän ainutkertaisia vaihtoehtoja"
     },
     "interactions": {
         "favs_repeats": "Toistot ja tykkäykset",
         "follows": "Uudet seuraukset",
-    "load_older": "Lataa vanhempia interaktioita"
+        "load_older": "Lataa vanhempia interaktioita",
+        "moves": "Käyttäjien siirtymiset"
     },
     "post_status": {
         "new_status": "Uusi viesti",
@@ -81,7 +105,10 @@
         "account_not_locked_warning_link": "lukittu",
         "attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
         "content_type": {
-      "text/plain": "Tavallinen teksti"
+            "text/plain": "Tavallinen teksti",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
         },
         "content_warning": "Aihe (valinnainen)",
         "default": "Tulin juuri saunasta.",
@@ -92,6 +119,13 @@
             "private": "Vain-seuraajille - Näkyy vain seuraajillesi",
             "public": "Julkinen - Näkyy julkisilla aikajanoilla",
             "unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
+        },
+        "direct_warning_to_all": "Tämä viesti näkyy vain viestissä mainituille käyttäjille.",
+        "direct_warning_to_first_only": "Tämä viesti näkyy vain viestin alussa mainituille käyttäjille.",
+        "scope_notice": {
+            "public": "Tämä viesti näkyy kaikille",
+            "private": "Tämä viesti näkyy vain sinun seuraajillesi",
+            "unlisted": "Tämä viesti ei näy Julkisella Aikajanalla tai Koko Tunnettu Verkosto -aikajanalla"
         }
     },
     "registration": {
@@ -110,7 +144,10 @@
             "password_required": "ei voi olla tyhjä",
             "password_confirmation_required": "ei voi olla tyhjä",
             "password_confirmation_match": "pitää vastata salasanaa"
-    }
+        },
+        "username_placeholder": "esim. peke",
+        "fullname_placeholder": "esim. Pekka Postaaja",
+        "bio_placeholder": "esim.\nHei, olen Pekka.\nOlen esimerkkikäyttäjä tässä verkostossa."
     },
     "settings": {
         "attachmentRadius": "Liitteet",
@@ -151,7 +188,7 @@
         "follow_import": "Seurausten tuonti",
         "follow_import_error": "Virhe tuodessa seuraksia",
         "follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
-    "foreground": "Korostus",
+        "foreground": "Etuala",
         "general": "Yleinen",
         "hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
         "hide_attachments_in_tl": "Piilota liitteet aikajanalla",
@@ -186,14 +223,14 @@
         "notification_visibility_mentions": "Maininnat",
         "notification_visibility_repeats": "Toistot",
         "notification_visibility_emoji_reactions": "Reaktiot",
-    "no_rich_text_description": "Älä näytä tekstin muotoilua.",
+        "no_rich_text_description": "Älä näytä tekstin muotoilua",
         "hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
         "nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
         "oauth_tokens": "OAuth-merkit",
         "token": "Token",
         "refresh_token": "Päivitä token",
         "valid_until": "Voimassa asti",
-    "revoke_token": "Peruuttaa",
+        "revoke_token": "Peruuta",
         "panelRadius": "Ruudut",
         "pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
         "presets": "Valmiit teemat",
@@ -231,6 +268,228 @@
         "values": {
             "false": "pois päältä",
             "true": "päällä"
+        },
+        "hide_follows_description": "Älä näytä ketä seuraan",
+        "show_moderator_badge": "Näytä Moderaattori-merkki profiilissani",
+        "useStreamingApi": "Vastaanota viestiejä ja ilmoituksia reaaliajassa",
+        "notification_setting_filters": "Suodattimet",
+        "notification_setting": "Vastaanota ilmoituksia seuraavista:",
+        "notification_setting_privacy_option": "Piilota lähettäjä ja sisältö sovelluksen ulkopuolisista ilmoituksista",
+        "enable_web_push_notifications": "Ota käyttöön sovelluksen ulkopuoliset ilmoitukset",
+        "app_name": "Sovelluksen nimi",
+        "security": "Turvallisuus",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "OTP-asetukset",
+            "wait_pre_setup_otp": "esiasetetaan OTP:ta",
+            "confirm_and_enable": "Hyväksy ja käytä OTP",
+            "title": "Monivaihetodennus",
+            "generate_new_recovery_codes": "Luo uudet palautuskoodit",
+            "authentication_methods": "Todennus",
+            "warning_of_generate_new_codes": "Luodessasi uudet palautuskoodit, vanhat koodisi lakkaavat toimimasta.",
+            "recovery_codes": "Palautuskoodit.",
+            "waiting_a_recovery_codes": "Odotetaan palautuskoodeja...",
+            "recovery_codes_warning": "Kirjoita koodit ylös tai tallenna ne turvallisesti, muuten et näe niitä uudestaan. Jos et voi käyttää monivaihetodennusta ja sinulla ei ole palautuskoodeja, et voi enää kirjautua sisään tilillesi.",
+            "scan": {
+                "title": "Skannaa",
+                "secret_code": "Avain",
+                "desc": "Käytä monivaihetodennus-sovellusta skannakksesi tämän QR-kooding, tai syötä avain:"
+            },
+            "verify": {
+                "desc": "Kytkeäksesi päälle monivaihetodennuksen, syötä koodi monivaihetodennussovellksesta:"
+            }
+        },
+        "allow_following_move": "Salli automaattinen seuraaminen kun käyttäjä siirtää tilinsä",
+        "block_export": "Estojen vienti",
+        "block_export_button": "Vie estosi CSV-tiedostoon",
+        "block_import": "Estojen tuonti",
+        "block_import_error": "Virhe tuodessa estoja",
+        "blocks_imported": "Estot tuotu! Käsittely vie hetken.",
+        "blocks_tab": "Estot",
+        "change_email": "Vaihda sähköpostiosoite",
+        "change_email_error": "Virhe vaihtaessa sähköpostiosoitetta.",
+        "changed_email": "Sähköpostiosoite vaihdettu!",
+        "domain_mutes": "Sivut",
+        "avatar_size_instruction": "Suositeltu vähimmäiskoko profiilikuville on 150x150 pikseliä.",
+        "accent": "Korostus",
+        "hide_muted_posts": "Piilota mykistettyjen käyttäjien viestit",
+        "hide_filtered_statuses": "Piilota mykistetyt viestit",
+        "import_blocks_from_a_csv_file": "Tuo estot CSV-tiedostosta",
+        "no_blocks": "Ei estoja",
+        "no_mutes": "Ei mykistyksiä",
+        "notification_visibility_moves": "Käyttäjien siirtymiset",
+        "hide_followers_description": "Älä näytä ketkä seuraavat minua",
+        "hide_follows_count_description": "Älä näytä seurauksien määrää",
+        "hide_followers_count_description": "Älä näytä seuraajien määrää",
+        "show_admin_badge": "Näytä Ylläpitäjä-merkki proofilissani",
+        "autohide_floating_post_button": "Piilota Uusi Viesti -nappi automaattisesti (mobiili)",
+        "search_user_to_block": "Hae estettäviä käyttäjiä",
+        "search_user_to_mute": "Hae mykistettäviä käyttäjiä",
+        "minimal_scopes_mode": "Yksinkertaista näkyvyydenrajauksen vaihtoehdot",
+        "post_status_content_type": "Uuden viestin sisällön muoto",
+        "user_mutes": "Käyttäjät",
+        "useStreamingApiWarning": "(Kokeellinen)",
+        "type_domains_to_mute": "Syötä mykistettäviä sivustoja",
+        "upload_a_photo": "Lataa kuva",
+        "fun": "Hupi",
+        "greentext": "Meeminuolet",
+        "notifications": "Ilmoitukset",
+        "style": {
+            "switcher": {
+                "save_load_hint": "\"Säilytä\" asetukset säilyttävät tällä hetkellä asetetut asetukset valittaessa tai ladatessa teemaa, se myös tallentaa kyseiset asetukset viedessä teemaa. Kun kaikki laatikot ovat tyhjänä, viety teema tallentaa kaiken.",
+                "help": {
+                    "older_version_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla.",
+                    "fe_upgraded": "PleromaFE:n teemaus päivitetty versiopäivityksen yhteydessä.",
+                    "migration_snapshot_ok": "Varmuuden vuoksi teeman kaappaus ladattu. Voit koittaa ladata teeman sisällön.",
+                    "migration_napshot_gone": "Jostain syystä teeman kaappaus puuttuu, kaikki asiat eivät välttämättä näytä oikealta.",
+                    "snapshot_source_mismatch": "Versiot eivät täsmää: todennäköisesti versio vaihdettu vanhempaan ja päivitetty uudestaan, jos vaihdoit teemaa vanhalla versiolla, sinun tulisi käyttää vanhaa versiota, muutoin uutta.",
+                    "upgraded_from_v2": "PleromaFE on päivitetty, teemasi saattaa näyttää erilaiselta kuin muistat.",
+                    "v2_imported": "Tuomasi tiedosto on luotu vanhemmalla versiolla. Yhteensopivuus ei välttämättä ole täydellinen.",
+                    "future_version_imported": "Tuomasi tiedosto on luotu uudemmalla versiolla.",
+                    "snapshot_present": "Teeman kaappaus ladattu, joten kaikki arvot ovat ylikirjoitettu. Voit sen sijaan ladata teeman sisällön.",
+                    "snapshot_missing": "Teeman kaappausta ei tiedostossa, joten se voi näyttää erilaiselta kuin suunniteltu.",
+                    "fe_downgraded": "PleromaFE:n versio vaihtunut vanhempaan."
+                },
+                "keep_color": "Säilytä värit",
+                "keep_shadows": "Säilytä varjot",
+                "keep_opacity": "Säilytä läpinäkyvyys",
+                "keep_roundness": "Säilytä pyöristys",
+                "keep_fonts": "Säilytä fontit",
+                "reset": "Palauta",
+                "clear_all": "Tyhjennä kaikki",
+                "clear_opacity": "Tyhjennä läpinäkyvyys",
+                "load_theme": "Lataa teema",
+                "keep_as_is": "Pidä sellaisenaan",
+                "use_snapshot": "Vanha",
+                "use_source": "Uusi"
+            },
+            "advanced_colors": {
+                "selectedPost": "Valittu viesti",
+                "_tab_label": "Edistynyt",
+                "alert": "Varoituksen tausta",
+                "alert_error": "Virhe",
+                "alert_warning": "Varoitus",
+                "alert_neutral": "Neutraali",
+                "post": "Viestit/Käyttäjien kuvaukset",
+                "badge": "Merkin tausta",
+                "badge_notification": "Ilmoitus",
+                "panel_header": "Ruudun otsikko",
+                "top_bar": "Yläpalkki",
+                "borders": "Reunat",
+                "buttons": "Napit",
+                "inputs": "Syöttökentät",
+                "faint_text": "Häivytetty teksti",
+                "underlay": "Taustapeite",
+                "poll": "Äänestyksen kuvaaja",
+                "icons": "Ikonit",
+                "highlight": "Korostetut elementit",
+                "pressed": "Painettu",
+                "selectedMenu": "Valikon valinta",
+                "disabled": "Pois käytöstä",
+                "toggled": "Kytketty",
+                "tabs": "Välilehdet",
+                "popover": "Työkaluvinkit, valikot, ponnahdusviestit"
+            },
+            "common": {
+                "color": "Väri",
+                "opacity": "Läpinäkyvyys",
+                "contrast": {
+                    "level": {
+                        "aaa": "saavuttaa AAA-tason (suositeltu)",
+                        "aa": "saavuttaa AA-tason (minimi)",
+                        "bad": "ei saavuta mitään helppokäyttöisyyssuosituksia"
+                    },
+                    "hint": "Kontrastisuhde on {ratio}, se {level} {context}",
+                    "context": {
+                        "18pt": "suurella (18pt+) tekstillä",
+                        "text": "tekstillä"
+                    }
+                }
+            },
+            "common_colors": {
+                "_tab_label": "Yleinen",
+                "main": "Yleiset värit",
+                "foreground_hint": "Löydät \"Edistynyt\"-välilehdeltä tarkemmat asetukset",
+                "rgbo": "Ikonit, korostukset, merkit"
+            },
+            "shadows": {
+                "filter_hint": {
+                    "always_drop_shadow": "Varoitus, tämä varjo käyttää aina {0} kun selain tukee sitä.",
+                    "avatar_inset": "Huom. sisennettyjen ja ei-sisennettyjen varjojen yhdistelmät saattavat luoda ei-odotettuja lopputuloksia läpinäkyvillä profiilikuvilla.",
+                    "drop_shadow_syntax": "{0} ei tue {1} parametria ja {2} avainsanaa.",
+                    "spread_zero": "Varjot joiden levitys > 0 näyttävät samalta kuin se olisi nolla",
+                    "inset_classic": "Sisennetyt varjot käyttävät {0}"
+                },
+                "components": {
+                    "buttonPressedHover": "Nappi (painettu ja kohdistettu)",
+                    "panel": "Ruutu",
+                    "panelHeader": "Ruudun otsikko",
+                    "topBar": "Yläpalkki",
+                    "avatar": "Profiilikuva (profiilinäkymässä)",
+                    "avatarStatus": "Profiilikuva (viestin yhtyedessä)",
+                    "popup": "Ponnahdusviestit ja työkaluvinkit",
+                    "button": "Nappi",
+                    "buttonHover": "Nappi (kohdistus)",
+                    "buttonPressed": "Nappi (painettu)",
+                    "input": "Syöttökenttä"
+                },
+                "hintV3": "Voit käyttää {0} merkintää varjoille käyttääksesi väriä toisesta asetuksesta.",
+                "_tab_label": "Valo ja varjostus",
+                "component": "Komponentti",
+                "override": "Ylikirjoita",
+                "shadow_id": "Varjo #{value}",
+                "blur": "Sumennus",
+                "spread": "Levitys",
+                "inset": "Sisennys"
+            },
+            "fonts": {
+                "help": "Valitse fontti käyttöliittymälle. \"Oma\"-vaihtohdolle on syötettävä fontin nimi tarkalleen samana kuin se on järjestelmässäsi.",
+                "_tab_label": "Fontit",
+                "components": {
+                    "interface": "Käyttöliittymä",
+                    "input": "Syöttökentät",
+                    "post": "Viestin teksti",
+                    "postCode": "Tasavälistetty teksti viestissä"
+                },
+                "family": "Fontin nimi",
+                "size": "Koko (pikseleissä)",
+                "weight": "Painostus (paksuus)",
+                "custom": "Oma"
+            },
+            "preview": {
+                "input": "Tulin juuri saunasta.",
+                "header": "Esikatselu",
+                "content": "Sisältö",
+                "error": "Esimerkkivirhe",
+                "button": "Nappi",
+                "text": "Vähän lisää {0} ja {1}",
+                "mono": "sisältöä",
+                "faint_link": "manuaali",
+                "fine_print": "Lue meidän {0} vaikka huvin vuoksi!",
+                "header_faint": "Tämä on OK",
+                "checkbox": "Olen silmäillyt käyttöehdot",
+                "link": "kiva linkki"
+            },
+            "radii": {
+                "_tab_label": "Pyöristys"
+            }
+        },
+        "enter_current_password_to_confirm": "Syötä nykyinen salasanasi todentaaksesi henkilöllisyytesi",
+        "discoverable": "Salli tilisi näkyvyys hakukoneisiin ja muihin palveluihin",
+        "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta",
+        "mutes_tab": "Mykistykset",
+        "new_email": "Uusi sähköpostiosoite",
+        "notification_setting_follows": "Käyttäjät joita seuraat",
+        "notification_setting_non_follows": "Käyttäjät joita et seuraa",
+        "notification_setting_followers": "Käyttäjät jotka seuraavat sinua",
+        "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua",
+        "notification_setting_privacy": "Yksityisyys",
+        "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.",
+        "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.",
+        "version": {
+            "title": "Versio",
+            "backend_version": "Palvelimen versio",
+            "frontend_version": "Käyttöliittymän versio"
         }
     },
     "time": {
@@ -252,8 +511,8 @@
         "months": "{0} kuukautta",
         "month_short": "{0}kk",
         "months_short": "{0}kk",
-    "now": "nyt",
+        "now": "juuri nyt",
-    "now_short": "juuri nyt",
+        "now_short": "nyt",
         "second": "{0} sekunti",
         "seconds": "{0} sekuntia",
         "second_short": "{0}s",
@@ -276,7 +535,8 @@
         "repeated": "toisti",
         "show_new": "Näytä uudet",
         "up_to_date": "Ajantasalla",
-    "no_more_statuses": "Ei enempää viestejä"
+        "no_more_statuses": "Ei enempää viestejä",
+        "no_statuses": "Ei viestejä"
     },
     "status": {
         "favorites": "Tykkäykset",
@@ -288,9 +548,10 @@
         "delete_confirm": "Haluatko varmasti postaa viestin?",
         "reply_to": "Vastaus",
         "replies_list": "Vastaukset:",
-    "mute_conversation": "Hiljennä keskustelu",
+        "mute_conversation": "Mykistä keskustelu",
-    "unmute_conversation": "Poista hiljennys",
+        "unmute_conversation": "Poista mykistys",
-    "status_unavailable": "Viesti ei saatavissa"
+        "status_unavailable": "Viesti ei saatavissa",
+        "copy_link": "Kopioi linkki"
     },
     "user_card": {
         "approve": "Hyväksy",
@@ -299,7 +560,7 @@
         "deny": "Älä hyväksy",
         "follow": "Seuraa",
         "follow_sent": "Pyyntö lähetetty!",
-    "follow_progress": "Pyydetään...",
+        "follow_progress": "Pyydetään…",
         "follow_again": "Lähetä pyyntö uudestaan",
         "follow_unfollow": "Älä seuraa",
         "followees": "Seuraa",
@@ -307,14 +568,50 @@
         "following": "Seuraat!",
         "follows_you": "Seuraa sinua!",
         "its_you": "Sinun tili!",
-    "mute": "Hiljennä",
+        "mute": "Mykistä",
-    "muted": "Hiljennetty",
+        "muted": "Mykistetty",
         "per_day": "päivässä",
         "remote_follow": "Seuraa muualta",
-    "statuses": "Viestit"
+        "statuses": "Viestit",
+        "hidden": "Piilotettu",
+        "media": "Media",
+        "block_progress": "Estetään...",
+        "admin_menu": {
+            "grant_admin": "Anna Ylläpitöoikeudet",
+            "force_nsfw": "Merkitse kaikki viestit NSFW:nä",
+            "disable_any_subscription": "Estä käyttäjän seuraaminen",
+            "moderation": "Moderaatio",
+            "revoke_admin": "Poista Ylläpitöoikeudet",
+            "grant_moderator": "Anna Moderaattorioikeudet",
+            "revoke_moderator": "Poista Moderaattorioikeudet",
+            "activate_account": "Aktivoi tili",
+            "deactivate_account": "Deaktivoi tili",
+            "delete_account": "Poista tili",
+            "strip_media": "Poista media viesteistä",
+            "force_unlisted": "Pakota viestit listaamattomiksi",
+            "sandbox": "Pakota viestit vain seuraajille",
+            "disable_remote_subscription": "Estä seuraaminen ulkopuolisilta sivuilta",
+            "quarantine": "Estä käyttäjän viestin federoituminen",
+            "delete_user": "Poista käyttäjä",
+            "delete_user_confirmation": "Oletko aivan varma? Tätä ei voi kumota."
+        },
+        "favorites": "Tykkäykset",
+        "mention": "Mainitse",
+        "report": "Ilmianna",
+        "subscribe": "Tilaa",
+        "unsubscribe": "Poista tilaus",
+        "unblock": "Poista esto",
+        "unblock_progress": "Postetaan estoa...",
+        "unmute": "Poista mykistys",
+        "unmute_progress": "Poistetaan mykistystä...",
+        "mute_progress": "Mykistetään...",
+        "hide_repeats": "Piilota toistot",
+        "show_repeats": "Näytä toistot"
     },
     "user_profile": {
-    "timeline_title": "Käyttäjän aikajana"
+        "timeline_title": "Käyttäjän aikajana",
+        "profile_does_not_exist": "Tätä profiilia ei ole.",
+        "profile_loading_error": "Virhe ladatessa profiilia."
     },
     "who_to_follow": {
         "more": "Lisää",
@@ -325,9 +622,12 @@
         "repeat": "Toista",
         "reply": "Vastaa",
         "favorite": "Tykkää",
-    "user_settings": "Käyttäjäasetukset"
+        "user_settings": "Käyttäjäasetukset",
+        "add_reaction": "Lisää Reaktio",
+        "accept_follow_request": "Hyväksy seurauspyyntö",
+        "reject_follow_request": "Hylkää seurauspyyntö"
     },
-  "upload":{
+    "upload": {
         "error": {
             "base": "Lataus epäonnistui.",
             "file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
@@ -340,5 +640,108 @@
             "GiB": "Gt",
             "TiB": "Tt"
         }
+    },
+    "about": {
+        "mrf": {
+            "keyword": {
+                "keyword_policies": "Avainsanasäännöt",
+                "ftl_removal": "Poistettu \"Koko Tunnettu Verkosto\" -aikajanalta",
+                "reject": "Hylkää",
+                "replace": "Korvaa",
+                "is_replaced_by": "→"
+            },
+            "simple": {
+                "accept": "Hyväksy",
+                "reject": "Hylkää",
+                "quarantine": "Karanteeni",
+                "ftl_removal": "Poisto \"Koko Tunnettu Verkosto\" -aikajanalta",
+                "media_removal": "Media-tiedostojen poisto",
+                "simple_policies": "Palvelinkohtaiset Säännöt",
+                "accept_desc": "Tämä palvelin hyväksyy viestit vain seuraavilta palvelimilta:",
+                "reject_desc": "Tämä palvelin ei hyväksy viestejä seuraavilta palvelimilta:",
+                "quarantine_desc": "Tämä palvelin lähettää vain julkisia viestejä seuraaville palvelimille:",
+                "ftl_removal_desc": "Tämä palvelin poistaa nämä palvelimet \"Koko Tunnettu Verkosto\"-aikajanalta:",
+                "media_removal_desc": "Tämä palvelin postaa mediatiedostot viesteistä seuraavilta palvelimilta:",
+                "media_nsfw": "Pakota Media Arkaluontoiseksi",
+                "media_nsfw_desc": "Tämä palvelin pakottaa mediatiedostot arkaluonteisiksi seuraavilta palvelimilta:"
+            },
+            "federation": "Federaatio",
+            "mrf_policies": "Aktivoidut MRF-säännöt",
+            "mrf_policies_desc": "MRF-säännöt muuttavat federaation toimintaa sivulla. Seuraavat säännöt ovat kytketty päälle:"
+        },
+        "staff": "Henkilökunta"
+    },
+    "domain_mute_card": {
+        "mute": "Mykistä",
+        "unmute": "Poista mykistys",
+        "mute_progress": "Mykistetään...",
+        "unmute_progress": "Poistetaan mykistyst..."
+    },
+    "exporter": {
+        "export": "Vie",
+        "processing": "Käsitellään, hetken päästä voit tallentaa tiedoston"
+    },
+    "image_cropper": {
+        "crop_picture": "Rajaa kuva",
+        "save": "Tallenna",
+        "save_without_cropping": "Tallenna rajaamatta",
+        "cancel": "Peruuta"
+    },
+    "importer": {
+        "submit": "Hyväksy",
+        "error": "Virhe tapahtui tietoja tuodessa.",
+        "success": "Tuonti onnistui."
+    },
+    "media_modal": {
+        "previous": "Edellinen",
+        "next": "Seuraava"
+    },
+    "emoji": {
+        "stickers": "Tarrat",
+        "emoji": "Emoji",
+        "keep_open": "Pidä valitsin auki",
+        "search_emoji": "Hae emojia",
+        "add_emoji": "Lisää emoji",
+        "custom": "Custom-emoji",
+        "load_all": "Ladataan kaikkia {emojiAmount} emojia",
+        "unicode": "Unicode-emoji",
+        "load_all_hint": "Ensimmäiset {saneAmount} emojia ladattu, kaikkien emojien lataaminen voi aiheuttaa hidastelua."
+    },
+    "remote_user_resolver": {
+        "remote_user_resolver": "Ulkopuolinen käyttäjä",
+        "searching_for": "Etsitään käyttäjää",
+        "error": "Ei löytynyt."
+    },
+    "selectable_list": {
+        "select_all": "Valitse kaikki"
+    },
+    "password_reset": {
+        "check_email": "Tarkista sähköpostisi salasanannollausta varten.",
+        "instruction": "Syötä sähköpostiosoite tai käyttäjänimi. Lähetämme linkin salasanan nollausta varten.",
+        "password_reset_disabled": "Salasanan nollaus ei käytössä. Ota yhteyttä sivun ylläpitäjään.",
+        "password_reset_required_but_mailer_is_disabled": "Sinun täytyy vaihtaa salasana, mutta salasanan nollaus on pois käytöstä. Ota yhteyttä sivun ylläpitäjään.",
+        "forgot_password": "Unohditko salasanan?",
+        "password_reset": "Salasanan nollaus",
+        "placeholder": "Sähköpostiosoite tai käyttäjänimi",
+        "return_home": "Palaa etusivulle",
+        "not_found": "Sähköpostiosoitetta tai käyttäjänimeä ei löytynyt.",
+        "too_many_requests": "Olet käyttänyt kaikki yritykset, yritä uudelleen myöhemmin.",
+        "password_reset_required": "Sinun täytyy vaihtaa salasana kirjautuaksesi."
+    },
+    "user_reporting": {
+        "add_comment_description": "Tämä raportti lähetetään sivun moderaattoreille. Voit antaa selityksen miksi ilmiannoit tilin:",
+        "title": "Ilmiannetaan {0}",
+        "additional_comments": "Lisäkommentit",
+        "forward_description": "Tämä tili on toiselta palvelimelta. Lähetä kopio ilmiannosta sinnekin?",
+        "forward_to": "Lähetä eteenpäin: {0}",
+        "submit": "Lähetä",
+        "generic_error": "Virhe käsitellessä pyyntöä."
+    },
+    "search": {
+        "people": "Käyttäjät",
+        "hashtags": "Aihetunnisteet",
+        "people_talking": "{0} käyttäjää puhuvat",
+        "person_talking": "{0} käyttäjä puhuu",
+        "no_results": "Ei tuloksia"
     }
 }

src/i18n/fr.json

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

src/i18n/it.json

@@ -1,140 +1,151 @@
 {
     "general": {
         "submit": "Invia",
-    "apply": "Applica"
+        "apply": "Applica",
+        "more": "Altro",
+        "generic_error": "Errore",
+        "optional": "facoltativo",
+        "show_more": "Mostra tutto",
+        "show_less": "Ripiega",
+        "dismiss": "Chiudi",
+        "cancel": "Annulla",
+        "disable": "Disabilita",
+        "enable": "Abilita",
+        "confirm": "Conferma",
+        "verify": "Verifica"
     },
     "nav": {
         "mentions": "Menzioni",
-    "public_tl": "Sequenza temporale pubblica",
+        "public_tl": "Sequenza pubblica",
-    "timeline": "Sequenza temporale",
+        "timeline": "Sequenza personale",
-    "twkn": "L'intera rete conosciuta",
+        "twkn": "Sequenza globale",
-    "chat": "Chat Locale",
+        "chat": "Chat della stanza",
-    "friend_requests": "Richieste di Seguirti"
+        "friend_requests": "Vogliono seguirti"
     },
     "notifications": {
         "followed_you": "ti segue",
         "notifications": "Notifiche",
-    "read": "Leggi!",
+        "read": "Letto!",
         "broken_favorite": "Stato sconosciuto, lo sto cercando...",
-    "favorited_you": "ha messo mi piace al tuo stato",
+        "favorited_you": "ha gradito il tuo messaggio",
-    "load_older": "Carica notifiche più vecchie",
+        "load_older": "Carica notifiche precedenti",
-    "repeated_you": "ha condiviso il tuo stato"
+        "repeated_you": "ha condiviso il tuo messaggio"
     },
     "settings": {
         "attachments": "Allegati",
-    "autoload": "Abilita caricamento automatico quando si raggiunge fondo pagina",
+        "autoload": "Abilita caricamento automatico quando raggiungi il fondo pagina",
-    "avatar": "Avatar",
+        "avatar": "Icona utente",
         "bio": "Introduzione",
-    "current_avatar": "Il tuo avatar attuale",
+        "current_avatar": "La tua icona attuale",
-    "current_profile_banner": "Il tuo banner attuale",
+        "current_profile_banner": "Il tuo stendardo attuale",
         "filtering": "Filtri",
-    "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, uno per linea",
+        "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, una per riga",
         "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
-    "hide_attachments_in_tl": "Nascondi gli allegati presenti nella sequenza temporale",
+        "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
         "name": "Nome",
-    "name_bio": "Nome & Introduzione",
+        "name_bio": "Nome ed introduzione",
-    "nsfw_clickthrough": "Abilita il click per visualizzare gli allegati segnati come NSFW",
+        "nsfw_clickthrough": "Fai click per visualizzare gli allegati nascosti",
         "profile_background": "Sfondo della tua pagina",
-    "profile_banner": "Banner del tuo profilo",
+        "profile_banner": "Stendardo del tuo profilo",
-    "reply_link_preview": "Abilita il link per la risposta al passaggio del mouse",
+        "reply_link_preview": "Visualizza le risposte al passaggio del cursore",
-    "set_new_avatar": "Scegli un nuovo avatar",
+        "set_new_avatar": "Scegli una nuova icona",
         "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina",
-    "set_new_profile_banner": "Scegli un nuovo banner per il tuo profilo",
+        "set_new_profile_banner": "Scegli un nuovo stendardo per il tuo profilo",
         "settings": "Impostazioni",
         "theme": "Tema",
         "user_settings": "Impostazioni Utente",
         "attachmentRadius": "Allegati",
-    "avatarAltRadius": "Avatar (Notifiche)",
+        "avatarAltRadius": "Icone utente (Notifiche)",
-    "avatarRadius": "Avatar",
+        "avatarRadius": "Icone utente",
         "background": "Sfondo",
         "btnRadius": "Pulsanti",
-    "cBlue": "Blu (Rispondere, seguire)",
+        "cBlue": "Blu (risposte, seguire)",
-    "cGreen": "Verde (Condividi)",
+        "cGreen": "Verde (ripeti)",
-    "cOrange": "Arancio (Mi piace)",
+        "cOrange": "Arancione (gradire)",
-    "cRed": "Rosso (Annulla)",
+        "cRed": "Rosso (annulla)",
-    "change_password": "Cambia Password",
+        "change_password": "Cambia password",
         "change_password_error": "C'è stato un problema durante il cambiamento della password.",
         "changed_password": "Password cambiata correttamente!",
-    "collapse_subject": "Riduci post che hanno un oggetto",
+        "collapse_subject": "Ripiega messaggi con Oggetto",
         "confirm_new_password": "Conferma la nuova password",
-    "current_password": "Password attuale",
+        "current_password": "La tua password attuale",
-    "data_import_export_tab": "Importa / Esporta Dati",
+        "data_import_export_tab": "Importa o esporta dati",
-    "default_vis": "Visibilità predefinita dei post",
+        "default_vis": "Visibilità predefinita dei messaggi",
-    "delete_account": "Elimina Account",
+        "delete_account": "Elimina profilo",
-    "delete_account_description": "Elimina definitivamente il tuo account e tutti i tuoi messaggi.",
+        "delete_account_description": "Elimina definitivamente il tuo profilo e tutti i tuoi messaggi.",
-    "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo account. Se il problema persiste contatta l'amministratore della tua istanza.",
+        "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo profilo. Se il problema persiste contatta l'amministratore della tua stanza.",
-    "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione dell'account.",
+        "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione del tuo profilo.",
-    "export_theme": "Salva settaggi",
+        "export_theme": "Salva impostazioni",
         "follow_export": "Esporta la lista di chi segui",
-    "follow_export_button": "Esporta la lista di chi segui in un file csv",
+        "follow_export_button": "Esporta la lista di chi segui in un file CSV",
         "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file",
         "follow_import": "Importa la lista di chi segui",
         "follow_import_error": "Errore nell'importazione della lista di chi segui",
         "follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.",
-    "foreground": "In primo piano",
+        "foreground": "Primo piano",
         "general": "Generale",
-    "hide_post_stats": "Nascondi statistiche dei post (es. il numero di mi piace)",
+        "hide_post_stats": "Nascondi statistiche dei messaggi (es. il numero di preferenze)",
-    "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero di chi ti segue)",
+        "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero dei tuoi seguaci)",
-    "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file csv",
+        "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file CSV",
-    "import_theme": "Carica settaggi",
+        "import_theme": "Carica impostazioni",
         "inputRadius": "Campi di testo",
         "instance_default": "(predefinito: {value})",
-    "interfaceLanguage": "Linguaggio dell'interfaccia",
+        "interfaceLanguage": "Lingua dell'interfaccia",
-    "invalid_theme_imported": "Il file selezionato non è un file di tema per Pleroma supportato. Il tuo tema non è stato modificato.",
+        "invalid_theme_imported": "Il file selezionato non è un tema supportato da Pleroma. Il tuo tema non è stato modificato.",
         "limited_availability": "Non disponibile nel tuo browser",
         "links": "Collegamenti",
-    "lock_account_description": "Limita il tuo account solo per contatti approvati",
+        "lock_account_description": "Limita il tuo account solo a seguaci approvati",
         "loop_video": "Riproduci video in ciclo continuo",
-    "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le gif di Mastodon)",
+        "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le \"gif\" di Mastodon)",
         "new_password": "Nuova password",
         "notification_visibility": "Tipi di notifiche da mostrare",
         "notification_visibility_follows": "Nuove persone ti seguono",
-    "notification_visibility_likes": "Mi piace",
+        "notification_visibility_likes": "Preferiti",
         "notification_visibility_mentions": "Menzioni",
         "notification_visibility_repeats": "Condivisioni",
-    "no_rich_text_description": "Togli la formattazione del testo da tutti i post",
+        "no_rich_text_description": "Togli la formattazione del testo da tutti i messaggi",
         "oauth_tokens": "Token OAuth",
         "token": "Token",
         "refresh_token": "Aggiorna token",
         "valid_until": "Valido fino a",
-    "revoke_token": "Revocare",
+        "revoke_token": "Revoca",
         "panelRadius": "Pannelli",
-    "pause_on_unfocused": "Metti in pausa l'aggiornamento continuo quando la scheda non è in primo piano",
+        "pause_on_unfocused": "Interrompi l'aggiornamento continuo mentre la scheda è in secondo piano",
         "presets": "Valori predefiniti",
         "profile_tab": "Profilo",
-    "radii_help": "Imposta l'arrotondamento dei bordi (in pixel)",
+        "radii_help": "Imposta il raggio degli angoli (in pixel)",
-    "replies_in_timeline": "Risposte nella sequenza temporale",
+        "replies_in_timeline": "Risposte nella sequenza personale",
         "reply_visibility_all": "Mostra tutte le risposte",
-    "reply_visibility_following": "Mostra solo le risposte dirette a me o agli utenti che seguo",
+        "reply_visibility_following": "Mostra solo le risposte rivolte a me o agli utenti che seguo",
-    "reply_visibility_self": "Mostra solo risposte dirette a me",
+        "reply_visibility_self": "Mostra solo risposte rivolte a me",
         "saving_err": "Errore nel salvataggio delle impostazioni",
         "saving_ok": "Impostazioni salvate",
         "security_tab": "Sicurezza",
-    "stop_gifs": "Riproduci GIF al passaggio del cursore del mouse",
+        "stop_gifs": "Riproduci GIF al passaggio del cursore",
-    "streaming": "Abilita aggiornamento automatico dei nuovi post quando si è in alto alla pagina",
+        "streaming": "Mostra automaticamente i nuovi messaggi quando sei in cima alla pagina",
         "text": "Testo",
         "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
         "tooltipRadius": "Descrizioni/avvisi",
         "values": {
             "false": "no",
-      "true": "si"
+            "true": "sì"
         }
     },
     "timeline": {
-    "error_fetching": "Errore nel prelievo aggiornamenti",
+        "error_fetching": "Errore nell'aggiornamento",
         "load_older": "Carica messaggi più vecchi",
         "show_new": "Mostra nuovi",
         "up_to_date": "Aggiornato",
         "collapse": "Riduci",
         "conversation": "Conversazione",
-    "no_retweet_hint": "La visibilità del post è impostata solo per chi ti segue o messaggio diretto e non può essere condiviso",
+        "no_retweet_hint": "Il messaggio è diretto o solo per seguaci e non può essere condiviso",
         "repeated": "condiviso"
     },
     "user_card": {
         "follow": "Segui",
         "followees": "Chi stai seguendo",
-    "followers": "Chi ti segue",
+        "followers": "Seguaci",
-    "following": "Lo stai seguendo!",
+        "following": "Seguìto!",
         "follows_you": "Ti segue!",
         "mute": "Silenzia",
         "muted": "Silenziato",
@@ -152,9 +163,9 @@
     "features_panel": {
         "chat": "Chat",
         "gopher": "Gopher",
-    "media_proxy": "Media proxy",
+        "media_proxy": "Proxy multimedia",
-    "scope_options": "Opzioni di visibilità",
+        "scope_options": "Opzioni visibilità",
-    "text_limit": "Lunghezza limite",
+        "text_limit": "Lunghezza massima",
         "title": "Caratteristiche",
         "who_to_follow": "Chi seguire"
     },
@@ -166,26 +177,27 @@
         "login": "Accedi",
         "logout": "Disconnettiti",
         "password": "Password",
-    "placeholder": "es. lain",
+        "placeholder": "es. Lupo Lucio",
         "register": "Registrati",
-    "username": "Nome utente"
+        "username": "Nome utente",
+        "description": "Accedi con OAuth"
     },
     "post_status": {
-    "account_not_locked_warning": "Il tuo account non è {0}. Chiunque può seguirti e vedere i tuoi post riservati a chi ti segue.",
+        "account_not_locked_warning": "Il tuo profilo non è {0}. Chiunque può seguirti e vedere i tuoi messaggi riservati ai tuoi seguaci.",
-    "account_not_locked_warning_link": "bloccato",
+        "account_not_locked_warning_link": "protetto",
-    "attachments_sensitive": "Segna allegati come sensibili",
+        "attachments_sensitive": "Nascondi gli allegati",
         "content_type": {
             "text/plain": "Testo normale"
         },
         "content_warning": "Oggetto (facoltativo)",
-    "default": "Appena atterrato in L.A.",
+        "default": "Sono appena atterrato a Fiumicino.",
         "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.",
-    "posting": "Pubblica",
+        "posting": "Sto pubblicando",
         "scope": {
-      "direct": "Diretto - Pubblicato solo per gli utenti menzionati",
+            "direct": "Diretto - Visibile solo agli utenti menzionati",
-      "private": "Solo per chi ti segue - Visibile solo da chi ti segue",
+            "private": "Solo per seguaci - Visibile solo dai tuoi seguaci",
-      "public": "Pubblico - Visibile sulla sequenza temporale pubblica",
+            "public": "Pubblico - Visibile sulla sequenza pubblica",
-      "unlisted": "Non elencato - Non visibile sulla sequenza temporale pubblica"
+            "unlisted": "Non elencato - Non visibile sulla sequenza pubblica"
         }
     },
     "registration": {
@@ -197,10 +209,61 @@
         "token": "Codice d'invito"
     },
     "user_profile": {
-    "timeline_title": "Sequenza Temporale dell'Utente"
+        "timeline_title": "Sequenza dell'Utente"
     },
     "who_to_follow": {
-    "more": "Più",
+        "more": "Altro",
         "who_to_follow": "Chi seguire"
+    },
+    "about": {
+        "mrf": {
+            "federation": "Federazione",
+            "keyword": {
+                "reject": "Rifiuta",
+                "replace": "Sostituisci",
+                "is_replaced_by": "→",
+                "keyword_policies": "Regole per parole chiave",
+                "ftl_removal": "Rimozione dalla sequenza globale"
+            },
+            "simple": {
+                "reject": "Rifiuta",
+                "accept": "Accetta",
+                "simple_policies": "Regole specifiche alla stanza",
+                "accept_desc": "Questa stanza accetta messaggi solo dalle seguenti stanze:",
+                "reject_desc": "Questa stanza non accetterà messaggi dalle stanze seguenti:",
+                "quarantine": "Quarantena",
+                "quarantine_desc": "Questa stanza inoltrerà solo messaggi pubblici alle seguenti stanze:",
+                "ftl_removal": "Rimozione dalla sequenza globale",
+                "ftl_removal_desc": "Questa stanza rimuove le seguenti stanze dalla sequenza globale:",
+                "media_removal": "Rimozione multimedia",
+                "media_removal_desc": "Questa istanza rimuove gli allegati dalle seguenti stanze:",
+                "media_nsfw": "Allegati oscurati forzatamente",
+                "media_nsfw_desc": "Questa stanza oscura gli allegati dei messaggi provenienti da queste stanze:"
+            },
+            "mrf_policies": "Regole RM abilitate",
+            "mrf_policies_desc": "Le regole RM cambiano il comportamento federativo della stanza. Vigono le seguenti regole:"
+        },
+        "staff": "Equipaggio"
+    },
+    "domain_mute_card": {
+        "mute": "Zittisci",
+        "mute_progress": "Zittisco...",
+        "unmute": "Ascolta",
+        "unmute_progress": "Procedo..."
+    },
+    "exporter": {
+        "export": "Esporta",
+        "processing": "In elaborazione, il tuo file sarà scaricabile a breve"
+    },
+    "image_cropper": {
+        "crop_picture": "Ritaglia immagine",
+        "save": "Salva",
+        "save_without_cropping": "Salva senza ritagliare",
+        "cancel": "Annulla"
+    },
+    "importer": {
+        "submit": "Invia",
+        "success": "Importato.",
+        "error": "L'importazione non è andata a buon fine."
     }
 }

src/i18n/nl.json

@@ -8,7 +8,7 @@
         "media_proxy": "Media proxy",
         "scope_options": "Zichtbaarheidsopties",
         "text_limit": "Tekst limiet",
-    "title": "Features",
+        "title": "Kenmerken",
         "who_to_follow": "Wie te volgen"
     },
     "finder": {
@@ -17,7 +17,18 @@
     },
     "general": {
         "apply": "toepassen",
-    "submit": "Verzend"
+        "submit": "Verzend",
+        "more": "Meer",
+        "optional": "optioneel",
+        "show_more": "Bekijk meer",
+        "show_less": "Bekijk minder",
+        "dismiss": "Opheffen",
+        "cancel": "Annuleren",
+        "disable": "Uitschakelen",
+        "enable": "Inschakelen",
+        "confirm": "Bevestigen",
+        "verify": "Verifiëren",
+        "generic_error": "Er is een fout opgetreden"
     },
     "login": {
         "login": "Log in",
@@ -26,7 +37,16 @@
         "password": "Wachtwoord",
         "placeholder": "bv. lain",
         "register": "Registreer",
-    "username": "Gebruikersnaam"
+        "username": "Gebruikersnaam",
+        "hint": "Log in om deel te nemen aan de discussie",
+        "authentication_code": "Authenticatie code",
+        "enter_recovery_code": "Voer een herstelcode in",
+        "enter_two_factor_code": "Voer een twee-factor code in",
+        "recovery_code": "Herstelcode",
+        "heading": {
+            "totp": "Twee-factor authenticatie",
+            "recovery": "Twee-factor herstelling"
+        }
     },
     "nav": {
         "about": "Over",
@@ -40,7 +60,10 @@
         "twkn": "Het Geheel Gekende Netwerk",
         "user_search": "Zoek Gebruiker",
         "who_to_follow": "Wie te volgen",
-    "preferences": "Voorkeuren"
+        "preferences": "Voorkeuren",
+        "administration": "Administratie",
+        "search": "Zoeken",
+        "interactions": "Interacties"
     },
     "notifications": {
         "broken_favorite": "Onbekende status, aan het zoeken...",
@@ -49,7 +72,11 @@
         "load_older": "Laad oudere meldingen",
         "notifications": "Meldingen",
         "read": "Gelezen!",
-    "repeated_you": "Herhaalde je status"
+        "repeated_you": "Herhaalde je status",
+        "no_more_notifications": "Geen notificaties meer",
+        "migrated_to": "is gemigreerd naar",
+        "follow_request": "wil je volgen",
+        "reacted_with": "reageerde met {0}"
     },
     "post_status": {
         "new_status": "Post nieuwe status",
@@ -57,7 +84,10 @@
         "account_not_locked_warning_link": "gesloten",
         "attachments_sensitive": "Markeer bijlage als gevoelig",
         "content_type": {
-      "text/plain": "Gewone tekst"
+            "text/plain": "Gewone tekst",
+            "text/html": "HTML",
+            "text/markdown": "Markdown",
+            "text/bbcode": "BBCode"
         },
         "content_warning": "Onderwerp (optioneel)",
         "default": "Tijd voor een pauze!",
@@ -68,6 +98,13 @@
             "private": "Enkel volgers - Post enkel naar volgers",
             "public": "Publiek - Post op publieke tijdlijnen",
             "unlisted": "Unlisted - Toon niet op publieke tijdlijnen"
+        },
+        "direct_warning_to_all": "Dit bericht zal zichtbaar zijn voor alle vermelde gebruikers.",
+        "direct_warning_to_first_only": "Dit bericht zal alleen zichtbaar zijn voor de vermelde gebruikers aan het begin van het bericht.",
+        "scope_notice": {
+            "public": "Dit bericht zal voor iedereen zichtbaar zijn",
+            "unlisted": "Dit bericht zal niet zichtbaar zijn in de Publieke Tijdlijn en Het Geheel Gekende Netwerk",
+            "private": "Dit bericht zal voor alleen je volgers zichtbaar zijn"
         }
     },
     "registration": {
@@ -86,7 +123,10 @@
             "password_required": "moet ingevuld zijn",
             "password_confirmation_required": "moet ingevuld zijn",
             "password_confirmation_match": "komt niet overeen met het wachtwoord"
-    }
+        },
+        "username_placeholder": "bijv. lain",
+        "fullname_placeholder": "bijv. Lain Iwakura",
+        "bio_placeholder": "bijv.\nHallo, ik ben Lain.\nIk ben een anime meisje woonachtig in een buitenwijk in Japan. Je kent me misschien van the Wired."
     },
     "settings": {
         "attachmentRadius": "Bijlages",
@@ -120,12 +160,12 @@
         "export_theme": "Sla preset op",
         "filtering": "Filtering",
         "filtering_explanation": "Alle statussen die deze woorden bevatten worden genegeerd, één filter per lijn.",
-    "follow_export": "Volgers export",
+        "follow_export": "Volgers exporteren",
         "follow_export_button": "Exporteer je volgers naar een csv file",
         "follow_export_processing": "Aan het verwerken, binnen enkele ogenblikken wordt je gevraagd je bestand te downloaden",
-    "follow_import": "Volgers import",
+        "follow_import": "Volgers importeren",
         "follow_import_error": "Fout bij importeren volgers",
-    "follows_imported": "Volgers geïmporteerd! Het kan even duren om ze allemaal te verwerken.",
+        "follows_imported": "Volgers geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
         "foreground": "Voorgrond",
         "general": "Algemeen",
         "hide_attachments_in_convo": "Verberg bijlages in conversaties",
@@ -214,7 +254,17 @@
                 "save_load_hint": "\"Behoud\" opties behouden de momenteel ingestelde opties bij het selecteren of laden van thema's, maar slaan ook de genoemde opties op bij het exporteren van een thema. Wanneer alle selectievakjes zijn uitgeschakeld, zal het exporteren van thema's alles opslaan.",
                 "reset": "Reset",
                 "clear_all": "Wis alles",
-        "clear_opacity": "Wis transparantie"
+                "clear_opacity": "Wis transparantie",
+                "keep_as_is": "Houdt zoals het is",
+                "use_snapshot": "Oude versie",
+                "use_source": "Nieuwe versie",
+                "help": {
+                    "future_version_imported": "Het geïmporteerde bestand is gemaakt voor een nieuwere versie van FE.",
+                    "older_version_imported": "Het geïmporteerde bestand is gemaakt voor een oudere versie van FE.",
+                    "upgraded_from_v2": "PleromaFE is bijgewerkt, het thema kan iets anders uitzien dan dat je gewend bent.",
+                    "v2_imported": "Het geïmporteerde bestand is gemaakt voor een oudere FE. We proberen compatibiliteit te maximaliseren, maar het kan toch voorkomen dat er inconsistenties zijn."
+                },
+                "load_theme": "Thema laden"
             },
             "common": {
                 "color": "Kleur",
@@ -312,7 +362,88 @@
                 "checkbox": "Ik heb de gebruikersvoorwaarden eens van ver bekeken",
                 "link": "een link"
             }
-    }
+        },
+        "notification_setting_follows": "Gebruikers die je volgt",
+        "notification_setting_non_follows": "Gebruikers die je niet volgt",
+        "notification_setting_followers": "Gebruikers die je volgen",
+        "notification_setting_privacy": "Privacy",
+        "notification_setting_privacy_option": "Verberg de afzender en inhoud van push notificaties",
+        "notification_mutes": "Om niet langer notificaties te ontvangen van een specifieke gebruiker, kun je deze dempen.",
+        "app_name": "App naam",
+        "security": "Beveiliging",
+        "enter_current_password_to_confirm": "Voer je huidige wachtwoord in om je identiteit te bevestigen",
+        "mfa": {
+            "otp": "OTP",
+            "setup_otp": "OTP instellen",
+            "wait_pre_setup_otp": "OTP voorinstellen",
+            "confirm_and_enable": "Bevestig en schakel OTP in",
+            "title": "Twee-factor Authenticatie",
+            "generate_new_recovery_codes": "Genereer nieuwe herstelcodes",
+            "recovery_codes": "Herstelcodes.",
+            "waiting_a_recovery_codes": "Backup codes ontvangen...",
+            "authentication_methods": "Authenticatie methodes",
+            "scan": {
+                "title": "Scannen",
+                "desc": "Scan de QR code of voer een sleutel in met je twee-factor applicatie:",
+                "secret_code": "Sleutel"
+            },
+            "verify": {
+                "desc": "Voer de code van je twee-factor applicatie in om twee-factor authenticatie in te schakelen:"
+            },
+            "warning_of_generate_new_codes": "Wanneer je nieuwe herstelcodes genereert, zullen je oude code niet langer werken.",
+            "recovery_codes_warning": "Schrijf de codes op of sla ze op een veilige locatie op - anders kun je ze niet meer inzien. Als je toegang tot je 2FA app en herstelcodes verliest, zal je buitengesloten zijn uit je account."
+        },
+        "allow_following_move": "Auto-volgen toestaan wanneer een gevolgd account migreert",
+        "block_export": "Geblokkeerde gebruikers exporteren",
+        "block_import": "Geblokkeerde gebruikers importeren",
+        "blocks_imported": "Geblokkeerde gebruikers geïmporteerd! Het kan even duren voordat deze verwerkt zijn.",
+        "blocks_tab": "Geblokkeerde gebruikers",
+        "change_email": "Email wijzigen",
+        "change_email_error": "Er is een probleem opgetreden tijdens het wijzigen van je email.",
+        "changed_email": "Email succesvol gewijzigd!",
+        "domain_mutes": "Domeinen",
+        "avatar_size_instruction": "De aangeraden minimale afmeting voor avatar afbeeldingen is 150x150 pixels.",
+        "pad_emoji": "Vul emoji op met spaties wanneer deze met de picker ingevoegd worden",
+        "emoji_reactions_on_timeline": "Toon emoji reacties op de tijdlijn",
+        "accent": "Accent",
+        "hide_muted_posts": "Verberg berichten van gedempte gebruikers",
+        "max_thumbnails": "Maximaal aantal miniaturen per bericht",
+        "use_one_click_nsfw": "Open gevoelige bijlagen met slechts één klik",
+        "hide_filtered_statuses": "Verberg gefilterde statussen",
+        "import_blocks_from_a_csv_file": "Importeer geblokkeerde gebruikers van een csv bestand",
+        "mutes_tab": "Gedempte gebruikers",
+        "play_videos_in_modal": "Speel video's af in een popup frame",
+        "new_email": "Nieuwe Email",
+        "notification_visibility_emoji_reactions": "Reacties",
+        "no_blocks": "Geen geblokkeerde gebruikers",
+        "no_mutes": "Geen gedempte gebruikers",
+        "hide_followers_description": "Niet tonen wie mij volgt",
+        "hide_followers_count_description": "Niet mijn volgers aantal tonen",
+        "hide_follows_count_description": "Niet mijn gevolgde aantal tonen",
+        "show_admin_badge": "Admin badge tonen in mijn profiel",
+        "autohide_floating_post_button": "Nieuw Bericht knop automatisch verbergen (mobiel)",
+        "search_user_to_block": "Zoek wie je wilt blokkeren",
+        "search_user_to_mute": "Zoek wie je wilt dempen",
+        "minimal_scopes_mode": "Bericht bereik-opties minimaliseren",
+        "post_status_content_type": "Bericht status content type",
+        "user_mutes": "Gebruikers",
+        "useStreamingApi": "Berichten en notificatie in real-time ontvangen",
+        "useStreamingApiWarning": "(Afgeraden, experimenteel, kan berichten overslaan)",
+        "type_domains_to_mute": "Voer domeinen in om te dempen",
+        "upload_a_photo": "Upload een foto",
+        "fun": "Plezier",
+        "greentext": "Meme pijlen",
+        "notification_setting": "Ontvang notificaties van:",
+        "block_export_button": "Exporteer je geblokkeerde gebruikers naar een csv bestand",
+        "block_import_error": "Fout bij importeren geblokkeerde gebruikers",
+        "discoverable": "Sta toe dat dit account ontdekt kan worden in zoekresultaten en andere diensten",
+        "use_contain_fit": "Bijlage in miniaturen niet bijsnijden",
+        "notification_visibility_moves": "Gebruiker Migraties",
+        "hide_follows_description": "Niet tonen wie ik volg",
+        "show_moderator_badge": "Moderator badge tonen in mijn profiel",
+        "notification_setting_filters": "Filters",
+        "notification_setting_non_followers": "Gebruikers die je niet volgen",
+        "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen notificaties meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven."
     },
     "timeline": {
         "collapse": "Inklappen",
@@ -360,7 +491,7 @@
         "favorite": "Vind-ik-leuk",
         "user_settings": "Gebruikers Instellingen"
     },
-  "upload":{
+    "upload": {
         "error": {
             "base": "Upload gefaald.",
             "file_too_big": "Bestand is te groot [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
@@ -373,5 +504,95 @@
             "GiB": "GiB",
             "TiB": "TiB"
         }
+    },
+    "about": {
+        "mrf": {
+            "federation": "Federatie",
+            "keyword": {
+                "reject": "Afwijzen",
+                "replace": "Vervangen",
+                "is_replaced_by": "→",
+                "keyword_policies": "Zoekwoord Beleid"
+            },
+            "mrf_policies_desc": "MRF regels beïnvloeden het federatie gedrag van de instantie. De volgende regels zijn ingeschakeld:",
+            "mrf_policies": "Ingeschakelde MRF Regels",
+            "simple": {
+                "simple_policies": "Instantie-specifieke Regels",
+                "accept": "Accepteren",
+                "accept_desc": "Deze instantie accepteert alleen berichten van de volgende instanties:",
+                "reject": "Afwijzen",
+                "reject_desc": "Deze instantie zal geen berichten accepteren van de volgende instanties:",
+                "quarantine": "Quarantaine",
+                "quarantine_desc": "Deze instantie zal alleen publieke berichten sturen naar de volgende instanties:",
+                "ftl_removal_desc": "Deze instantie verwijdert de volgende instanties van \"Het Geheel Gekende Netwerk\" tijdlijn:",
+                "media_removal_desc": "Deze instantie verwijdert media van berichten van de volgende instanties:",
+                "media_nsfw_desc": "Deze instantie stelt media in als gevoelig in berichten van de volgende instanties:",
+                "ftl_removal": "Verwijderen van \"Het Geheel Bekende Netwerk\" Tijdlijn",
+                "media_removal": "Media Verwijdering"
+            }
+        },
+        "staff": "Personeel"
+    },
+    "domain_mute_card": {
+        "mute": "Dempen",
+        "mute_progress": "Dempen...",
+        "unmute": "Dempen opheffen",
+        "unmute_progress": "Dempen wordt opgeheven..."
+    },
+    "exporter": {
+        "export": "Exporteren",
+        "processing": "Verwerken, er wordt zo gevraagd om je bestand te downloaden"
+    },
+    "image_cropper": {
+        "save": "Opslaan",
+        "save_without_cropping": "Opslaan zonder bijsnijden",
+        "cancel": "Annuleren",
+        "crop_picture": "Afbeelding bijsnijden"
+    },
+    "importer": {
+        "submit": "Verzenden",
+        "success": "Succesvol geïmporteerd.",
+        "error": "Er is een fout opgetreden bij het importeren van dit bestand."
+    },
+    "media_modal": {
+        "previous": "Vorige",
+        "next": "Volgende"
+    },
+    "polls": {
+        "add_poll": "Poll Toevoegen",
+        "add_option": "Optie Toevoegen",
+        "option": "Optie",
+        "votes": "stemmen",
+        "vote": "Stem",
+        "single_choice": "Enkelkeuze",
+        "multiple_choices": "Meerkeuze",
+        "expiry": "Poll leeftijd",
+        "expires_in": "Poll eindigt in {0}",
+        "expired": "Poll is {0} geleden beëindigd",
+        "not_enough_options": "Te weinig opties in poll",
+        "type": "Poll type"
+    },
+    "emoji": {
+        "emoji": "Emoji",
+        "keep_open": "Houdt picker open",
+        "search_emoji": "Zoek voor een emoji",
+        "add_emoji": "Emoji invoegen",
+        "unicode": "Unicode emoji",
+        "load_all": "Alle {emojiAmount} emoji worden geladen",
+        "stickers": "Stickers",
+        "load_all_hint": "Eerste {saneAmount} emoji geladen, alle emoji tegelijk laden kan prestatie problemen veroorzaken."
+    },
+    "interactions": {
+        "favs_repeats": "Herhalingen en Favorieten",
+        "follows": "Nieuwe volgers",
+        "moves": "Gebruiker migreert",
+        "load_older": "Oudere interacties laden"
+    },
+    "remote_user_resolver": {
+        "searching_for": "Zoeken naar",
+        "error": "Niet gevonden."
+    },
+    "selectable_list": {
+        "select_all": "Alles selecteren"
     }
 }

src/i18n/pl.json

@@ -20,7 +20,7 @@
                 "quarantine": "Kwarantanna",
                 "quarantine_desc": "Ta instancja wysyła tylko publiczne posty do wymienionych instancji:",
                 "ftl_removal": "Usunięcie z \"Całej znanej sieci\"",
-        "ftl_removal_desc": "Ta instancja usuwa te instancje z \"Całej znanej sieci\"",
+                "ftl_removal_desc": "Ta instancja usuwa wymienionych instancje z \"Całej znanej sieci\":",
                 "media_removal": "Usuwanie multimediów",
                 "media_removal_desc": "Ta instancja usuwa multimedia z postów od wymienionych instancji:",
                 "media_nsfw": "Multimedia ustawione jako wrażliwe",
@@ -78,7 +78,7 @@
     },
     "importer": {
         "submit": "Wyślij",
-    "success": "Zaimportowano pomyślnie",
+        "success": "Zaimportowano pomyślnie.",
         "error": "Wystąpił błąd podczas importowania pliku."
     },
     "login": {
@@ -94,9 +94,9 @@
         "enter_recovery_code": "Wprowadź kod zapasowy",
         "enter_two_factor_code": "Wprowadź kod weryfikacyjny",
         "recovery_code": "Kod zapasowy",
-    "heading" : {
+        "heading": {
-      "totp" : "Weryfikacja dwuetapowa",
+            "totp": "Weryfikacja dwuetapowa",
-      "recovery" : "Zapasowa weryfikacja dwuetapowa"
+            "recovery": "Zapasowa weryfikacja dwuetapowa"
         }
     },
     "media_modal": {
@@ -130,7 +130,8 @@
         "repeated_you": "powtórzył(-a) twój status",
         "no_more_notifications": "Nie masz więcej powiadomień",
         "migrated_to": "wyemigrował do",
-    "reacted_with": "zareagował z {0}"
+        "reacted_with": "zareagował z {0}",
+        "follow_request": "chce cię obserwować"
     },
     "polls": {
         "add_poll": "Dodaj ankietę",
@@ -225,17 +226,17 @@
         "security": "Bezpieczeństwo",
         "enter_current_password_to_confirm": "Wprowadź obecne hasło, by potwierdzić twoją tożsamość",
         "mfa": {
-      "otp" : "OTP",
+            "otp": "OTP",
-      "setup_otp" : "Ustaw OTP",
+            "setup_otp": "Ustaw OTP",
-      "wait_pre_setup_otp" : "początkowe ustawianie OTP",
+            "wait_pre_setup_otp": "początkowe ustawianie OTP",
-      "confirm_and_enable" : "Potwierdź i włącz OTP",
+            "confirm_and_enable": "Potwierdź i włącz OTP",
             "title": "Weryfikacja dwuetapowa",
-      "generate_new_recovery_codes" : "Wygeneruj nowe kody zapasowe",
+            "generate_new_recovery_codes": "Wygeneruj nowe kody zapasowe",
-      "warning_of_generate_new_codes" : "Po tym gdy generujesz nowe kody zapasowe, stare przestaną działać.",
+            "warning_of_generate_new_codes": "Po tym gdy generujesz nowe kody zapasowe, stare przestaną działać.",
-      "recovery_codes" : "Kody zapasowe.",
+            "recovery_codes": "Kody zapasowe.",
             "waiting_a_recovery_codes": "Otrzymuję kody zapasowe...",
-      "recovery_codes_warning" : "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał dostępu do swojego konta.",
+            "recovery_codes_warning": "Spisz kody na kartce papieru, albo zapisz je w bezpiecznym miejscu - inaczej nie zobaczysz ich już nigdy. Jeśli stracisz dostęp do twojej aplikacji 2FA i kodów zapasowych, nie będziesz miał dostępu do swojego konta.",
-      "authentication_methods" : "Metody weryfikacji",
+            "authentication_methods": "Metody weryfikacji",
             "scan": {
                 "title": "Skanuj",
                 "desc": "Zeskanuj ten kod QR używając twojej aplikacji 2FA albo wpisz ten klucz:",
@@ -283,7 +284,7 @@
         "delete_account_description": "Trwale usuń konto i wszystkie posty.",
         "delete_account_error": "Wystąpił problem z usuwaniem twojego konta. Jeżeli problem powtarza się, poinformuj administratora swojej instancji.",
         "delete_account_instructions": "Wprowadź swoje hasło w poniższe pole aby potwierdzić usunięcie konta.",
-    "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługa.",
+        "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługach",
         "domain_mutes": "Domeny",
         "avatar_size_instruction": "Zalecany minimalny rozmiar awatarów to 150x150 pikseli.",
         "pad_emoji": "Dodaj odstęp z obu stron emoji podczas dodawania selektorem",
@@ -385,7 +386,7 @@
         "post_status_content_type": "Post status content type",
         "stop_gifs": "Odtwarzaj GIFy po najechaniu kursorem",
         "streaming": "Włącz automatycznie strumieniowanie nowych postów gdy jesteś na początku strony",
-    "user_mutes": "Users",
+        "user_mutes": "Użytkownicy",
         "useStreamingApi": "Otrzymuj posty i powiadomienia w czasie rzeczywistym",
         "useStreamingApiWarning": "(Niezalecane, eksperymentalne, pomija posty)",
         "text": "Tekst",
@@ -409,7 +410,7 @@
         "notification_setting_non_follows": "Ludzi których nie obserwujesz",
         "notification_setting_followers": "Ludzi którzy obserwują ciebie",
         "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie",
-    "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go",
+        "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
         "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.",
         "enable_web_push_notifications": "Włącz powiadomienia push",
         "style": {
@@ -432,7 +433,7 @@
                     "v2_imported": "Plik który zaimportowałeś został stworzony dla starszego FE. Próbujemy zwiększyć kompatybiliność, lecz wciąż mogą występować rozbieżności.",
                     "future_version_imported": "Plik który zaimportowałeś został stworzony w nowszej wersji FE.",
                     "older_version_imported": "Plik który zaimportowałeś został stworzony w starszej wersji FE.",
-          "snapshot_present": "Migawka motywu jest załadowana, więc wszystkie wartości zostały nadpisane. Zamiast tego, możesz załadować właściwe dane motywu",
+                    "snapshot_present": "Migawka motywu jest załadowana, więc wszystkie wartości zostały nadpisane. Zamiast tego możesz załadować właściwe dane motywu.",
                     "snapshot_missing": "Nie znaleziono migawki motywu w pliku, więc motyw może wyglądać inaczej niż pierwotnie zaplanowano.",
                     "fe_upgraded": "Silnik motywów PleromaFE został zaaktualizowany.",
                     "fe_downgraded": "Wersja PleromaFE została cofnięta.",
@@ -556,7 +557,10 @@
             "title": "Wersja",
             "backend_version": "Wersja back-endu",
             "frontend_version": "Wersja front-endu"
-    }
+        },
+        "notification_setting_privacy": "Prywatność",
+        "notification_setting_filters": "Filtry",
+        "notification_setting_privacy_option": "Ukryj nadawcę i zawartość powiadomień push"
     },
     "time": {
         "day": "{0} dzień",
@@ -615,7 +619,9 @@
         "reply_to": "Odpowiedź dla",
         "replies_list": "Odpowiedzi:",
         "mute_conversation": "Wycisz konwersację",
-    "unmute_conversation": "Odcisz konwersację"
+        "unmute_conversation": "Odcisz konwersację",
+        "status_unavailable": "Status niedostępny",
+        "copy_link": "Kopiuj link do statusu"
     },
     "user_card": {
         "approve": "Przyjmij",
@@ -696,9 +702,11 @@
         "reply": "Odpowiedz",
         "favorite": "Dodaj do ulubionych",
         "add_reaction": "Dodaj reakcję",
-    "user_settings": "Ustawienia użytkownika"
+        "user_settings": "Ustawienia użytkownika",
+        "accept_follow_request": "Akceptuj prośbę o możliwość obserwacji",
+        "reject_follow_request": "Odrzuć prośbę o możliwość obserwacji"
     },
-  "upload":{
+    "upload": {
         "error": {
             "base": "Wysyłanie nie powiodło się.",
             "file_too_big": "Zbyt duży plik [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",

src/i18n/ru.json

@@ -13,7 +13,10 @@
         "disable": "Оключить",
         "enable": "Включить",
         "confirm": "Подтвердить",
-    "verify": "Проверить"
+        "verify": "Проверить",
+        "more": "Больше",
+        "generic_error": "Произошла ошибка",
+        "optional": "не обязательно"
     },
     "login": {
         "login": "Войти",
@@ -26,9 +29,9 @@
         "enter_recovery_code": "Ввести код восстановления",
         "enter_two_factor_code": "Ввести код аутентификации",
         "recovery_code": "Код восстановления",
-    "heading" : {
+        "heading": {
-      "TotpForm" : "Двухфакторная аутентификация",
+            "TotpForm": "Двухфакторная аутентификация",
-      "RecoveryForm" : "Two-factor recovery"
+            "RecoveryForm": "Two-factor recovery"
         }
     },
     "nav": {
@@ -39,7 +42,8 @@
         "public_tl": "Публичная лента",
         "timeline": "Лента",
         "twkn": "Федеративная лента",
-    "search": "Поиск"
+        "search": "Поиск",
+        "friend_requests": "Запросы на чтение"
     },
     "notifications": {
         "broken_favorite": "Неизвестный статус, ищем...",
@@ -48,7 +52,8 @@
         "load_older": "Загрузить старые уведомления",
         "notifications": "Уведомления",
         "read": "Прочесть",
-    "repeated_you": "повторил(а) ваш статус"
+        "repeated_you": "повторил(а) ваш статус",
+        "follow_request": "хочет читать вас"
     },
     "interactions": {
         "favs_repeats": "Повторы и фавориты",
@@ -56,7 +61,7 @@
         "load_older": "Загрузить старые взаимодействия"
     },
     "post_status": {
-    "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков",
+        "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может начать читать вас чтобы видеть посты только для подписчиков.",
         "account_not_locked_warning_link": "залочен",
         "attachments_sensitive": "Вложения содержат чувствительный контент",
         "content_warning": "Тема (не обязательно)",
@@ -94,17 +99,17 @@
     "settings": {
         "enter_current_password_to_confirm": "Введите свой текущий пароль",
         "mfa": {
-      "otp" : "OTP",
+            "otp": "OTP",
-      "setup_otp" : "Настройка OTP",
+            "setup_otp": "Настройка OTP",
-      "wait_pre_setup_otp" : "предварительная настройка OTP",
+            "wait_pre_setup_otp": "предварительная настройка OTP",
-      "confirm_and_enable" : "Подтвердить и включить OTP",
+            "confirm_and_enable": "Подтвердить и включить OTP",
             "title": "Двухфакторная аутентификация",
-      "generate_new_recovery_codes" : "Получить новые коды востановления",
+            "generate_new_recovery_codes": "Получить новые коды востановления",
-      "warning_of_generate_new_codes" : "После получения новых кодов восстановления, старые больше не будут работать.",
+            "warning_of_generate_new_codes": "После получения новых кодов восстановления, старые больше не будут работать.",
-      "recovery_codes" : "Коды восстановления.",
+            "recovery_codes": "Коды восстановления.",
             "waiting_a_recovery_codes": "Получение кодов восстановления ...",
-      "recovery_codes_warning" : "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
+            "recovery_codes_warning": "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
-      "authentication_methods" : "Методы аутентификации",
+            "authentication_methods": "Методы аутентификации",
             "scan": {
                 "title": "Сканирование",
                 "desc": "Используйте приложение для двухэтапной аутентификации для сканирования этого QR-код или введите текстовый ключ:",
@@ -129,10 +134,10 @@
         "cRed": "Отменить",
         "change_email": "Сменить email",
         "change_email_error": "Произошла ошибка при попытке изменить email.",
-    "changed_email": "Email изменён успешно.",
+        "changed_email": "Email изменён успешно!",
         "change_password": "Сменить пароль",
         "change_password_error": "Произошла ошибка при попытке изменить пароль.",
-    "changed_password": "Пароль изменён успешно.",
+        "changed_password": "Пароль изменён успешно!",
         "collapse_subject": "Сворачивать посты с темой",
         "confirm_new_password": "Подтверждение нового пароля",
         "current_avatar": "Текущий аватар",
@@ -150,7 +155,7 @@
         "follow_export_button": "Экспортировать читаемых в файл .csv",
         "follow_export_processing": "Ведётся обработка, скоро вам будет предложено загрузить файл",
         "follow_import": "Импортировать читаемых",
-    "follow_import_error": "Ошибка при импортировании читаемых.",
+        "follow_import_error": "Ошибка при импортировании читаемых",
         "follows_imported": "Список читаемых импортирован. Обработка займёт некоторое время..",
         "foreground": "Передний план",
         "general": "Общие",
@@ -204,7 +209,7 @@
         "replies_in_timeline": "Ответы в ленте",
         "reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
         "reply_visibility_all": "Показывать все ответы",
-    "reply_visibility_following": "Показывать только ответы мне и тех на кого я подписан",
+        "reply_visibility_following": "Показывать только ответы мне или тех на кого я подписан",
         "reply_visibility_self": "Показывать только ответы мне",
         "autohide_floating_post_button": "Автоматически скрывать кнопку постинга (в мобильной версии)",
         "saving_err": "Не удалось сохранить настройки",
@@ -224,7 +229,7 @@
         "text": "Текст",
         "theme": "Тема",
         "theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",
-    "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения",
+        "theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения.",
         "theme_help_v2_2": "Под некоторыми полями ввода это идикаторы контрастности, наведите на них мышью чтобы узнать больше. Приспользовании прозрачности контраст расчитывается для наихудшего варианта.",
         "tooltipRadius": "Всплывающие подсказки/уведомления",
         "user_settings": "Настройки пользователя",
@@ -292,9 +297,9 @@
                 "inset": "Внутренняя",
                 "hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
                 "filter_hint": {
-          "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это",
+                    "always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это.",
-          "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}",
+                    "drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}.",
-          "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете",
+                    "avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете.",
                     "spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
                     "inset_classic": "Внутренние тени будут использовать {0}"
                 },
@@ -340,7 +345,13 @@
                 "checkbox": "Я подтверждаю что не было ни единого разрыва",
                 "link": "ссылка"
             }
-    }
+        },
+        "notification_setting_non_followers": "Не читающие вас",
+        "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер",
+        "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)",
+        "notification_setting_followers": "Читающие вас",
+        "notification_setting_follows": "Читаемые вами",
+        "notification_setting_non_follows": "Не читаемые вами"
     },
     "timeline": {
         "collapse": "Свернуть",
@@ -359,12 +370,12 @@
         "follow": "Читать",
         "follow_sent": "Запрос отправлен!",
         "follow_progress": "Запрашиваем…",
-    "follow_again": "Запросить еще заново?",
+        "follow_again": "Запросить еще раз?",
         "follow_unfollow": "Перестать читать",
         "followees": "Читаемые",
         "followers": "Читатели",
-    "following": "Читаю",
+        "following": "Читаю!",
-    "follows_you": "Читает вас",
+        "follows_you": "Читает вас!",
         "mute": "Игнорировать",
         "muted": "Игнорирую",
         "per_day": "в день",
@@ -382,9 +393,9 @@
             "force_nsfw": "Отмечать посты пользователя как NSFW",
             "strip_media": "Убирать вложения из постов пользователя",
             "force_unlisted": "Не добавлять посты в публичные ленты",
-      "sandbox": "Посты доступны только для подписчиков",
+            "sandbox": "Принудить видимость постов только читателям",
-      "disable_remote_subscription": "Запретить подписываться с удаленных серверов",
+            "disable_remote_subscription": "Запретить читать с удаленных серверов",
-      "disable_any_subscription": "Запретить подписываться на пользователя",
+            "disable_any_subscription": "Запретить читать пользователя",
             "quarantine": "Не федерировать посты пользователя",
             "delete_user": "Удалить пользователя",
             "delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
@@ -410,5 +421,56 @@
         "not_found": "Мы не смогли найти аккаунт с таким email-ом или именем пользователя.",
         "too_many_requests": "Вы исчерпали допустимое количество попыток, попробуйте позже.",
         "password_reset_disabled": "Сброс пароля отключен. Cвяжитесь с администратором вашего сервера."
+    },
+    "about": {
+        "mrf": {
+            "federation": "Федерация",
+            "simple": {
+                "accept_desc": "Данный сервер принимает сообщения только со следующих серверов:",
+                "ftl_removal_desc": "Данный сервер скрывает следующие сервера с федеративной ленты:",
+                "media_nsfw_desc": "Данный сервер принужденно помечает вложения со следущих серверов как NSFW:",
+                "simple_policies": "Правила для определенных серверов",
+                "accept": "Принимаемые сообщения",
+                "reject": "Отклоняемые сообщения",
+                "reject_desc": "Данный сервер не принимает сообщения со следующих серверов:",
+                "quarantine": "Зона карантина",
+                "quarantine_desc": "Данный сервер отправляет только публичные посты следующим серверам:",
+                "ftl_removal": "Скрытие с федеративной ленты",
+                "media_removal": "Удаление вложений",
+                "media_removal_desc": "Данный сервер удаляет вложения со следующих серверов:",
+                "media_nsfw": "Принужденно помеченно как NSFW"
+            },
+            "keyword": {
+                "ftl_removal": "Убрать из федеративной ленты",
+                "reject": "Отклонить",
+                "keyword_policies": "Действия на ключевые слова",
+                "replace": "Заменить",
+                "is_replaced_by": "→"
+            },
+            "mrf_policies": "Активные правила MRF (модуль переписывания сообщений)",
+            "mrf_policies_desc": "Правила MRF (модуль переписывания сообщений) влияют на федерацию данного сервера. Следующие правила активны:"
+        },
+        "staff": "Администрация"
+    },
+    "domain_mute_card": {
+        "mute": "Игнорировать",
+        "mute_progress": "В процессе...",
+        "unmute": "Прекратить игнорирование",
+        "unmute_progress": "В процессе..."
+    },
+    "exporter": {
+        "export": "Экспорт",
+        "processing": "Запрос в обработке, вам скоро будет предложено загрузить файл"
+    },
+    "features_panel": {
+        "chat": "Чат",
+        "media_proxy": "Прокси для внешних вложений",
+        "text_limit": "Лимит символов",
+        "title": "Особенности",
+        "gopher": "Gopher"
+    },
+    "tool_tip": {
+        "accept_follow_request": "Принять запрос на чтение",
+        "reject_follow_request": "Отклонить запрос на чтение"
     }
 }

src/modules/instance.js

@@ -4,53 +4,55 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
-  // Stuff from static/config.json and apiConfig
+  // Stuff from apiConfig
   name: 'Pleroma FE',
   registrationOpen: true,
-  safeDM: true,
-  textlimit: 5000,
   server: 'http://localhost:4040/',
-  theme: 'pleroma-dark',
+  textlimit: 5000,
   themeData: undefined,
-  background: '/static/aurora_borealis.jpg',
-  logo: '/static/logo.png',
-  logoMask: true,
-  logoMargin: '.2em',
-  redirectRootNoLogin: '/main/all',
-  redirectRootLogin: '/main/friends',
-  showInstanceSpecificPanel: false,
-  alwaysShowSubjectInput: true,
-  hideMutedPosts: false,
-  collapseMessageWithSubject: false,
-  hidePostStats: false,
-  hideUserStats: false,
-  hideFilteredStatuses: false,
-  disableChat: false,
-  scopeCopy: true,
-  subjectLineBehavior: 'email',
-  postContentType: 'text/plain',
-  hideSitename: false,
-  nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
-  noAttachmentLinks: false,
+
-  showFeaturesPanel: true,
+  // Stuff from static/config.json
-  minimalScopesMode: false,
+  alwaysShowSubjectInput: true,
+  background: '/static/aurora_borealis.jpg',
+  collapseMessageWithSubject: false,
+  disableChat: false,
   greentext: false,
+  hideFilteredStatuses: false,
+  hideMutedPosts: false,
+  hidePostStats: false,
+  hideSitename: false,
+  hideUserStats: false,
+  loginMethod: 'password',
+  logo: '/static/logo.png',
+  logoMargin: '.2em',
+  logoMask: true,
+  minimalScopesMode: false,
+  nsfwCensorImage: undefined,
+  postContentType: 'text/plain',
+  redirectRootLogin: '/main/friends',
+  redirectRootNoLogin: '/main/all',
+  scopeCopy: true,
+  showFeaturesPanel: true,
+  showInstanceSpecificPanel: false,
   sidebarRight: false,
+  subjectLineBehavior: 'email',
+  theme: 'pleroma-dark',
 
   // Nasty stuff
-  pleromaBackend: true,
-  emoji: [],
-  emojiFetched: false,
   customEmoji: [],
   customEmojiFetched: false,
-  restrictedNicknames: [],
+  emoji: [],
+  emojiFetched: false,
+  pleromaBackend: true,
   postFormats: [],
+  restrictedNicknames: [],
+  safeDM: true,
 
   // Feature-set, apparently, not everything here is reported...
-  mediaProxyAvailable: false,
   chatAvailable: false,
   gopherAvailable: false,
+  mediaProxyAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',
 

static/config.json

@@ -1,24 +1,29 @@
 {
-  "theme": "pleroma-dark",
-  "background": "/static/aurora_borealis.jpg",
-  "logo": "/static/logo.png",
-  "logoMask": true,
-  "logoMargin": ".1em",
-  "redirectRootNoLogin": "/main/all",
-  "redirectRootLogin": "/main/friends",
-  "showInstanceSpecificPanel": false,
-  "collapseMessageWithSubject": false,
-  "scopeCopy": true,
-  "subjectLineBehavior": "email",
-  "postContentType": "text/plain",
   "alwaysShowSubjectInput": true,
+  "background": "/static/aurora_borealis.jpg",
+  "collapseMessageWithSubject": false,
+  "disableChat": false,
+  "greentext": false,
+  "hideFilteredStatuses": false,
+  "hideMutedPosts": false,
   "hidePostStats": false,
+  "hideSitename": false,
   "hideUserStats": false,
   "loginMethod": "password",
-  "webPushNotifications": false,
+  "logo": "/static/logo.png",
+  "logoMargin": ".1em",
+  "logoMask": true,
+  "minimalScopesMode": false,
   "noAttachmentLinks": false,
   "nsfwCensorImage": "",
+  "postContentType": "text/plain",
+  "redirectRootLogin": "/main/friends",
+  "redirectRootNoLogin": "/main/all",
+  "scopeCopy": true,
   "showFeaturesPanel": true,
-  "minimalScopesMode": false,
+  "showInstanceSpecificPanel": false,
-  "sidebarRight": false
+  "sidebarRight": false,
+  "subjectLineBehavior": "email",
+  "theme": "pleroma-dark",
+  "webPushNotifications": false
 }