From 6a1409e09b6a5324f3d801c971f5fd8cefb11eab Mon Sep 17 00:00:00 2001
From: sn0w <me@sn0w.cx>
Date: Sun, 3 Sep 2023 16:05:56 +0200
Subject: [PATCH 01/36] Do not copy all emojis in recentEmoji getter

---
 src/modules/recentEmojis.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/recentEmojis.js b/src/modules/recentEmojis.js
index baab1c52..81936b98 100644
--- a/src/modules/recentEmojis.js
+++ b/src/modules/recentEmojis.js
@@ -37,11 +37,18 @@ const recentEmojis = {
 
   getters: {
     recentEmojis: (state, getters, rootState) => state.emojis.reduce((objects, displayText) => {
-      const allEmojis = rootState.instance.emoji.concat(rootState.instance.customEmoji)
-      let emojiObject = allEmojis.find(emoji => emoji.displayText === displayText)
+      let comparator = emoji => emoji.displayText === displayText
+
+      let emojiObject = rootState.instance.emoji.find(comparator)
       if (emojiObject !== undefined) {
         objects.push(emojiObject)
+      } else {
+        emojiObject = rootState.instance.customEmoji.find(comparator)
+        if (emojiObject !== undefined) {
+          objects.push(emojiObject)
+        }
       }
+
       return objects
     }, []),
   },

From e13c4b6b851df7b74ec18f42c0d100c5c57a6c95 Mon Sep 17 00:00:00 2001
From: Mergan <mergan@viridianpatriots.com>
Date: Tue, 12 Sep 2023 02:48:53 -0700
Subject: [PATCH 02/36] Revamped still-image

---
 src/components/still-image/still-image.js  | 103 +++++++++++++++------
 src/components/still-image/still-image.vue |   2 +-
 2 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js
index 9c335d6c..963bb1ac 100644
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@@ -39,27 +39,18 @@ const StillImage = {
       this.imageLoadError && this.imageLoadError()
     },
     detectAnimation (image) {
-      // If there are no file extensions, the mimetype isn't set, and no mediaproxy is available, we can't figure out
-      // the mimetype of the image.
-      const hasFileExtension = this.src.split('/').pop().includes('.') // TODO: Better check?
-      const mediaProxyAvailable = this.$store.state.instance.mediaProxyAvailable
-      if (!hasFileExtension && this.mimetype === undefined && !mediaProxyAvailable) {
-        // It's a bit aggressive to assume all images we can't find the mimetype of is animated, but necessary for
-        // people in need of reduced motion accessibility. As such, we'll consider those images animated if the user
-        // agent is set to prefer reduced motion. Otherwise, it'll just be used as an early exit.
-        if (window.matchMedia('(prefers-reduced-motion: reduce)').matches)
-          this.isAnimated = true
-        return
+      // It's a bit aggressive to assume all images we can't find the mimetype of is animated, but necessary for
+      // people in need of reduced motion accessibility. As such, we'll consider those images animated if the user
+      // agent is set to prefer reduced motion. Otherwise, it'll just be used as an early exit.
+      if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
+        this.isAnimated = true
       }
 
-      if (this.mimetype === 'image/gif' || this.src.endsWith('.gif')) {
-        this.isAnimated = true
-        return
-      }
+      const mediaProxyAvailable = this.$store.state.instance.mediaProxyAvailable
+
       // harmless CORS errors without-- clean console with
       if (!mediaProxyAvailable) return
-      // Animated JPEGs?
-      if (!(this.src.endsWith('.webp') || this.src.endsWith('.png'))) return
+      
       // Browser Cache should ensure image doesn't get loaded twice if cache exists
       fetch(image.src, {
         referrerPolicy: 'same-origin'
@@ -68,11 +59,16 @@ const StillImage = {
           // We don't need to read the whole file so only call it once
           data.body.getReader().read()
             .then(reader => {
-              if (this.src.endsWith('.webp') && this.isAnimatedWEBP(reader.value)) {
+              // Ordered from least to most intensive
+              if (this.isGIF(reader.value)) {
                 this.isAnimated = true
                 return
               }
-              if (this.src.endsWith('.png') && this.isAnimatedPNG(reader.value)) {
+              if (this.isAnimatedWEBP(reader.value)) {
+                this.isAnimated = true
+                return
+              }
+              if (this.isAnimatedPNG(reader.value)) {
                 this.isAnimated = true
               }
             })
@@ -81,6 +77,20 @@ const StillImage = {
           // this.imageLoadError && this.imageLoadError()
         })
     },
+    isGIF (data) {
+      // I am a perfectly sane individual
+      //
+      // GIF HEADER CHUNK
+      // === START HEADER ===
+      // 47 49 46 38 ("GIF8")
+      const gifHeader = [0x47, 0x49, 0x46];
+      for (let i = 0; i < 3; i++) {
+        if (data[i] !== gifHeader[i]) {
+          return false;
+        }
+      }
+      return true
+    },
     isAnimatedWEBP (data) {
       /**
        * WEBP HEADER CHUNK
@@ -114,16 +124,51 @@ const StillImage = {
       const idatPos = str.indexOf('IDAT')
       return (str.substring(0, idatPos > 0 ? idatPos : 0).indexOf('acTL') > 0)
     },
-    drawThumbnail () {
-      const canvas = this.$refs.canvas
-      if (!this.$refs.canvas) return
-      const image = this.$refs.src
-      const width = image.naturalWidth
-      const height = image.naturalHeight
-      canvas.width = width
-      canvas.height = height
-      canvas.getContext('2d').drawImage(image, 0, 0, width, height)
-    }
+    drawThumbnail() {
+      const canvas = this.$refs.canvas;
+      if (!canvas) return;
+    
+      const context = canvas.getContext('2d');
+      const image = this.$refs.src;
+      const parentElement = canvas.parentElement;
+    
+      // Draw the quick, unscaled version first
+      context.drawImage(image, 0, 0, parentElement.clientWidth, parentElement.clientHeight);
+    
+      // Use requestAnimationFrame to schedule the scaling to the next frame
+      requestAnimationFrame(() => {
+        // Adjust for high-DPI displays
+        const ratio = window.devicePixelRatio || 1;
+        canvas.width = parentElement.clientWidth * ratio;
+        canvas.height = parentElement.clientHeight * ratio;
+        canvas.style.width = `${parentElement.clientWidth}px`;
+        canvas.style.height = `${parentElement.clientHeight}px`;
+        context.scale(ratio, ratio);
+    
+        // Maintain the aspect ratio of the image
+        const imgAspectRatio = image.naturalWidth / image.naturalHeight;
+        const canvasAspectRatio = parentElement.clientWidth / parentElement.clientHeight;
+    
+        let drawWidth, drawHeight;
+    
+        if (imgAspectRatio > canvasAspectRatio) {
+          drawWidth = parentElement.clientWidth;
+          drawHeight = parentElement.clientWidth / imgAspectRatio;
+        } else {
+          drawHeight = parentElement.clientHeight;
+          drawWidth = parentElement.clientHeight * imgAspectRatio;
+        }
+    
+        context.clearRect(0, 0, canvas.width, canvas.height);  // Clear the previous unscaled image
+        context.imageSmoothingEnabled = true;
+        context.imageSmoothingQuality = 'high';
+
+        // Draw the good one for realsies
+        const dx = (parentElement.clientWidth - drawWidth) / 2;
+        const dy = (parentElement.clientHeight - drawHeight) / 2;
+        context.drawImage(image, dx, dy, drawWidth, drawHeight);
+      });
+    }    
   },
   updated () {
     // On computed animated change
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index fa3edacf..68e4ca49 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -60,7 +60,7 @@
   &.animated {
     &::before {
       zoom: var(--_still_image-label-scale, 1);
-      content: 'gif';
+      content: var(--image-type-label, 'A?');
       position: absolute;
       line-height: 1;
       font-size: 0.7em;

From 42a13b0f1b2d0a3786f5c86883b1397a50891ed3 Mon Sep 17 00:00:00 2001
From: Mergan <mergan@viridianpatriots.com>
Date: Tue, 12 Sep 2023 03:05:42 -0700
Subject: [PATCH 03/36] Modify label

---
 src/components/still-image/still-image.js  |  7 ++++
 src/components/still-image/still-image.vue | 40 ++++++++++++----------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js
index 963bb1ac..93fa0022 100644
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@@ -13,6 +13,7 @@ const StillImage = {
     return {
       stopGifs: this.$store.getters.mergedConfig.stopGifs || window.matchMedia('(prefers-reduced-motion: reduce)').matches,
       isAnimated: false,
+      imageTypeLabel: ''
     }
   },
   computed: {
@@ -62,14 +63,17 @@ const StillImage = {
               // Ordered from least to most intensive
               if (this.isGIF(reader.value)) {
                 this.isAnimated = true
+                this.setLabel('GIF')
                 return
               }
               if (this.isAnimatedWEBP(reader.value)) {
                 this.isAnimated = true
+                this.setLabel('WEBP')
                 return
               }
               if (this.isAnimatedPNG(reader.value)) {
                 this.isAnimated = true
+                this.setLabel('APNG')
               }
             })
         })
@@ -77,6 +81,9 @@ const StillImage = {
           // this.imageLoadError && this.imageLoadError()
         })
     },
+    setLabel (name) {
+      this.imageTypeLabel = name;
+    },
     isGIF (data) {
       // I am a perfectly sane individual
       //
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 68e4ca49..d1d4e890 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -1,9 +1,15 @@
 <template>
   <div
+    ref="still-image"
     class="still-image"
     :class="{ animated: animated }"
     :style="style"
   >
+    <div
+      v-if="isAnimated && imageTypeLabel"
+      class="image-type-label">
+        {{ imageTypeLabel }}
+    </div>
     <canvas
       v-if="animated"
       ref="canvas"
@@ -57,30 +63,26 @@
     }
   }
 
-  &.animated {
-    &::before {
-      zoom: var(--_still_image-label-scale, 1);
-      content: var(--image-type-label, 'A?');
-      position: absolute;
-      line-height: 1;
-      font-size: 0.7em;
-      top: 0.5em;
-      left: 0.5em;
-      background: rgba(127, 127, 127, 0.5);
-      color: #fff;
-      display: block;
-      padding: 2px 4px;
-      border-radius: $fallback--tooltipRadius;
-      border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-      z-index: 2;
-      visibility: var(--_still-image-label-visibility, visible);
-    }
+  .image-type-label {
+    position: absolute;
+    top: 0.25em;
+    left: 0.25em;
+    line-height: 1;
+    font-size: 0.6em;
+    background: rgba(127, 127, 127, 0.5);
+    color: #fff;
+    padding: 2px 4px;
+    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+    z-index: 2;
+    visibility: var(--_still-image-label-visibility, visible);
+  }
 
+  &.animated {
     &:hover canvas {
       display: none;
     }
 
-    &:hover::before {
+    &:hover .image-type-label {
       visibility: var(--_still-image-label-visibility, hidden);
     }
 

From 345934c2f3d8178c7e2a08923da53fa7ce444d14 Mon Sep 17 00:00:00 2001
From: Mergan <mergan@viridianpatriots.com>
Date: Tue, 12 Sep 2023 03:36:14 -0700
Subject: [PATCH 04/36] Make label visible on avatar

---
 src/components/user_avatar/user_avatar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index f4d294df..e64b54df 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -33,7 +33,7 @@
   --_avatarShadowBox: var(--avatarStatusShadow);
   --_avatarShadowFilter: var(--avatarStatusShadowFilter);
   --_avatarShadowInset: var(--avatarStatusShadowInset);
-  --_still-image-label-visibility: hidden;
+  // --_still-image-label-visibility: hidden;
 
   display: inline-block;
   position: relative;

From 3947aafeba74e3f1da215fbc3e2af498408cc17d Mon Sep 17 00:00:00 2001
From: Mergan <mergan@viridianpatriots.com>
Date: Tue, 12 Sep 2023 04:08:47 -0700
Subject: [PATCH 05/36] Aligning canvas to image

---
 src/components/still-image/still-image.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js
index 93fa0022..3872685c 100644
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@@ -144,10 +144,14 @@ const StillImage = {
     
       // Use requestAnimationFrame to schedule the scaling to the next frame
       requestAnimationFrame(() => {
+        // Compute scaling ratio between the natural dimensions of the image and its display dimensions
+        const scalingRatioWidth = parentElement.clientWidth / image.naturalWidth;
+        const scalingRatioHeight = parentElement.clientHeight / image.naturalHeight;
+
         // Adjust for high-DPI displays
         const ratio = window.devicePixelRatio || 1;
-        canvas.width = parentElement.clientWidth * ratio;
-        canvas.height = parentElement.clientHeight * ratio;
+        canvas.width = image.naturalWidth * scalingRatioWidth * ratio;
+        canvas.height = image.naturalHeight * scalingRatioHeight * ratio;
         canvas.style.width = `${parentElement.clientWidth}px`;
         canvas.style.height = `${parentElement.clientHeight}px`;
         context.scale(ratio, ratio);

From 3e64d78d052da5207d1f831fe82d8f612e49fda4 Mon Sep 17 00:00:00 2001
From: Mergan <mergan@viridianpatriots.com>
Date: Tue, 12 Sep 2023 04:17:28 -0700
Subject: [PATCH 06/36] An oopsie

---
 src/components/still-image/still-image.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index d1d4e890..074a8eef 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -6,7 +6,7 @@
     :style="style"
   >
     <div
-      v-if="isAnimated && imageTypeLabel"
+      v-if="animated && imageTypeLabel"
       class="image-type-label">
         {{ imageTypeLabel }}
     </div>

From 1056b89fd1b4fd67b491217508a0fa830cb0bc7d Mon Sep 17 00:00:00 2001
From: Mergan <mergan@viridianpatriots.com>
Date: Tue, 12 Sep 2023 04:19:08 -0700
Subject: [PATCH 07/36] Disabled aggressive matching for reduced motion (we
 search for gif now)

---
 src/components/still-image/still-image.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js
index 3872685c..43ecad54 100644
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@@ -40,17 +40,21 @@ const StillImage = {
       this.imageLoadError && this.imageLoadError()
     },
     detectAnimation (image) {
-      // It's a bit aggressive to assume all images we can't find the mimetype of is animated, but necessary for
-      // people in need of reduced motion accessibility. As such, we'll consider those images animated if the user
-      // agent is set to prefer reduced motion. Otherwise, it'll just be used as an early exit.
-      if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
-        this.isAnimated = true
-      }
-
       const mediaProxyAvailable = this.$store.state.instance.mediaProxyAvailable
 
       // harmless CORS errors without-- clean console with
-      if (!mediaProxyAvailable) return
+      if (!mediaProxyAvailable) {
+        // It's a bit aggressive to assume all images we can't find the mimetype of is animated, but necessary for
+        // people in need of reduced motion accessibility. As such, we'll consider those images animated if the user
+        // agent is set to prefer reduced motion. Otherwise, it'll just be used as an early exit.
+        if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
+          // Only for no media-proxy for now, since we're capturing gif, webp, and apng (are there others?)
+          // Since the canvas and images are not pixel-perfect matching (due to scaling),
+          // It makes the images jiggle on hover, which is not ideal for accessibility, methinks
+          this.isAnimated = true
+        }
+        return
+      }
       
       // Browser Cache should ensure image doesn't get loaded twice if cache exists
       fetch(image.src, {

From 52b0b6f0088acf82bebf2a2d141011517459daf8 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Mon, 2 Oct 2023 13:28:23 +0100
Subject: [PATCH 08/36] add VI to messages.js

---
 src/i18n/messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 18ed79b7..4e92834c 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -35,6 +35,7 @@ const loaders = {
   sk: () => import('./sk.json'),
   te: () => import('./te.json'),
   uk: () => import('./uk.json'),
+  vi: () => import('./vi.json'),
   zh: () => import('./zh.json'),
   zh_Hant: () => import('./zh_Hant.json')
 }

From d9e1bc4d9993441ee76620008eb97d3d0aeb1bc0 Mon Sep 17 00:00:00 2001
From: Mergan <mergan@viridianpatriots.com>
Date: Mon, 2 Oct 2023 15:29:54 -0700
Subject: [PATCH 09/36] Re-added extension checking for still-image

- Bonus refactoring
---
 src/components/still-image/still-image.js | 40 ++++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js
index 43ecad54..a4c24df7 100644
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@@ -42,20 +42,22 @@ const StillImage = {
     detectAnimation (image) {
       const mediaProxyAvailable = this.$store.state.instance.mediaProxyAvailable
 
-      // harmless CORS errors without-- clean console with
       if (!mediaProxyAvailable) {
         // It's a bit aggressive to assume all images we can't find the mimetype of is animated, but necessary for
         // people in need of reduced motion accessibility. As such, we'll consider those images animated if the user
         // agent is set to prefer reduced motion. Otherwise, it'll just be used as an early exit.
         if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
-          // Only for no media-proxy for now, since we're capturing gif, webp, and apng (are there others?)
           // Since the canvas and images are not pixel-perfect matching (due to scaling),
           // It makes the images jiggle on hover, which is not ideal for accessibility, methinks
           this.isAnimated = true
+          return
         }
-        return
+        this.detectWithoutMediaProxy(image)
+      } else {
+        this.detectWithMediaProxy(image)
       }
-      
+    },
+    detectAnimationWithFetch (image) {
       // Browser Cache should ensure image doesn't get loaded twice if cache exists
       fetch(image.src, {
         referrerPolicy: 'same-origin'
@@ -85,6 +87,36 @@ const StillImage = {
           // this.imageLoadError && this.imageLoadError()
         })
     },
+    detectWithMediaProxy (image) {
+      this.detectAnimationWithFetch(image)
+    },
+    detectWithoutMediaProxy (image) {
+      // We'll just assume that gifs and webp are animated
+      const extension = image.src.split('.').pop().toLowerCase()
+
+      if (extension === 'gif') {
+        this.isAnimated = true
+        this.setLabel('GIF')
+        return
+      }
+      if (extension === 'webp') {
+        this.isAnimated = true
+        this.setLabel('WEBP')
+        return
+      }
+      // Beware the apng! use this if ye dare
+      // if (extension === 'png') {
+      //  this.isAnimated = true
+      //  this.setLabel('PNG')
+      //  return
+      // }
+      
+      // Hail mary for extensionless
+      if (extension.includes('/')) {
+        // Don't mind the CORS error barrage
+        this.detectAnimationWithFetch(image)
+      }
+    },
     setLabel (name) {
       this.imageTypeLabel = name;
     },

From 306cea04a12743481b95fe39d529bf2f2b1a9f56 Mon Sep 17 00:00:00 2001
From: Norm <normandy@biribiri.dev>
Date: Sat, 23 Sep 2023 20:33:46 -0400
Subject: [PATCH 10/36] Use corepack in build instructions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 43e177b4..3b5bf271 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/ad
 
 ``` bash
 # install dependencies
-npm install -g yarn
+corepack enable
 yarn
 
 # serve with hot reload at localhost:8080

From 1de62fffcd6b752dbdf32792e99ef127cccd75b0 Mon Sep 17 00:00:00 2001
From: Norm <normandy@biribiri.dev>
Date: Sat, 23 Sep 2023 20:34:30 -0400
Subject: [PATCH 11/36] Update config.example.json link and example domain

---
 README.md                 | 8 ++++----
 config/local.example.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3b5bf271..fc8db83c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Akkoma-FE 
+# Akkoma-FE
 
 ![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)
 
@@ -8,7 +8,7 @@ This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkom
 
 # For Translators
 
-The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE. 
+The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE.
 
 Alternatively, edit/create `src/i18n/$LANGUAGE_CODE.json` (where `$LANGUAGE_CODE` is the [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language), then add your language to [src/i18n/messages.js](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/i18n/messages.js) if it doesn't already exist there.
 
@@ -37,7 +37,7 @@ npm run unit
 
 # For Contributors:
 
-You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/config/local.example.json)) to enable some convenience dev options:
+You can create file `/config/local.json` (see [example](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/config/local.example.json)) to enable some convenience dev options:
 
 * `target`: makes local dev server redirect to some existing instance's BE instead of local BE, useful for testing things in near-production environment and searching for real-life use-cases.
 * `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/statusnet/config.json`. Only works in dev mode.
@@ -52,4 +52,4 @@ Edit config.json for configuration.
 
 ### Login methods
 
-```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. 
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.
diff --git a/config/local.example.json b/config/local.example.json
index 2a3bd00d..43ebd649 100644
--- a/config/local.example.json
+++ b/config/local.example.json
@@ -1,4 +1,4 @@
 {
-  "target": "https://pleroma.soykaf.com/",
+  "target": "https://otp.akkoma.dev/",
   "staticConfigPreference": false
 }

From ab250c2f3a1ac1fa0d7d525fbd903d11c4806f6f Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Thu, 19 Oct 2023 00:45:11 +0200
Subject: [PATCH 12/36] Explicitly set SameSite attribute for cookies

Modern browsers start to tighten down on third-party access to cookies.
E.g. in current Firefox, a warning about the userLanguage cookie was
shown since it did not yet explicitly set the SameSite attribute and the
default is about to change.

The cookie name being referred to as BACKEND_LANGUAGE_COOKIE_NAME
suggests it should be readable by the actual Akkoma backend, which can
live at a different domain than akkoma-fe. Thus explicitly enable
sharing with third-party sites.

No warnings were shown for other cookies, so I assume
this was the only one not yet setting SameSite.
---
 src/modules/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/config.js b/src/modules/config.js
index ebb27929..2c4e461d 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -229,7 +229,7 @@ const config = {
           break
         case 'interfaceLanguage':
           messages.setLanguage(this.getters.i18n, value)
-          Cookies.set(BACKEND_LANGUAGE_COOKIE_NAME, localeService.internalToBackendLocale(value))
+          Cookies.set(BACKEND_LANGUAGE_COOKIE_NAME, localeService.internalToBackendLocale(value), {sameSite: 'Lax'})
           dispatch('setInstanceOption', { name: 'interfaceLanguage', value })
           break
         case 'thirdColumnMode':

From ccb0ffdc8ad72bef462ba21bb4aae8a09f83012a Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Tue, 24 Oct 2023 18:23:47 +0200
Subject: [PATCH 13/36] Don't show direction in notification timestamps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently all notifications except follow-related once include
and explicit direction text. (It missing in follow notifs is due to an
omission in 804ba0cdb6b353e0c959c68f44c6a1316c0d6b10 which only added
the newly introduced with-direction to status-related notifs. Before,
presumably all notifs included direction text.)

But in the notification tray horizontal space is scarce
and notifs can already be assumed to only come from the past.
While it might not be too bad for the English localisation’s 4-letter
' ago' suffix, e.g. the Indonesian localisation’s ' yang lalu' needs
10 letters.

Thus instead of fixing the omission for follow-related notifs,
drop direction text from all notification timestamps.
---
 src/components/notification/notification.vue | 1 -
 src/components/status/status.vue             | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 76101865..5ea6ab04 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -151,7 +151,6 @@
             >
               <Timeago
                 :time="notification.created_at"
-                :with-direction="true"
                 :auto-update="240"
               />
             </router-link>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a54782e3..c34d38f0 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -190,7 +190,7 @@
                 >
                   <Timeago
                     :time="status.created_at"
-                    :with-direction="true"
+                    :with-direction="!compact"
                     :auto-update="60"
                   />
                 </router-link>

From beee99e733a6508e3744140ee73e8b7be8194d85 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Wed, 18 Oct 2023 22:51:24 +0200
Subject: [PATCH 14/36] Stop notifications boxes from change size over time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Notifications about favourites and follows use .notification-right,
notifications about replies instead use .heading-right.

Previously only the former set a min-width, however the
chosen value of 3em was too small to fit the worst case.
As a consequence, when the timestamp text changes over time,
its element width changes, which may result in neighbouring text
(no longer) needing to wrap to a new line in turn changing the size
of the whole notification box pushing older notification boxes down/up.

These constant movements at the side of the screen can be quite
annoying and confusing when the cause cannot be immediately discerned.

Avoid this, by reserving enough space for any timestamp.

For English, the worst case is the five-character 'XXmin', since the
short identifier for minutes is the longest with three letters.
With two exceptions, all other current localisation also do not exceed
three letters in any short unit identifier up to days.
However, some localisations (e.g. Polish) additionally insert a space
between numerical value and unit. This matches SI recommendations
pushing the worst case to 6 characters.

6 characters will be sufficient for timestamps up to 3 weeks in all
languages (minus prev exceptions), which seems reasonable enough
as beyond this timestamps rarely change anyway.

The aforementioned exceptions being Vietnamese and Occitan,
but in the current localisation all or the relevant short unit
identifiers are identical to the long forms indicating this is
just due to incomplete translation.
Indeed, Vietnamese Wikipedia (read through machine translation) suggests
“ph” is commonly used as unit identifiers for minutes, but the current
localisation fully spells it out as “phút”.
---
 src/components/notifications/notifications.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 3d3408f7..635a0a9b 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -105,9 +105,12 @@
     flex: 1;
     padding-left: 0.8em;
     min-width: 0;
+  }
 
+  .heading-right, .notification-right {
     .timeago {
-      min-width: 3em;
+      display: inline-block;
+      min-width: 6em;
       text-align: right;
     }
   }

From c9dc8f00f9c574b082c6ae63c3f59777764837da Mon Sep 17 00:00:00 2001
From: smitten <everything-cozy@pm.me>
Date: Mon, 30 Oct 2023 18:54:07 -0400
Subject: [PATCH 15/36] Use window.navigator.language before interface i18n
 language

---
 src/services/locale/locale.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index 8cef2522..c4f8ce21 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -8,7 +8,7 @@ const specialLanguageCodes = {
   'zh': 'zh-Hans'
 }
 
-const internalToBrowserLocale = code => specialLanguageCodes[code] || code
+const internalToBrowserLocale = fallbackCode => specialLanguageCodes[fallbackCode] || window.navigator.language || fallbackCode
 
 const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_', '-')
 

From 1b28ec3b72fde74265df4150be39295b0ae1a345 Mon Sep 17 00:00:00 2001
From: smitten <everything-cozy@pm.me>
Date: Wed, 1 Nov 2023 23:10:57 -0400
Subject: [PATCH 16/36] Match UI i18n configuration to browser locales

---
 src/services/locale/locale.service.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index c4f8ce21..607cd447 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -8,7 +8,30 @@ const specialLanguageCodes = {
   'zh': 'zh-Hans'
 }
 
-const internalToBrowserLocale = fallbackCode => specialLanguageCodes[fallbackCode] || window.navigator.language || fallbackCode
+// Find a browser language that matches the configured UI language.
+// Browser language should match the configured generic short code prefix:
+// eg 'en-GB' browser language matches 'en' UI language.
+const findBrowserRegionMatch = genericLang => {
+  for (const blang of window.navigator.languages) {
+    if (genericLang === blang.split('-')[0])
+      return blang;
+  }
+  return null;
+}
+
+const internalToBrowserLocale = (() => {
+  const resolvedBrowserLocales = {}
+
+  return i18nLocale => {
+    if (resolvedBrowserLocales[i18nLocale]) {
+      return resolvedBrowserLocales[i18nLocale]
+    }
+    const lang = specialLanguageCodes[i18nLocale] || i18nLocale;
+    const resolved = findBrowserRegionMatch(lang) || lang;
+    resolvedBrowserLocales[i18nLocale] = resolved
+    return resolved
+  }
+})()
 
 const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_', '-')
 

From deaef1d0b9c32a0f6101a3447fb19aa6684b8c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ng=C3=B4=20Ng=E1=BB=8Dc=20=C4=90=E1=BB=A9c=20Huy?=
 <huyngo@disroot.org>
Date: Sun, 5 Nov 2023 09:21:01 +0700
Subject: [PATCH 17/36] Use relative unit for font size

---
 src/App.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.scss b/src/App.scss
index 36176b35..1d338d15 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -8,7 +8,7 @@
 }
 
 html {
-  font-size: 14px;
+  font-size: 0.875rem;
   // overflow-x: clip causes my browser's tab to crash with SIGILL lul
 }
 

From 235c734d3700342fc98366160f84b9b42785ad7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ng=C3=B4=20Ng=E1=BB=8Dc=20=C4=90=E1=BB=A9c=20Huy?=
 <huyngo@disroot.org>
Date: Sun, 5 Nov 2023 09:21:49 +0700
Subject: [PATCH 18/36] Use overflow: auto for description

Previously it sets overflow: scroll, so there's an unnecessary
horizontal scroll.
overflow: auto only shows scrollbar when it overflows
---
 src/components/attachment/attachment.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss
index 484ca0c4..d65f39fb 100644
--- a/src/components/attachment/attachment.scss
+++ b/src/components/attachment/attachment.scss
@@ -37,7 +37,7 @@
       white-space: pre-line;
       word-break: break-word;
       text-overflow: ellipsis;
-      overflow: scroll;
+      overflow: auto;
     }
 
     &.-static {

From c524a47e6f3ce341861f0a4c03aac45c4c1e6461 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Wed, 15 Nov 2023 23:36:19 +0100
Subject: [PATCH 19/36] Drop broken "@ symbol as icon" setting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It was merged into pleroma-fe on 2022-02-03 in
76547fe66d1771f5bff732a34b0547f890f4621a and imported
into akkoma-fe on 2022-06-08 with the merge commit
f6cf509a046507eeb9e52e2a279e82dd7a0f6bf8.

However, something went wrong in the merge and while the setting
and its infrastructure exist, it is never used anywhere and @ is
always displayed as text.

Given it existed in this broken state for nearly one and a half years,
never worked on akkoma-fe and no bugs were filed about this, it appears
nobody cares, so let’s just remove it.
---
 src/components/mention_link/mention_link.js        | 3 ---
 src/components/settings_modal/tabs/general_tab.vue | 8 --------
 src/i18n/ca.json                                   | 1 -
 src/i18n/de.json                                   | 1 -
 src/i18n/en.json                                   | 1 -
 src/i18n/fr.json                                   | 1 -
 src/i18n/ja_pedantic.json                          | 1 -
 src/i18n/nl.json                                   | 1 -
 src/i18n/uk.json                                   | 1 -
 src/i18n/zh.json                                   | 1 -
 src/modules/config.js                              | 1 -
 src/modules/instance.js                            | 1 -
 12 files changed, 21 deletions(-)

diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 55eea195..377f8ea5 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -93,9 +93,6 @@ const MentionLink = {
         this.highlightType
       ]
     },
-    useAtIcon () {
-      return this.mergedConfig.useAtIcon
-    },
     isRemote () {
       return this.userName !== this.userNameFull
     },
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 7dc1c3f1..2754cde0 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -483,14 +483,6 @@
             </BooleanSetting>
           </li>
         </ul>
-        <li>
-          <BooleanSetting
-            path="useAtIcon"
-            expert="1"
-          >
-            {{ $t('settings.use_at_icon') }}
-          </BooleanSetting>
-        </li>
         <li>
           <BooleanSetting path="mentionLinkShowAvatar">
             {{ $t('settings.mention_link_show_avatar') }}
diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index e2cd094a..47f1eaf0 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -884,7 +884,6 @@
         "upload_a_photo": "Pujar una foto",
         "useStreamingApi": "Rebre apunts i notificacions en temps real",
         "useStreamingApiWarning": "És genial emprar-lo. Si es trenca, refresca, suposo?",
-        "use_at_icon": "Mostra el símbol {'@'} com a icona enlloc de text",
         "use_contain_fit": "No retallar els adjunts en miniatures",
         "use_one_click_nsfw": "Obre els adjunts NSFW amb només un clic",
         "user_mutes": "Usuaris",
diff --git a/src/i18n/de.json b/src/i18n/de.json
index a4ec886c..d5a7b1c0 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -916,7 +916,6 @@
         "upload_a_photo": "Lade ein Foto hoch",
         "useStreamingApi": "Empfange Posts und Benachrichtigungen in Echtzeit",
         "useStreamingApiWarning": "(Nicht empfohlen, experimentell, bekannt dafür, Posts zu überspringen)",
-        "use_at_icon": "{'@'}-Symbol als Icon und nicht als Text anzeigen",
         "use_blurhash": "Blurhash für NSFW-Vorschauen verwenden",
         "use_contain_fit": "Vorschaubilder nicht zuschneiden",
         "use_one_click_nsfw": "Heikle Anhänge mit nur einem Klick öffnen",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index a5e9d9c1..0160b187 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -922,7 +922,6 @@
         "upload_a_photo": "Upload a photo",
         "useStreamingApi": "Receive posts and notifications real-time",
         "useStreamingApiWarning": "It's cool use it. If it breaks refresh I guess?",
-        "use_at_icon": "Display {'@'} symbol as an icon instead of text",
         "use_contain_fit": "Don't crop the attachment in thumbnails",
         "use_one_click_nsfw": "Open NSFW attachments with just one click",
         "user_mutes": "Users",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 252291ea..0344d9ec 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -920,7 +920,6 @@
         "upload_a_photo": "Envoyer une photo",
         "useStreamingApi": "Recevoir les messages et notifications en temps réel",
         "useStreamingApiWarning": "(Non recommandé, expérimental, connu pour rater des messages)",
-        "use_at_icon": "Afficher le symbol {'@'} comme une image",
         "use_contain_fit": "Ne pas rogner les miniatures des pièces-jointes",
         "use_one_click_nsfw": "Ouvrir les pièces-jointes sensibles avec un seul clic",
         "user_mutes": "Comptes",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 5f315172..c685ea1d 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -921,7 +921,6 @@
         "upload_a_photo": "画像をアップロード",
         "useStreamingApi": "投稿と通知を、すぐに受け取る",
         "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）",
-        "use_at_icon": "{'@'}マークをアイコンにする",
         "use_contain_fit": "画像のサムネイルを、切り抜かない",
         "use_one_click_nsfw": "NSFWなファイルを1クリックで開く",
         "user_mutes": "ユーザー",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 15d639c4..75e10500 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -918,7 +918,6 @@
         "upload_a_photo": "Foto uploaden",
         "useStreamingApi": "Berichten en meldingen in real-time ontvangen",
         "useStreamingApiWarning": "Iets experimenteels met berichten streamen uwu miss kun je beter uit laten ofzo?",
-        "use_at_icon": "{'@'} symbool als icoon tonen in plaats van tekst",
         "use_blurhash": "Waas tonen over NSFW-miniaturen",
         "use_contain_fit": "Bijlage in miniaturen niet bijsnijden",
         "use_one_click_nsfw": "Gevoelige bijlagen met slechts één klik openen",
diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 08570f9b..13b92e03 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -922,7 +922,6 @@
         "upload_a_photo": "Вивантажити фото",
         "useStreamingApi": "Отримувати дописи та сповіщення наживо",
         "useStreamingApiWarning": "Загалом працює. Якщо не зовсім, спробуєте оновити сторінку?",
-        "use_at_icon": "Значок {'@'} замість символу",
         "use_blurhash": "Показувати дражливі мініатюри (як розмиті кольори)",
         "use_contain_fit": "Не обрізати краї мініатюр",
         "use_one_click_nsfw": "Відкривати NSFW вкладення одним кліком миші",
diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 7fec7226..c342bc5b 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -922,7 +922,6 @@
         "upload_a_photo": "上传照片",
         "useStreamingApi": "实时接收帖文和通知",
         "useStreamingApiWarning": "十分炫酷推荐使用。要是崩了试试刷新？",
-        "use_at_icon": "将 {'@'} 符号显示为图标而不是文本",
         "use_blurhash": "对NSFW的缩略图使用模糊处理",
         "use_contain_fit": "生成缩略图时不要裁剪附件",
         "use_one_click_nsfw": "点击一次以打开工作场所不适宜（NSFW）的附件",
diff --git a/src/modules/config.js b/src/modules/config.js
index ebb27929..39ac1076 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -95,7 +95,6 @@ export const defaultState = {
   disableStickyHeaders: false,
   showScrollbars: false,
   greentext: undefined, // instance default
-  useAtIcon: undefined, // instance default
   mentionLinkDisplay: undefined, // instance default
   mentionLinkShowTooltip: undefined, // instance default
   mentionLinkShowAvatar: undefined, // instance default
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 02cbe1f8..0c856352 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -21,7 +21,6 @@ const defaultState = {
   background: '/static/aurora_borealis.jpg',
   collapseMessageWithSubject: true,
   greentext: false,
-  useAtIcon: false,
   mentionLinkDisplay: 'short',
   mentionLinkShowTooltip: true,
   mentionLinkShowAvatar: false,

From 3d65eccf047f1fbe4479559aa4a04902fd3a143c Mon Sep 17 00:00:00 2001
From: Hazel Koehler <acomputerdog@gmail.com>
Date: Sat, 16 Dec 2023 13:37:59 -0500
Subject: [PATCH 20/36] use main emoji button for spoiler / CW field

---
 .../post_status_form/post_status_form.js      | 19 ++++++++++++++++---
 .../post_status_form/post_status_form.vue     |  5 +++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 5647a9eb..b648b50c 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -213,7 +213,9 @@ const PostStatusForm = {
       preview: null,
       previewLoading: false,
       emojiInputShown: false,
-      idempotencyKey: ''
+      idempotencyKey: '',
+      activeEmojiInput: undefined,
+      activeTextInput: undefined
     }
   },
   computed: {
@@ -674,8 +676,19 @@ const PostStatusForm = {
       this.$refs['emoji-input'].resize()
     },
     showEmojiPicker () {
-      this.$refs['textarea'].focus()
-      this.$refs['emoji-input'].triggerShowPicker()
+      if (!this.activeEmojiInput || !this.activeTextInput)
+        this.focusStatusInput()
+
+      this.$refs[this.activeTextInput].focus()
+      this.$refs[this.activeEmojiInput].triggerShowPicker()
+    },
+    focusStatusInput() {
+      this.activeEmojiInput = 'emoji-input'
+      this.activeTextInput = 'textarea'
+    },
+    focusSubjectInput() {
+      this.activeEmojiInput = 'subject-emoji-input'
+      this.activeTextInput = 'subject-input'
     },
     clearError () {
       this.error = null
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index f4680336..601b7d0c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -118,13 +118,16 @@
           />
         </div>
         <EmojiInput
+          ref="subject-emoji-input"
           v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
           v-model="newStatus.spoilerText"
           enable-emoji-picker
+          hide-emoji-button
           :suggest="emojiSuggestor"
           class="form-control"
         >
           <input
+            ref="subject-input"
             v-model="newStatus.spoilerText"
             type="text"
             :placeholder="$t('post_status.content_warning')"
@@ -132,6 +135,7 @@
             size="1"
             class="form-post-subject"
             @input="onSubjectInput"
+            @focus="focusSubjectInput()"
           >
         </EmojiInput>
         <i18n-t
@@ -173,6 +177,7 @@
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
+            @focus="focusStatusInput()"
           />
           <p
             v-if="hasStatusLengthLimit"

From 34e2800f5910be0bdc1abc9fb83d21dfde6424e0 Mon Sep 17 00:00:00 2001
From: Hazel Koehler <acomputerdog@gmail.com>
Date: Sat, 16 Dec 2023 14:44:26 -0500
Subject: [PATCH 21/36] add button to toggle the spoiler / CW field

---
 .../post_status_form/post_status_form.js      | 21 ++++++++++++++++++-
 .../post_status_form/post_status_form.vue     | 18 ++++++++++++++--
 src/i18n/en.json                              |  1 +
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index b648b50c..3bc6dc99 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -199,6 +199,10 @@ const PostStatusForm = {
       }
     }
 
+    // When first loading the form, hide the subject (CW) field if it's disabled or doesn't have a starting value.
+    // "disableSubject" seems to take priority over "alwaysShowSubject"
+    const showSubject = !this.disableSubject && (statusParams.spoilerText || this.alwaysShowSubject)
+
     return {
       dropFiles: [],
       uploadingFiles: false,
@@ -215,7 +219,8 @@ const PostStatusForm = {
       emojiInputShown: false,
       idempotencyKey: '',
       activeEmojiInput: undefined,
-      activeTextInput: undefined
+      activeTextInput: undefined,
+      subjectVisible: showSubject
     }
   },
   computed: {
@@ -690,6 +695,20 @@ const PostStatusForm = {
       this.activeEmojiInput = 'subject-emoji-input'
       this.activeTextInput = 'subject-input'
     },
+    toggleSubjectVisible() {
+      // If hiding CW, then we need to clear the subject and reset focus
+      if (this.subjectVisible)
+      {
+        this.focusStatusInput()
+
+        // "nsfw" property is normally set by the @change listener, but this bypasses it.
+        // We need to clear it manually instead.
+        this.newStatus.spoilerText = ''
+        this.newStatus.nsfw = false
+      }
+
+      this.subjectVisible = !this.subjectVisible
+    },
     clearError () {
       this.error = null
     },
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 601b7d0c..74663fd7 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -119,7 +119,7 @@
         </div>
         <EmojiInput
           ref="subject-emoji-input"
-          v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
+          v-if="subjectVisible"
           v-model="newStatus.spoilerText"
           enable-emoji-picker
           hide-emoji-button
@@ -281,6 +281,15 @@
           >
             <FAIcon icon="poll-h" />
           </button>
+          <button
+            v-if="!disableSubject"
+            class="spoiler-icon button-unstyled"
+            :class="{ selected: subjectVisible }"
+            :title="$t('post_status.toggle_content_warning')"
+            @click="toggleSubjectVisible"
+          >
+            <FAIcon icon="eye-slash" />
+          </button>
         </div>
         <button
           v-if="posting"
@@ -461,7 +470,7 @@
     }
   }
 
-  .media-upload-icon, .poll-icon, .emoji-icon {
+  .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
     font-size: 1.85em;
     line-height: 1.1;
     flex: 1;
@@ -504,6 +513,11 @@
 
   .poll-icon {
     order: 3;
+    justify-content: center;
+  }
+
+  .spoiler-icon {
+    order: 4;
     justify-content: right;
   }
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0160b187..a7fbb12f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -380,6 +380,7 @@
             "text/x.misskeymarkdown": "MFM"
         },
         "content_warning": "Content Warning (optional)",
+        "toggle_content_warning": "Toggle content warning",
         "default": "Just arrived at Luna Nova Academy",
         "direct_warning_to_all": "This post will be visible to all the mentioned users.",
         "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",

From ea9ad4d600a312b008287d8dabca12f758440495 Mon Sep 17 00:00:00 2001
From: Hazel Koehler <acomputerdog@gmail.com>
Date: Wed, 20 Dec 2023 12:39:31 -0500
Subject: [PATCH 22/36] fix "always show content warning" setting

---
 src/components/post_status_form/post_status_form.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3bc6dc99..703d8a63 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -138,7 +138,7 @@ const PostStatusForm = {
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
 
     let statusParams = {
       spoilerText: this.subject || '',
@@ -200,8 +200,8 @@ const PostStatusForm = {
     }
 
     // When first loading the form, hide the subject (CW) field if it's disabled or doesn't have a starting value.
-    // "disableSubject" seems to take priority over "alwaysShowSubject"
-    const showSubject = !this.disableSubject && (statusParams.spoilerText || this.alwaysShowSubject)
+    // "disableSubject" seems to take priority over "alwaysShowSubjectInput".
+    const showSubject = !this.disableSubject && (statusParams.spoilerText || alwaysShowSubjectInput)
 
     return {
       dropFiles: [],

From a57334991e886aff4c98575c4e8576ff3a4966fe Mon Sep 17 00:00:00 2001
From: leap123 <leapofazzam@protonmail.com>
Date: Fri, 19 Jan 2024 04:27:26 +0000
Subject: [PATCH 23/36] Add Indonesian translation

The Indonesian translation is technically almost complete, just not added to messages.js
---
 src/i18n/messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 4e92834c..3282fd85 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -21,6 +21,7 @@ const loaders = {
   ga: () => import('./ga.json'),
   he: () => import('./he.json'),
   hu: () => import('./hu.json'),
+  id: () => import('./id.json'),
   it: () => import('./it.json'),
   ja: () => import('./ja_pedantic.json'),
   ja_easy: () => import('./ja_easy.json'),

From a77a9e04d9579a27cdfb6ebc31b17b906bf8833e Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Wed, 17 Jan 2024 19:50:47 +0000
Subject: [PATCH 24/36] Expose new server-side permit_followback setting

Added to backend in https://akkoma.dev/AkkomaGang/akkoma/pulls/674
---
 src/components/settings_modal/tabs/profile_tab.js   |  2 ++
 src/components/settings_modal/tabs/profile_tab.vue  | 13 +++++++++++++
 src/i18n/en.json                                    |  1 +
 src/modules/serverSideConfig.js                     |  4 ++++
 .../entity_normalizer/entity_normalizer.service.js  |  1 +
 5 files changed, 21 insertions(+)

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 46cb91e5..a5794630 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -33,6 +33,7 @@ const ProfileTab = {
       newName: this.$store.state.users.currentUser.name_unescaped,
       newBio: unescape(this.$store.state.users.currentUser.description),
       newLocked: this.$store.state.users.currentUser.locked,
+      newPermitFollowback: this.$store.state.users.currentUser.permit_followback,
       newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
       showRole: this.$store.state.users.currentUser.show_role,
       role: this.$store.state.users.currentUser.role,
@@ -135,6 +136,7 @@ const ProfileTab = {
         bot: this.bot,
         show_role: this.showRole,
         status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
+        permit_followback: this.permit_followback,
         accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
         /* eslint-enable camelcase */
       }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 9f80582f..f3cabd37 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -259,6 +259,19 @@
           <BooleanSetting path="serverSide_locked">
             {{ $t('settings.lock_account_description') }}
           </BooleanSetting>
+          <ul
+            class="setting-list suboptions"
+            :class="[{disabled: !serverSide_locked}]"
+          >
+            <li>
+              <BooleanSetting
+                path="serverSide_permitFollowback"
+                :disabled="!serverSide_locked"
+              >
+                {{ $t('settings.permit_followback_description') }}
+              </BooleanSetting>
+            </li>
+          </ul>
         </li>
         <li>
           <BooleanSetting path="serverSide_discoverable">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index a7fbb12f..aaac5f8e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -601,6 +601,7 @@
         "list_aliases_error": "Error fetching aliases: {error}",
         "list_backups_error": "Error fetching backup list: {error}",
         "lock_account_description": "Restrict your account to approved followers only",
+        "permit_followback_description": "Automatically approve requests from already followed users",
         "loop_video": "Loop videos",
         "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
         "mascot": "Mastodon FE Mascot",
diff --git a/src/modules/serverSideConfig.js b/src/modules/serverSideConfig.js
index e7a6c95c..0764073d 100644
--- a/src/modules/serverSideConfig.js
+++ b/src/modules/serverSideConfig.js
@@ -47,6 +47,10 @@ export const settingsMap = {
   },
   // Privacy
   'locked': 'locked',
+  'permitFollowback': {
+    get: 'akkoma.permit_followback',
+    set: 'permit_followback'
+  },
   'allowFollowingMove': {
     get: 'pleroma.allow_following_move',
     set: 'allow_following_move'
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 4fddd875..b7f382d8 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -95,6 +95,7 @@ export const parseUser = (data) => {
     if (data.akkoma) {
       output.instance = data.akkoma.instance
       output.status_ttl_days = data.akkoma.status_ttl_days
+      output.permit_followback = data.akkoma.permit_followback
     }
 
     if (data.pleroma) {

From 050c7df2e669620a689ab5ac26d6f9c84889d39c Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Wed, 14 Feb 2024 17:44:57 +0000
Subject: [PATCH 25/36] Display profile background of other users

And add a new frontend setting to hide other people's background.
---
 src/App.js                                         | 7 ++++++-
 src/components/settings_modal/tabs/general_tab.vue | 5 +++++
 src/components/user_profile/user_profile.js        | 7 ++++++-
 src/i18n/en.json                                   | 1 +
 src/modules/config.js                              | 1 +
 src/modules/users.js                               | 9 +++++++++
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/App.js b/src/App.js
index d4b3b41a..3e0d0d6f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -64,6 +64,11 @@ export default {
         '-' + this.layoutType
       ]
     },
+    pageBackground () {
+      return this.mergedConfig.displayPageBackgrounds
+        ? this.$store.state.users.displayBackground
+        : null
+    },
     currentUser () { return this.$store.state.users.currentUser },
     userBackground () { return this.currentUser.background_image },
     instanceBackground () {
@@ -71,7 +76,7 @@ export default {
         ? null
         : this.$store.state.instance.background
     },
-    background () { return this.userBackground || this.instanceBackground },
+    background () { return this.pageBackground || this.userBackground || this.instanceBackground },
     bgStyle () {
       if (this.background) {
         return {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 2754cde0..64950f8a 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -146,6 +146,11 @@
             {{ $t('settings.show_wider_shortcuts') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="displayPageBackgrounds">
+            {{ $t('settings.show_page_backgrounds') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 9ea8c2a7..eaadca72 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -145,10 +145,12 @@ const UserProfile = {
       if (user) {
         loadById(user.id)
         this.note = user.relationship.note
+        this.$store.dispatch('setDisplayBackground', user.background_image)
       } else {
         this.$store.dispatch('fetchUser', userNameOrId)
-          .then(({ id, relationship }) => {
+          .then(({ id, relationship, background_image }) => {
             this.note = relationship.note
+            this.$store.dispatch('setDisplayBackground', background_image)
             return loadById(id)
           })
           .catch((reason) => {
@@ -225,6 +227,9 @@ const UserProfile = {
     Conversation,
     RichContent,
     FollowedTagList
+  },
+  beforeRouteLeave(to, from) {
+    this.$store.dispatch('setDisplayBackground', null)
   }
 }
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index a7fbb12f..7b091cd2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -750,6 +750,7 @@
         "show_nav_shortcuts": "Show extra navigation shortcuts in top panel",
         "show_panel_nav_shortcuts": "Show timeline navigation shortcuts at the top of the panel",
         "show_scrollbars": "Show side column's scrollbars",
+        "show_page_backgrounds": "Show page-specific backgrounds, e.g. for user profiles",
         "show_wider_shortcuts": "Show wider gap between top panel shortcuts",
         "show_yous": "Show (You)s",
         "stop_gifs": "Pause animated images until you hover on them",
diff --git a/src/modules/config.js b/src/modules/config.js
index 91a966bd..551b5bb6 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -55,6 +55,7 @@ export const defaultState = {
   alwaysShowNewPostButton: false,
   autohideFloatingPostButton: false,
   pauseOnUnfocused: true,
+  displayPageBackgrounds: true,
   stopGifs: undefined,
   replyVisibility: 'all',
   thirdColumnMode: 'notifications',
diff --git a/src/modules/users.js b/src/modules/users.js
index 6968ce1e..b8baf9a4 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -135,6 +135,10 @@ export const mutations = {
     const user = state.usersObject[id]
     user['deactivated'] = deactivated
   },
+  setDisplayBackground(state, url) {
+    console.log("Commiting user profile bg mutation")
+    state.displayBackground = url
+  },
   setCurrentUser (state, user) {
     state.lastLoginName = user.screen_name
     state.currentUser = mergeWith(state.currentUser || {}, user, mergeArrayLength)
@@ -307,6 +311,7 @@ export const defaultState = {
   currentUser: false,
   users: [],
   usersObject: {},
+  displayBackground: null,
   signUpPending: false,
   signUpErrors: [],
   relationships: {},
@@ -319,6 +324,10 @@ const users = {
   mutations,
   getters,
   actions: {
+    setDisplayBackground (store, url) {
+      console.log("Performing user profile bg action...")
+      store.commit('setDisplayBackground', url)
+    },
     fetchUserIfMissing (store, id) {
       if (!store.getters.findUser(id)) {
         store.dispatch('fetchUser', id)

From 665f88f5c79bd56e6dd1450e85063c708bda15ee Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:32 +0000
Subject: [PATCH 26/36] Translated using Weblate (Indonesian)

Currently translated at 71.9% (753 of 1046 strings)

Co-authored-by: Aldiantoro Nugroho <kriwil@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/id/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/id.json | 56 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/i18n/id.json b/src/i18n/id.json
index 86940ff4..ddbda711 100644
--- a/src/i18n/id.json
+++ b/src/i18n/id.json
@@ -1,7 +1,7 @@
 {
     "about": {
         "bubble_instances": "Instance Bubble Lokal",
-        "bubble_instances_description": "Instansi yang dipilih oleh admin untuk mewakili instance ini",
+        "bubble_instances_description": "Instansi yang dipilih oleh admin untuk mewakili daerah lokal instansi ini",
         "mrf": {
             "federation": "Federasi",
             "keyword": {
@@ -456,8 +456,10 @@
     "settings": {
         "accent": "Aksen",
         "account_alias": "Akun alias",
+        "account_alias_table_head": "Alias",
         "account_backup": "Pencadangan akun",
         "account_backup_description": "Ini memungkinkan kamu untuk mengunduh arsip yang berisi informasi tentang akun dan postingan kamu, namun belum bisa diimpor ke akun Pleroma.",
+        "account_backup_table_head": "Cadangan",
         "account_privacy": "Privasi",
         "add_alias_error": "Gagal menambahkan alias: {error}",
         "add_backup": "Buat cadangan baru",
@@ -555,7 +557,8 @@
         "follow_export_button": "Export yang kamu ikuti ke dalam file csv",
         "follow_import": "Import pengikut",
         "follow_import_error": "Terjadi kesalahan ketika mengimpor pengikut",
-        "follows_imported": "Pengguna yang diikuti telak diimpor! Proses mungkin membutuhkan beberapa saat.",
+        "follows_imported": "Daftar mengikuti telah diimpor! Proses mungkin membutuhkan beberapa saat.",
+        "foreground": "Latar depan",
         "fun": "Seru",
         "general": "Umum",
         "greentext": "Panah meme",
@@ -563,17 +566,30 @@
         "hide_attachments_in_convo": "Sembunyikan lampiran pada percakapan",
         "hide_attachments_in_tl": "Sembunyikan lampiran di linimasa",
         "hide_bot_indication": "Sembunyikan tanda bot pada postingan",
+        "hide_favorites_description": "Jangan tunjukkan daftar kesukaan saya (orang masih mendapatkan notifikasi)",
         "hide_filtered_statuses": "Sembunyikan semua postingan yang tersaring",
         "hide_followers_count_description": "Jangan tampilkan jumlah pengikut",
         "hide_followers_description": "Jangan tampilkan siapa yang mengikutiku",
         "hide_follows_count_description": "Jangan tampilkan jumlah mengikuti",
         "hide_follows_description": "Jangan tampilkan siapa yang aku ikuti",
+        "hide_isp": "Sembunyikan panel spesifik instansi",
+        "hide_list_aliases_error_action": "Tutup",
+        "hide_media_previews": "Sembunyikan pratinjau media",
         "hide_muted_posts": "Sembunyikan postingan-postingan dari pengguna yang dibisukan",
+        "hide_muted_threads": "Sembunyikan thread yang dibisukan",
         "hide_post_stats": "Sembunyikan statistik postingan (seperti jumlah favorit)",
         "hide_shoutbox": "Sembunyikan kotak suara instansi",
+        "hide_site_favicon": "Sembunyikan favicon instansi di panel atas",
+        "hide_site_name": "Sembunyikan nama instansi di panel atas",
+        "hide_threads_with_blocked_users": "Sembunyikan thread yang menyebut orang yang diblok",
         "hide_user_stats": "Sembunyikan statistik pengguna (seperti jumlah pengikut)",
         "hide_wallpaper": "Sembunyikan latar belakang instansi",
+        "hide_wordfiltered_statuses": "Sembunyikan post yang disaring dengan kata",
         "import_blocks_from_a_csv_file": "Impor blokiran dari berkas csv",
+        "import_followers_from_a_csv_file": "Impor daftar mengikuti dari berkas csv",
+        "import_mutes_from_a_csv_file": "Impor daftar pembisuan dari berkas csv",
+        "import_theme": "Muat preset",
+        "inputRadius": "Bidang masukan",
         "instance_default": "(bawaan: {value})",
         "instance_default_simple": "(bawaan)",
         "interface": "Antarmuka",
@@ -581,16 +597,23 @@
         "invalid_theme_imported": "Berkas yang dipilih bukan sebuah tema yang didukung Pleroma. Tidak ada perubahan yang dibuat pada tema kamu.",
         "limited_availability": "Tidak tersedia di browser kamu",
         "links": "Tautan",
+        "list_aliases_error": "Gagal mengambil alias: {error}",
+        "list_backups_error": "Gagal mengambil daftar cadangan: {error}",
         "lock_account_description": "Batasi akunmu kepada pengikut yang sudah disetujui saja",
         "loop_video": "Ulang-ulang video",
         "loop_video_silent_only": "Ulang-ulang video tanpa suara (seperti \"gif\" Mastodon)",
+        "mascot": "Maskot Mastodon FE",
+        "max_depth_in_thread": "Tingat thread maksimum yang ditampilkan oleh bawaan",
         "max_thumbnails": "Jumlah thumbnail maksimum per postingan (kosong = tidak terbatas)",
         "mention_link_bolden_you": "Sorot sebutan kamu apabila kamu disebut",
         "mention_link_display": "Tampilkan tautan sebutan",
         "mention_link_display_full": "selalu sebagai nama lengkap (cth. {'@'}foo{'@'}example.org)",
         "mention_link_display_full_for_remote": "sebagai nama lengkap hanya untuk pengguna di instansi lain (cth. {'@'}foo{'@'}example.org)",
         "mention_link_display_short": "selalu sebagai nama pendek (cth. {'@'}foo)",
+        "mention_link_fade_domain": "Pudarkan domain (contoh: {'@'}example.org di {'@'}foo{'@'}example.org)",
         "mention_link_show_avatar": "Tampilkan avatar pengguna di samping tautan",
+        "mention_link_show_tooltip": "Tunjukkan nama penuh pengguna sebagai tooltip untuk pengguna jauh",
+        "mention_links": "Tautan sebutan",
         "mfa": {
             "authentication_methods": "Metode otentikasi",
             "confirm_and_enable": "Konfirmasi & aktifkan OTP",
@@ -599,6 +622,8 @@
             "recovery_codes": "Kode pemulihan.",
             "recovery_codes_warning": "Tulis kodenya atau simpan mereka di tempat yang aman - jika tidak kamu tidak akan melihat mereka lagi. Jika kamu tidak dapat mengakses aplikasi 2FA kamu dan kode pemulihanmu hilang, kamu tidak akan bisa mengakses akun kamu.",
             "scan": {
+                "desc": "Menggunakan aplikasi dua-faktor kamu, pindai kode QR ini atau masukkan kunci teks:",
+                "secret_code": "Kunci",
                 "title": "Pindai"
             },
             "setup_otp": "Siapkan OTP",
@@ -606,10 +631,19 @@
             "verify": {
                 "desc": "Untuk mengaktifkan otentikasi dua-faktor, masukkan kode dari aplikasi dua-faktor kamu:"
             },
+            "wait_pre_setup_otp": "Pengaturan awal OTP",
             "waiting_a_recovery_codes": "Menerima kode cadangan…",
             "warning_of_generate_new_codes": "Ketika kamu menghasilkan kode pemulihan baru, kode lama kamu berhenti bekerja."
         },
+        "minimal_scopes_mode": "Minimalkan pilihan seleksi lingkup posting",
         "more_settings": "Lebih banyak pengaturan",
+        "move_account": "Pindahkan akun",
+        "move_account_error": "Gagal memindahkan akun: {error}",
+        "move_account_notes": "Jika kamu ingin memindahkan akun ini ke tempat lain, kamu harus pergi ke akun tujuan kamu dan menambahkan alias yang mengarah ke sini.",
+        "move_account_target": "Akun tujuan (contoh {example})",
+        "moved_account": "Akun telah dipindahkan.",
+        "mute_bot_posts": "Bisukan posting dari bot",
+        "mute_export": "Expor pembisuan",
         "mutes_and_blocks": "Bisuan dan Blokiran",
         "name": "Nama",
         "name_bio": "Nama & bio",
@@ -699,7 +733,7 @@
                 "fine_print": "Baca {0} kami untuk belajar sesuatu yang tak ada gunanya!",
                 "header": "Pratinjau",
                 "header_faint": "Ini baik-baik saja",
-                "input": "Baru saja mendarat di L.A.",
+                "input": "Baru saja mendarat di Luna Nova Academy",
                 "link": "sebuah tautan yang kecil nan bagus"
             },
             "shadows": {
@@ -720,15 +754,15 @@
                 "use_source": "Versi baru"
             }
         },
-        "subject_line_behavior": "Salin subyek ketika membalas",
-        "subject_line_email": "Seperti surel: \"re: subyek\"",
+        "subject_line_behavior": "Salin peringatan isi ketika membalas",
+        "subject_line_email": "Seperti surel: \"re: peringatan\"",
         "subject_line_mastodon": "Seperti mastodon: salin saja",
         "subject_line_noop": "Jangan salin",
         "text": "Teks",
         "theme": "Tema",
         "token": "Token",
         "upload_a_photo": "Unggah foto",
-        "useStreamingApiWarning": "(Tidak disarankan, eksperimental, diketahui dapat melewati postingan-postingan)",
+        "useStreamingApiWarning": "Ini bagus, gunakan. Kalau tidak jalan, mungkin segarkan halaman?",
         "use_one_click_nsfw": "Buka lampiran NSFW hanya dengan satu klik",
         "user_settings": "Pengaturan Pengguna",
         "valid_until": "Valid hingga",
@@ -744,7 +778,7 @@
         "word_filter": "Penyaring kata"
     },
     "status": {
-        "delete": "Hapus status",
+        "delete": "Hapus post",
         "delete_confirm": "Apakah kamu benar-benar ingin menghapus postingan ini?",
         "favorites": "Favorit",
         "hide_content": "",
@@ -757,7 +791,7 @@
         "reply_to": "Balas ke",
         "show_content": "",
         "status_deleted": "Postingan ini telah dihapus",
-        "status_unavailable": "Status tidak tersedia",
+        "status_unavailable": "Post tidak tersedia",
         "thread_muted_and_words": ", memiliki kata:",
         "unmute_conversation": "Berhenti membisikan percakapan",
         "unpin": "Berhenti menyematkan dari profil"
@@ -787,9 +821,9 @@
     "timeline": {
         "conversation": "Percakapan",
         "error": "Terjadi kesalahan memuat linimasa: {0}",
-        "no_more_statuses": "Tidak ada status lagi",
+        "no_more_statuses": "Tidak ada post lagi",
         "no_retweet_hint": "Postingan ditandai sebagai hanya-pengikut atau langsung dan tidak dapat diulang atau dikutip",
-        "no_statuses": "Tidak ada status",
+        "no_statuses": "Tidak ada post",
         "reload": "Muat ulang",
         "repeated": "diulangi"
     },
@@ -853,7 +887,7 @@
         "per_day": "per hari",
         "report": "Laporkan",
         "show_repeats": "Tampilkan ulangan",
-        "statuses": "Status",
+        "statuses": "Postingan",
         "unblock": "Berhenti memblokir",
         "unmute": "Berhenti membisukan"
     },

From 5bb53c8b0dd37e1b0048ba150d55fe840aa7f3ec Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:32 +0000
Subject: [PATCH 27/36] Translated using Weblate (Spanish)

Currently translated at 93.9% (983 of 1046 strings)

Translated using Weblate (Spanish)

Currently translated at 92.5% (967 of 1045 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: taretka <info@tarteka.net>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/es.json | 53 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index dd910232..0fe74704 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -84,6 +84,7 @@
         "keep_open": "Mantener el selector abierto",
         "load_all": "Cargando todos los {emojiAmount} emoji",
         "load_all_hint": "Cargado el primer emoji {saneAmount}, cargar todos los emoji puede causar problemas de rendimiento.",
+        "recent": "Recientemente usado",
         "search_emoji": "Buscar un emoji",
         "stickers": "Pegatinas",
         "unicode": "Emojis unicode"
@@ -915,13 +916,20 @@
         "token": "Token",
         "tooltipRadius": "Información/alertas",
         "translation_language": "Idioma de traducción automática",
+        "tree_advanced": "Mostrar botones extras para abrir y cerrar la cadena de réplicas en los hilos",
         "type_domains_to_mute": "Buscar dominios para silenciar",
         "upload_a_photo": "Subir una foto",
         "useStreamingApi": "Recibir publicaciones y notificaciones en tiempo real",
         "useStreamingApiWarning": "(no recomendado, experimental, puede omitir publicaciones)",
+        "use_blurhash": "Usar miniaturas borrosas para las imágenes sensibles",
         "use_contain_fit": "No recortar los adjuntos en miniaturas",
         "use_one_click_nsfw": "Abrir los adjuntos NSFW con un solo click",
+        "user_accepts_direct_messages_from": "Aceptar mensajes directos de",
+        "user_accepts_direct_messages_from_everybody": "Todos",
+        "user_accepts_direct_messages_from_nobody": "Nadie",
+        "user_accepts_direct_messages_from_people_i_follow": "Personas que sigo",
         "user_mutes": "Usuarios",
+        "user_profiles": "Perfiles de usuario",
         "user_settings": "Ajustes del Usuario",
         "valid_until": "Válido hasta",
         "values": {
@@ -934,26 +942,61 @@
             "title": "Versión"
         },
         "virtual_scrolling": "Optimizar la representación de la linea temporal",
-        "word_filter": "Filtro de palabras"
+        "word_filter": "Filtro de palabras",
+        "wordfilter": "Filtro de palabras"
+    },
+    "settings_profile": {
+        "creating": "Creando un nuevo perfil de configuración \"{profile}\"...",
+        "synchronization_error": "No se pudo sincronizar la configuración: {err}",
+        "synchronized": "¡Ajustes sincronizados!",
+        "synchronizing": "Sincronizando los ajustes de perfil \"{profile}\"..."
     },
     "status": {
+        "ancestor_follow": "Vea {numReplies} respuesta en esta publicación | Ver otras {numReplies} respuestas en esta publicación",
+        "ancestor_follow_with_icon": "{icon} {text}",
+        "attachment_stop_flash": "Parar el reproductor Flash",
         "bookmark": "Marcar",
-        "copy_link": "Copiar el enlace al estado",
-        "delete": "Eliminar publicación",
-        "delete_confirm": "¿Realmente quieres borrar la publicación?",
+        "collapse_attachments": "Minimizar adjuntos",
+        "copy_link": "Copiar el enlace al mensaje",
+        "delete": "Eliminar mensaje",
+        "delete_confirm": "¿Realmente quieres borrar el mensaje?",
+        "delete_confirm_accept_button": "Sí, elimínelo",
+        "delete_confirm_cancel_button": "No, mantenerlo",
+        "delete_confirm_title": "Confirmar la eliminación",
+        "edit": "Editar",
+        "edit_history": "Editar el historial",
+        "edit_history_modal_title": "Editado {historyCount} vez | Editado {historyCount} veces",
+        "edited_at": "Editado {time}",
         "expand": "Expandir",
         "external_source": "Fuente externa",
         "favorites": "Favoritos",
+        "hide_attachment": "Ocultar adjuntos",
         "hide_content": "Ocultar el contenido",
-        "hide_full_subject": "Ocultar el tema completo",
+        "hide_full_subject": "Ocultar la advertencia de contenido",
+        "many_attachments": "El mensaje tiene {number} adjunto | El mensaje tiene {number} adjuntos",
         "mentions": "Menciones",
+        "move_down": "Desplazar adjunto a la derecha",
+        "move_up": "Desplazar adjunto a la izquierda",
         "mute_conversation": "Silenciar la conversación",
         "nsfw": "NSFW (No apropiado para el trabajo)",
+        "open_gallery": "Abrir la galería",
+        "override_translation_source_language": "Anular el idioma de origen",
         "pin": "Fijar en tu perfil",
         "pinned": "Fijado",
         "plus_more": "+{number} más",
+        "redraft": "Eliminar y volver a redactar",
+        "redraft_confirm": "¿Realmente deseas eliminar y volver a redactar esta publicación? Las interacciones con la publicación original no se conservarán.",
+        "redraft_confirm_accept_button": "Sí, eliminar y volver a redactar",
+        "redraft_confirm_cancel_button": "No, conserva el original",
+        "redraft_confirm_title": "Confirmar eliminación y volver a redactar",
+        "remove_attachment": "Quitar archivo adjunto",
+        "repeat_confirm": "¿De verdad quieres repetir esta entrada?",
+        "repeat_confirm_accept_button": "Si, repítela",
+        "repeat_confirm_cancel_button": "No, no repitas",
+        "repeat_confirm_title": "Confirmar repetir",
         "repeats": "Repetidos",
         "replies_list": "Respuestas:",
+        "replies_list_with_others": "Ver {numReplies} respuesta | Ver {numReplies} respuestas más",
         "reply_to": "Respondiendo a",
         "show_content": "Mostrar el contenido",
         "show_full_subject": "Mostrar el tema completo",

From db5c9572dc9d09de38b93a70eee23b05e813aeda Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:32 +0000
Subject: [PATCH 28/36] Translated using Weblate (Italian)

Currently translated at 80.4% (841 of 1045 strings)

Translated using Weblate (Italian)

Currently translated at 65.3% (683 of 1045 strings)

Co-authored-by: Cuche <cuche@mailbox.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/it/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/it.json | 192 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 185 insertions(+), 7 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 3c1ec603..46e9fcea 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -1,5 +1,7 @@
 {
     "about": {
+        "bubble_instances": "Istanze della Bolla Locale",
+        "bubble_instances_description": "Istanze selezionate dagli amministratori per rappresentare l'area d'interesse dell'istanza",
         "mrf": {
             "federation": "Federazione",
             "keyword": {
@@ -16,12 +18,15 @@
                 "accept_desc": "Questa stanza accetta messaggi solo dalle seguenti altre:",
                 "ftl_removal": "Rimozione dalla sequenza federale",
                 "ftl_removal_desc": "Questa stanza rimuove le seguenti dalla sequenza federale:",
+                "instance": "Istanza",
                 "media_nsfw": "Allegati oscurati d'ufficio",
                 "media_nsfw_desc": "Questa stanza oscura gli allegati dei messaggi provenienti da queste stanze:",
                 "media_removal": "Rimozione multimedia",
                 "media_removal_desc": "Questa istanza rimuove gli allegati dalle seguenti stanze:",
+                "not_applicable": "N/D",
                 "quarantine": "Quarantena",
-                "quarantine_desc": "Questa stanza inoltrerà solo messaggi pubblici alle seguenti:",
+                "quarantine_desc": "Questa istanza non invierà post alle seguenti istanze:",
+                "reason": "Motivazione",
                 "reject": "Rifiuta",
                 "reject_desc": "Questa stanza rifiuterà i messaggi provenienti dalle seguenti:",
                 "simple_policies": "Regole specifiche alla stanza"
@@ -29,6 +34,27 @@
         },
         "staff": "Responsabili"
     },
+    "announcements": {
+        "all_day_prompt": "Evento lungo tutto il giorno",
+        "cancel_edit_action": "Annulla",
+        "close_error": "Chiudi",
+        "delete_action": "Elimina",
+        "edit_action": "Modifica",
+        "end_time_display": "Finisce alle {time}",
+        "end_time_prompt": "Ora di fine: ",
+        "inactive_message": "Questo annuncio è inattivo",
+        "mark_as_read_action": "Segna come già letto",
+        "page_header": "Annunci",
+        "post_action": "Post",
+        "post_error": "Errore: {error}",
+        "post_form_header": "Posta annuncio",
+        "post_placeholder": "Contenuto dell'annuncio",
+        "published_time_display": "Pubblicato alle {time}",
+        "start_time_display": "Inizia alle {time}",
+        "start_time_prompt": "Ora di inizio: ",
+        "submit_edit_action": "Invia",
+        "title": "Annuncio"
+    },
     "chats": {
         "chats": "Conversazioni",
         "delete": "Elimina",
@@ -58,6 +84,7 @@
         "keep_open": "Tieni aperto il menù",
         "load_all": "Carico tutti i {emojiAmount} emoji",
         "load_all_hint": "Primi {saneAmount} emoji caricati, caricarli tutti potrebbe causare rallentamenti.",
+        "recent": "Usato di recente",
         "search_emoji": "Cerca un emoji",
         "stickers": "Adesivi",
         "unicode": "Emoji Unicode"
@@ -109,6 +136,13 @@
             "admin": "Amministratore",
             "moderator": "Moderatore"
         },
+        "scope_in_timeline": {
+            "direct": "Diretto",
+            "local": "Locale - Solo la tua istanza può vedere questo post",
+            "private": "Solo per i seguaci",
+            "public": "Pubblico",
+            "unlisted": "Non elencato"
+        },
         "show_less": "Ripiega",
         "show_more": "Mostra tutto",
         "submit": "Invia",
@@ -131,6 +165,84 @@
         "load_older": "Carica interazioni precedenti",
         "moves": "Utenti migrati"
     },
+    "languages": {
+        "ar": "Arabo",
+        "az": "Azero",
+        "bg": "Bulgaro",
+        "cs": "Ceco",
+        "da": "Danese",
+        "de": "Tedesco",
+        "el": "Greco",
+        "en": "Inglese",
+        "eo": "Esperanto",
+        "es": "Spagnolo",
+        "fa": "Persiano",
+        "fi": "Finlandese",
+        "fr": "Francese",
+        "ga": "Irlandese",
+        "he": "Ebreo",
+        "hi": "Hindi",
+        "hu": "Ungherese",
+        "id": "Indonesiano",
+        "it": "Italiano",
+        "ja": "Giapponese",
+        "ko": "Coreano",
+        "lt": "Lituano",
+        "lv": "Lettone",
+        "nl": "Olandese",
+        "pl": "Polacco",
+        "pt": "Portoghese",
+        "ru": "Russo",
+        "sk": "Slovacco",
+        "sv": "Svedese",
+        "tr": "Turco",
+        "translated_from": {
+            "ar": "Tradotto dall' @:languages.ar",
+            "az": "Tradotto dall' @:languages.az",
+            "bg": "Tradotto dal @:languages.bg",
+            "cs": "Tradotto dal @:languages.cs",
+            "da": "Tradotto dal @:languages.da",
+            "de": "Tradotto dal @:languages.de",
+            "el": "Tradotto dal @:languages.el",
+            "en": "Tradotto dall' @:languages.en",
+            "eo": "Tradotto dal @:languages.eo",
+            "es": "Tradotto dallo @:languages.es",
+            "fa": "Tradotto dal @:languages.fa",
+            "fi": "Tradotto dal @:languages.fi",
+            "fr": "Tradotto dal @:languages.fr",
+            "ga": "Tradotto dal @:languages.ga",
+            "he": "Tradotto dal @:languages.he",
+            "hi": "Tradotto dal @:languages.hi",
+            "hu": "Tradotto dal @:languages.hu",
+            "id": "Tradotto dal @:languages.id",
+            "it": "Tradotto dall' @:languages.it",
+            "ja": "Tradotto dal @:languages.ja",
+            "ko": "Tradotto dal @:languages.ko",
+            "lt": "Tradotto dal @:languages.lt",
+            "lv": "Tradotto dal @:languages.lv",
+            "nl": "Tradotto dall' @:languages.nl",
+            "pl": "Tradotto dal @:languages.pl",
+            "pt": "Tradotto dal @:languages.pt",
+            "ru": "Tradotto dal @:languages.ru",
+            "sk": "Tradotto dal @:languages.sk",
+            "sv": "Tradotto dal @:languages.sv",
+            "tr": "Tradotto dal @:languages.tr",
+            "uk": "Tradotto dal @:languages.uk",
+            "zh": "Tradotto dal @:languages.zh"
+        },
+        "uk": "Ucraino",
+        "zh": "Cinese"
+    },
+    "lists": {
+        "create": "Crea",
+        "delete": "Elimina lista",
+        "following_only": "Limita a chi segui",
+        "lists": "Liste",
+        "new": "Nuova Lista",
+        "save": "Salva cambiamenti",
+        "search": "Cerca utenti",
+        "title": "Titolo della lista"
+    },
     "login": {
         "authentication_code": "Codice di autenticazione",
         "description": "Accedi con OAuth",
@@ -143,6 +255,10 @@
         "hint": "Accedi per conversare",
         "login": "Accedi",
         "logout": "Disconnettiti",
+        "logout_confirm": "Sicuro di disconnetterti?",
+        "logout_confirm_accept_button": "Disconnetti",
+        "logout_confirm_cancel_button": "Annulla",
+        "logout_confirm_title": "Disconnetti",
         "password": "Password",
         "placeholder": "es. Lupo Lucio",
         "recovery_code": "Codice di recupero",
@@ -150,31 +266,67 @@
         "username": "Nome utente"
     },
     "media_modal": {
+        "counter": "{current} / {total}",
+        "hide": "Chiudi visualizzatore multimediale",
         "next": "Prossimo",
         "previous": "Precedente"
     },
+    "moderation": {
+        "moderation": "Moderazione",
+        "reports": {
+            "add_note": "Aggiungi nota",
+            "close": "Chiudi",
+            "delete_note": "Elimina",
+            "delete_note_accept": "Si, eliminalo",
+            "delete_note_cancel": "No, lascialo stare",
+            "delete_note_confirm": "Sei sicurə di voler eliminare questa nota?",
+            "delete_note_title": "Conferma eliminazione",
+            "no_content": "Nessuna descrizione",
+            "no_reports": "Nessun report da mostrare",
+            "note_placeholder": "Lascia una nota",
+            "notes": "{ count } nota | { count } note",
+            "reopen": "Riapri",
+            "report": "Riporta su",
+            "reports": "Rapporti",
+            "resolve": "Risolvi",
+            "show_closed": "Mostra chiusi",
+            "statuses": "{ count } post| { count } post",
+            "tag_policy_notice": "Abilita il TagPolicy MRF per poter impostare restrizioni sui post",
+            "tags": "Imposta restrizioni sui post"
+        },
+        "statuses": "Post",
+        "users": "Utenti"
+    },
     "nav": {
         "about": "Informazioni",
         "administration": "Amministrazione",
+        "announcements": "Annunci",
         "back": "Indietro",
         "bookmarks": "Segnalibri",
+        "bubble_timeline": "Timeline della Bolla Locale",
+        "bubble_timeline_description": "Post da istanze vicine alla tua e raccomandate dagli amministratori",
         "chats": "Conversazioni",
         "dms": "Messaggi privati",
         "friend_requests": "Vogliono seguirti",
         "home_timeline": "Sequenza personale",
+        "home_timeline_description": "Post dalle persone che segui",
         "interactions": "Interazioni",
+        "lists": "Liste",
         "mentions": "Menzioni",
+        "moderation": "Moderazione",
         "preferences": "Preferenze",
+        "public_timeline_description": "Post pubblici da questa istanza",
         "public_tl": "Sequenza pubblica",
         "search": "Ricerca",
         "timeline": "Sequenza personale",
         "timelines": "Sequenze",
         "twkn": "Sequenza federale",
+        "twkn_timeline_description": "Post da tutta la rete",
         "user_search": "Ricerca utenti",
         "who_to_follow": "Chi seguire"
     },
     "notifications": {
-        "broken_favorite": "Stato sconosciuto, lo sto cercando…",
+        "broken_favorite": "Post sconosciuto, lo sto cercando…",
         "error": "Errore nel caricare le notifiche: {0}",
         "favorited_you": "ha gradito",
         "follow_request": "vuole seguirti",
@@ -183,9 +335,10 @@
         "migrated_to": "è migrato verso",
         "no_more_notifications": "Fine delle notifiche",
         "notifications": "Notifiche",
+        "poll_ended": "sondaggio terminato",
         "reacted_with": "ha reagito con {0}",
         "read": "Letto!",
-        "repeated_you": "ha condiviso il tuo messaggio"
+        "repeated_you": "ha condiviso il tuo post"
     },
     "password_reset": {
         "check_email": "Controlla la tua posta elettronica.",
@@ -223,15 +376,20 @@
             "text/bbcode": "BBCode",
             "text/html": "HTML",
             "text/markdown": "Markdown",
-            "text/plain": "Testo normale"
+            "text/plain": "Testo normale",
+            "text/x.misskeymarkdown": "MFM"
         },
-        "content_warning": "Oggetto (facoltativo)",
+        "content_warning": "Contenuto Sensibile (facoltativo)",
         "default": "Sono appena atterrato a Città Laggiù.",
         "direct_warning_to_all": "Questo messaggio sarà visibile a tutti i menzionati.",
         "direct_warning_to_first_only": "Questo messaggio sarà visibile solo agli utenti menzionati in testa.",
+        "edit_remote_warning": "Le modifiche fatte al messaggio potrebbero non essere visibili su alcune istanze!",
+        "edit_status": "Modifica Stato",
+        "edit_unsupported_warning": "Sondaggi e menzioni non verranno cambiati in fase di modifica.",
         "empty_status_error": "Aggiungi del testo o degli allegati",
         "media_description": "Descrizione allegati",
         "media_description_error": "Allegati non caricati, riprova",
+        "media_not_sensitive_warning": "C'è un Contenuto Sensibile, ma gli allegati non sono contrassegnati come sensibili!",
         "new_status": "Nuovo messaggio",
         "post": "Pubblica",
         "posting": "Sto pubblicando",
@@ -239,21 +397,26 @@
         "preview_empty": "Vuoto",
         "scope": {
             "direct": "Diretto - Visibile solo agli utenti menzionati",
+            "local": "Locale - non federare questo messaggio",
             "private": "Solo per seguaci - Visibile solo dai tuoi seguaci",
             "public": "Pubblico - Visibile sulla sequenza pubblica",
             "unlisted": "Nascosto - Non visibile sulla sequenza pubblica"
         },
         "scope_notice": {
+            "local": "Questo messaggio non sarà visibile sulle altre istanze",
             "private": "Questo messaggio sarà visibile solo ai tuoi seguaci",
             "public": "Questo messaggio sarà visibile a tutti",
             "unlisted": "Questo messaggio non sarà visibile sulla sequenza locale né su quella pubblica"
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Il tuo account è stato registrato e un'email è stata inviata al tuo indirizzo. Controllala per completare la registrazione.",
+        "awaiting_email_confirmation_title": "Attendo la conferma dell'email",
         "bio": "Introduzione",
         "bio_placeholder": "es.\nCiao, sono Lupo Lucio.\nSono un lupo fantastico che vive nel Fantabosco. Forse mi hai visto alla Melevisione.",
         "captcha": "CAPTCHA",
         "email": "Email",
+        "email_language": "In quale lingua vuoi ricevere email dal server?",
         "fullname": "Nome visualizzato",
         "fullname_placeholder": "es. Lupo Lucio",
         "new_captcha": "Clicca il captcha per averne uno nuovo",
@@ -262,6 +425,8 @@
         "reason_placeholder": "L'amministratore esamina ciascuna richiesta.\nFornisci il motivo della tua iscrizione.",
         "register": "Registrati",
         "registration": "Registrazione",
+        "request_sent": "La richiesta di registrazione è stata inoltrata ad un amministratore. Riceverai un'email non appena il tuo account verrà approvato.",
+        "request_sent_title": "Richiesta di registrazione inviata",
         "token": "Codice d'invito",
         "username_placeholder": "es. mister_wolf",
         "validations": {
@@ -290,6 +455,17 @@
     },
     "settings": {
         "accent": "Accento",
+        "account_alias": "Alias dell'account",
+        "account_alias_table_head": "Alias",
+        "account_backup": "Backup dell'account",
+        "account_backup_description": "Puoi scaricare un archivio con le tue informazioni ed i tuoi messaggi, ma non possono essere importati in un account Akkoma.",
+        "account_backup_table_head": "Backup",
+        "account_privacy": "Privacy",
+        "add_alias_error": "Errore durante l'aggiunta dell'alias: {error}",
+        "add_backup": "Crea un nuovo backup",
+        "add_backup_error": "Errore durante l'aggiunta di un nuovo backup: {error}",
+        "added_alias": "Alias aggiunto.",
+        "added_backup": "Nuovo backup aggiunto.",
         "allow_following_move": "Consenti l'iscrizione automatica ai profili traslocati",
         "always_show_post_button": "Non nascondere il pulsante di composizione",
         "app_name": "Nome applicazione",
@@ -301,6 +477,7 @@
         "avatarRadius": "Icone utente",
         "avatar_size_instruction": "La taglia minima per l'icona personale è 150x150 pixel.",
         "background": "Sfondo",
+        "backup_not_ready": "Questo backup non è ancora pronto.",
         "bio": "Introduzione",
         "block_export": "Esporta blocchi",
         "block_export_button": "Esporta i tuoi blocchi in un file CSV",
@@ -322,7 +499,8 @@
         "changed_password": "Password cambiata correttamente!",
         "chatMessageRadius": "Messaggi istantanei",
         "checkboxRadius": "Caselle di selezione",
-        "collapse_subject": "Ripiega messaggi con oggetto",
+        "collapse_subject": "Ripiega messaggi con Contenuto Sensibile",
+        "columns": "Colonne",
         "composing": "Composizione",
         "confirm_new_password": "Conferma la nuova password",
         "current_avatar": "La tua icona attuale",
@@ -848,4 +1026,4 @@
         "more": "Altro",
         "who_to_follow": "Chi seguire"
     }
-}
\ No newline at end of file
+}

From 1489d92997854c44c3dad65699faf100e340b3a5 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:32 +0000
Subject: [PATCH 29/36] Translated using Weblate (Japanese (ja_EASY))

Currently translated at 72.3% (757 of 1046 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: kazari <6c577a54-aac9-482a-955e-745c858445e3@simplelogin.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_EASY/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_easy.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index 8dcb6514..a3d92508 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -523,7 +523,7 @@
         "delete_account_description": "あなたのアカウントとメッセージが、きえます。",
         "delete_account_error": "アカウントをけすことが、できなかったかもしれません。インスタンスのアドミニストレーターに、おといあわせください。",
         "delete_account_instructions": "ほんとうにアカウントをけしてもいいなら、パスワードをかいてください。",
-        "disable_sticky_headers": "カラムヘッダーを、がめんのいちばんうえにくっつけない",
+        "disable_sticky_headers": "カラムヘッダーをがめんのいちばんうえにくっつけない",
         "discoverable": "けんさくなどのサービスで、このアカウントをみつけてもよい",
         "domain_mutes": "ドメイン",
         "download_backup": "ダウンロード",

From 83db80f88c0fdcf3848b511940ebcfcfd5ec8078 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:32 +0000
Subject: [PATCH 30/36] Translated using Weblate (Polish)

Currently translated at 100.0% (1046 of 1046 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (1046 of 1046 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: subtype <subtype@hollow.capital>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/pl/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/pl.json | 459 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 403 insertions(+), 56 deletions(-)

diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 3727875a..15526d2d 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -14,16 +14,16 @@
             "mrf_policies": "Włączone zasady MRF",
             "mrf_policies_desc": "Zasady MRF zmieniają zachowanie federowania instancji. Następujące zasady są włączone:",
             "simple": {
-                "accept": "Akceptowanie",
+                "accept": "Akceptowane",
                 "accept_desc": "Ta instancja akceptuje tylko posty z wymienionych instancji:",
                 "ftl_removal": "Usunięcie z „Całej znanej sieci”",
                 "ftl_removal_desc": "Ta instancja usuwa wymienionych instancje z „Całej znanej sieci”:",
-                "instance": "Instacja",
+                "instance": "Instancja",
                 "media_nsfw": "Multimedia ustawione jako wrażliwe",
                 "media_nsfw_desc": "Ta instancja wymusza, by multimedia z wymienionych instancji były ustawione jako wrażliwe:",
                 "media_removal": "Usuwanie multimediów",
                 "media_removal_desc": "Ta instancja usuwa multimedia z postów od wymienionych instancji:",
-                "not_applicable": "N/A",
+                "not_applicable": "nie dotyczy",
                 "quarantine": "Kwarantanna",
                 "quarantine_desc": "Ta instancja nie wysyła postów do wymienionych instancji:",
                 "reason": "Powód",
@@ -40,7 +40,7 @@
         "close_error": "Zamknij",
         "delete_action": "Usuń",
         "edit_action": "Edytuj",
-        "end_time_display": "Kończy się o: {time}",
+        "end_time_display": "Kończy się o {time}",
         "end_time_prompt": "Koniec: ",
         "inactive_message": "To ogłoszenie jest nieaktywne",
         "mark_as_read_action": "Oznacz jako przeczytane",
@@ -50,7 +50,7 @@
         "post_form_header": "Wyślij ogłoszenie",
         "post_placeholder": "Zawartość ogłoszenia",
         "published_time_display": "Opublikowano o {time}",
-        "start_time_display": "Zaczyna się o: {time}",
+        "start_time_display": "Zaczyna się o {time}",
         "start_time_prompt": "Początek: ",
         "submit_edit_action": "Wyślij",
         "title": "Ogłoszenie"
@@ -58,7 +58,7 @@
     "chats": {
         "chats": "Czaty",
         "delete": "Usuń",
-        "delete_confirm": "Czy na pewno chcesz usunąć tą wiadomość?",
+        "delete_confirm": "Czy na pewno chcesz usunąć tę wiadomość?",
         "empty_chat_list_placeholder": "Nie masz jeszcze żadnych czatów. Zacznij nowy czat!",
         "empty_message_error": "Nie można wysłać pustej wiadomości",
         "error_loading_chat": "Coś poszło nie tak podczas ładowania czatu.",
@@ -74,8 +74,8 @@
     "domain_mute_card": {
         "mute": "Wycisz",
         "mute_progress": "Wyciszam…",
-        "unmute": "Odcisz",
-        "unmute_progress": "Odciszam…"
+        "unmute": "Cofnij wyciszenie",
+        "unmute_progress": "Cofam wyciszenie…"
     },
     "emoji": {
         "add_emoji": "Wstaw emoji",
@@ -90,11 +90,11 @@
         "unicode": "Emoji unicode"
     },
     "errors": {
-        "storage_unavailable": "Pleroma nie mogła uzyskać dostępu do pamięci masowej przeglądarki. Twój login lub lokalne ustawienia nie zostaną zapisane i możesz napotkać problemy. Spróbuj włączyć ciasteczka."
+        "storage_unavailable": "Akkoma nie mogła uzyskać dostępu do pamięci masowej przeglądarki. Twój login lub lokalne ustawienia nie zostaną zapisane i możesz napotkać problemy. Spróbuj włączyć ciasteczka."
     },
     "exporter": {
         "export": "Eksportuj",
-        "processing": "Przetwarzam, za chwilę zostaniesz zapytany(-na) o ściągnięcie pliku"
+        "processing": "Przetwarzam, za chwilę zostaniesz zapytane o ściągnięcie pliku"
     },
     "features_panel": {
         "media_proxy": "Proxy mediów",
@@ -123,8 +123,9 @@
         "dismiss": "Odrzuć",
         "enable": "Włącz",
         "error_retry": "Spróbuj ponownie",
-        "flash_content": "Naciśnij, aby wyświetlić zawartości Flash z użyciem Ruffle (eksperymentalnie, może nie działać).",
-        "flash_fail": "Nie udało się załadować treści flash, zajrzyj do konsoli, aby odnaleźć szczegóły.",
+        "flash_content": "Naciśnij, aby wyświetlić zawartości Flash z użyciem Ruffle (eksperymentalne, może nie działać).",
+        "flash_fail": "Nie udało się załadować treści flash, zajrzyj do konsoli, by zobaczyć szczegóły.",
+        "flash_security": "Zauważ, że może to być potencjalnie niebezpieczne, ponieważ Flash zawiera dowolny kod wykonywalny.",
         "generic_error": "Wystąpił błąd",
         "loading": "Ładowanie…",
         "more": "Więcej",
@@ -135,6 +136,13 @@
             "admin": "Administrator",
             "moderator": "Moderator"
         },
+        "scope_in_timeline": {
+            "direct": "Wiadomość bezpośrednia",
+            "local": "Lokalnie - tylko twoja instancja może zobaczyć ten post",
+            "private": "Tylko dla śledzących",
+            "public": "Publicznie",
+            "unlisted": "Poza listą"
+        },
         "show_less": "Pokaż mniej",
         "show_more": "Pokaż więcej",
         "submit": "Wyślij",
@@ -157,6 +165,84 @@
         "load_older": "Załaduj starsze interakcje",
         "moves": "Użytkownik migruje"
     },
+    "languages": {
+        "ar": "Arabski",
+        "az": "Azerski",
+        "bg": "Bułgarski",
+        "cs": "Czeski",
+        "da": "Duński",
+        "de": "Niemiecki",
+        "el": "Grecki",
+        "en": "Angielski",
+        "eo": "Esperanto",
+        "es": "Hiszpański",
+        "fa": "Perski",
+        "fi": "Fiński",
+        "fr": "Francuski",
+        "ga": "Irlandzki",
+        "he": "Hebrajski",
+        "hi": "Hindi",
+        "hu": "Węgierski",
+        "id": "Indonezyjski",
+        "it": "Włoski",
+        "ja": "Japoński",
+        "ko": "Koreański",
+        "lt": "Litewski",
+        "lv": "Łotewski",
+        "nl": "Holenderski",
+        "pl": "Polski",
+        "pt": "Portugalski",
+        "ru": "Rosyjski",
+        "sk": "Słowacki",
+        "sv": "Szwedzki",
+        "tr": "Turecki",
+        "translated_from": {
+            "ar": "Przetłumaczono z języka arabskiego",
+            "az": "Przetłumaczono z języka azerskiego",
+            "bg": "Przetłumaczono z języka bułgarskiego",
+            "cs": "Przetłumaczono z języka czeskiego",
+            "da": "Przetłumaczono z języka duńskiego",
+            "de": "Przetłumaczono z języka niemieckiego",
+            "el": "Przetłumaczono z języka greckiego",
+            "en": "Przetłumaczono z języka angielskiego",
+            "eo": "Przetłumaczono z Esperanto",
+            "es": "Przetłumaczono z języka hiszpańskiego",
+            "fa": "Przetłumaczono z języka perskiego",
+            "fi": "Przetłumaczono z języka fińskiego",
+            "fr": "Przetłumaczono z języka francuskiego",
+            "ga": "Przetłumaczono z języka irlandzkiego",
+            "he": "Przetłumaczono z języka hebrajskiego",
+            "hi": "Przetłumaczono z Hindi",
+            "hu": "Przetłumaczono z języka węgierskiego",
+            "id": "Przetłumaczono z języka indonezyjskiego",
+            "it": "Przetłumaczono z języka włoskiego",
+            "ja": "Przetłumaczono z języka japońskiego",
+            "ko": "Przetłumaczono z języka koreańskiego",
+            "lt": "Przetłumaczono z języka litewskiego",
+            "lv": "Przetłumaczono z języka łotewskiego",
+            "nl": "Przetłumaczono z języka holenderskiego",
+            "pl": "Przetłumaczono z języka polskiego",
+            "pt": "Przetłumaczono z języka portugalskiego",
+            "ru": "Przetłumaczono z języka rosyjskiego",
+            "sk": "Przetłumaczono z języka słowackiego",
+            "sv": "Przetłumaczono z języka szwedzkiego",
+            "tr": "Przetłumaczono z języka tureckiego",
+            "uk": "Przetłumaczono z języka ukraińskiego",
+            "zh": "Przetłumaczono z języka chińskiego"
+        },
+        "uk": "Ukraiński",
+        "zh": "Chiński"
+    },
+    "lists": {
+        "create": "Stwórz listę",
+        "delete": "Usuń listę",
+        "following_only": "Zawęź do Śledzących",
+        "lists": "Listy",
+        "new": "Nowa Lista",
+        "save": "Zapisz zmiany",
+        "search": "Szukaj użytkowników",
+        "title": "Tytuł listy"
+    },
     "login": {
         "authentication_code": "Kod weryfikacyjny",
         "description": "Zaloguj używając OAuth",
@@ -169,61 +255,102 @@
         "hint": "Zaloguj się, aby dołączyć do dyskusji",
         "login": "Zaloguj",
         "logout": "Wyloguj",
+        "logout_confirm": "Czy na pewno chcesz się wylogować?",
+        "logout_confirm_accept_button": "Wyloguj",
+        "logout_confirm_cancel_button": "Anuluj",
+        "logout_confirm_title": "Wyloguj",
         "password": "Hasło",
-        "placeholder": "n.p. lain",
+        "placeholder": "mojanazwausera",
         "recovery_code": "Kod zapasowy",
         "register": "Zarejestruj",
         "username": "Użytkownik"
     },
     "media_modal": {
+        "counter": "{current} / {total}",
+        "hide": "Zamknij przeglądarkę mediów",
         "next": "Następne",
         "previous": "Poprzednie"
     },
+    "moderation": {
+        "moderation": "Moderacja",
+        "reports": {
+            "add_note": "Dodaj komentarz",
+            "close": "Zamknij",
+            "delete_note": "Usuń",
+            "delete_note_accept": "Tak, usuń",
+            "delete_note_cancel": "Nie, zostaw",
+            "delete_note_confirm": "Czy na pewno chesz usunąć ten komentarz?",
+            "delete_note_title": "Potwierdź usunięcie",
+            "no_content": "Brak opisu",
+            "no_reports": "Brak raportów do pokazania",
+            "note_placeholder": "Zostaw komenarz",
+            "notes": "{ count } komentarz | { count } komentarzy",
+            "reopen": "Otwórz ponownie",
+            "report": "Raport na",
+            "reports": "Raporty",
+            "resolve": "Oznacz jako rozwiązane",
+            "show_closed": "Pokaż zamknięte",
+            "statuses": "{ count } post| { count } postów",
+            "tag_policy_notice": "Włącz TagPolicy MRF by ustawić obostrzenia dla wpisów",
+            "tags": "Ustaw obostrzenia dla wpisów"
+        },
+        "statuses": "Wpisy",
+        "users": "Użytkownicy"
+    },
     "nav": {
         "about": "O nas",
         "administration": "Administracja",
+        "announcements": "Ogłoszenia",
         "back": "Wróć",
         "bookmarks": "Zakładki",
+        "bubble_timeline": "Lokalna bańka",
+        "bubble_timeline_description": "Wpisy z instancji bliskich twojej, tak jak zaleca administracja",
         "chats": "Czaty",
         "dms": "Wiadomości bezpośrednie",
         "friend_requests": "Prośby o możliwość obserwacji",
         "home_timeline": "Główna oś czasu",
+        "home_timeline_description": "Wpisy ludzi, których śledzisz",
         "interactions": "Interakcje",
+        "lists": "Listy",
         "mentions": "Wzmianki",
+        "moderation": "Moderacja",
         "preferences": "Preferencje",
+        "public_timeline_description": "Publiczne wpisy z tej instancji",
         "public_tl": "Publiczna oś czasu",
         "search": "Wyszukiwanie",
         "timeline": "Oś czasu",
         "timelines": "Osie czasu",
         "twkn": "Znana sieć",
+        "twkn_timeline_description": "Wpisy z całej znanej sieci",
         "user_search": "Wyszukiwanie użytkowników",
         "who_to_follow": "Sugestie obserwacji"
     },
     "notifications": {
-        "broken_favorite": "Nieznany status, szukam go…",
+        "broken_favorite": "Nieznany wpis, szukam go…",
         "error": "Błąd pobierania powiadomień: {0}",
-        "favorited_you": "dodał(-a) twój status do ulubionych",
+        "favorited_you": "dodało twój wpis do ulubionych",
         "follow_request": "chce ciebie obserwować",
         "followed_you": "obserwuje cię",
         "load_older": "Załaduj starsze powiadomienia",
         "migrated_to": "wyemigrował do",
         "no_more_notifications": "Nie masz więcej powiadomień",
         "notifications": "Powiadomienia",
+        "poll_ended": "Ankieta zakończona",
         "reacted_with": "zareagował z {0}",
         "read": "Przeczytane!",
-        "repeated_you": "powtórzył(-a) twój status"
+        "repeated_you": "powtórzyło twój wpis"
     },
     "password_reset": {
         "check_email": "Sprawdź pocztę, aby uzyskać link do zresetowania hasła.",
-        "forgot_password": "Zapomniałeś(-aś) hasła?",
+        "forgot_password": "Zapomniałoś hasła?",
         "instruction": "Wprowadź swój adres email lub nazwę użytkownika. Wyślemy ci link z którym możesz zresetować hasło.",
         "password_reset": "Reset hasła",
-        "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
+        "password_reset_disabled": "Resetowanie hasła jest wyłączone. Proszę skontaktuj się z administracją tej instancji.",
         "password_reset_required": "Musisz zresetować hasło, by się zalogować.",
-        "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administratorem tej instancji.",
+        "password_reset_required_but_mailer_is_disabled": "Musisz zresetować hasło, ale resetowanie hasła jest wyłączone. Proszę skontaktuj się z administracją tej instancji.",
         "placeholder": "Twój email lub nazwa użytkownika",
         "return_home": "Wróć do strony głównej",
-        "too_many_requests": "Przekroczyłeś(-aś) limit prób, spróbuj ponownie później."
+        "too_many_requests": "Przekroczyłoś limit prób, spróbuj ponownie później."
     },
     "polls": {
         "add_option": "Dodaj opcję",
@@ -249,47 +376,59 @@
             "text/bbcode": "BBCode",
             "text/html": "HTML",
             "text/markdown": "Markdown",
-            "text/plain": "Czysty tekst"
+            "text/plain": "Czysty tekst",
+            "text/x.misskeymarkdown": "MFM"
         },
-        "content_warning": "Temat (nieobowiązkowy)",
-        "default": "Właśnie wróciłem z kościoła",
-        "direct_warning_to_all": "Ten wpis zobaczą wszystkie osoby, o których wspomniałeś(-aś).",
-        "direct_warning_to_first_only": "Ten wpis zobaczą tylko te osoby, o których wspomniałeś(-aś) na początku wiadomości.",
+        "content_warning": "Ostrzeżenie o zawartości (nieobowiązkowe)",
+        "default": "Właśnie wróciłom z kremówek",
+        "direct_warning_to_all": "Ten wpis zobaczą wszystkie osoby, o których wspomniałoś.",
+        "direct_warning_to_first_only": "Ten wpis zobaczą tylko te osoby, o których wspomniałoś na początku wiadomości.",
+        "edit_remote_warning": "Zmiany dokonane w tym wpisie mogą nie być widoczne na niektórych instancjach!",
+        "edit_status": "Edytuj wpis",
+        "edit_unsupported_warning": "Ankiety i wzmianki nie zostaną zmienione przez edycję",
         "empty_status_error": "Nie można wysłać pustego wpisu bez plików",
         "media_description": "Opis mediów",
         "media_description_error": "Nie udało się zaktualizować mediów, spróbuj ponownie",
-        "new_status": "Dodaj nowy status",
+        "media_not_sensitive_warning": "Ustawiłoś ostrzeżenie o zawartości, ale załączniki nie zostały oznaczone jako wrażliwe!",
+        "new_status": "Dodaj nowy wpis",
         "post": "Opublikuj",
         "posting": "Wysyłanie",
         "preview": "Podgląd",
         "preview_empty": "Pusty",
         "scope": {
             "direct": "Bezpośredni – tylko dla wspomnianych użytkowników",
+            "local": "Lokalnie - nie federuj tego wpisu",
             "private": "Tylko dla obserwujących – umieść dla osób, które cię obserwują",
             "public": "Publiczny – umieść na publicznych osiach czasu",
             "unlisted": "Niewidoczny – nie umieszczaj na publicznych osiach czasu"
         },
         "scope_notice": {
+            "local": "Ten wpis nie będzie widoczny dla innych instancji",
             "private": "Ten post będzie widoczny tylko dla twoich obserwujących",
-            "public": "Ten post będzie widoczny dla każdego",
-            "unlisted": "Ten post nie będzie widoczny na publicznej osi czasu i całej znanej sieci"
+            "public": "Ten wpis będzie widoczny dla każdego",
+            "unlisted": "Ten wpis nie będzie widoczny na publicznej osi czasu i całej znanej sieci"
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Twoje konto zostało zarejestrowane i email został wysłany na twój adres. Sprawdź swoją skrzynkę by dokończyć rejestrację.",
+        "awaiting_email_confirmation_title": "Oczekiwanie na potwierdzenie emailem",
         "bio": "Bio",
-        "bio_placeholder": "e.g.\nCześć, jestem Lain.\nJestem dziewczynką z anime żyjącą na peryferiach Japonii. Możesz znać mnie z Wired.",
+        "bio_placeholder": "e.g.\nCześć! Witaj w moim bio.\nLubię oglądać anime i grać w gry. Mam nadzieję, że zostaniemy przyjaciółmi!",
         "captcha": "CAPTCHA",
         "email": "E-mail",
+        "email_language": "W jakim języku chcesz otrzymywać wiadomości z tego serwera?",
         "fullname": "Wyświetlana nazwa profilu",
-        "fullname_placeholder": "np. Lain Iwakura",
+        "fullname_placeholder": "np. Atsuko Kagari",
         "new_captcha": "Naciśnij na obrazek, aby dostać nowy kod captcha",
         "password_confirm": "Potwierdzenie hasła",
         "reason": "Powód rejestracji",
         "reason_placeholder": "Ta instancja ręcznie zatwierdza rejestracje.\nPoinformuj administratora, dlaczego chcesz się zarejestrować.",
         "register": "Zarejestruj się",
         "registration": "Rejestracja",
+        "request_sent": "Twoja prośba o rejestrację została wysłana i czeka na potwierdzenie. Dostaniesz email kiedy twoje konto zostanie zaakceptowane.",
+        "request_sent_title": "Wysłano prośbę o rejestrację",
         "token": "Token zaproszenia",
-        "username_placeholder": "np. lain",
+        "username_placeholder": "np. akko",
         "validations": {
             "email_required": "nie może być pusty",
             "fullname_required": "nie może być pusta",
@@ -316,7 +455,19 @@
     },
     "settings": {
         "accent": "Akcent",
+        "account_alias": "Aliasy konta",
+        "account_alias_table_head": "Alias",
+        "account_backup": "Kopia zapasowa konta",
+        "account_backup_description": "Możesz ściągnąć archiwum danych swojego konta oraz swoje posty, ale na razie nie da się ich importować do konta na Akkomie.",
+        "account_backup_table_head": "Kopia zapasowa",
+        "account_privacy": "Prywatność",
+        "add_alias_error": "Błąd dodawania aliasu: {error}",
+        "add_backup": "Stwórz nową kopię zapasową",
+        "add_backup_error": "Błąd dodawania kopii zapasowej: {error}",
+        "added_alias": "Dodano alias.",
+        "added_backup": "Dodano kopię zapasową.",
         "allow_following_move": "Zezwalaj na automatyczną obserwację gdy obserwowane konto migruje",
+        "always_show_post_button": "Zawsze pokazuj pływający przycisk Nowy Wpis",
         "app_name": "Nazwa aplikacji",
         "attachmentRadius": "Załączniki",
         "attachments": "Załączniki",
@@ -326,6 +477,7 @@
         "avatarRadius": "Awatary",
         "avatar_size_instruction": "Zalecany minimalny rozmiar awatarów to 150x150 pikseli.",
         "background": "Tło",
+        "backup_not_ready": "Kopia zapasowa nie jest jeszcze gotowa.",
         "bio": "Bio",
         "block_export": "Eksport blokad",
         "block_export_button": "Eksportuj twoje blokady do pliku .csv",
@@ -347,10 +499,27 @@
         "changed_password": "Pomyślnie zmieniono hasło!",
         "chatMessageRadius": "Wiadomość czatu",
         "checkboxRadius": "Pola wyboru",
-        "collapse_subject": "Zwijaj posty z tematami",
+        "collapse_subject": "Zwijaj posty z ostrzeżeniami o treści",
+        "columns": "Kolumny",
         "composing": "Pisanie",
+        "confirm_dialogs": "Wymagaj potwierdzenia dla:",
+        "confirm_dialogs_approve_follow": "Akceptację prośby o śledzenie",
+        "confirm_dialogs_block": "Blokowanie kogoś",
+        "confirm_dialogs_delete": "Usunięcie wpisu",
+        "confirm_dialogs_deny_follow": "Odrzucenie prośby o śledzenie",
+        "confirm_dialogs_mute": "Wyciszenie kogoś",
+        "confirm_dialogs_repeat": "Powtórzenie wpisu",
+        "confirm_dialogs_unfollow": "Odwołanie śledzenia kogoś",
         "confirm_new_password": "Potwierdź nowe hasło",
+        "confirmation_dialogs": "Opcje potwierdzeń",
+        "conversation_display": "Styl wyświetlania rozmów",
+        "conversation_display_linear": "Liniowy",
+        "conversation_display_tree": "Drzewiasty",
+        "conversation_other_replies_button": "Pokaż przycisk \"inne odpowiedzi\"",
+        "conversation_other_replies_button_below": "Pod wpisami",
+        "conversation_other_replies_button_inside": "Wewnątrz wpisów",
         "current_avatar": "Twój obecny awatar",
+        "current_mascot": "Twoja obecna maskotka",
         "current_password": "Obecne hasło",
         "data_import_export_tab": "Import/eksport danych",
         "default_vis": "Domyślny zakres widoczności",
@@ -358,23 +527,32 @@
         "delete_account_description": "Trwale usuń dane i zdezaktywuj konto.",
         "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.",
+        "disable_sticky_headers": "Nie przyklejaj nagłówków kolumn do góry ekranu",
         "discoverable": "Zezwól na odkrywanie tego konta w wynikach wyszukiwania i innych usługach",
         "domain_mutes": "Domeny",
+        "download_backup": "Ściągnij",
+        "email_language": "Język w którym otrzymujesz emaile od serwera",
         "emoji_reactions_on_timeline": "Pokaż reakcje emoji na osi czasu",
         "enable_web_push_notifications": "Włącz powiadomienia push",
         "enter_current_password_to_confirm": "Wprowadź obecne hasło, by potwierdzić twoją tożsamość",
+        "expert_mode": "Pokaż zaawansowane",
+        "expire_posts_enabled": "Usuń wpisy po zadanej liczbie dni",
+        "expire_posts_input_placeholder": "Liczba dni",
         "export_theme": "Zapisz motyw",
         "file_export_import": {
             "backup_restore": "Kopia zapasowa ustawień",
             "backup_settings": "Kopia zapasowa ustawień do pliku",
             "backup_settings_theme": "Kopia zapasowa ustawień i motywu do pliku",
             "errors": {
+                "file_slightly_new": "Nie zgadza się pomniejsza wersja pliku, niektóre ustawienia mogą się nie załadować",
+                "file_too_new": "Niekompatybilna główna wersja: {fileMajor}, ten PleromaFE (wersja ustawień {feMajor}) jest zbyt stary by to obsłużyć",
+                "file_too_old": "Niekompatybilna główna wersja: {fileMajor}, wersja pliku jest zbyt stara i nie wspierana (min. ustawiona wer. {feMajor})",
                 "invalid_file": "Wybrany plik nie jest obsługiwaną kopią zapasową ustawień Pleromy. Nie dokonano żadnych zmian."
             },
             "restore_settings": "Przywróć ustawienia z pliku"
         },
         "filtering": "Filtrowanie",
-        "filtering_explanation": "Wszystkie statusy zawierające te słowa będą wyciszone. Jedno słowo na linijkę.",
+        "filtering_explanation": "Wszystkie wpisy zawierające te słowa będą wyciszone. Jedno słowo na linijkę.",
         "follow_export": "Eksport obserwowanych",
         "follow_export_button": "Eksportuj swoją listę obserwowanych do pliku CSV",
         "follow_import": "Import obserwowanych",
@@ -387,18 +565,26 @@
         "hide_all_muted_posts": "Ukryj wyciszone słowa",
         "hide_attachments_in_convo": "Ukrywaj załączniki w rozmowach",
         "hide_attachments_in_tl": "Ukrywaj załączniki w osi czasu",
+        "hide_bot_indication": "Ukryj we wpisach oznaczenie botów",
+        "hide_favorites_description": "Nie pokazuj list moich ulubionych (ludzie wciąż dostaną notyfikacje)",
         "hide_filtered_statuses": "Ukrywaj filtrowane statusy",
         "hide_followers_count_description": "Nie pokazuj licznika obserwujących",
         "hide_followers_description": "Nie pokazuj kto mnie obserwuje",
         "hide_follows_count_description": "Nie pokazuj licznika obserwowanych",
         "hide_follows_description": "Nie pokazuj kogo obserwuję",
         "hide_isp": "Ukryj panel informacji o instancji",
+        "hide_list_aliases_error_action": "Zamknij",
         "hide_media_previews": "Ukryj podgląd mediów",
         "hide_muted_posts": "Ukrywaj wpisy wyciszonych użytkowników",
+        "hide_muted_threads": "Ukryj wyciszone wątki",
         "hide_post_stats": "Ukrywaj statysyki postów (np. liczbę polubień)",
         "hide_shoutbox": "Ukryj shoutbox instancji",
+        "hide_site_favicon": "Ukryj favikonę instancji na górze panelu",
+        "hide_site_name": "Ukryj nazwę instancji na górze panelu",
+        "hide_threads_with_blocked_users": "Ukryj wątki wspominające o zablokowanych użytkownikach",
         "hide_user_stats": "Ukrywaj statysyki użytkowników (np. liczbę obserwujących)",
         "hide_wallpaper": "Ukryj tło instancji",
+        "hide_wordfiltered_statuses": "Ukryj wpisy zawierające wyfiltrowane słowa",
         "import_blocks_from_a_csv_file": "Importuj blokady z pliku CSV",
         "import_followers_from_a_csv_file": "Importuj obserwowanych z pliku CSV",
         "import_mutes_from_a_csv_file": "Zaimportuj wyciszenia z pliku .csv",
@@ -411,10 +597,23 @@
         "invalid_theme_imported": "Wybrany plik nie jest obsługiwanym motywem Pleromy. Nie dokonano zmian w twoim motywie.",
         "limited_availability": "Niedostępne w twojej przeglądarce",
         "links": "Łącza",
+        "list_aliases_error": "Błąd pobierania aliasów: {error}",
+        "list_backups_error": "Błąd pobierania listy kopii zapasowych: {error}",
         "lock_account_description": "Spraw, by konto mogli wyświetlać tylko zatwierdzeni obserwujący",
         "loop_video": "Zapętlaj filmy",
         "loop_video_silent_only": "Zapętlaj tylko filmy bez dźwięku (np. mastodonowe „gify”)",
+        "mascot": "Maskotka Mastodon FE",
+        "max_depth_in_thread": "Maksymalna liczba poziomów w wątku wyświetlana domyślnie",
         "max_thumbnails": "Maksymalna liczba miniatur w poście",
+        "mention_link_bolden_you": "Podkreśl wspomnienia o tobie",
+        "mention_link_display": "Pokaż linki wspomnień",
+        "mention_link_display_full": "zawsze jako pełne nazwy (np. {'@'}foo{'@'}example.org)",
+        "mention_link_display_full_for_remote": "jako pełne nazwy tylko dla zdalnych użytkowników (np. {'@'}foo{'@'}example.org)",
+        "mention_link_display_short": "zawsze jako krótkie nazwy (np. {'@'}foo)",
+        "mention_link_fade_domain": "Wyblakłe domeny (np. {'@'}example.org w {'@'}foo{'@'}example.org)",
+        "mention_link_show_avatar": "Pokaż avatar użytkownika obok linku",
+        "mention_link_show_tooltip": "Pokaż pełne nazwy użytkowników jako dymek dla zdalnych użytkowników",
+        "mention_links": "Linki wspomnień",
         "mfa": {
             "authentication_methods": "Metody weryfikacji",
             "confirm_and_enable": "Potwierdź i włącz OTP",
@@ -438,6 +637,12 @@
         },
         "minimal_scopes_mode": "Zminimalizuj opcje wyboru zakresu postów",
         "more_settings": "Więcej ustawień",
+        "move_account": "Przenieś konto",
+        "move_account_error": "Błąd przenoszenia konta: {error}",
+        "move_account_notes": "Jeśli chcesz przenieść to konto gdzieś indziej, musisz przejść do konta docelowego i dodać tam alias wskazujący tutaj.",
+        "move_account_target": "Konto docelowe (np. {example})",
+        "moved_account": "Konto zostało przeniesione.",
+        "mute_bot_posts": "Wycisz posty botów",
         "mute_export": "Eksport wyciszeń",
         "mute_export_button": "Wyeksportuj swoje wyciszenia do pliku .csv",
         "mute_import": "Import wyciszeń",
@@ -447,6 +652,7 @@
         "mutes_tab": "Wyciszenia",
         "name": "Imię",
         "name_bio": "Imię i bio",
+        "new_alias_target": "Dodaj nowy alias (np. {example})",
         "new_email": "Nowy e-mail",
         "new_password": "Nowe hasło",
         "no_blocks": "Brak blokad",
@@ -456,6 +662,7 @@
         "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.",
         "notification_setting_block_from_strangers": "Zablokuj powiadomienia od użytkowników których nie obserwujesz",
         "notification_setting_filters": "Filtry",
+        "notification_setting_hide_if_cw": "Ukryj zawartość powiadomień jeśli jest pod Ostrzeżeniem o Treści",
         "notification_setting_hide_notification_contents": "Ukryj nadawcę i zawartość powiadomień push",
         "notification_setting_privacy": "Prywatność",
         "notification_visibility": "Rodzaje powiadomień do wyświetlania",
@@ -464,6 +671,7 @@
         "notification_visibility_likes": "Ulubione",
         "notification_visibility_mentions": "Wzmianki",
         "notification_visibility_moves": "Użytkownik migruje",
+        "notification_visibility_polls": "Koniec ankiety w której brałoś udział",
         "notification_visibility_repeats": "Powtórzenia",
         "notifications": "Powiadomienia",
         "nsfw_clickthrough": "Włącz domyślne ukrywanie załączników o treści nieprzyzwoitej (NSFW)",
@@ -472,7 +680,9 @@
         "panelRadius": "Panele",
         "pause_on_unfocused": "Wstrzymuj strumieniowanie kiedy karta nie jest aktywna",
         "play_videos_in_modal": "Odtwarzaj filmy bezpośrednio w przeglądarce mediów",
-        "post_status_content_type": "Post status content type",
+        "post_look_feel": "Wygląd wpisów",
+        "post_status_content_type": "Domyślny typ zawartości wpisów",
+        "posts": "Wpisy",
         "preload_images": "Ładuj wstępnie obrazy",
         "presets": "Gotowe motywy",
         "profile_background": "Tło profilu",
@@ -486,6 +696,10 @@
         "profile_tab": "Profil",
         "radii_help": "Ustaw zaokrąglenie krawędzi interfejsu (w pikselach)",
         "refresh_token": "Odśwież token",
+        "remove_alias": "Usuń ten alias",
+        "remove_backup": "Usuń kopię zapasową",
+        "render_mfm": "Wyświetlaj Misskey Markdown",
+        "render_mfm_on_hover": "Pauzuj animacje MFM dopóki nie najedziesz na nie kursorem",
         "replies_in_timeline": "Odpowiedzi na osi czasu",
         "reply_visibility_all": "Pokazuj wszystkie odpowiedzi",
         "reply_visibility_following": "Pokazuj tylko odpowiedzi skierowane do mnie i osób które obserwuję",
@@ -509,13 +723,34 @@
         "security": "Bezpieczeństwo",
         "security_tab": "Bezpieczeństwo",
         "sensitive_by_default": "Domyślnie oznaczaj wpisy jako wrażliwe",
+        "sensitive_if_subject": "Automatycznie oznacz obrazki jako wrażliwe jeśli jest ustawnione ostrzeżenie o zawartości",
         "set_new_avatar": "Ustaw nowy awatar",
+        "set_new_mascot": "Ustaw nową maskotkę",
         "set_new_profile_background": "Ustaw nowe tło profilu",
         "set_new_profile_banner": "Ustaw nowy banner profilu",
         "setting_changed": "Opcja różni się od domyślnej",
+        "setting_server_side": "Ta opcja jest przywiązana do twojego profilu i wpływa na wszystkie sesje i klienty",
         "settings": "Ustawienia",
+        "settings_profile": "Profile Ustawień",
+        "settings_profile_creation": "Stwórz nowy profil",
+        "settings_profile_creation_new_name_label": "Nazwa",
+        "settings_profile_creation_submit": "Stwórz",
+        "settings_profile_currently": "Aktualnie używane jest {name} (wersja: {version})",
+        "settings_profile_delete": "Usuń",
+        "settings_profile_delete_confirm": "Czy na pewno chesz usunąć ten profil?",
+        "settings_profile_force_sync": "Synchronizuj",
+        "settings_profile_in_use": "W użyciu",
+        "settings_profile_use": "Użyj",
+        "settings_profiles_refresh": "Odświerz profile ustawień",
+        "settings_profiles_show": "Pokaż wszystkie profile ustawień",
+        "settings_profiles_unshow": "Ukryj wszystkie profile ustawień",
         "show_admin_badge": "Pokazuj odznakę „Administrator” na moim profilu",
         "show_moderator_badge": "Pokazuj odznakę „Moderator” na moim profilu",
+        "show_nav_shortcuts": "Pokaż dodatkowe skróty nawigacyjne w górnym panelu",
+        "show_panel_nav_shortcuts": "Pokaż skróty nawigacji osi czasu na górze panelu",
+        "show_scrollbars": "Pokaż paski przewijania kolumn bocznych",
+        "show_wider_shortcuts": "Zwiększ odstęp między skrótami na panelu górnym",
+        "show_yous": "Pokaż (Ty)",
         "stop_gifs": "Odtwarzaj GIFy po najechaniu kursorem",
         "streaming": "Włącz automatycznie strumieniowanie nowych postów gdy jesteś na początku strony",
         "style": {
@@ -641,15 +876,15 @@
                 "help": {
                     "fe_downgraded": "Wersja PleromaFE została cofnięta.",
                     "fe_upgraded": "Silnik motywów PleromaFE został zaaktualizowany.",
-                    "future_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w nowszej wersji FE.",
-                    "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż zapamiętałeś(-aś).",
+                    "future_version_imported": "Plik który zaimportowałoś został stworzony w nowszej wersji FE.",
+                    "migration_napshot_gone": "Z jakiegoś powodu migawka zniknęła, niektóre rzeczy mogą wyglądać inaczej niż zapamiętałoś.",
                     "migration_snapshot_ok": "Żeby być bezpiecznym, migawka motywu została załadowana. Możesz spróbować załadować dane motywu.",
-                    "older_version_imported": "Plik który zaimportowałeś(-aś) został stworzony w starszej wersji FE.",
+                    "older_version_imported": "Plik który zaimportowałoś został stworzony w starszej wersji FE.",
                     "snapshot_missing": "Nie znaleziono migawki motywu w pliku, więc motyw może wyglądać inaczej niż pierwotnie zaplanowano.",
                     "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_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaktualizowane ponownie, jeśli zmieniłeś(-aś) motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji.",
-                    "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż zapamiętałeś(-aś).",
-                    "v2_imported": "Plik który zaimportowałeś(-aś) został stworzony dla starszego FE. Próbujemy zwiększyć kompatybilność, lecz wciąż mogą występować rozbieżności."
+                    "snapshot_source_mismatch": "Konflikt wersji: najprawdopodobniej FE zostało cofnięte do poprzedniej wersji i zaktualizowane ponownie, jeśli zmieniłoś motyw używając starszej wersji FE, najprawdopodobniej chcesz używać starszej wersji, w przeciwnym razie użyj nowej wersji.",
+                    "upgraded_from_v2": "PleromaFE zostało zaaktualizowane, motyw może wyglądać nieco inaczej niż zapamiętałoś.",
+                    "v2_imported": "Plik który zaimportowałoś został stworzony dla starszego FE. Próbujemy zwiększyć kompatybilność, lecz wciąż mogą występować rozbieżności."
                 },
                 "keep_as_is": "Zostaw po staremu",
                 "keep_color": "Zachowaj kolory",
@@ -664,9 +899,9 @@
                 "use_source": "Nowa wersja"
             }
         },
-        "subject_input_always_show": "Zawsze pokazuj pole tematu",
-        "subject_line_behavior": "Kopiuj temat podczas odpowiedzi",
-        "subject_line_email": "Jak w mailach – „re: temat”",
+        "subject_input_always_show": "Zawsze pokazuj pole ostrzeżenia o treści",
+        "subject_line_behavior": "Kopiuj ostrzeżenie o treści podczas odpowiedzi",
+        "subject_line_email": "Jak w mailach – „re: ostrzeżenie”",
         "subject_line_mastodon": "Jak na Mastodonie – po prostu kopiuj",
         "subject_line_noop": "Nie kopiuj",
         "text": "Tekst",
@@ -674,15 +909,30 @@
         "theme_help": "Użyj kolorów w notacji szesnastkowej (#rrggbb), by stworzyć swój motyw.",
         "theme_help_v2_1": "Możesz też zastąpić kolory i widoczność poszczególnych komponentów przełączając pola wyboru, użyj „Wyczyść wszystko” aby usunąć wszystkie zastąpienia.",
         "theme_help_v2_2": "Ikony pod niektórych wpisami są wskaźnikami kontrastu pomiędzy tłem a tekstem, po najechaniu na nie otrzymasz szczegółowe informacje. Zapamiętaj, że jeżeli używasz przezroczystości, wskaźniki pokazują najgorszy możliwy przypadek.",
+        "third_column_mode": "Jeśli jest dość miejsca, pokaż trzecią kolumnę zawierającą",
+        "third_column_mode_none": "Nie pokazuj trzeciej kolumny",
+        "third_column_mode_notifications": "Kolumnę powiadomień",
+        "third_column_mode_postform": "Główny formularz wpisu i nawigacja",
         "token": "Token",
         "tooltipRadius": "Etykiety/alerty",
+        "translation_language": "Automatyczny Język Tłumaczeń",
+        "tree_advanced": "Pokaż dodatkowe przyciski do otwierania i zamykania ciągów odpowiedzi w wątkach",
+        "tree_fade_ancestors": "Pokaż przodków aktualnego wpisu jako blady tekst",
         "type_domains_to_mute": "Wyszukaj domeny, które chcesz wyciszyć",
         "upload_a_photo": "Wyślij zdjęcie",
         "useStreamingApi": "Otrzymuj posty i powiadomienia w czasie rzeczywistym",
         "useStreamingApiWarning": "(Niezalecane, eksperymentalne, pomija posty)",
+        "use_at_icon": "Pokazuj symbol {'@'} jako ikonę a nie tekst",
+        "use_blurhash": "Używaj rozmycia dla miniatur wrażliwych obrazków",
         "use_contain_fit": "Nie przycinaj załączników na miniaturach",
         "use_one_click_nsfw": "Otwieraj załączniki NSFW jednym kliknięciem",
+        "user_accepts_direct_messages_from": "Pozwalaj na wiadomości od",
+        "user_accepts_direct_messages_from_everybody": "Każdego",
+        "user_accepts_direct_messages_from_nobody": "Nikogo",
+        "user_accepts_direct_messages_from_people_i_follow": "Ludzi, których śledzę",
         "user_mutes": "Użytkownicy",
+        "user_profile_default_tab": "Domyślna Karta na Profilu Użytkownika",
+        "user_profiles": "Profile Użytkowników",
         "user_settings": "Ustawienia użytkownika",
         "valid_until": "Ważne do",
         "values": {
@@ -695,34 +945,86 @@
             "title": "Wersja"
         },
         "virtual_scrolling": "Optymalizuj renderowanie osi czasu",
-        "word_filter": "Filtr słów"
+        "word_filter": "Filtr słów",
+        "wordfilter": "Filtr słów"
+    },
+    "settings_profile": {
+        "creating": "Tworzę nowy profil ustawień \"{profile}\"...",
+        "synchronization_error": "Nie można zsynchronizować ustawień: {err}",
+        "synchronized": "Zsynchronizowano ustawienia!",
+        "synchronizing": "Synchronizuję profil ustawień \"{profile}\"..."
     },
     "status": {
+        "ancestor_follow": "Pokaż {numReplies} inną odpowiedź pod tym wpisem | Pokaż {numReplies} innych odpowiedzi pod tym wpisem",
+        "ancestor_follow_with_icon": "{icon} {text}",
+        "attachment_stop_flash": "Zatrzymaj odtwarzacz Flash",
         "bookmark": "Dodaj do zakładek",
-        "copy_link": "Kopiuj link do statusu",
-        "delete": "Usuń status",
-        "delete_confirm": "Czy naprawdę chcesz usunąć ten status?",
+        "collapse_attachments": "Złóż załączniki",
+        "copy_link": "Kopiuj link do wpisu",
+        "delete": "Usuń wpis",
+        "delete_confirm": "Czy naprawdę chcesz usunąć ten wpis?",
+        "delete_confirm_accept_button": "Tak, usuń",
+        "delete_confirm_cancel_button": "Nie, zostaw",
+        "delete_confirm_title": "Potwierdź usunięcie",
+        "edit": "Edytuj",
+        "edit_history": "Historia edycji",
+        "edit_history_modal_title": "Edytowano {historyCount} raz | Edytowano {historyCount} razy",
+        "edited_at": "Edytowano {time}",
         "expand": "Rozwiń",
         "external_source": "Zewnętrzne źródło",
         "favorites": "Ulubione",
+        "hide_attachment": "Ukryj załącznik",
         "hide_content": "Ukryj zawartość",
-        "hide_full_subject": "Ukryj cały temat",
+        "hide_full_subject": "Ukryj całe ostrzeżenie o treści",
+        "many_attachments": "Wpis ma {number} załącznik | Wpis ma {number} załączników",
+        "mentions": "Wspomnienia",
+        "move_down": "Przesuń załączniki w prawo",
+        "move_up": "Przesuń załączniki w lewo",
         "mute_conversation": "Wycisz konwersację",
         "nsfw": "NSFW",
+        "open_gallery": "Otwórz galerię",
+        "override_translation_source_language": "Nadpisz język źródłowy",
         "pin": "Przypnij na profilu",
         "pinned": "Przypnięte",
+        "plus_more": "+{number} więcej",
+        "redraft": "Usuń i przeredaguj",
+        "redraft_confirm": "Czy na pewno chesz usunąć i przeredagować post? Interakcje z oryginalnym wpisem nie zostaną zachowane.",
+        "redraft_confirm_accept_button": "Tak, usuń i przeredaguj",
+        "redraft_confirm_cancel_button": "Nie, zostaw wpis oryginalny",
+        "redraft_confirm_title": "Potwierdź usunięcie i przeredagowanie",
+        "remove_attachment": "Usuń załącznik",
+        "repeat_confirm": "Czy na pewno chesz powtórzyć ten wpis?",
+        "repeat_confirm_accept_button": "Tak, powtórz",
+        "repeat_confirm_cancel_button": "Nie, nie powtarzaj",
+        "repeat_confirm_title": "Potwierdź powtórzenie",
         "repeats": "Powtórzenia",
         "replies_list": "Odpowiedzi:",
+        "replies_list_with_others": "Pokaż {numReplies} więcej odpowiedź | Pokaż {numReplies} więcej odpowiedzi",
         "reply_to": "Odpowiedź dla",
+        "show_all_attachments": "Pokaż wszystkie załączniki",
+        "show_all_conversation": "Pokaż pełną rozmowę ({numStatus} inny wpis) | Pokaż pełną rozmowę ({numStatus} innych wpisów)",
+        "show_all_conversation_with_icon": "{icon} {text}",
+        "show_attachment_description": "Podgląd opisu (otwórz załącznik by zobaczyć pełen opis)",
+        "show_attachment_in_modal": "Pokaż załącznik w oknie",
         "show_content": "Pokaż zawartość",
-        "show_full_subject": "Pokaż cały temat",
+        "show_full_subject": "Pokaż całe ostrzeżenie o treści",
+        "show_only_conversation_under_this": "Pokaż tylko odpowiedzi na ten wpis",
         "status_deleted": "Ten wpis został usunięty",
-        "status_unavailable": "Status niedostępny",
+        "status_unavailable": "Wpis niedostępny",
+        "thread_follow": "Pokaż {numStatus} więcej odpowiedź | Pokaż {numStatus} więcej odpowiedzi",
+        "thread_follow_with_icon": "{icon} {text}",
+        "thread_hide": "Ukryj ten wątek",
         "thread_muted": "Wątek wyciszony",
         "thread_muted_and_words": ", ma słowa:",
+        "thread_show": "Pokaż ten wątek",
+        "thread_show_full": "Pokaż {numStatus} odpowiedź | Pokaż wszystkie {numStatus} odpowiedzi",
+        "thread_show_full_with_icon": "{icon} {text}",
+        "translate": "Przetłumacz",
+        "translated_from": "Przetłumaczone z {language}",
         "unbookmark": "Usuń z zakładek",
         "unmute_conversation": "Odcisz konwersację",
-        "unpin": "Odepnij z profilu"
+        "unpin": "Odepnij z profilu",
+        "you": "(Ty)"
     },
     "time": {
         "in_future": "za {0}",
@@ -750,23 +1052,29 @@
         "collapse": "Zwiń",
         "conversation": "Rozmowa",
         "error": "Błąd pobierania osi czasu: {0}",
-        "load_older": "Załaduj starsze statusy",
-        "no_more_statuses": "Brak kolejnych statusów",
+        "follow_tag": "Śledź hasztag",
+        "load_older": "Załaduj starsze wpisy",
+        "no_more_statuses": "Brak kolejnych wpisów",
         "no_retweet_hint": "Wpis oznaczony jako tylko dla obserwujących lub bezpośredni nie może zostać powtórzony",
-        "no_statuses": "Brak statusów",
+        "no_statuses": "Brak wpisów",
         "reload": "Odśwież",
         "repeated": "powtórzył(-a)",
         "show_new": "Pokaż nowe",
         "socket_broke": "Utracono połączenie w czasie rzeczywistym: kod CloseEvent {0}",
         "socket_reconnected": "Osiągnięto połączenie w czasie rzeczywistym",
+        "unfollow_tag": "Przestań śledzić hasztag",
         "up_to_date": "Na bieżąco"
     },
+    "toast": {
+        "no_translation_target_set": "Nie ustawiono docelowego języka tłumaczenia - to może się nie udać. Ustaw język docelowy w ustawieniach."
+    },
     "tool_tip": {
         "accept_follow_request": "Akceptuj prośbę o możliwość obserwacji",
         "add_reaction": "Dodaj reakcję",
         "bookmark": "Zakładka",
         "favorite": "Dodaj do ulubionych",
         "media_upload": "Wyślij media",
+        "quote": "Cytuj",
         "reject_follow_request": "Odrzuć prośbę o możliwość obserwacji",
         "repeat": "Powtórz",
         "reply": "Odpowiedz",
@@ -793,6 +1101,7 @@
             "deactivate_account": "Dezaktywuj konto",
             "delete_account": "Usuń konto",
             "delete_user": "Usuń użytkownika",
+            "delete_user_data_and_deactivate_confirmation": "To nieodwracalnie usunie dane tego konta i je zdezaktywuje. Czy na pewno chesz to zrobić?",
             "disable_any_subscription": "Zakaż całkowicie obserwowania użytkownika",
             "disable_remote_subscription": "Zakaż obserwowania użytkownika ze zdalnych instancji",
             "force_nsfw": "Oznacz wszystkie posty jako NSFW",
@@ -807,17 +1116,36 @@
             "strip_media": "Usuń multimedia z postów"
         },
         "approve": "Przyjmij",
+        "approve_confirm": "Czy na pewno chesz pozwolić by ten użytkownik cię śledził?",
+        "approve_confirm_accept_button": "Tak, akceptuj",
+        "approve_confirm_cancel_button": "Nie, anuluj",
+        "approve_confirm_title": "Akceptuj prośbę o śledzenie",
         "block": "Zablokuj",
+        "block_confirm": "Czy na pewno chesz zablokować {user}?",
+        "block_confirm_accept_button": "Tak, blokuj",
+        "block_confirm_cancel_button": "Nie, nie blokuj",
+        "block_confirm_title": "Blokuj użytkownika",
         "block_progress": "Blokuję…",
         "blocked": "Zablokowany!",
+        "blocks_you": "Blokuje cię!",
         "bot": "Bot",
+        "deactivated": "Zdezaktywowano",
         "deny": "Odrzuć",
+        "deny_confirm": "Czy na pewno chesz odmówić prośbie o śledzenie?",
+        "deny_confirm_accept_button": "Tak, odmów",
+        "deny_confirm_cancel_button": "Nie, nie odmawiaj",
+        "deny_confirm_title": "Odmów prośbie o śledzenie",
+        "domain_muted": "Odblokuj domenę",
         "edit_profile": "Edytuj profil",
         "favorites": "Ulubione",
         "follow": "Obserwuj",
+        "follow_cancel": "Anuluj prośbę",
         "follow_progress": "Wysyłam prośbę…",
         "follow_sent": "Wysłano prośbę!",
+        "follow_tag": "Śledź hasztag",
         "follow_unfollow": "Przestań obserwować",
+        "followed_tags": "Śledzone hasztagi",
+        "followed_users": "Śledzeni użytkownicy",
         "followees": "Obserwowani",
         "followers": "Obserwujący",
         "following": "Obserwowany!",
@@ -825,28 +1153,47 @@
         "hidden": "Ukryte",
         "hide_repeats": "Ukryj powtórzenia",
         "highlight": {
-            "disabled": "Bez wyróżnienia"
+            "disabled": "Bez wyróżnienia",
+            "side": "Pasek boczny",
+            "solid": "Jednokolorowe tło",
+            "striped": "Tło w paski"
         },
         "its_you": "To ty!",
         "media": "Media",
         "mention": "Wspomnienie",
         "message": "Napisz",
         "mute": "Wycisz",
+        "mute_confirm": "Czy na pewno chcesz wyciszyć {user}?",
+        "mute_confirm_accept_button": "Tak, wycisz",
+        "mute_confirm_cancel_button": "Nie, nie wyciszaj",
+        "mute_confirm_title": "Wycisz użytkownika",
+        "mute_domain": "Blokuj domenę",
         "mute_progress": "Wyciszam…",
         "muted": "Wyciszony(-a)",
+        "not_following_any_hashtags": "Nie śledzisz żadnych hasztagów",
+        "note": "Prywatna notatka",
         "per_day": "dziennie",
         "remote_follow": "Zdalna obserwacja",
+        "remove_follower": "Zdalny śledzący",
+        "replies": "Z odpowiedziami",
         "report": "Zgłoś",
+        "requested_by": "Chce cię śledzić",
         "show_repeats": "Pokaż powtórzenia",
-        "statuses": "Statusy",
+        "statuses": "Wpisy",
         "subscribe": "Subskrybuj",
         "unblock": "Odblokuj",
         "unblock_progress": "Odblokowuję…",
+        "unfollow_confirm": "Czy na pewno chesz przestać śledzić {user}?",
+        "unfollow_confirm_accept_button": "Tak, przestań śledzić",
+        "unfollow_confirm_cancel_button": "Nie, nie przestawaj",
+        "unfollow_confirm_title": "Przestań śledzić użytkownika",
+        "unfollow_tag": "Przestań śledzić hasztag",
         "unmute": "Cofnij wyciszenie",
         "unmute_progress": "Cofam wyciszenie…",
         "unsubscribe": "Odsubskrybuj"
     },
     "user_profile": {
+        "field_validated": "Link zweryfikowany",
         "profile_does_not_exist": "Przepraszamy, ten profil nie istnieje.",
         "profile_loading_error": "Przepraszamy, wystąpił błąd podczas ładowania tego profilu.",
         "timeline_title": "Oś czasu użytkownika"

From 3ba8c90e1ea52510eacf582e88ef2c3933cfbe4c Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:33 +0000
Subject: [PATCH 31/36] Translated using Weblate (Russian)

Currently translated at 68.7% (719 of 1046 strings)

Co-authored-by: Mel <hi@mel.gg>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ru/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ru.json | 151 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 148 insertions(+), 3 deletions(-)

diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 76c46809..b5611430 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -1,5 +1,7 @@
 {
     "about": {
+        "bubble_instances": "Узлы из локального пузыря",
+        "bubble_instances_description": "Узлы, выбранные администрацией для обозначения местности данного узла",
         "mrf": {
             "federation": "Федерация",
             "keyword": {
@@ -16,12 +18,15 @@
                 "accept_desc": "Данный узел принимает сообщения только со следующих узлов:",
                 "ftl_removal": "Скрытие с федеративной ленты",
                 "ftl_removal_desc": "Данный узел скрывает следующие узлы с федеративной ленты:",
+                "instance": "Узел",
                 "media_nsfw": "Принужденно помеченно как имеющее щекотливый характер",
                 "media_nsfw_desc": "Данный узел принужденно помечает вложения со следующих узлов как имеющие щекотливый характер:",
                 "media_removal": "Удаление вложений",
                 "media_removal_desc": "Данный узел удаляет вложения со следующих узлов:",
+                "not_applicable": "Н/Д",
                 "quarantine": "Зона карантина",
-                "quarantine_desc": "Данный узел отправляет только публичные статусы следующим узлам:",
+                "quarantine_desc": "Данный узел не отправляет статусы следующим узлам:",
+                "reason": "Причина",
                 "reject": "Черный список",
                 "reject_desc": "Данный узел не принимает сообщения со следующих узлов:",
                 "simple_policies": "Правила для определенных узлов"
@@ -29,17 +34,43 @@
         },
         "staff": "Администрация"
     },
+    "announcements": {
+        "all_day_prompt": "Весь день",
+        "cancel_edit_action": "Отмена",
+        "close_error": "Закрыть",
+        "delete_action": "Удалить",
+        "edit_action": "Редактировать",
+        "end_time_display": "Заканчивается в {time}",
+        "end_time_prompt": "Конец: ",
+        "inactive_message": "Это объявление неактивно",
+        "mark_as_read_action": "Прочитано",
+        "page_header": "Объявления",
+        "post_action": "Опубликовать",
+        "post_error": "Ошибка: {error}",
+        "post_form_header": "Опубликовать объявление",
+        "post_placeholder": "Содержание объявления",
+        "published_time_display": "Опубликовано в {time}",
+        "start_time_display": "Начинается в {time}",
+        "start_time_prompt": "Начало: ",
+        "submit_edit_action": "Отправить",
+        "title": "Объявление"
+    },
     "chats": {
         "chats": "Беседы",
         "delete": "Удалить",
         "delete_confirm": "Вы точно хотите удалить сообщение?",
         "empty_chat_list_placeholder": "У вас пока нет бесед. Начните одну!",
         "empty_message_error": "Нельзя отправить пустое сообщение",
+        "error_loading_chat": "Произошла ошибка при загрузке беседы.",
         "error_sending_message": "Произошла ошибка при отправке сообщения.",
         "message_user": "Напишите {nickname}",
+        "more": "Больше",
         "new": "Новая беседа",
         "you": "Вы:"
     },
+    "display_date": {
+        "today": "Сегодня"
+    },
     "domain_mute_card": {
         "mute": "Игнорировать",
         "mute_progress": "В процессе…",
@@ -53,6 +84,7 @@
         "keep_open": "Оставить окно выбора открытым",
         "load_all": "Все {emojiAmount} эмодзи загружаются",
         "load_all_hint": "Загружены первые {saneAmount} эмодзи, загрузка всех эмодзи может привести к проблемам с производительностью.",
+        "recent": "Недавно использованные",
         "search_emoji": "Поиск эмодзи",
         "stickers": "Стикеры",
         "unicode": "Стандартные эмодзи"
@@ -91,6 +123,9 @@
         "dismiss": "Закрыть",
         "enable": "Включить",
         "error_retry": "Пожалуйста попробуйте еще раз",
+        "flash_content": "Показывать Flash-контент с помощью Ruffle (экспериментально, гарантии работы нет).",
+        "flash_fail": "Не удалось загрузить Flash-контент, подробности см. в консоли.",
+        "flash_security": "Эта функция является потенциально опасной, так как Flash-контент допускает выполнение произвольного кода.",
         "generic_error": "Произошла ошибка",
         "loading": "Загрузка…",
         "more": "Больше",
@@ -101,6 +136,13 @@
             "admin": "Администратор",
             "moderator": "Модератор"
         },
+        "scope_in_timeline": {
+            "direct": "Прямой",
+            "local": "Локальный - только ваш узел может видеть этот статус",
+            "private": "Только для читателей",
+            "public": "Публичный",
+            "unlisted": "Тихий"
+        },
         "show_less": "Показать меньше",
         "show_more": "Показать больше",
         "submit": "Отправить",
@@ -123,6 +165,84 @@
         "load_older": "Загрузить старые взаимодействия",
         "moves": "Переезды"
     },
+    "languages": {
+        "ar": "Арабский",
+        "az": "Азербайджанский",
+        "bg": "Болгарский",
+        "cs": "Чешский",
+        "da": "Датский",
+        "de": "Немецкий",
+        "el": "Греческий",
+        "en": "Английский",
+        "eo": "Эсперанто",
+        "es": "Испанский",
+        "fa": "Персидский",
+        "fi": "Финский",
+        "fr": "Французский",
+        "ga": "Ирландский",
+        "he": "Иврит",
+        "hi": "Хинди",
+        "hu": "Венгерский",
+        "id": "Индонезийский",
+        "it": "Итальянский",
+        "ja": "Японский",
+        "ko": "Корейский",
+        "lt": "Литовский",
+        "lv": "Латышский",
+        "nl": "Нидерландский",
+        "pl": "Польский",
+        "pt": "Португальский",
+        "ru": "Русский",
+        "sk": "Словацкий",
+        "sv": "Шведский",
+        "tr": "Турецкий",
+        "translated_from": {
+            "ar": "Переведено с арабского",
+            "az": "Переведено с азербайджанского",
+            "bg": "Переведено с болгарского",
+            "cs": "Переведено с чешского",
+            "da": "Переведено с датского",
+            "de": "Переведено с немецкого",
+            "el": "Переведено с греческого",
+            "en": "Переведено с английского",
+            "eo": "Переведено с эсперанто",
+            "es": "Переведено с испанского",
+            "fa": "Переведено с персидского",
+            "fi": "Переведено с финского",
+            "fr": "Переведено с французского",
+            "ga": "Переведено с ирландского",
+            "he": "Переведено с иврита",
+            "hi": "Переведено с хинди",
+            "hu": "Переведено с венгерского",
+            "id": "Переведено с индонезийского",
+            "it": "Переведено с итальянского",
+            "ja": "Переведено с японского",
+            "ko": "Переведено с корейского",
+            "lt": "Переведено с литовского",
+            "lv": "Переведено с латышского",
+            "nl": "Переведено с нидерландского",
+            "pl": "Переведено с польского",
+            "pt": "Переведено с португальского",
+            "ru": "Переведено с русского",
+            "sk": "Переведено со словацкого",
+            "sv": "Переведено со шведского",
+            "tr": "Переведено с турецкого",
+            "uk": "Переведено с украинского",
+            "zh": "Переведено с китайского"
+        },
+        "uk": "Украинский",
+        "zh": "Китайский"
+    },
+    "lists": {
+        "create": "Создать",
+        "delete": "Удалить список",
+        "following_only": "Показывать только читаемых пользователей",
+        "lists": "Списки",
+        "new": "Новый список",
+        "save": "Сохранить изменения",
+        "search": "Найти пользователя",
+        "title": "Название списка"
+    },
     "login": {
         "authentication_code": "Код аутентификации",
         "description": "Войти с помощью OAuth",
@@ -135,16 +255,41 @@
         "hint": "Войдите чтобы присоединиться к дискуссии",
         "login": "Войти",
         "logout": "Выйти",
+        "logout_confirm": "Точно завершить сеанс?",
+        "logout_confirm_accept_button": "Выйти",
+        "logout_confirm_cancel_button": "Отмена",
+        "logout_confirm_title": "Выйти",
         "password": "Пароль",
-        "placeholder": "e.c. lain",
+        "placeholder": "пользователь123",
         "recovery_code": "Код восстановления",
         "register": "Зарегистрироваться",
         "username": "Имя пользователя"
     },
     "media_modal": {
+        "counter": "{current} / {total}",
+        "hide": "Закрыть смотровое окно",
         "next": "Следующая",
         "previous": "Предыдущая"
     },
+    "moderation": {
+        "moderation": "Модерация",
+        "reports": {
+            "add_note": "Добавить заметку",
+            "close": "Закрыть",
+            "delete_note": "Удалить",
+            "delete_note_accept": "Да, удалить",
+            "delete_note_cancel": "Нет, оставить",
+            "delete_note_confirm": "Точно удалить эту заметку?",
+            "delete_note_title": "Подтвердить удаление",
+            "no_content": "Описание отсутствует",
+            "no_reports": "Жалоб нет",
+            "note_placeholder": "Добавьте вашу заметку",
+            "notes": "{ count } заметка | { count } заметок",
+            "reopen": "Возобновить",
+            "report": "Жалоба на",
+            "reports": "Жалобы"
+        }
+    },
     "nav": {
         "about": "Об узле",
         "administration": "Панель администратора",
@@ -748,4 +893,4 @@
         "add_comment_description": "Жалоба будет направлена модераторам вашего узла. Вы можете указать причину жалобы ниже:",
         "forward_description": "Данный пользователь находится на другом узле. Отослать туда копию вашей жалобы?"
     }
-}
\ No newline at end of file
+}

From 94c70f89142fcdcdd08899c7de50ed153ee8459b Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:33 +0000
Subject: [PATCH 32/36] Merge branch 'origin/develop' into Weblate.

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1046 of 1046 strings)

Co-authored-by: Poesty Li <poesty7450@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/zh_Hans/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/zh.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index c342bc5b..dd56088c 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -576,12 +576,12 @@
         "hide_list_aliases_error_action": "关闭",
         "hide_media_previews": "隐藏媒体预览",
         "hide_muted_posts": "隐藏已静音用户的帖文",
-        "hide_muted_threads": "隐藏已静音的同主题帖文",
+        "hide_muted_threads": "隐藏已静音的对话",
         "hide_post_stats": "隐藏帖文的统计数据（例如：喜欢的次数）",
         "hide_shoutbox": "隐藏实例留言板",
         "hide_site_favicon": "隐藏顶部面板中的实例图标",
         "hide_site_name": "隐藏顶部面板中的实例名称",
-        "hide_threads_with_blocked_users": "隐藏提及被屏蔽用户的同主题帖文",
+        "hide_threads_with_blocked_users": "隐藏提及被屏蔽用户的对话",
         "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）",
         "hide_wallpaper": "隐藏实例壁纸",
         "hide_wordfiltered_statuses": "隐藏经过词语过滤的帖文",
@@ -603,7 +603,7 @@
         "loop_video": "循环视频",
         "loop_video_silent_only": "仅循环没有声音的视频（例如：Mastodon 里的“GIF”）",
         "mascot": "Mastodon FE 吉祥物",
-        "max_depth_in_thread": "默认显示同主题帖文中的最大层数",
+        "max_depth_in_thread": "默认显示对话中的最大层数",
         "max_thumbnails": "每个帖文最多能显示的缩略图数量",
         "mention_link_bolden_you": "当你被提及时突出显示提及你",
         "mention_link_display": "显示提及链接",
@@ -916,8 +916,8 @@
         "token": "令牌",
         "tooltipRadius": "提醒",
         "translation_language": "自动翻译语言",
-        "tree_advanced": "显示额外的按钮来打开和关闭同主题帖文中的回复链",
-        "tree_fade_ancestors": "在当前帖子中以淡色文本显示其原型帖子",
+        "tree_advanced": "显示额外的按钮来打开和关闭对话中的回复链",
+        "tree_fade_ancestors": "以淡色文本显示当前帖文的上文",
         "type_domains_to_mute": "搜索需要静音的域名",
         "upload_a_photo": "上传照片",
         "useStreamingApi": "实时接收帖文和通知",
@@ -1012,10 +1012,10 @@
         "status_unavailable": "帖文不可用",
         "thread_follow": "查看 {numStatus} 条更多回复",
         "thread_follow_with_icon": "{icon} {text}",
-        "thread_hide": "隐藏此同主题帖文",
-        "thread_muted": "同主题帖文已被静音",
+        "thread_hide": "隐藏此对话",
+        "thread_muted": "对话已被静音",
         "thread_muted_and_words": "，含有过滤词：",
-        "thread_show": "显示这个同主题帖文",
+        "thread_show": "显示这个对话",
         "thread_show_full": "显示 {numStatus} 条回复 | 显示全部 {numStatus} 条回复",
         "thread_show_full_with_icon": "{icon} {text}",
         "translate": "翻译",

From 02a6591f2059748fd42765893116c5b36e5bb1ba Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:33 +0000
Subject: [PATCH 33/36] Translated using Weblate (Greek)

Currently translated at 15.9% (167 of 1046 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: getimiskon <getimiskon@disroot.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/el/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/el.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i18n/el.json b/src/i18n/el.json
index f09d18a9..c7ae5ae4 100644
--- a/src/i18n/el.json
+++ b/src/i18n/el.json
@@ -18,7 +18,8 @@
                 "reason": "Λόγος",
                 "simple_policies": "Πολιτικές του instance"
             }
-        }
+        },
+        "staff": "Προσωπικό"
     },
     "announcements": {
         "all_day_prompt": "Αυτό είναι ένα ολοήμερο συμβάν",
@@ -27,10 +28,14 @@
         "delete_action": "Διαγραφή",
         "edit_action": "Επεξεργασία",
         "end_time_display": "Λήγει στις {time}",
+        "end_time_prompt": "Λήξη: ",
+        "inactive_message": "Αυτή η ανακοίνωση είναι ανενεργή",
         "page_header": "Ανακοινώσεις",
+        "post_action": "Ανάρτηση",
         "title": "Ανακοίνωση"
     },
     "chats": {
+        "delete_confirm": "Θέλετε σίγουρα να διαγράψετε αυτό το μήνυμα;",
         "empty_message_error": "Δε μπορεί να σταλεί κενό μήνυμα",
         "error_sending_message": "Κάτι πήγε λάθος κατά την αποστολή του μηνύματος.",
         "message_user": "Στείλε μήνυμα στον/στην {nickname}",

From f2d0c4c7d57ef05b223b58d599f4f66bd4e9bcd3 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:33 +0000
Subject: [PATCH 34/36] Translated using Weblate (Japanese)

Currently translated at 0.2% (3 of 1046 strings)

Added translation using Weblate (Japanese)

Co-authored-by: Nakaya <s_fpfb_sub-second@yahoo.co.jp>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/i18n/ja.json

diff --git a/src/i18n/ja.json b/src/i18n/ja.json
new file mode 100644
index 00000000..4f994a22
--- /dev/null
+++ b/src/i18n/ja.json
@@ -0,0 +1,11 @@
+{
+    "about": {
+        "mrf": {
+            "keyword": {
+                "is_replaced_by": "→",
+                "replace": "置き換える"
+            },
+            "mrf_policies": "有効なMRFポリシー"
+        }
+    }
+}

From 4e7d5d3a08182b1d0ab07a997212e297ab08093a Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 15 Feb 2024 17:32:33 +0000
Subject: [PATCH 35/36] Translated using Weblate (Vietnamese)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 92.2% (965 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 92.2% (965 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 84.3% (882 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 84.3% (882 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 79.8% (835 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 79.8% (835 of 1046 strings)

Co-authored-by: Nguyễn Gia Phong <cnx@loang.net>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: xarvos <huyngo@disroot.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/vi/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/vi.json | 401 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 344 insertions(+), 57 deletions(-)

diff --git a/src/i18n/vi.json b/src/i18n/vi.json
index 2e67e2ff..3c3763c5 100644
--- a/src/i18n/vi.json
+++ b/src/i18n/vi.json
@@ -1,5 +1,7 @@
 {
     "about": {
+        "bubble_instances": "Các máy chủ lân cận",
+        "bubble_instances_description": "Các máy chủ được quản trị chọn để thể hiện vùng xung quanh máy chủ này",
         "mrf": {
             "federation": "Liên hợp",
             "keyword": {
@@ -16,12 +18,15 @@
                 "accept_desc": "Máy chủ này chỉ chấp nhận tin nhắn từ những máy chủ:",
                 "ftl_removal": "Giới hạn chung",
                 "ftl_removal_desc": "Nội dung từ những máy chủ sau sẽ bị ẩn:",
-                "media_nsfw": "Áp đặt nhạy cảm",
-                "media_nsfw_desc": "Nội dung từ những máy chủ sau sẽ bị tự động gắn nhãn nhạy cảm:",
+                "instance": "Máy chủ",
+                "media_nsfw": "Áp đặt nhạy cảm cho nội dung đa phương tiện",
+                "media_nsfw_desc": "Nội dung đa phương tiện từ những máy chủ sau sẽ bị tự động gắn nhãn nhạy cảm:",
                 "media_removal": "Ẩn Media",
                 "media_removal_desc": "Media từ những máy chủ sau sẽ bị ẩn:",
-                "quarantine": "Bảo hành",
-                "quarantine_desc": "Máy chủ này sẽ gửi tút công khai đến những máy chủ:",
+                "not_applicable": "không ghi",
+                "quarantine": "Cách ly",
+                "quarantine_desc": "Máy chủ này sẽ chỉ gửi bài đăng công khai đến những máy chủ:",
+                "reason": "Lý do",
                 "reject": "Từ chối",
                 "reject_desc": "Máy chủ này không chấp nhận tin nhắn từ những máy chủ:",
                 "simple_policies": "Quy tắc máy chủ"
@@ -29,6 +34,27 @@
         },
         "staff": "Nhân viên"
     },
+    "announcements": {
+        "all_day_prompt": "Đây là sự kiện kéo dài cả ngày",
+        "cancel_edit_action": "Huỷ",
+        "close_error": "Đóng",
+        "delete_action": "Xoá",
+        "edit_action": "Sửa",
+        "end_time_display": "Kết thúc lúc {time}",
+        "end_time_prompt": "Thời gian kết thúc: ",
+        "inactive_message": "Thông báo này đang vô hiệu",
+        "mark_as_read_action": "Đánh dấu đã đọc",
+        "page_header": "Thông báo",
+        "post_action": "Bài đăng",
+        "post_error": "Lỗi: {error}",
+        "post_form_header": "Đăng thông báo",
+        "post_placeholder": "Nội dung thông báo",
+        "published_time_display": "Đăng lúc {time}",
+        "start_time_display": "Bắt đầu lúc {time}",
+        "start_time_prompt": "Thời gian bắt đầu: ",
+        "submit_edit_action": "Đăng",
+        "title": "Thông báo"
+    },
     "chats": {
         "chats": "Chat",
         "delete": "Xóa",
@@ -58,6 +84,7 @@
         "keep_open": "Mở khung lựa chọn",
         "load_all": "Đang tải {emojiAmount} emoji",
         "load_all_hint": "Tải trước {saneAmount} emoji, tải toàn bộ emoji có thể gây xử lí chậm.",
+        "recent": "Sử dụng gần đây",
         "search_emoji": "Tìm emoji",
         "stickers": "Sticker",
         "unicode": "Unicode emoji"
@@ -109,6 +136,13 @@
             "admin": "Quản trị viên",
             "moderator": "Kiểm duyệt viên"
         },
+        "scope_in_timeline": {
+            "direct": "Trực tiếp",
+            "local": "Nội bộ - chỉ thành viên cùng máy chủ xem được bài đăng này",
+            "private": "Cho người theo dõi",
+            "public": "Công khai",
+            "unlisted": "Hạn chế"
+        },
         "show_less": "Thu gọn",
         "show_more": "Xem thêm",
         "submit": "Gửi tặng",
@@ -131,6 +165,84 @@
         "load_older": "Xem tương tác cũ hơn",
         "moves": "Người dùng chuyển đi"
     },
+    "languages": {
+        "ar": "tiếng Ả-rập",
+        "az": "tiếng Azerbaijan",
+        "bg": "tiếng Bulgari",
+        "cs": "tiếng Séc",
+        "da": "tiếng Đan Mạch",
+        "de": "tiếng Đức",
+        "el": "tiếng Hy Lạp",
+        "en": "tiếng Anh",
+        "eo": "Quốc tế ngữ",
+        "es": "tiếng Tây Ban Nha",
+        "fa": "tiếng Ba Tư",
+        "fi": "tiếng Phần Lan",
+        "fr": "tiếng Pháp",
+        "ga": "tiếng Ireland",
+        "he": "tiếng Hebrew",
+        "hi": "tiếng Hindi",
+        "hu": "tiếng Hungari",
+        "id": "tiếng Indonesia",
+        "it": "tiếng Ý",
+        "ja": "tiếng Nhật",
+        "ko": "tiếng Hàn",
+        "lt": "tiếng Litva",
+        "lv": "tiếng Latvia",
+        "nl": "tiếng Hà Lan",
+        "pl": "tiếng Ba Lan",
+        "pt": "tiếng Bồ Đào Nha",
+        "ru": "tiếng Nga",
+        "sk": "tiếng Slovakia",
+        "sv": "tiếng Thuỵ Điển",
+        "tr": "tiếng Thổ Nhĩ Kỳ",
+        "translated_from": {
+            "ar": "Dịch từ @:languages.ar",
+            "az": "Dịch từ @:languages.az",
+            "bg": "Dịch từ @:languages.bg",
+            "cs": "Dịch từ @:languages.cs",
+            "da": "Dịch từ @:languages.da",
+            "de": "Dịch từ @:languages.de",
+            "el": "Dịch từ @:languages.el",
+            "en": "Dịch từ @:languages.en",
+            "eo": "Dịch từ @:languages.eo",
+            "es": "Dịch từ @:languages.es",
+            "fa": "Dịch từ @:languages.fa",
+            "fi": "Dịch từ @:languages.fi",
+            "fr": "Dịch từ @:languages.fr",
+            "ga": "Dịch từ @:languages.ga",
+            "he": "Dịch từ @:languages.he",
+            "hi": "Dịch từ @:languages.hi",
+            "hu": "Dịch từ @:languages.hu",
+            "id": "Dịch từ @:languages.id",
+            "it": "Dịch từ @:languages.it",
+            "ja": "Dịch từ @:languages.ja",
+            "ko": "Dịch từ @:languages.ko",
+            "lt": "Dịch từ @:languages.lt",
+            "lv": "Dịch từ @:languages.lv",
+            "nl": "Dịch từ @:languages.nl",
+            "pl": "Dịch từ @:languages.pl",
+            "pt": "Dịch từ @:languages.pt",
+            "ru": "Dịch từ @:languages.ru",
+            "sk": "Dịch từ @:languages.sk",
+            "sv": "Dịch từ @:languages.sv",
+            "tr": "Dịch từ @:languages.tr",
+            "uk": "Dịch từ @:languages.uk",
+            "zh": "Dịch từ @:languages.zh"
+        },
+        "uk": "Tiếng Ukraina",
+        "zh": "Tiếng Trung"
+    },
+    "lists": {
+        "create": "Tạo",
+        "delete": "Xoá danh sách",
+        "following_only": "Giới hạn chỉ người được theo dõi",
+        "lists": "Danh sách",
+        "new": "Tạo danh sách mới",
+        "save": "Lưu thay đổi",
+        "search": "Tìm người dùng",
+        "title": "Tên danh sách"
+    },
     "login": {
         "authentication_code": "Mã truy cập",
         "description": "Đăng nhập bằng OAuth",
@@ -143,60 +255,101 @@
         "hint": "Đăng nhập để cùng trò chuyện",
         "login": "Đăng nhập",
         "logout": "Đăng xuất",
+        "logout_confirm": "Bạn có chắc mình muốn đăng xuất?",
+        "logout_confirm_accept_button": "Đăng xuất",
+        "logout_confirm_cancel_button": "Huỷ",
+        "logout_confirm_title": "Đăng xuất",
         "password": "Mật khẩu",
-        "placeholder": "vd: cobetronxinh",
+        "placeholder": "ví dụ: kimdung",
         "recovery_code": "Mã khôi phục",
         "register": "Đăng ký",
         "username": "Tên người dùng"
     },
     "media_modal": {
+        "counter": "{current} / {total}",
+        "hide": "Đóng nội dung đa phương tiện",
         "next": "Kế tiếp",
         "previous": "Trước đó"
     },
+    "moderation": {
+        "moderation": "Quản lý",
+        "reports": {
+            "add_note": "Thêm ghi chú",
+            "close": "Đóng",
+            "delete_note": "Xoá",
+            "delete_note_accept": "Đúng, tôi muốn xoá",
+            "delete_note_cancel": "Không, giữ lại",
+            "delete_note_confirm": "Bạn có chắc bạn muốn xoá ghi chú này?",
+            "delete_note_title": "Xác nhận xoá",
+            "no_content": "Không có mô tả",
+            "no_reports": "Không có báo cáo nào",
+            "note_placeholder": "Để lại ghi chú",
+            "notes": "{ count } ghi chú | { count } ghi chú",
+            "reopen": "Mở lại",
+            "report": "Báo cáo",
+            "reports": "Báo cáo",
+            "resolve": "Giải quyết",
+            "show_closed": "Hiện những thông báo đã đóng",
+            "statuses": "{ count } bài đăng| { count } bài đăng",
+            "tag_policy_notice": "Kích hoạt MRF TagPolicy để giới hạn bài đăng",
+            "tags": "Giới hạn bài đăng"
+        },
+        "statuses": "Bài đăng",
+        "users": "Người dùng"
+    },
     "nav": {
         "about": "Về máy chủ này",
         "administration": "Vận hành bởi",
+        "announcements": "Thông báo",
         "back": "Quay lại",
         "bookmarks": "Đã lưu",
+        "bubble_timeline": "Dòng thời gian lân cận",
+        "bubble_timeline_description": "Bài đăng từ các máy chủ gần với của bạn, được chọn bởi quản trị viên",
         "chats": "Chat",
         "dms": "Nhắn tin",
         "friend_requests": "Yêu cầu theo dõi",
         "home_timeline": "Bảng tin của bạn",
-        "interactions": "Giao tiếp",
+        "home_timeline_description": "Bài đăng từ những người bạn theo dõi",
+        "interactions": "Tương tác",
+        "lists": "Danh sách",
         "mentions": "Lượt nhắc đến",
+        "moderation": "Quản lý",
         "preferences": "Thiết lập",
+        "public_timeline_description": "Bài đăng công khai từ máy chủ này",
         "public_tl": "Bảng tin máy chủ",
         "search": "Tìm kiếm",
         "timeline": "Bảng tin",
         "timelines": "Bảng tin",
         "twkn": "Thế giới",
+        "twkn_timeline_description": "Bài đăng từ toàn bộ mạng liên hợp",
         "user_search": "Tìm kiếm người dùng",
         "who_to_follow": "Đề xuất theo dõi"
     },
     "notifications": {
         "broken_favorite": "Trạng thái chưa rõ, đang tìm kiếm…",
         "error": "Lỗi khi nạp thông báo {0}",
-        "favorited_you": "thích tút của bạn",
+        "favorited_you": "thích bài đăng của bạn",
         "follow_request": "yêu cầu theo dõi bạn",
         "followed_you": "theo dõi bạn",
         "load_older": "Xem những thông báo cũ hơn",
         "migrated_to": "chuyển sang",
         "no_more_notifications": "Không còn thông báo nào",
         "notifications": "Thông báo",
-        "reacted_with": "chạm tới {0}",
+        "poll_ended": "bình chọn đã kết thúc",
+        "reacted_with": "biểu lộ cảm xúc {0}",
         "read": "Đọc!",
-        "repeated_you": "chia sẻ tút của bạn"
+        "repeated_you": "chia sẻ bài đăng của bạn"
     },
     "password_reset": {
-        "check_email": "Kiểm tra email của bạn.",
-        "forgot_password": "Quên mật khẩu",
-        "instruction": "Nhập email hoặc tên người dùng. Chúng tôi sẽ gửi email reset mật khẩu cho bạn.",
+        "check_email": "Kiểm tra đường dẫn khôi phục mật khẩu trong email của bạn.",
+        "forgot_password": "Quên mật khẩu?",
+        "instruction": "Nhập email hoặc tên người dùng. Chúng tôi sẽ gửi email khôi phục mật khẩu cho bạn.",
         "password_reset": "Đổi mật khẩu",
-        "password_reset_disabled": "Reset mật khẩu bị tắt. Hãy liên hệ quản trị viên máy chủ.",
+        "password_reset_disabled": "Đổi mật khẩu bị tắt. Hãy liên hệ quản trị viên máy chủ.",
         "password_reset_required": "Bạn phải đổi mật khẩu để đăng nhập.",
         "password_reset_required_but_mailer_is_disabled": "Bạn cần phải đổi mật khẩu, nhưng tính năng bị tắt. Hãy liên hệ quản trị viên máy chủ.",
         "placeholder": "Email hoặc tên người dùng",
-        "return_home": "Quay lại Pleroma",
+        "return_home": "Quay lại trang chủ",
         "too_many_requests": "Bạn đã vượt giới hạn cho phép, hãy thử lại sau."
     },
     "polls": {
@@ -212,58 +365,70 @@
         "single_choice": "Chỉ được chọn một lựa chọn",
         "type": "Kiểu bình chọn",
         "vote": "Bình chọn",
-        "votes": "người bình chọn",
+        "votes": "lượt bình chọn",
         "votes_count": "{count} bình chọn | {count} bình chọn"
     },
     "post_status": {
         "account_not_locked_warning": "Tài khoản của bạn chưa {0}. Bất kỳ ai cũng có thể xem những tút dành cho người theo dõi của bạn.",
-        "account_not_locked_warning_link": "đã khóa",
+        "account_not_locked_warning_link": "được khóa",
         "attachments_sensitive": "Đánh dấu media là nhạy cảm",
         "content_type": {
             "text/bbcode": "BBCode",
             "text/html": "HTML",
             "text/markdown": "Markdown",
-            "text/plain": "Văn bản"
+            "text/plain": "Văn bản",
+            "text/x.misskeymarkdown": "Markdown kiểu Misskey"
         },
-        "content_warning": "Tiêu đề (tùy chọn)",
+        "content_warning": "Cảnh báo nội dung (tùy chọn)",
         "default": "Đời người con gái không muốn yêu ai được không?",
-        "direct_warning_to_all": "Những ai được nhắc đến sẽ đều thấy tút này.",
-        "direct_warning_to_first_only": "Người đầu tiên được nhắc đến mới có thể thấy tút này.",
-        "empty_status_error": "Không thể đăng một tút trống và không có media",
-        "media_description": "Mô tả media",
+        "direct_warning_to_all": "Những ai được nhắc đến sẽ đều thấy bài đăng này.",
+        "direct_warning_to_first_only": "Những được nhắc đến ở đầu bài dăng mới có thể thấy bài đăng này.",
+        "edit_remote_warning": "Thay đổi của bài đăng này có thể không đến được một số máy chủ khác!",
+        "edit_status": "Sửa bài đăng",
+        "edit_unsupported_warning": "Bình chọn và những người được đề cập sẽ không bị thay đổi bởi chỉnh sửa.",
+        "empty_status_error": "Không thể đăng một bài đăng trống và không có tập tin đính kèm",
+        "media_description": "Mô tả nội dung tập tin",
         "media_description_error": "Cập nhật media thất bại, thử lại sau",
-        "new_status": "Đăng tút",
+        "media_not_sensitive_warning": "Bạn có cảnh báo nội dung, nhưng tập tin đính kèm chưa được đánh dấu là nhạy cảm!",
+        "new_status": "Bài đăng mới",
         "post": "Đăng",
-        "posting": "Đang đăng tút",
+        "posting": "Đang đăng",
         "preview": "Xem trước",
         "preview_empty": "Trống",
         "scope": {
             "direct": "Tin nhắn - chỉ người được nhắc đến mới thấy",
+            "local": "Nội bộ - không chia sẻ sang máy chủ khác",
             "private": "Riêng tư - Chỉ dành cho người theo dõi",
             "public": "Công khai - hiện trên bảng tin máy chủ",
             "unlisted": "Hạn chế - không hiện trên bảng tin"
         },
         "scope_notice": {
-            "private": "Chỉ những người theo dõi bạn mới thấy tút này",
-            "public": "Mọi người đều có thể thấy tút này",
-            "unlisted": "Tút này sẽ không hiện trong bảng tin máy chủ và thế giới"
+            "local": "Bài đăng này sẽ không hiện trên máy chủ khác",
+            "private": "Chỉ những người theo dõi bạn mới thấy bài đăng này",
+            "public": "Mọi người đều có thể thấy bài đăng này",
+            "unlisted": "Bài đăng này sẽ không hiện trong bảng tin máy chủ và thế giới"
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Tài khoản của bạn đã được đăng ký và một email đã được gửi cho bạn. Hãy kiểm tra email để hoàn tất đăng ký.",
+        "awaiting_email_confirmation_title": "Đang chờ xác nhận email",
         "bio": "Tiểu sử",
-        "bio_placeholder": "vd:\nHi, I'm Cô Bé Tròn Xinh.\nI’m an anime girl living in suburban Vietnam. You may know me from the school.",
+        "bio_placeholder": "ví dụ:\nChào mừng bạn đến với tiểu sử của tôi.\nTôi thích viết văn theo trường phái hiện thực, sau này viết báo kháng chiến. Hi vọng chúng ta có thể làm bạn!",
         "captcha": "CAPTCHA",
         "email": "Email",
+        "email_language": "Bạn muốn nhận email từ máy chủ này bằng ngôn ngữ nào?",
         "fullname": "Tên hiển thị",
-        "fullname_placeholder": "vd: Cô Bé Tròn Xinh",
+        "fullname_placeholder": "ví dụ: Trần Hữu Tri",
         "new_captcha": "Nhấn vào hình ảnh để đổi captcha mới",
         "password_confirm": "Xác nhận mật khẩu",
         "reason": "Lý do đăng ký",
         "reason_placeholder": "Máy chủ này phê duyệt đăng ký thủ công.\nHãy cho quản trị viên biết lý do bạn muốn đăng ký.",
         "register": "Đăng ký",
         "registration": "Đăng ký",
+        "request_sent": "Đơn xin đăng ký đã được gửi và đang chờ phê duyệt. Bạn sẽ nhận được email khi tài khoản của bạn được duyệt.",
+        "request_sent_title": "Đã gửi đơn xin đăng ký",
         "token": "Lời mời",
-        "username_placeholder": "vd: cobetronxinh",
+        "username_placeholder": "vd: namcao",
         "validations": {
             "email_required": "không được để trống",
             "fullname_required": "không được để trống",
@@ -281,7 +446,7 @@
     "search": {
         "hashtags": "Hashtag",
         "no_results": "Không tìm thấy",
-        "people": "Người",
+        "people": "Mọi người",
         "people_talking": "{count} người đang trò chuyện",
         "person_talking": "{count} người đang trò chuyện"
     },
@@ -290,6 +455,13 @@
     },
     "settings": {
         "accent": "Màu chủ đạo",
+        "account_backup": "Sao lưu dữ liệu",
+        "account_backup_description": "Tạo bản sao thông tin tài khoản và các bài viết (Akkoma hiện tại chưa thể nhập dữ liệu ngược lại từ bản sao).",
+        "account_backup_table_head": "Các bản sao",
+        "account_privacy": "Riêng tư",
+        "add_backup": "Thêm bản sao dữ liệu",
+        "add_backup_error": "Lỗi khi sao dữ liệu: {error}",
+        "added_backup": "Đã tạo bản sao dữ liệu.",
         "allow_following_move": "Cho phép tự động theo dõi lại khi tài khoản đang theo dõi chuyển sang máy chủ khác",
         "always_show_post_button": "Luôn hiện nút viết tút mới",
         "app_name": "Tên app",
@@ -301,6 +473,7 @@
         "avatarRadius": "Ảnh đại diện",
         "avatar_size_instruction": "Kích cỡ tối thiểu 150x150 pixels.",
         "background": "Ảnh nền",
+        "backup_not_ready": "Sao lưu chưa hoàn tất.",
         "bio": "Tiểu sử",
         "block_export": "Xuất danh sách chặn",
         "block_export_button": "Xuất danh sách chặn ra tập tin CSV",
@@ -322,9 +495,27 @@
         "changed_password": "Đổi mật khẩu thành công!",
         "chatMessageRadius": "Tin nhắn chat",
         "checkboxRadius": "Hộp kiểm",
-        "collapse_subject": "Thu gọn những tút có tựa đề",
+        "collapse_subject": "Thu gọn các bài viết có cảnh báo về nội dung",
+        "columns": "Cột",
         "composing": "Thu gọn",
+        "confirm_dialogs": "Yêu cầu xác nhận cho:",
+        "confirm_dialogs_approve_follow": "Cho phép theo dõi",
+        "confirm_dialogs_block": "Chặn ai đó",
+        "confirm_dialogs_delete": "Xoá bài viết",
+        "confirm_dialogs_deny_follow": "Không cho theo dõi",
+        "confirm_dialogs_mute": "Bơ ai đó",
+        "confirm_dialogs_repeat": "Chia sẻ bài viết",
+        "confirm_dialogs_unfollow": "Ngừng theo dõi ai đó",
         "confirm_new_password": "Xác nhận mật khẩu mới",
+        "confirmation_dialogs": "Lựa chọn xác nhận",
+        "conversation_display": "Cách hiển thị một thớt",
+        "conversation_display_linear": "Dọc",
+        "conversation_display_tree": "Hình cây",
+        "conversation_other_replies_button": "Hiện nút \"các phản hồi khác\"",
+        "conversation_other_replies_button_below": "Dưới bài viết",
+        "conversation_other_replies_button_inside": "Trong bài viết",
+        "current_avatar": "Hình đại diện hiện tại",
+        "current_mascot": "Linh vật hiện tại",
         "current_password": "Mật khẩu cũ",
         "data_import_export_tab": "Nhập / Xuất dữ liệu",
         "default_vis": "Kiểu đăng tút mặc định",
@@ -332,11 +523,16 @@
         "delete_account_description": "Xóa vĩnh viễn mọi dữ liệu và vô hiệu hóa tài khoản của bạn.",
         "delete_account_error": "Có lỗi khi xóa tài khoản. Xin liên hệ quản trị viên máy chủ để tìm hiểu.",
         "delete_account_instructions": "Nhập mật khẩu bên dưới để xác nhận.",
+        "disable_sticky_headers": "Đừng dính đỉnh các cột vào trần màn hình",
         "discoverable": "Hiện tài khoản trong công cụ tìm kiếm và những tính năng khác",
         "domain_mutes": "Máy chủ",
+        "download_backup": "Tải xuống",
+        "email_language": "Ngôn ngữ gửi thư điện tử từ máy chủ",
         "emoji_reactions_on_timeline": "Hiện tương tác emoji trên bảng tin",
         "enable_web_push_notifications": "Cho phép thông báo đẩy trên web",
         "enter_current_password_to_confirm": "Nhập mật khẩu để xác thực",
+        "expire_posts_enabled": "Xoá bài đăng sau một số ngày",
+        "expire_posts_input_placeholder": "Số ngày",
         "export_theme": "Lưu mẫu",
         "file_export_import": {
             "backup_restore": "Sao lưu",
@@ -345,13 +541,13 @@
             "errors": {
                 "file_slightly_new": "Phiên bản tập tin khác biệt, không thể áp dụng một vài thay đổi",
                 "file_too_new": "Phiên bản không tương thích: {fileMajor}, phiên bản PleromaFE(settings ver {feMajor}) của máy chủ này quá cũ để sử dụng",
-                "file_too_old": "Phiên bản không tương thích: {fileMajor}, phiên bản tập tin quá cũ và không được hỗ trợ (min. set. ver. {feMajor})",
+                "file_too_old": "Phiên bản không tương thích: {fileMajor}, tập tin quá cũ và không được hỗ trợ (phiên bản tối thiểu: {feMajor})",
                 "invalid_file": "Tập tin đã chọn không hỗ trợ bởi Pleroma. Giữ nguyên mọi thay đổi."
             },
             "restore_settings": "Khôi phục thiết lập từ tập tin"
         },
         "filtering": "Bộ lọc",
-        "filtering_explanation": "Những tút chứa từ sau sẽ bị ẩn, mỗi chữ một hàng",
+        "filtering_explanation": "Những bài viết chứa các từ sau sẽ bị ẩn, mỗi từ một hàng",
         "follow_export": "Xuất danh sách theo dõi",
         "follow_export_button": "Xuất danh sách theo dõi ra tập tin CSV",
         "follow_import": "Nhập danh sách theo dõi",
@@ -364,16 +560,20 @@
         "hide_all_muted_posts": "Ẩn những tút đã ẩn",
         "hide_attachments_in_convo": "Ẩn tập tin đính kèm trong thảo luận",
         "hide_attachments_in_tl": "Ẩn tập tin đính kèm trong bảng tin",
+        "hide_favorites_description": "Không hiện danh sách bài đăng đã thích (mọi người vẫn nhận được thông báo)",
         "hide_filtered_statuses": "Ẩn những tút đã lọc",
         "hide_followers_count_description": "Ẩn số lượng người theo dõi tôi",
         "hide_followers_description": "Ẩn danh sách những người theo dõi tôi",
         "hide_follows_count_description": "Ẩn số lượng người tôi theo dõi",
         "hide_follows_description": "Ẩn danh sách những người tôi theo dõi",
         "hide_isp": "Ẩn thanh bên của máy chủ",
+        "hide_list_aliases_error_action": "Đóng",
         "hide_media_previews": "Ẩn xem trước media",
         "hide_muted_posts": "Ẩn tút từ các người dùng đã ẩn",
         "hide_post_stats": "Ẩn tương tác của tút (vd: số lượt thích)",
         "hide_shoutbox": "Ẩn thanh chat máy chủ",
+        "hide_site_favicon": "Ẩn biểu tượng máy chủ ở thanh trên cùng",
+        "hide_site_name": "Ẩn tên máy chủ ở thanh trên cùng",
         "hide_user_stats": "Ẩn số liệu người dùng (vd: số người theo dõi)",
         "hide_wallpaper": "Ẩn ảnh nền máy chủ",
         "import_blocks_from_a_csv_file": "Nhập danh sách chặn từ tập tin CSV",
@@ -388,10 +588,17 @@
         "invalid_theme_imported": "Tập tin đã chọn không hỗ trợ bởi Pleroma. Giao diện của bạn sẽ giữ nguyên.",
         "limited_availability": "Trình duyệt không hỗ trợ",
         "links": "Liên kết",
+        "list_backups_error": "Lỗi khi liệt kê các bản sao: {error}",
         "lock_account_description": "Tự phê duyệt yêu cầu theo dõi",
         "loop_video": "Lặp lại video",
         "loop_video_silent_only": "Chỉ lặp lại những video không có âm thanh",
         "max_thumbnails": "Số ảnh xem trước tối đa cho mỗi tút",
+        "mention_link_display_full": "luôn hiện đầy đủ tên (v.d. {'@'}foo{'@'}example.org)",
+        "mention_link_display_full_for_remote": "chỉ hiện đầy đủ tên cho người từ máy chủ khác (v.d. {'@'}foo{'@'}example.org)",
+        "mention_link_display_short": "luôn rút gọn tên (v.d. {'@'}foo)",
+        "mention_link_fade_domain": "Làm mờ tên miền (v.d. {'@'}example.org trong {'@'}foo{'@'}example.org)",
+        "mention_link_show_avatar": "Hiện ảnh đại diện cạnh đường dẫn",
+        "mention_link_show_tooltip": "Hiện tên đầy đủ khi trỏ vào cho người dùng từ máy chủ khác",
         "mfa": {
             "authentication_methods": "Phương pháp xác thực",
             "confirm_and_enable": "Xác nhận và kích hoạt OTP",
@@ -444,12 +651,13 @@
         "notification_visibility_repeats": "Chia sẻ",
         "notifications": "Thông báo",
         "nsfw_clickthrough": "Cho phép nhấn vào xem các tút nhạy cảm",
-        "oauth_tokens": "OAuth tokens",
+        "oauth_tokens": "Các phiên đăng nhập",
         "pad_emoji": "Nhớ chừa khoảng cách khi chèn emoji",
-        "panelRadius": "Panels",
+        "panelRadius": "Hộp thoại",
         "pause_on_unfocused": "Dừng phát khi đang lướt các tút khác",
         "play_videos_in_modal": "Phát video trong khung hình riêng",
-        "post_status_content_type": "Loại tút đăng",
+        "post_status_content_type": "Định dạng mặc định cho bài viết",
+        "posts": "Bài đăng",
         "preload_images": "Tải trước hình ảnh",
         "presets": "Mẫu có sẵn",
         "profile_background": "Ảnh nền trang cá nhân",
@@ -463,6 +671,9 @@
         "profile_tab": "Trang cá nhân",
         "radii_help": "Thiết lập góc bo tròn (bằng pixels)",
         "refresh_token": "Làm tươi token",
+        "remove_backup": "Xoá",
+        "render_mfm": "Xử lí Markdown Misskey",
+        "render_mfm_on_hover": "Dừng hoạt hình MFM đến khi di chuột lên",
         "replies_in_timeline": "Trả lời trong bảng tin",
         "reply_visibility_all": "Hiện toàn bộ trả lời",
         "reply_visibility_following": "Chỉ hiện những trả lời có nhắc tới tôi hoặc từ những người mà tôi theo dõi",
@@ -476,7 +687,7 @@
         "reset_profile_background": "Đặt lại ảnh nền",
         "reset_profile_banner": "Đặt lại ảnh bìa",
         "revoke_token": "Gỡ",
-        "right_sidebar": "Hiện thanh bên bên phải",
+        "right_sidebar": "Đảo ngược thứ tự các cột",
         "save": "Lưu thay đổi",
         "saving_err": "Thiết lập lỗi lưu",
         "saving_ok": "Đã lưu các thay đổi",
@@ -486,13 +697,30 @@
         "security": "Bảo mật",
         "security_tab": "Bảo mật",
         "sensitive_by_default": "Mặc định tút là nhạy cảm",
+        "sensitive_if_subject": "Tự động đánh dấu hình ảnh nhậy cảm khi có cảnh báo nội dung",
         "set_new_avatar": "Đổi ảnh đại diện",
+        "set_new_mascot": "Thay đổi linh vật",
         "set_new_profile_background": "Đổi ảnh nền",
         "set_new_profile_banner": "Đổi ảnh bìa",
         "setting_changed": "Thiết lập khác với mặc định",
+        "setting_server_side": "Cài đặt này gắn liền với tài khoản của bạn và có hiệu lực với tất cả phiên làm việc và client khác nhau",
         "settings": "Cài đặt",
+        "settings_profile": "Phiên bản tuỳ chỉnh",
+        "settings_profile_creation": "Tạo bản mới",
+        "settings_profile_creation_new_name_label": "Tên",
+        "settings_profile_creation_submit": "Tạo",
+        "settings_profile_currently": "Hiện tại: {name} (phiên bản thứ {version})",
+        "settings_profile_delete": "Xoá",
+        "settings_profile_delete_confirm": "Chắc chắn xoá bản tuỳ chọn này?",
+        "settings_profile_force_sync": "Đồng bộ",
+        "settings_profile_in_use": "Đang sử dụng",
+        "settings_profile_use": "Dùng",
+        "settings_profiles_refresh": "Tải lại bản tuỳ chỉnh",
+        "settings_profiles_show": "Hiện tất cả bản tuỳ chỉnh",
+        "settings_profiles_unshow": "Ẩn hết các bản tuỳ chỉnh",
         "show_admin_badge": "Hiện huy hiệu \"Quản trị viên\" trên trang của tôi",
         "show_moderator_badge": "Hiện huy hiệu \"Kiểm duyệt viên\" trên trang của tôi",
+        "show_yous": "Hiện (bạn) sau tên người dùng của bạn trong bài viết",
         "stop_gifs": "Chỉ phát GIF khi chạm vào",
         "streaming": "Tự động tải tút mới khi cuộn lên trên",
         "style": {
@@ -518,16 +746,16 @@
                 "inputs": "Khung soạn thảo",
                 "panel_header": "Tiêu đề panel",
                 "poll": "Biểu đồ cuộc bình chọn",
-                "popover": "Tooltips, menus, popovers",
+                "popover": "Tooltip, menu, popover",
                 "post": "Tút/Tiểu sử",
                 "pressed": "Khi nhấn xuống",
                 "selectedMenu": "Chọn menu",
                 "selectedPost": "Chọn tút",
                 "tabs": "Tab",
-                "toggled": "Toggled",
+                "toggled": "Đã thay đổi",
                 "top_bar": "Thanh trên cùng",
                 "underlay": "Lớp dưới",
-                "wallpaper": "Wallpaper"
+                "wallpaper": "Hình nền"
             },
             "common": {
                 "color": "Màu sắc",
@@ -549,7 +777,7 @@
                 "_tab_label": "Chung",
                 "foreground_hint": "Mở tab \"Nâng cao\" để có nhiều tùy chọn hơn",
                 "main": "Màu sắc chung",
-                "rgbo": "Icons, accents, badges"
+                "rgbo": "Biểu tượng, accent, huy hiệu"
             },
             "fonts": {
                 "_tab_label": "Phông chữ",
@@ -641,9 +869,9 @@
                 "use_source": "Bản mới"
             }
         },
-        "subject_input_always_show": "Luôn hiện vùng tiêu đề",
-        "subject_line_behavior": "Chép tiêu đề khi trả lời",
-        "subject_line_email": "Giống email: \"re: subject\"",
+        "subject_input_always_show": "Luôn hiện hộp nhập cảnh báo nội dung",
+        "subject_line_behavior": "Chép cảnh báo về nội dung khi trả lời",
+        "subject_line_email": "Như email: \"re: cảnh báo\"",
         "subject_line_mastodon": "Giống Mastodon: copy as is",
         "subject_line_noop": "Đừng chép",
         "text": "Văn bản",
@@ -651,14 +879,25 @@
         "theme_help": "Dùng mã màu hex (#rrggbb) để tự chế theme.",
         "theme_help_v2_1": "Bạn cũng có thể xóa hết màu thành phần và làm theme trong suốt, chọn nút \"Xóa hết\".",
         "theme_help_v2_2": "Các biểu tượng bên dưới các mục có độ tương phản nền/văn bản, hãy rê chuột qua để biết thông tin chi tiết. Xin lưu ý rằng, khi sử dụng các độ tương phản trong suốt có thể khiến đọc chữ không ra.",
+        "third_column_mode": "Khi có đủ chỗ, tạo cột thứ ba cho",
+        "third_column_mode_none": "tốn chỗ (không tạo cột thứ ba)",
+        "third_column_mode_notifications": "thông báo",
+        "third_column_mode_postform": "bài viết mới và các đường dẫn nhanh",
         "token": "Token",
-        "tooltipRadius": "Tooltips/alerts",
+        "tooltipRadius": "Tooltip/cảnh báo",
+        "translation_language": "Dịch tự động về",
         "type_domains_to_mute": "Tìm máy chủ để ẩn",
         "upload_a_photo": "Tải ảnh lên",
         "useStreamingApi": "Nhận tút và thông báo theo thời gian thực",
         "useStreamingApiWarning": "(Tính năng thử nghiệm, không đề xuất sử dụng)",
+        "use_at_icon": "Hiển thị kí hiệu {'@'} dạng biểu tượng thay vì chữ",
+        "use_blurhash": "Dùng ảnh xem trước làm mờ cho nội dung nhạy cảm",
         "use_contain_fit": "Không cắt ảnh đính kèm trong bản xem trước",
         "use_one_click_nsfw": "Xem nội dung nhạy cảm bằng cách nhấn vào",
+        "user_accepts_direct_messages_from": "Nhận tin nhắn riêng từ",
+        "user_accepts_direct_messages_from_everybody": "Mọi người",
+        "user_accepts_direct_messages_from_nobody": "Không ai hết",
+        "user_accepts_direct_messages_from_people_i_follow": "Những người tôi quen",
         "user_mutes": "Người dùng",
         "user_settings": "Thiết lập người dùng",
         "valid_until": "Có giá trị tới",
@@ -672,31 +911,69 @@
             "title": "Phiên bản"
         },
         "virtual_scrolling": "Render bảng tin",
-        "word_filter": "Bộ lọc từ ngữ"
+        "word_filter": "Bộ lọc từ ngữ",
+        "wordfilter": "Lọc từ khoá"
+    },
+    "settings_profile": {
+        "creating": "Đang tạo hồ sơ cài đặt mới \"{profile}\"....",
+        "synchronization_error": "Không thể đồng bộ hoá cài đặt: {err}",
+        "synchronized": "Đã đồng bộ hoá cài đặt!",
+        "synchronizing": "Đang đồng bộ hoá hồ sơ cài đặt \"{profile}\"..."
     },
     "status": {
+        "ancestor_follow": "Xem {numReplies} phản hồi dưới bài này",
+        "ancestor_follow_with_icon": "{icon} {text}",
         "bookmark": "Lưu",
-        "copy_link": "Sao chép URL",
-        "delete": "Xóa tút",
-        "delete_confirm": "Bạn có chắc chắn muốn xóa tút này?",
+        "collapse_attachments": "Đóng tập tin đính kèm",
+        "copy_link": "Sao chép đường dẫn đến bài viết",
+        "delete": "Xóa bài viết",
+        "delete_confirm": "Chắc chắn xoá vài viết này?",
+        "delete_confirm_accept_button": "Đúng, xoá nó",
+        "delete_confirm_cancel_button": "Không, giữ lại",
+        "delete_confirm_title": "Xác nhận xoá bài đăng",
+        "edit": "Chỉnh sửa",
+        "edit_history": "Lịch sử chỉnh sửa",
+        "edit_history_modal_title": "Đã sửa {historyCount} lần",
+        "edited_at": "Đã sửa lúc {time}",
         "expand": "Xem nguyên văn",
         "external_source": "Nguồn bên ngoài",
         "favorites": "Thích",
+        "hide_attachment": "Ẩn tập tin đính kèm",
         "hide_content": "Ẩn nội dung",
-        "hide_full_subject": "Ẩn tiêu đề",
+        "hide_full_subject": "Ẩn cảnh báo nội dung",
+        "many_attachments": "Bài đăng có {number} tập tin đính kèm",
         "mentions": "Lượt nhắc",
+        "move_down": "Dịch tập tin sang phải",
+        "move_up": "Dịch tập tin sang trái",
         "mute_conversation": "Không quan tâm nữa",
         "nsfw": "Nhạy cảm",
+        "open_gallery": "Mở bộ ảnh",
         "pin": "Ghim trên trang cá nhân",
         "pinned": "Tút được ghim",
         "plus_more": "+{number} nhiều hơn",
+        "redraft": "Xoá và viết lại",
+        "redraft_confirm": "Bạn có chắc muốn xoá và viết lại bài đăng này không? Tương tác với bài đăng gốc sẽ bị mất.",
+        "redraft_confirm_accept_button": "Đúng, xoá và viết lại",
+        "redraft_confirm_cancel_button": "Không, giữ lại bài gốc",
+        "redraft_confirm_title": "Xác nhận xoá và viết lại",
+        "remove_attachment": "Xoá tập tin",
+        "repeat_confirm": "Bạn có muốn chia sẻ bài đăng này?",
+        "repeat_confirm_accept_button": "Có, chia sẻ đi",
+        "repeat_confirm_cancel_button": "Không chia sẻ",
+        "repeat_confirm_title": "Xác nhận chia sẻ",
         "repeats": "Chia sẻ",
         "replies_list": "Những trả lời:",
+        "replies_list_with_others": "Xem thêm {numReplies} phản hồi",
         "reply_to": "Trả lời",
+        "show_all_attachments": "Hiện tất cả tập tin đính kèm",
+        "show_all_conversation": "Hiện đầy đủ cuộc trò chuyện ({numStatus} bài đăng nữa)",
+        "show_all_conversation_with_icon": "{icon} {text}",
         "show_content": "Hiện nội dung",
-        "show_full_subject": "Hiện đầy đủ tiêu đề",
+        "show_full_subject": "Hiện đầy đủ cảnh báo nội dung",
+        "show_only_conversation_under_this": "Chỉ hiện trả lời cho bài đăng này",
         "status_deleted": "Tút này đã bị xóa",
-        "status_unavailable": "Không tìm thấy tút",
+        "status_unavailable": "Không tìm thấy bài viết",
+        "thread_follow_with_icon": "{icon} {text}",
         "thread_muted": "Đã ẩn chủ đề",
         "thread_muted_and_words": ", có từ:",
         "unbookmark": "Bỏ lưu",
@@ -730,8 +1007,8 @@
         "collapse": "Thu gọn",
         "conversation": "Thảo luận",
         "error": "Lỗi khi nạp bảng tin {0}",
-        "load_older": "Xem tút cũ hơn",
-        "no_more_statuses": "Không còn tút nào",
+        "load_older": "Xem thêm",
+        "no_more_statuses": "Hết",
         "no_retweet_hint": "Không thể chia sẻ tin nhắn và những tút riêng tư",
         "no_statuses": "Trống trơn!",
         "reload": "Tải lại",
@@ -797,6 +1074,7 @@
         "follow": "Theo dõi",
         "follow_progress": "Đang yêu cầu…",
         "follow_sent": "Đã gửi yêu cầu!",
+        "follow_tag": "Theo dõi hashtag",
         "follow_unfollow": "Ngưng theo dõi",
         "followees": "Đang theo dõi",
         "followers": "Người theo dõi",
@@ -817,19 +1095,28 @@
         "mute": "Ẩn",
         "mute_progress": "Đang ẩn…",
         "muted": "Đã ẩn",
+        "not_following_any_hashtags": "Bạn không theo dõi hashtag nào cả",
         "per_day": "tút mỗi ngày",
         "remote_follow": "Theo dõi từ xa",
+        "replies": "Cả phản hồi",
         "report": "Báo cáo",
+        "requested_by": "Muốn theo dõi bạn",
         "show_repeats": "Hiện lượt chia sẻ",
-        "statuses": "Tút",
+        "statuses": "Các bài viết",
         "subscribe": "Đăng ký",
         "unblock": "Bỏ chặn",
         "unblock_progress": "Đang bỏ chặn…",
+        "unfollow_confirm": "Xác nhận ngừng theo dõi {user}?",
+        "unfollow_confirm_accept_button": "Phải, ngừng theo dõi",
+        "unfollow_confirm_cancel_button": "Không, tiếp tục theo dõi",
+        "unfollow_confirm_title": "Ngừng theo dõi tài khoản này",
+        "unfollow_tag": "Ngừng theo dõi hashtag",
         "unmute": "Bỏ ẩn",
         "unmute_progress": "Đang bỏ ẩn…",
         "unsubscribe": "Hủy đăng ký"
     },
     "user_profile": {
+        "field_validated": "Đường dẫn được xác nhận",
         "profile_does_not_exist": "Xin lỗi, tài khoản này không tồn tại.",
         "profile_loading_error": "Xin lỗi, có lỗi xảy ra khi xem trang cá nhân này.",
         "timeline_title": "Bảng tin người dùng"
@@ -847,4 +1134,4 @@
         "more": "Nhiều hơn nữa",
         "who_to_follow": "Những người dùng nổi bật"
     }
-}
\ No newline at end of file
+}

From 228679e49efefe9695b5866511a1521282af0c6e Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sat, 24 Feb 2024 13:55:10 +0000
Subject: [PATCH 36/36] 2024.02 release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d0e2d7f9..51ee4830 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "description": "A frontend for Akkoma instances",
   "author": "Roger Braun <roger@rogerbraun.net>",
   "private": true,