merge catcatnya/main into main

.github/workflows/rebase-needed.yml

@@ -0,0 +1,17 @@
+name: PR Needs Rebase
+
+on:
+  push:
+  pull_request_target:
+    types: [synchronize]
+
+jobs:
+  label-rebase-needed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for merge conflicts
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: 'rebase needed :construction:'
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          commentOnDirty: This pull request has merge conflicts that must be resolved before it can be merged.

.github/workflows/test-chart.yml

@@ -1,138 +0,0 @@
-# This is a GitHub workflow defining a set of jobs with a set of steps.
-# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
-#
-name: Test chart
-
-on:
-  pull_request:
-    paths:
-      - 'chart/**'
-      - '!**.md'
-      - '.github/workflows/test-chart.yml'
-  push:
-    paths:
-      - 'chart/**'
-      - '!**.md'
-      - '.github/workflows/test-chart.yml'
-    branches-ignore:
-      - 'dependabot/**'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-defaults:
-  run:
-    working-directory: chart
-
-jobs:
-  lint-templates:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies (yamllint)
-        run: pip install yamllint
-
-      - run: helm dependency update
-
-      - name: helm lint
-        run: |
-          helm lint . \
-              --values dev-values.yaml
-
-      - name: helm template
-        run: |
-          helm template . \
-              --values dev-values.yaml \
-              --output-dir rendered-templates
-
-      - name: yamllint (only on templates we manage)
-        run: |
-          rm -rf rendered-templates/mastodon/charts
-
-          yamllint rendered-templates \
-            --config-data "{rules: {indentation: {spaces: 2}, line-length: disable}}"
-
-  # This job helps us validate that rendered templates are valid k8s resources
-  # against a k8s api-server, via "helm template --validate", but also that a
-  # basic configuration can be used to successfully startup mastodon.
-  #
-  test-install:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 15
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # k3s-channel reference: https://update.k3s.io/v1-release/channels
-          - k3s-channel: latest
-          - k3s-channel: stable
-
-          # This represents the oldest configuration we test against.
-          #
-          # The k8s version chosen is based on the oldest still supported k8s
-          # version among two managed k8s services, GKE, EKS.
-          # - GKE: https://endoflife.date/google-kubernetes-engine
-          # - EKS: https://endoflife.date/amazon-eks
-          #
-          # The helm client's version can influence what helper functions is
-          # available for use in the templates, currently we need v3.6.0 or
-          # higher.
-          #
-          - k3s-channel: v1.21
-            helm-version: v3.6.0
-
-    steps:
-      - uses: actions/checkout@v3
-
-      # This action starts a k8s cluster with NetworkPolicy enforcement and
-      # installs both kubectl and helm.
-      #
-      # ref: https://github.com/jupyterhub/action-k3s-helm#readme
-      #
-      - uses: jupyterhub/action-k3s-helm@v3
-        with:
-          k3s-channel: ${{ matrix.k3s-channel }}
-          helm-version: ${{ matrix.helm-version }}
-          metrics-enabled: false
-          traefik-enabled: false
-          docker-enabled: false
-
-      - run: helm dependency update
-
-      # Validate rendered helm templates against the k8s api-server
-      - name: helm template --validate
-        run: |
-          helm template --validate mastodon . \
-              --values dev-values.yaml
-
-      - name: helm install
-        run: |
-          helm install mastodon . \
-              --values dev-values.yaml \
-              --timeout 10m
-
-      # This actions provides a report about the state of the k8s cluster,
-      # providing logs etc on anything that has failed and workloads marked as
-      # important.
-      #
-      # ref: https://github.com/jupyterhub/action-k8s-namespace-report#readme
-      #
-      - name: Kubernetes namespace report
-        uses: jupyterhub/action-k8s-namespace-report@v1
-        if: always()
-        with:
-          important-workloads: >-
-            deploy/mastodon-sidekiq
-            deploy/mastodon-streaming
-            deploy/mastodon-web
-            job/mastodon-assets-precompile
-            job/mastodon-chewy-upgrade
-            job/mastodon-create-admin
-            job/mastodon-db-migrate

.gitignore

@@ -44,12 +44,6 @@
 /redis
 /elasticsearch
 
-# ignore Helm charts
-/chart/*.tgz
-
-# ignore Helm dependency charts
-/chart/charts/*.tgz
-
 # Ignore Apple files
 .DS_Store
 

.prettierignore

@@ -44,9 +44,6 @@
 /redis
 /elasticsearch
 
-# ignore Helm dependency charts
-/chart/charts/*.tgz
-
 # Ignore Apple files
 .DS_Store
 
@@ -67,9 +64,6 @@ yarn-debug.log
 # Ignore Docker option files
 docker-compose.override.yml
 
-# Ignore Helm files
-/chart
-
 # Ignore emoji map file
 /app/javascript/mastodon/features/emoji/emoji_map.json
 

Gemfile.lock

@@ -419,7 +419,7 @@ GEM
       net-protocol
     net-ssh (7.0.1)
     nio4r (2.5.8)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nsa (0.2.8)
@@ -491,7 +491,7 @@ GEM
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.4)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)

app/javascript/flavours/glitch/reducers/status_lists.js

@@ -25,7 +25,7 @@ import {
   TRENDS_STATUSES_EXPAND_SUCCESS,
   TRENDS_STATUSES_EXPAND_FAIL,
 } from 'flavours/glitch/actions/trends';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 import {
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
@@ -43,22 +43,22 @@ const initialState = ImmutableMap({
   favourites: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   bookmarks: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   pins: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   trending: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
 });
 
@@ -67,7 +67,7 @@ const normalizeList = (state, listType, statuses, next) => {
     map.set('next', next);
     map.set('loaded', true);
     map.set('isLoading', false);
-    map.set('items', ImmutableList(statuses.map(item => item.id)));
+    map.set('items', ImmutableOrderedSet(statuses.map(item => item.id)));
   }));
 };
 
@@ -75,20 +75,22 @@ const appendToList = (state, listType, statuses, next) => {
   return state.update(listType, listMap => listMap.withMutations(map => {
     map.set('next', next);
     map.set('isLoading', false);
-    map.set('items', map.get('items').concat(statuses.map(item => item.id)));
+    map.set('items', map.get('items').union(statuses.map(item => item.id)));
   }));
 };
 
 const prependOneToList = (state, listType, status) => {
-  return state.update(listType, listMap => listMap.withMutations(map => {
+  return state.updateIn([listType, 'items'], (list) => {
-    map.set('items', map.get('items').unshift(status.get('id')));
+    if (list.includes(status.get('id'))) {
-  }));
+      return list;
+    } else {
+      return ImmutableOrderedSet([status.get('id')]).union(list);
+    }
+  });
 };
 
 const removeOneFromList = (state, listType, status) => {
-  return state.update(listType, listMap => listMap.withMutations(map => {
+  return state.updateIn([listType, 'items'], (list) => list.delete(status.get('id')));
-    map.set('items', map.get('items').filter(item => item !== status.get('id')));
-  }));
 };
 
 export default function statusLists(state = initialState, action) {
@@ -139,7 +141,7 @@ export default function statusLists(state = initialState, action) {
     return removeOneFromList(state, 'pins', action.status);
   case ACCOUNT_BLOCK_SUCCESS:
   case ACCOUNT_MUTE_SUCCESS:
-    return state.updateIn(['trending', 'items'], ImmutableList(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id));
+    return state.updateIn(['trending', 'items'], ImmutableOrderedSet(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id));
   default:
     return state;
   }

app/javascript/mastodon/locales/cs.json

@@ -301,7 +301,7 @@
   "keyboard_shortcuts.back": "Přejít zpět",
   "keyboard_shortcuts.blocked": "Otevřít seznam blokovaných uživatelů",
   "keyboard_shortcuts.boost": "Boostnout příspěvek",
-  "keyboard_shortcuts.column": "Zaměřit se na sloupec",
+  "keyboard_shortcuts.column": "Focus na sloupec",
   "keyboard_shortcuts.compose": "Zaměřit se na textové pole nového příspěvku",
   "keyboard_shortcuts.description": "Popis",
   "keyboard_shortcuts.direct": "k otevření sloupce přímých zpráv",
@@ -505,7 +505,7 @@
   "report.thanks.title": "Nechcete tohle vidět?",
   "report.thanks.title_actionable": "Děkujeme za nahlášení, podíváme se na to.",
   "report.unfollow": "Přestat sledovat @{name}",
-  "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domácí časové ose, přestaňte jej sledovat.",
+  "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domovské časové ose, přestaňte jej sledovat.",
   "report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
   "report_notification.categories.other": "Ostatní",
   "report_notification.categories.spam": "Spam",

app/javascript/mastodon/locales/cy.json

@@ -9,7 +9,7 @@
   "about.domain_blocks.suspended.explanation": "Ni fydd data o'r gweinydd hwn yn cael ei brosesu, ei storio na'i gyfnewid, gan wneud unrhyw ryngweithio neu gyfathrebu gyda defnyddwyr o'r gweinydd hwn yn amhosibl.",
   "about.domain_blocks.suspended.title": "Ataliwyd",
   "about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
-  "about.powered_by": "Cyfrwng cymdeithasol datganoledig wedi ei yrru gan {mastodon}",
+  "about.powered_by": "Cyfrwng cymdeithasol datganoledig yn cael ei yrru gan {mastodon}",
   "about.rules": "Rheolau'r gweinydd",
   "account.account_note_header": "Nodyn",
   "account.add_or_remove_from_list": "Ychwanegu neu Dileu o'r rhestrau",
@@ -26,7 +26,7 @@
   "account.edit_profile": "Golygu proffil",
   "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Dangos ar fy mhroffil",
-  "account.featured_tags.last_status_at": "Y cofnod diwethaf ar {date}",
+  "account.featured_tags.last_status_at": "Y postiad diwethaf ar {date}",
   "account.featured_tags.last_status_never": "Dim postiadau",
   "account.featured_tags.title": "hashnodau dan sylw {name}",
   "account.follow": "Dilyn",
@@ -39,16 +39,16 @@
   "account.follows_you": "Yn eich dilyn chi",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
-  "account.joined_short": "Ymunodd",
+  "account.joined_short": "Wedi Ymuno",
-  "account.languages": "Newid ieithoedd wedi tanysgrifio iddynt nhw",
+  "account.languages": "Newid ieithoedd wedi tanysgrifio iddyn nhw",
   "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
   "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i fod ar glo. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
   "account.media": "Cyfryngau",
   "account.mention": "Crybwyll @{name}",
   "account.moved_to": "Mae {name} wedi nodi fod eu cyfrif newydd yn:",
-  "account.mute": "Anwybyddu @{name}",
+  "account.mute": "Tewi @{name}",
-  "account.mute_notifications": "Diffodd hysbysiadau o @{name}",
+  "account.mute_notifications": "Tewi hysbysiadau o @{name}",
-  "account.muted": "Wedi anwybyddu",
+  "account.muted": "Wedi tewi",
   "account.open_original_page": "Agor y dudalen wreiddiol",
   "account.posts": "Postiadau",
   "account.posts_with_replies": "Postiadau ac atebion",
@@ -56,14 +56,14 @@
   "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
   "account.share": "Rhannwch broffil @{name}",
   "account.show_reblogs": "Dangos hybiau gan @{name}",
-  "account.statuses_counter": "{count, plural, one {Postiad: {counter}} other {Postiadau: {counter}}}",
+  "account.statuses_counter": "{count, plural, one {Postiad: {counter}} other {Postiad: {counter}}}",
   "account.unblock": "Dadflocio @{name}",
   "account.unblock_domain": "Dadflocio parth {domain}",
   "account.unblock_short": "Dadflocio",
-  "account.unendorse": "Peidio a'i arddangos ar fy mhroffil",
+  "account.unendorse": "Peidio a'i ddangos ar fy mhroffil",
   "account.unfollow": "Dad-ddilyn",
-  "account.unmute": "Dad-anwybyddu {name}",
+  "account.unmute": "Dad-dewi {name}",
-  "account.unmute_notifications": "Dad-ddiffodd hysbysiadau o @{name}",
+  "account.unmute_notifications": "Dad-dewi hysbysiadau o @{name}",
   "account.unmute_short": "Dad-anwybyddu",
   "account_note.placeholder": "Clicio i ychwanegu nodyn",
   "admin.dashboard.daily_retention": "Cyfradd cadw defnyddwyr fesul diwrnod ar ôl cofrestru",
@@ -95,20 +95,20 @@
   "closed_registrations.other_server_instructions": "Gan fod Mastodon yn ddatganoledig, gallwch greu cyfrif ar weinydd arall a dal i ryngweithio gyda hwn.",
   "closed_registrations_modal.description": "Ar hyn o bryd nid yw'n bosib creu cyfrif ar {domain}, ond cadwch mewn cof nad oes raid i chi gael cyfrif yn benodol ar {domain} i ddefnyddio Mastodon.",
   "closed_registrations_modal.find_another_server": "Dod o hyd i weinydd arall",
-  "closed_registrations_modal.preamble": "Mae Mastodon wedi'i ddatganoli, felly does dim gwahaniaeth ble rydych chi'n creu eich cyfrif, byddwch chi'n gallu dilyn a rhyngweithio ag unrhyw un ar y gweinydd hwn. Gallwch hyd yn oed ei gynnal ef eich hun!",
+  "closed_registrations_modal.preamble": "Mae Mastodon wedi'i ddatganoli, felly does dim gwahaniaeth ble rydych chi'n creu eich cyfrif, byddwch chi'n gallu dilyn a rhyngweithio ag unrhyw un ar y gweinydd hwn. Gallwch hyd yn oed ei gynnal un eich hun!",
   "closed_registrations_modal.title": "Ymgofrestru ar Mastodon",
   "column.about": "Ynghylch",
   "column.blocks": "Defnyddwyr a flociwyd",
-  "column.bookmarks": "Nodau Tudalen",
+  "column.bookmarks": "Nodau tudalen",
   "column.community": "Ffrwd lleol",
   "column.direct": "Negeseuon preifat",
   "column.directory": "Pori proffiliau",
-  "column.domain_blocks": "Parthau cuddiedig",
+  "column.domain_blocks": "Parthau wedi'u blocio",
   "column.favourites": "Ffefrynnau",
   "column.follow_requests": "Ceisiadau dilyn",
-  "column.home": "Hafan",
+  "column.home": "Cartref",
   "column.lists": "Rhestrau",
-  "column.mutes": "Wedi anwybyddu",
+  "column.mutes": "Defnyddwyr wedi'u tewi",
   "column.notifications": "Hysbysiadau",
   "column.pins": "Postiadau wedi eu pinio",
   "column.public": "Ffrwd y ffederasiwn",
@@ -150,7 +150,7 @@
   "confirmation_modal.cancel": "Diddymu",
   "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
-  "confirmations.block.message": "Ydych chi'n sicr eich bod eisiau blocio {name}?",
+  "confirmations.block.message": "Ydych chi'n siŵr eich bod eisiau blocio {name}?",
   "confirmations.cancel_follow_request.confirm": "Tynnu'r cais yn ôl",
   "confirmations.cancel_follow_request.message": "Ydych chi'n siŵr eich bod am dynnu'ch cais i ddilyn {name} yn ôl?",
   "confirmations.delete.confirm": "Dileu",
@@ -160,18 +160,18 @@
   "confirmations.discard_edit_media.confirm": "Dileu",
   "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg, eu taflu beth bynnag?",
   "confirmations.domain_block.confirm": "Blocio parth cyfan",
-  "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu anwybyddu pobl penodol yn broses mwy effeithiol. Ni fyddwch yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
+  "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
-  "confirmations.mute.confirm": "Anwybyddu",
+  "confirmations.mute.confirm": "Tewi",
   "confirmations.mute.explanation": "Bydd hyn yn cuddio postiadau oddi wrthyn nhw a phostiadau sydd yn sôn amdanyn nhw, ond bydd hyn dal yn gadael iddyn nhw gweld eich postiadau a'ch dilyn.",
-  "confirmations.mute.message": "Ydych chi wir eisiau anwybyddu {name}?",
+  "confirmations.mute.message": "Ydych chi wir eisiau tewi {name}?",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
-  "confirmations.redraft.message": "Ydych chi wir eisiau dileu y post hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd ymatebion i'r post gwreiddiol yn cael eu hamddifadu.",
+  "confirmations.redraft.message": "Ydych chi wir eisiau dileu y postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd ymatebion i'r postiad gwreiddiol yn cael eu hamddifadu.",
   "confirmations.reply.confirm": "Ateb",
-  "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n sicr yr ydych am barhau?",
+  "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?",
   "confirmations.unfollow.confirm": "Dad-ddilyn",
-  "confirmations.unfollow.message": "Ydych chi'n sicr eich bod am ddad-ddilyn {name}?",
+  "confirmations.unfollow.message": "Ydych chi'n siŵr eich bod am ddad-ddilyn {name}?",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
@@ -196,13 +196,13 @@
   "emoji_button.clear": "Clirio",
   "emoji_button.custom": "Unigryw",
   "emoji_button.flags": "Baneri",
-  "emoji_button.food": "Bwyd a Diod",
+  "emoji_button.food": "Bwyd & Diod",
   "emoji_button.label": "Mewnosodwch emoji",
   "emoji_button.nature": "Natur",
   "emoji_button.not_found": "Dim emojau'n cydweddu",
   "emoji_button.objects": "Gwrthrychau",
   "emoji_button.people": "Pobl",
-  "emoji_button.recent": "Defnyddir yn aml",
+  "emoji_button.recent": "Defnydd cyffredin",
   "emoji_button.search": "Chwilio...",
   "emoji_button.search_results": "Canlyniadau chwilio",
   "emoji_button.symbols": "Symbolau",
@@ -211,32 +211,32 @@
   "empty_column.account_timeline": "Dim postiadau yma!",
   "empty_column.account_unavailable": "Proffil ddim ar gael",
   "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
-  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bost wedi'u cadw fel nodau tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
+  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bostiad wedi'u cadw fel nodau tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth yn gyhoeddus?",
   "empty_column.direct": "Does gennych unrhyw negeseuon preifat eto. Pan byddwch yn anfon neu derbyn un, bydd yn ymddangos yma.",
   "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
-  "empty_column.explore_statuses": "Does dim pynciau llosg ar hyn o bryd. Dewch nôl nes ymlaen!",
+  "empty_column.explore_statuses": "Does dim trendio ar hyn o bryd. Dewch nôl nes ymlaen!",
   "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff bostiadau eto. Pan y byddwch yn hoffi un, mi fydd yn ymddangos yma.",
   "empty_column.favourites": "Does neb wedi hoffi'r post hwn eto. Pan bydd rhywun yn ei hoffi, byddent yn ymddangos yma.",
   "empty_column.follow_recommendations": "Does dim awgrymiadau yma i chi. Gallwch geisio chwilio am bobl yr ydych yn eu hadnabod neu archwilio hashnodau sy'n trendio.",
   "empty_column.follow_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan fyddwch yn derbyn un, byddan nhw'n ymddangos yma.",
   "empty_column.hashtag": "Nid oes dim ar yr hashnod hwn eto.",
-  "empty_column.home": "Mae eich llinell amser gartref yn wag! Ymwelwch â {public} neu defnyddiwch y chwilotwr i ddechrau arni ac i gwrdd â defnyddwyr eraill.",
+  "empty_column.home": "Mae eich ffrwd gartref yn wag! Ymwelwch â {public} neu defnyddiwch y chwilotwr i ddechrau arni ac i gwrdd â defnyddwyr eraill.",
   "empty_column.home.suggestions": "Dyma rai awgrymiadau",
-  "empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi statws newydd, mi fydd yn ymddangos yma.",
+  "empty_column.list": "Does dim yn y rhestr yma eto. Pan fydd aelodau'r rhestr yn cyhoeddi postiad newydd, mi fydd yn ymddangos yma.",
   "empty_column.lists": "Nid oes gennych unrhyw restrau eto. Pan fyddwch yn creu un, mi fydd yn ymddangos yma.",
-  "empty_column.mutes": "Nid ydych wedi anwybyddu unrhyw ddefnyddwyr eto.",
+  "empty_column.mutes": "Nid ydych wedi tewi unrhyw ddefnyddwyr eto.",
-  "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ac eraill i ddechrau'r sgwrs.",
+  "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ag eraill i ddechrau'r sgwrs.",
-  "empty_column.public": "Does dim byd yma! Ysgrifennwch rhywbeth yn gyhoeddus, neu dilynwch ddefnyddwyr o achosion eraill i'w lenwi",
+  "empty_column.public": "Does dim byd yma! Ysgrifennwch rywbeth cyhoeddus, neu dilynwch ddefnyddwyr o weinyddion eraill i'w lanw",
   "error.unexpected_crash.explanation": "Oherwydd gwall yn ein cod neu oherwydd problem cysondeb porwr, nid oedd y dudalen hon gallu cael ei dangos yn gywir.",
-  "error.unexpected_crash.explanation_addons": "Ni ellid arddangos y dudalen hon yn gywir. Mae'r gwall hwn yn debygol o gael ei achosi gan ategyn porwr neu offer cyfieithu awtomatig.",
+  "error.unexpected_crash.explanation_addons": "Nid oes modd dangos y dudalen hon yn gywir. Mae'r gwall hwn yn debygol o gael ei achosi gan ategyn porwr neu offer cyfieithu awtomatig.",
-  "error.unexpected_crash.next_steps": "Ceisiwch ail-lwytho y dudalen. Os nad yw hyn yn eich helpu, efallai gallech defnyddio Mastodon trwy borwr neu ap brodorol gwahanol.",
+  "error.unexpected_crash.next_steps": "Ceisiwch ail-lwytho'r dudalen. Os nad yw hyn yn eich helpu, efallai gallwch ddefnyddio Mastodon trwy borwr neu ap brodorol gwahanol.",
   "error.unexpected_crash.next_steps_addons": "Ceisiwch eu hanalluogi ac adnewyddu'r dudalen. Os nad yw hynny'n helpu, efallai y byddwch yn dal i allu defnyddio Mastodon trwy borwr neu ap cynhenid arall.",
   "errors.unexpected_crash.copy_stacktrace": "Copïo'r olrhain stac i'r clipfwrdd",
   "errors.unexpected_crash.report_issue": "Rhoi gwybod am broblem",
   "explore.search_results": "Canlyniadau chwilio",
   "explore.title": "Archwilio",
-  "filter_modal.added.context_mismatch_explanation": "Nid yw'r categori hidlo hwn yn berthnasol i'r cyd-destun yr ydych wedi cyrchu'r postiad hwn ynddo. Os ydych chi am i'r post gael ei hidlo yn y cyd-destun hwn hefyd, bydd yn rhaid i chi olygu'r hidlydd.",
+  "filter_modal.added.context_mismatch_explanation": "Nid yw'r categori hidlo hwn yn berthnasol i'r cyd-destun yr ydych wedi cyrchu'r postiad hwn ynddo. Os ydych chi am i'r postiad gael ei hidlo yn y cyd-destun hwn hefyd, bydd yn rhaid i chi olygu'r hidlydd.",
   "filter_modal.added.context_mismatch_title": "Diffyg cyfatebiaeth cyd-destun!",
   "filter_modal.added.expired_explanation": "Mae'r categori hidlydd hwn wedi dod i ben, bydd angen i chi newid y dyddiad dod i ben er mwyn iddo fod yn berthnasol.",
   "filter_modal.added.expired_title": "Hidlydd wedi dod i ben!",
@@ -249,15 +249,15 @@
   "filter_modal.select_filter.expired": "daeth i ben",
   "filter_modal.select_filter.prompt_new": "Categori newydd: {name}",
   "filter_modal.select_filter.search": "Chwilio neu greu",
-  "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëwch un newydd",
+  "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
-  "filter_modal.select_filter.title": "Hidlo'r post hwn",
+  "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
-  "filter_modal.title.status": "Hidlo post",
+  "filter_modal.title.status": "Hidlo postiad",
   "follow_recommendations.done": "Wedi gorffen",
   "follow_recommendations.heading": "Dilynwch y bobl yr hoffech chi weld eu postiadau! Dyma ambell i awgrymiad.",
   "follow_recommendations.lead": "Bydd postiadau gan bobl rydych chi'n eu dilyn yn ymddangos mewn trefn amser ar eich ffrwd cartref. Peidiwch â bod ofn gwneud camgymeriadau, gallwch chi ddad-ddilyn pobl yr un mor hawdd unrhyw bryd!",
-  "follow_request.authorize": "Caniatau",
+  "follow_request.authorize": "Awdurdodi",
   "follow_request.reject": "Gwrthod",
-  "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, oedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
+  "follow_requests.unlocked_explanation": "Er nid yw eich cyfrif wedi'i gloi, roedd y staff {domain} yn meddwl efallai hoffech adolygu ceisiadau dilyn o'r cyfrifau rhain wrth law.",
   "footer.about": "Ynghylch",
   "footer.directory": "Cyfeiriadur proffiliau",
   "footer.get_app": "Lawrlwytho'r ap",
@@ -280,104 +280,104 @@
   "hashtag.unfollow": "Dad-ddilyn hashnod",
   "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos hybiau",
-  "home.column_settings.show_replies": "Dangos ymatebion",
+  "home.column_settings.show_replies": "Dangos atebion",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.show_announcements": "Dangos cyhoeddiadau",
-  "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r post hwn i roi gwybod i'r awdur eich bod chi'n ei werthfawrogi a'i gadw ar gyfer nes ymlaen.",
+  "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi hoffi'r postiad hwn i roi gwybod i'r awdur eich bod chi'n ei werthfawrogi a'i gadw ar gyfer nes ymlaen.",
   "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich llif cartref.",
-  "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r post hwn i'w rannu â'ch dilynwyr.",
+  "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
-  "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r post hwn.",
+  "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r postiad hwn.",
   "interaction_modal.on_another_server": "Ar weinydd gwahanol",
   "interaction_modal.on_this_server": "Ar y gweinydd hwn",
   "interaction_modal.other_server_instructions": "Copïwch a gludo'r URL hwn i faes chwilio eich hoff ap Mastodon neu ryngwyneb gwe eich gweinydd Mastodon.",
   "interaction_modal.preamble": "Gan fod Mastodon wedi'i ddatganoli, gallwch ddefnyddio'ch cyfrif presennol a gynhelir gan weinydd Mastodon arall neu blatfform cydnaws os nad oes gennych gyfrif ar yr un hwn.",
-  "interaction_modal.title.favourite": "Hoffi post {name}",
+  "interaction_modal.title.favourite": "Hoffi postiad {name}",
   "interaction_modal.title.follow": "Dilyn {name}",
-  "interaction_modal.title.reblog": "Hybu post {name}",
+  "interaction_modal.title.reblog": "Hybu postiad {name}",
-  "interaction_modal.title.reply": "Ymateb i bost {name}",
+  "interaction_modal.title.reply": "Ymateb i bostiad {name}",
   "intervals.full.days": "{number, plural, one {# dydd} two {# ddydd} other {# o ddyddiau}}",
   "intervals.full.hours": "{number, plural, one {# awr} other {# o oriau}}",
   "intervals.full.minutes": "{number, plural, one {# funud} other {# o funudau}}",
-  "keyboard_shortcuts.back": "i lywio nôl",
+  "keyboard_shortcuts.back": "Llywio nôl",
   "keyboard_shortcuts.blocked": "i agor rhestr defnyddwyr a flociwyd",
-  "keyboard_shortcuts.boost": "Hybu post",
+  "keyboard_shortcuts.boost": "Hybu postiad",
   "keyboard_shortcuts.column": "Ffocysu colofn",
-  "keyboard_shortcuts.compose": "i ffocysu yr ardal cyfansoddi testun",
+  "keyboard_shortcuts.compose": "Ffocysu ar ardal cyfansoddi testun",
   "keyboard_shortcuts.description": "Disgrifiad",
   "keyboard_shortcuts.direct": "i agor colofn negeseuon preifat",
-  "keyboard_shortcuts.down": "i symud lawr yn y rhestr",
+  "keyboard_shortcuts.down": "Symud lawr yn y rhestr",
   "keyboard_shortcuts.enter": "Agor post",
-  "keyboard_shortcuts.favourite": "i hoffi",
+  "keyboard_shortcuts.favourite": "Hoffi postiad",
-  "keyboard_shortcuts.favourites": "i agor rhestr hoffi",
+  "keyboard_shortcuts.favourites": "Agor rhestr ffefrynnau",
   "keyboard_shortcuts.federated": "Agor ffrwd y ffederasiwn",
   "keyboard_shortcuts.heading": "Bysellau brys",
-  "keyboard_shortcuts.home": "i agor ffrwd cartref",
+  "keyboard_shortcuts.home": "Agor ffrwd cartref",
-  "keyboard_shortcuts.hotkey": "Bysell brys",
+  "keyboard_shortcuts.hotkey": "Bysell boeth",
-  "keyboard_shortcuts.legend": "i ddangos y rhestr hon",
+  "keyboard_shortcuts.legend": "Dangos y rhestr hon",
   "keyboard_shortcuts.local": "Agor ffrwd lleol",
-  "keyboard_shortcuts.mention": "i grybwyll yr awdur",
+  "keyboard_shortcuts.mention": "Crybwyll yr awdur",
-  "keyboard_shortcuts.muted": "Agor rhestr defnyddwyr rydych wedi anwybyddu",
+  "keyboard_shortcuts.muted": "Agor rhestr defnyddwyr rydych wedi'u tewi",
-  "keyboard_shortcuts.my_profile": "i agor eich proffil",
+  "keyboard_shortcuts.my_profile": "Agor eich proffil",
-  "keyboard_shortcuts.notifications": "i agor colofn hysbysiadau",
+  "keyboard_shortcuts.notifications": "Agor colofn hysbysiadau",
-  "keyboard_shortcuts.open_media": "i agor cyfryngau",
+  "keyboard_shortcuts.open_media": "Agor cyfryngau",
   "keyboard_shortcuts.pinned": "Agor rhestr postiadau wedi'u pinio",
-  "keyboard_shortcuts.profile": "i agor proffil yr awdur",
+  "keyboard_shortcuts.profile": "Agor proffil yr awdur",
-  "keyboard_shortcuts.reply": "i ateb",
+  "keyboard_shortcuts.reply": "Ateb i bostiad",
-  "keyboard_shortcuts.requests": "i agor rhestr ceisiadau dilyn",
+  "keyboard_shortcuts.requests": "Agor rhestr ceisiadau dilyn",
-  "keyboard_shortcuts.search": "i ffocysu chwilio",
+  "keyboard_shortcuts.search": "Ffocysu ar y bar chwilio",
-  "keyboard_shortcuts.spoilers": "i ddangos/cuddio'r maes CW",
+  "keyboard_shortcuts.spoilers": "Dangos/cuddio'r maes CW",
-  "keyboard_shortcuts.start": "i agor colofn \"dechrau arni\"",
+  "keyboard_shortcuts.start": "Agor colofn \"dechrau arni\"",
-  "keyboard_shortcuts.toggle_hidden": "i ddangos/cuddio testun tu ôl i CW",
+  "keyboard_shortcuts.toggle_hidden": "Dangos/cuddio testun tu ôl i CW",
-  "keyboard_shortcuts.toggle_sensitivity": "i ddangos/gyddio cyfryngau",
+  "keyboard_shortcuts.toggle_sensitivity": "Dangos/cuddio cyfryngau",
   "keyboard_shortcuts.toot": "Dechrau post newydd",
-  "keyboard_shortcuts.unfocus": "i ddad-ffocysu ardal cyfansoddi testun/chwilio",
+  "keyboard_shortcuts.unfocus": "Dad-ffocysu ardal cyfansoddi testun/chwilio",
-  "keyboard_shortcuts.up": "i symud yn uwch yn y rhestr",
+  "keyboard_shortcuts.up": "Symud yn uwch yn y rhestr",
   "lightbox.close": "Cau",
   "lightbox.compress": "Cywasgu blwch gweld delwedd",
   "lightbox.expand": "Ehangu blwch gweld delwedd",
   "lightbox.next": "Nesaf",
   "lightbox.previous": "Blaenorol",
   "limited_account_hint.action": "Dangos y proffil beth bynnag",
-  "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan arolygwyr {domain}.",
+  "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
-  "lists.account.add": "Ychwanegwch at restr",
+  "lists.account.add": "Ychwanegu at restr",
-  "lists.account.remove": "Dileu o'r rhestr",
+  "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
-  "lists.edit": "Golygwch rhestr",
+  "lists.edit": "Golygu rhestr",
   "lists.edit.submit": "Newid teitl",
   "lists.new.create": "Ychwanegu rhestr",
   "lists.new.title_placeholder": "Teitl rhestr newydd",
-  "lists.replies_policy.followed": "Unrhyw ddefnyddiwr a ddilynir",
+  "lists.replies_policy.followed": "Unrhyw ddefnyddiwr sy'n cael ei ddilyn",
   "lists.replies_policy.list": "Aelodau'r rhestr",
   "lists.replies_policy.none": "Neb",
-  "lists.replies_policy.title": "Dangos ymatebion i:",
+  "lists.replies_policy.title": "Dangos atebion i:",
-  "lists.search": "Chwilio ymysg pobl yr ydych yn eu dilyn",
+  "lists.search": "Chwilio ymysg pobl rydych yn eu dilyn",
   "lists.subheading": "Eich rhestrau",
-  "load_pending": "{count, plural, one {# eitem newydd} other {# eitemau newydd}}",
+  "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
   "loading_indicator.label": "Llwytho...",
-  "media_gallery.toggle_visible": "Toglo gwelededd",
+  "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "missing_indicator.label": "Heb ei ganfod",
-  "missing_indicator.sublabel": "Ni ellid canfod yr adnodd hwn",
+  "missing_indicator.sublabel": "Nid oes modd canfod yr adnodd hwn",
-  "moved_to_account_banner.text": "Mae eich cyfrif {disabledAccount} wedi ei analluogi ar hyn y bryd am i chi symud i {movedToAccount}.",
+  "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
   "mute_modal.duration": "Hyd",
   "mute_modal.hide_notifications": "Cuddio hysbysiadau gan y defnyddiwr hwn?",
   "mute_modal.indefinite": "Parhaus",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
-  "navigation_bar.bookmarks": "Tudalnodau",
+  "navigation_bar.bookmarks": "Nodau tudalen",
   "navigation_bar.community_timeline": "Ffrwd leol",
   "navigation_bar.compose": "Cyfansoddi post newydd",
   "navigation_bar.direct": "Negeseuon preifat",
   "navigation_bar.discover": "Darganfod",
-  "navigation_bar.domain_blocks": "Parthau cuddiedig",
+  "navigation_bar.domain_blocks": "Parthau wedi'u blocio",
   "navigation_bar.edit_profile": "Golygu proffil",
   "navigation_bar.explore": "Archwilio",
   "navigation_bar.favourites": "Ffefrynnau",
-  "navigation_bar.filters": "Geiriau ag anwybyddwyd",
+  "navigation_bar.filters": "Geiriau wedi'u tewi",
   "navigation_bar.follow_requests": "Ceisiadau dilyn",
-  "navigation_bar.follows_and_followers": "Dilynion a ddilynwyr",
+  "navigation_bar.follows_and_followers": "Yn dilyn a dilynwyr",
   "navigation_bar.lists": "Rhestrau",
   "navigation_bar.logout": "Allgofnodi",
-  "navigation_bar.mutes": "Defnyddwyr ag anwybyddwyd",
+  "navigation_bar.mutes": "Defnyddwyr wedi'u tewi",
   "navigation_bar.personal": "Personol",
   "navigation_bar.pins": "Postiadau wedi eu pinio",
   "navigation_bar.preferences": "Dewisiadau",
@@ -385,25 +385,25 @@
   "navigation_bar.search": "Chwilio",
   "navigation_bar.security": "Diogelwch",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
-  "notification.admin.report": "Adroddodd {name} {target}",
+  "notification.admin.report": "Adroddwyd ar {name} {target}",
   "notification.admin.sign_up": "Cofrestrodd {name}",
   "notification.favourite": "Hoffodd {name} eich post",
   "notification.follow": "Dilynodd {name} chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
-  "notification.mention": "Soniodd {name} amdanoch chi",
+  "notification.mention": "Crybwyllodd {name} amdanoch chi",
-  "notification.own_poll": "Mae eich pôl wedi diweddu",
+  "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae pleidlais rydych wedi pleidleisio ynddi wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
   "notification.status": "{name} newydd ei bostio",
-  "notification.update": "Golygodd {name} bost",
+  "notification.update": "Golygodd {name} bostiad",
   "notifications.clear": "Clirio hysbysiadau",
-  "notifications.clear_confirmation": "Ydych chi'n sicr eich bod am glirio'ch holl hysbysiadau am byth?",
+  "notifications.clear_confirmation": "Ydych chi'n siŵr eich bod am glirio'ch holl hysbysiadau am byth?",
   "notifications.column_settings.admin.report": "Adroddiadau newydd:",
   "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
   "notifications.column_settings.favourite": "Ffefrynnau:",
   "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
-  "notifications.column_settings.filter_bar.category": "Bar hidlo",
+  "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
   "notifications.column_settings.filter_bar.show_bar": "Dangos y bar hidlo",
   "notifications.column_settings.follow": "Dilynwyr newydd:",
   "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
@@ -413,7 +413,7 @@
   "notifications.column_settings.reblog": "Hybiau:",
   "notifications.column_settings.show": "Dangos yn y golofn",
   "notifications.column_settings.sound": "Chwarae sain",
-  "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.status": "Postiadau newydd:",
   "notifications.column_settings.unread_notifications.category": "Hysbysiadau heb eu darllen",
   "notifications.column_settings.unread_notifications.highlight": "Amlygu hysbysiadau heb eu darllen",
   "notifications.column_settings.update": "Golygiadau:",
@@ -425,28 +425,28 @@
   "notifications.filter.polls": "Canlyniadau polau",
   "notifications.filter.statuses": "Diweddariadau gan bobl rydych chi'n eu dilyn",
   "notifications.grant_permission": "Caniatáu.",
-  "notifications.group": "{count} o hysbysiadau",
+  "notifications.group": "{count} hysbysiad",
-  "notifications.mark_as_read": "Marciwch bob hysbysiad fel y'i darllenwyd",
+  "notifications.mark_as_read": "Marciwch bob hysbysiad wedi'i ddarllen",
   "notifications.permission_denied": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd cais am ganiatâd porwr a wrthodwyd yn flaenorol",
-  "notifications.permission_denied_alert": "Ni ellir galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
+  "notifications.permission_denied_alert": "Nid oes modd galluogi hysbysiadau bwrdd gwaith, gan fod caniatâd porwr wedi'i wrthod o'r blaen",
   "notifications.permission_required": "Nid oes hysbysiadau bwrdd gwaith ar gael oherwydd na roddwyd y caniatâd gofynnol.",
   "notifications_permission_banner.enable": "Galluogi hysbysiadau bwrdd gwaith",
-  "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogi hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithio sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddant wedi'u galluogi.",
+  "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddant wedi'u galluogi.",
-  "notifications_permission_banner.title": "Peidiwch byth â cholli peth",
+  "notifications_permission_banner.title": "Peidiwch colli dim",
   "picture_in_picture.restore": "Rhowch ef yn ôl",
   "poll.closed": "Ar gau",
   "poll.refresh": "Adnewyddu",
-  "poll.total_people": "{count, plural, one {# berson} other {# o bobl}}",
+  "poll.total_people": "{count, plural, one {# person} other {# person}}",
-  "poll.total_votes": "{count, plural, one {# bleidlais} other {# o bleidleisiau}}",
+  "poll.total_votes": "{count, plural, one {# bleidlais} other {# pleidlais}}",
   "poll.vote": "Pleidleisio",
-  "poll.voted": "Pleidleisioch chi am yr ateb hon",
+  "poll.voted": "Fe wnaethoch chi bleidleisio dros yr ateb hwn",
-  "poll.votes": "{votes, plural, one {# bleidlais} other {# o bleidleisiau}}",
+  "poll.votes": "{votes, plural, one {# pleidlais} other {# pleidlais}}",
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
-  "privacy.direct.long": "Cyhoeddi i'r defnyddwyr sy'n cael eu crybwyll yn unig",
+  "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
-  "privacy.direct.short": "Pobl sy wedi'u crybwyll yn unig",
+  "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
-  "privacy.private.long": "Cyhoeddi i ddilynwyr yn unig",
+  "privacy.private.long": "Dim ond pobl sy'n ddilynwyrl",
   "privacy.private.short": "Dilynwyr yn unig",
   "privacy.public.long": "Gweladwy i bawb",
   "privacy.public.short": "Cyhoeddus",
@@ -458,11 +458,11 @@
   "regeneration_indicator.label": "Llwytho…",
   "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
   "relative_time.days": "{number}d",
-  "relative_time.full.days": "{number, plural, one {# dydd} other {# o ddyddiau}} yn ôl",
+  "relative_time.full.days": "{number, plural, one {# diwrnod} other {# diwrnod}} yn ôl",
-  "relative_time.full.hours": "{number, plural, one {# awr} other {# o oriau}} yn ôl",
+  "relative_time.full.hours": "{number, plural, one {# awr} other {# awr}} yn ôl",
-  "relative_time.full.just_now": "jyst nawr",
+  "relative_time.full.just_now": "newydd ddigwydd",
-  "relative_time.full.minutes": "{number, plural, one {# funud} other {# o funudau}} yn ôl",
+  "relative_time.full.minutes": "{number, plural, one {# munud} other {# munud}} yn ôl",
-  "relative_time.full.seconds": "{number, plural, one {# eiliad} other {# o eiliadau}} yn ôl",
+  "relative_time.full.seconds": "{number, plural, one {# eiliad} other {# eiliad}} yn ôl",
   "relative_time.hours": "{number} awr",
   "relative_time.just_now": "nawr",
   "relative_time.minutes": "{number} munud",
@@ -474,15 +474,15 @@
   "report.categories.other": "Arall",
   "report.categories.spam": "Sbam",
   "report.categories.violation": "Mae cynnwys yn torri un neu fwy o reolau'r gweinydd",
-  "report.category.subtitle": "Dewiswch yr ateb gorau",
+  "report.category.subtitle": "Dewiswch y gyfatebiaeth gorau",
-  "report.category.title": "Beth sy'n bod â'r {type} hwn?",
+  "report.category.title": "Beth sy'n digwydd gyda'r {type} yma?",
   "report.category.title_account": "proffil",
   "report.category.title_status": "post",
   "report.close": "Iawn",
   "report.comment.title": "Oes unrhyw beth arall y dylem ei wybod yn eich barn chi?",
   "report.forward": "Ymlaen i {target}",
   "report.forward_hint": "Mae'r cyfrif o weinydd arall. Anfon copi anhysbys o'r adroddiad yno hefyd?",
-  "report.mute": "Anwybyddu",
+  "report.mute": "Tewi",
   "report.mute_explanation": "Ni fyddwch yn gweld eu postiadau. Gallant eich dilyn o hyd a gweld eich postiadau ac ni fyddant yn gwybod eu bod nhw wedi'u mudo.",
   "report.next": "Nesaf",
   "report.placeholder": "Sylwadau ychwanegol",
@@ -490,7 +490,7 @@
   "report.reasons.dislike_description": "Nid yw'n rhywbeth yr ydych am ei weld",
   "report.reasons.other": "Mae'n rhywbeth arall",
   "report.reasons.other_description": "Nid yw'r mater yn ffitio i gategorïau eraill",
-  "report.reasons.spam": "Sothach yw e",
+  "report.reasons.spam": "Sbam yw e",
   "report.reasons.spam_description": "Dolenni maleisus, ymgysylltu ffug, neu ymatebion ailadroddus",
   "report.reasons.violation": "Mae'n torri rheolau'r gweinydd",
   "report.reasons.violation_description": "Rydych yn ymwybodol ei fod yn torri rheolau penodol",
@@ -499,14 +499,14 @@
   "report.statuses.subtitle": "Dewiswch bob un sy'n berthnasol",
   "report.statuses.title": "Oes postiadau eraill sy'n cefnogi'r adroddiad hwn?",
   "report.submit": "Cyflwyno",
-  "report.target": "Cwyno am {target}",
+  "report.target": "Adrodd am {target}",
-  "report.thanks.take_action": "Dyma'ch opsiynau ar gyfer rheoli'r hyn a welwch ar Mastodon:",
+  "report.thanks.take_action": "Dyma'ch dewisiadau i reoli'r hyn a welwch ar Mastodon:",
-  "report.thanks.take_action_actionable": "Tra byddwn yn edrych ar hyn, gallwch gymryd camau yn erbyn @{name}:",
+  "report.thanks.take_action_actionable": "Tra byddwn yn adolygu hyn, gallwch gymryd camau yn erbyn @{name}:",
   "report.thanks.title": "Ddim eisiau gweld hwn?",
   "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
   "report.unfollow": "Dad-ddilyn @{name}",
   "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich porthiant cartref mwyach, dad-ddilynwch nhw.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} post} arall {{count} posts}} atodwyd",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
   "report_notification.categories.other": "Arall",
   "report_notification.categories.spam": "Sbam",
   "report_notification.categories.violation": "Torri rheol",
@@ -517,7 +517,7 @@
   "search_popout.tips.full_text": "Mae testun syml yn dychwelyd postiadau yr ydych wedi ysgrifennu, hoffi, wedi'u hybio, neu wedi'ch crybwyll ynddynt, ynghyd a chyfateb a enwau defnyddwyr, enwau arddangos ac hashnodau.",
   "search_popout.tips.hashtag": "hashnod",
   "search_popout.tips.status": "post",
-  "search_popout.tips.text": "Mae testun syml yn dychwelyd enwau arddangos, enwau defnyddwyr a hashnodau sy'n cyfateb",
+  "search_popout.tips.text": "Mae testun syml yn dychwelyd enwau dangos, enwau defnyddwyr a hashnodau sy'n cyfateb",
   "search_popout.tips.user": "defnyddiwr",
   "search_results.accounts": "Pobl",
   "search_results.all": "Popeth",
@@ -526,56 +526,56 @@
   "search_results.statuses": "Postiadau",
   "search_results.statuses_fts_disabled": "Nid yw chwilio postiadau yn ôl eu cynnwys wedi'i alluogi ar y gweinydd Mastodon hwn.",
   "search_results.title": "Chwilio am {q}",
-  "search_results.total": "{count, number} {count, plural, zero {canlyniad} one {canlyniad} two {ganlyniad} other {o ganlyniadau}}",
+  "search_results.total": "{count, number} {count, plural, zero {canlyniad} one {canlyniad} two {ganlyniad} other {canlyniad}}",
   "server_banner.about_active_users": "Pobl sy'n defnyddio'r gweinydd hwn yn ystod y 30 diwrnod diwethaf (Defnyddwyr Gweithredol Misol)",
   "server_banner.active_users": "defnyddwyr gweithredol",
-  "server_banner.administered_by": "Gweinyddir gan:",
+  "server_banner.administered_by": "Yn cael ei weinyddu gan:",
   "server_banner.introduction": "Mae {domain} yn rhan o'r rhwydwaith cymdeithasol datganoledig a bwerir gan {mastodon}.",
   "server_banner.learn_more": "Dysgu mwy",
   "server_banner.server_stats": "Ystagedau'r gweinydd:",
   "sign_in_banner.create_account": "Creu cyfrif",
   "sign_in_banner.sign_in": "Mewngofnodi",
   "sign_in_banner.text": "Mewngofnodwch i ddilyn proffiliau neu hashnodau, ffefrynnau, rhannu ac ymateb i bostiadau, neu ryngweithio o'ch cyfrif ar weinydd gwahanol.",
-  "status.admin_account": "Agor rhyngwyneb goruwchwylio ar gyfer @{name}",
+  "status.admin_account": "Agor rhyngwyneb cymedroli ar gyfer @{name}",
   "status.admin_status": "Agor y post hwn yn y rhyngwyneb goruwchwylio",
   "status.block": "Blocio @{name}",
-  "status.bookmark": "Tudalnodi",
+  "status.bookmark": "Nod Tudalen",
   "status.cancel_reblog_private": "Dadhybu",
-  "status.cannot_reblog": "Ni ellir hybu'r post hwn",
+  "status.cannot_reblog": "Nid oes modd hybu'r postiad hwn",
   "status.copy": "Copïo dolen i'r post",
   "status.delete": "Dileu",
   "status.detailed_status": "Golwg manwl o'r sgwrs",
   "status.direct": "Neges breifat @{name}",
   "status.edit": "Golygu",
   "status.edited": "Golygwyd {date}",
-  "status.edited_x_times": "Golygwyd {count, plural, one {unwaith} two {dwywaith} other {{count} gwaith}}",
+  "status.edited_x_times": "Golygwyd {count, plural, one {waith} two {waith} other {{count} gwaith}}",
   "status.embed": "Mewnblannu",
-  "status.favourite": "Hoffi",
+  "status.favourite": "Ffefryn",
-  "status.filter": "Hidlo'r post hwn",
+  "status.filter": "Hidlo'r postiad hwn",
   "status.filtered": "Wedi'i hidlo",
-  "status.hide": "Cuddio'r post",
+  "status.hide": "Cuddio postiad",
-  "status.history.created": "{name} greuodd {date}",
+  "status.history.created": "Crëwyd gan {name} {date}",
-  "status.history.edited": "{name} olygodd {date}",
+  "status.history.edited": "Golygwyd gan {name} {date}",
-  "status.load_more": "Llwythwch mwy",
+  "status.load_more": "Llwythwch ragor",
   "status.media_hidden": "Cyfryngau wedi'u cuddio",
   "status.mention": "Crybwyll @{name}",
-  "status.more": "Mwy",
+  "status.more": "Rhagor",
-  "status.mute": "Anwybyddu @{name}",
+  "status.mute": "Tewi @{name}",
-  "status.mute_conversation": "Anwybyddu sgwrs",
+  "status.mute_conversation": "Tewi sgwrs",
   "status.open": "Ehangu'r post hwn",
   "status.pin": "Pinio ar y proffil",
   "status.pinned": "Post wedi'i binio",
-  "status.read_more": "Darllen mwy",
+  "status.read_more": "Darllen rhagor",
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
   "status.reblogged_by": "Hybodd {name}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
-  "status.remove_bookmark": "Tynnu'r tudalnod",
+  "status.remove_bookmark": "Tynnu Nod Tudalen",
-  "status.replied_to": "Wedi ymateb i {name}",
+  "status.replied_to": "Wedi ateb {name}",
   "status.reply": "Ateb",
   "status.replyAll": "Ateb i edefyn",
-  "status.report": "Adrodd @{name}",
+  "status.report": "Adrodd ar @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",
   "status.show_filter_reason": "Dangos beth bynnag",
@@ -587,63 +587,63 @@
   "status.translate": "Cyfieithu",
   "status.translated_from_with": "Cyfieithwyd o {lang} gan ddefnyddio {provider}",
   "status.uncached_media_warning": "Dim ar gael",
-  "status.unmute_conversation": "Dad-anwybyddu sgwrs",
+  "status.unmute_conversation": "Dad-dewi sgwrs",
   "status.unpin": "Dadbinio o'r proffil",
-  "subscribed_languages.lead": "Dim ond postiadau mewn ieithoedd dethol fydd yn ymddangos yn eich ffrydiau ar ôl y newid. Dewiswch ddim byd i dderbyn postiadau ym mhob iaith.",
+  "subscribed_languages.lead": "Dim ond postiadau mewn ieithoedd penodol fydd yn ymddangos yn eich ffrydiau ar ôl y newid. Dewiswch ddim byd i dderbyn postiadau ym mhob iaith.",
   "subscribed_languages.save": "Cadw'r newidiadau",
   "subscribed_languages.target": "Newid ieithoedd tanysgrifio {target}",
-  "suggestions.dismiss": "Diswyddo",
+  "suggestions.dismiss": "Diystyru'r awgrym",
   "suggestions.header": "Efallai y bydd gennych ddiddordeb mewn…",
-  "tabs_bar.federated_timeline": "Ffederasiwn",
+  "tabs_bar.federated_timeline": "Ffedereiddiwyd",
-  "tabs_bar.home": "Hafan",
+  "tabs_bar.home": "Cartref",
   "tabs_bar.local_timeline": "Lleol",
   "tabs_bar.notifications": "Hysbysiadau",
-  "time_remaining.days": "{number, plural, one {# ddydd} other {# o ddyddiau}} ar ôl",
+  "time_remaining.days": "{number, plural, one {# diwrnod} other {# diwrnod}} ar ôl",
-  "time_remaining.hours": "{number, plural, one {# awr} other {# o oriau}} ar ôl",
+  "time_remaining.hours": "{number, plural, one {# awr} other {# awr}} ar ôl",
-  "time_remaining.minutes": "{number, plural, one {# funud} other {# o funudau}} ar ôl",
+  "time_remaining.minutes": "{number, plural, one {# munud} other {# munud}} ar ôl",
-  "time_remaining.moments": "Munudau ar ôl",
+  "time_remaining.moments": "Munudau yn weddill",
-  "time_remaining.seconds": "{number, plural, one {# eiliad} other {# o eiliadau}} ar ôl",
+  "time_remaining.seconds": "{number, plural, one {# eiliad} other {# eiliad}} ar ôl",
-  "timeline_hint.remote_resource_not_displayed": "ni chaiff {resource} o gweinyddion eraill ei ddangos.",
+  "timeline_hint.remote_resource_not_displayed": "Nid yw {resource} o weinyddion eraill yn cael ei ddangos.",
   "timeline_hint.resources.followers": "Dilynwyr",
   "timeline_hint.resources.follows": "Yn dilyn",
   "timeline_hint.resources.statuses": "Postiadau hŷn",
   "trends.counter_by_accounts": "{count, plural, zero {neb} one {{counter} person} two {{counter} berson} few {{counter} pherson} other {{counter} o bobl}} yn y {days, plural, one {diwrnod diwethaf} two {ddeuddydd diwethaf} other {{days} diwrnod diwethaf}}",
-  "trends.trending_now": "Pynciau llosg",
+  "trends.trending_now": "Yn trendio nawr",
-  "ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
+  "ui.beforeunload": "Byddwch yn colli eich drafft os byddwch yn gadael Mastodon.",
   "units.short.billion": "{count}biliwn",
   "units.short.million": "{count}miliwn",
   "units.short.thousand": "{count}mil",
   "upload_area.title": "Llusgwch a gollwng i lwytho",
   "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Wedi mynd heibio'r uchafswm terfyn uwchlwytho.",
-  "upload_error.poll": "Nid oes modd uwchlwytho ffeiliau â phleidleisiau.",
+  "upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
   "upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
   "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
   "upload_form.description_missing": "Dim disgrifiad wedi'i ychwanegu",
   "upload_form.edit": "Golygu",
-  "upload_form.thumbnail": "Newid mân-lun",
+  "upload_form.thumbnail": "Newid llun bach",
   "upload_form.undo": "Dileu",
   "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
-  "upload_modal.analyzing_picture": "Dadansoddi llun…",
+  "upload_modal.analyzing_picture": "Yn dadansoddi llun…",
-  "upload_modal.apply": "Gweithredu",
+  "upload_modal.apply": "Gosod",
-  "upload_modal.applying": "Gweithio…",
+  "upload_modal.applying": "Yn gosod…",
   "upload_modal.choose_image": "Dewis delwedd",
   "upload_modal.description_placeholder": "Mae ei phen bach llawn jocs, 'run peth a fy nghot golff, rhai dyddiau",
   "upload_modal.detect_text": "Canfod testun o'r llun",
   "upload_modal.edit_media": "Golygu cyfryngau",
-  "upload_modal.hint": "Cliciwch neu llusgwch y cylch ar y rhagolwg i ddewis y canolbwynt a fydd bob amser i'w weld ar bob mân-lunau.",
+  "upload_modal.hint": "Cliciwch neu llusgwch y cylch ar y rhagolwg i ddewis y canolbwynt a fydd bob amser i'w weld ar bob llun bach.",
-  "upload_modal.preparing_ocr": "Paratoi OCR…",
+  "upload_modal.preparing_ocr": "Yn paratoi OCR…",
   "upload_modal.preview_label": "Rhagolwg ({ratio})",
-  "upload_progress.label": "Uwchlwytho...",
+  "upload_progress.label": "Yn llwytho...",
   "upload_progress.processing": "Wrthi'n prosesu…",
   "video.close": "Cau fideo",
-  "video.download": "Lawrlwytho ffeil",
+  "video.download": "Llwytho ffeil i lawr",
   "video.exit_fullscreen": "Gadael sgrin llawn",
   "video.expand": "Ymestyn fideo",
   "video.fullscreen": "Sgrin llawn",
   "video.hide": "Cuddio fideo",
-  "video.mute": "Diffodd sain",
+  "video.mute": "Tewi sain",
   "video.pause": "Oedi",
   "video.play": "Chwarae",
-  "video.unmute": "Dad-ddiffodd sain"
+  "video.unmute": "Dad-dewi sain"
 }

app/javascript/mastodon/locales/da.json

@@ -285,7 +285,7 @@
   "home.show_announcements": "Vis bekendtgørelser",
   "interaction_modal.description.favourite": "Med en konto på Mastodon kan dette indlæg gøres til favorit for at lade forfatteren vide, at det værdsættes, samt gemme det til senere.",
   "interaction_modal.description.follow": "Med en konto på Mastodon kan du følge {name} for at modtage vedkommendes indlæg i dit hjemmefeed.",
-  "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg boostes for at dele det med egne følgere.",
+  "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.",
   "interaction_modal.description.reply": "Med en konto på Mastodon kan dette indlæg besvares.",
   "interaction_modal.on_another_server": "På en anden server",
   "interaction_modal.on_this_server": "På denne server",
@@ -541,7 +541,7 @@
   "status.block": "Blokér @{name}",
   "status.bookmark": "Bogmærk",
   "status.cancel_reblog_private": "Fjern boost",
-  "status.cannot_reblog": "Dette indlæg kan ikke boostes",
+  "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
   "status.copy": "Kopiér link til indlæg",
   "status.delete": "Slet",
   "status.detailed_status": "Detaljeret samtalevisning",
@@ -568,8 +568,8 @@
   "status.read_more": "Læs mere",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost med oprindelig synlighed",
-  "status.reblogged_by": "{name} boostede",
+  "status.reblogged_by": "{name} fremhævede",
-  "status.reblogs.empty": "Ingen har boostet dette indlæg endnu. Når nogen gør, vil det fremgå her.",
+  "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
   "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",
   "status.replied_to": "Besvarede {name}",

app/javascript/mastodon/locales/de.json

@@ -57,9 +57,9 @@
   "account.share": "Profil von @{name} teilen",
   "account.show_reblogs": "Geteilte Beiträge von @{name} wieder anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
-  "account.unblock": "@{name} entblocken",
+  "account.unblock": "@{name} entsperren",
-  "account.unblock_domain": "Entblocken von {domain}",
+  "account.unblock_domain": "Sperre von {domain} aufheben",
-  "account.unblock_short": "Blockierung aufheben",
+  "account.unblock_short": "Sperre aufheben",
   "account.unendorse": "Im Profil nicht mehr empfehlen",
   "account.unfollow": "Entfolgen",
   "account.unmute": "Stummschaltung von @{name} aufheben",
@@ -77,7 +77,7 @@
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
-  "audio.hide": "Audio stummschalten",
+  "audio.hide": "Audio verbergen",
   "autosuggest_hashtag.per_week": "{count} pro Woche",
   "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
@@ -90,7 +90,7 @@
   "bundle_column_error.routing.body": "Die angeforderte Seite konnte nicht gefunden werden. Bist du dir sicher, dass die URL in der Adressleiste korrekt ist?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Schließen",
-  "bundle_modal_error.message": "Etwas ist beim Laden schiefgelaufen.",
+  "bundle_modal_error.message": "Beim Laden dieser Komponente ist etwas schiefgelaufen.",
   "bundle_modal_error.retry": "Erneut versuchen",
   "closed_registrations.other_server_instructions": "Da Mastodon dezentralisiert ist, kannst du ein Konto auf einem anderen Server erstellen und trotzdem mit diesem Server interagieren.",
   "closed_registrations_modal.description": "Das Anlegen eines Kontos auf {domain} ist derzeit nicht möglich, aber bedenke, dass du kein extra Konto auf {domain} benötigst, um Mastodon nutzen zu können.",
@@ -98,12 +98,12 @@
   "closed_registrations_modal.preamble": "Mastodon ist dezentralisiert, das heißt, unabhängig davon, wo du dein Konto erstellt hast, kannst du jedem Profil auf diesem Server folgen und mit ihm interagieren. Du kannst sogar deinen eigenen Server hosten!",
   "closed_registrations_modal.title": "Bei Mastodon registrieren",
   "column.about": "Über",
-  "column.blocks": "Blockierte Profile",
+  "column.blocks": "Gesperrte Profile",
   "column.bookmarks": "Lesezeichen",
   "column.community": "Lokale Timeline",
   "column.direct": "Direktnachrichten",
   "column.directory": "Profile durchsuchen",
-  "column.domain_blocks": "Blockierte Domains",
+  "column.domain_blocks": "Gesperrte Domains",
   "column.favourites": "Favoriten",
   "column.follow_requests": "Follower-Anfragen",
   "column.home": "Startseite",
@@ -148,19 +148,19 @@
   "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
   "compose_form.spoiler_placeholder": "Inhaltswarnung",
   "confirmation_modal.cancel": "Abbrechen",
-  "confirmations.block.block_and_report": "Blockieren und melden",
+  "confirmations.block.block_and_report": "Sperren und melden",
-  "confirmations.block.confirm": "Blockieren",
+  "confirmations.block.confirm": "Sperren",
-  "confirmations.block.message": "Bist du dir sicher, dass du {name} blockieren möchtest?",
+  "confirmations.block.message": "Bist du dir sicher, dass du {name} sperren möchtest?",
   "confirmations.cancel_follow_request.confirm": "Anfrage zurückziehen",
   "confirmations.cancel_follow_request.message": "Möchtest du deine Anfrage, {name} zu folgen, wirklich zurückziehen?",
   "confirmations.delete.confirm": "Löschen",
   "confirmations.delete.message": "Bist du dir sicher, dass du diesen Beitrag löschen möchtest?",
   "confirmations.delete_list.confirm": "Löschen",
-  "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste permanent löschen möchtest?",
+  "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste endgültig löschen möchtest?",
   "confirmations.discard_edit_media.confirm": "Verwerfen",
-  "confirmations.discard_edit_media.message": "Du hast ungespeicherte Änderungen an der Medienbeschreibung oder der Medienvorschau. Trotzdem verwerfen?",
+  "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
   "confirmations.domain_block.confirm": "Domain sperren",
-  "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} blockieren willst? In den meisten Fällen reichen ein paar gezielte Blockierungen oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
+  "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} sperren willst? In den meisten Fällen reichen ein paar gezielte Sperren oder Stummschaltungen aus. Du wirst den Inhalt von dieser Domain nicht in irgendwelchen öffentlichen Timelines oder den Benachrichtigungen finden. Auch deine Follower von dieser Domain werden entfernt.",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Bist du sicher, dass du dich abmelden möchtest?",
   "confirmations.mute.confirm": "Stummschalten",
@@ -169,7 +169,7 @@
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und auf Basis deines vorherigen neu erstellen möchtest? Favoriten und geteilte Beiträge gehen verloren. Vorhandene Antworten von dir und anderen Nutzer*innen auf diesen Beitrag werden zwar nicht gelöscht, aber die Verknüpfungen gehen verloren.",
   "confirmations.reply.confirm": "Antworten",
-  "confirmations.reply.message": "Wenn du jetzt antwortest wird die gesamte Nachricht verworfen, die du gerade schreibst. Möchtest du wirklich fortfahren?",
+  "confirmations.reply.message": "Wenn du jetzt darauf antwortest, wird der andere Beitrag, an dem du gerade geschrieben hast, verworfen. Möchtest du wirklich fortfahren?",
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Bist du dir sicher, dass du {name} entfolgen möchtest?",
   "conversation.delete": "Unterhaltung löschen",
@@ -210,11 +210,11 @@
   "empty_column.account_suspended": "Konto gesperrt",
   "empty_column.account_timeline": "Keine Beiträge vorhanden!",
   "empty_column.account_unavailable": "Profil nicht verfügbar",
-  "empty_column.blocks": "Du hast bisher keine Profile blockiert.",
+  "empty_column.blocks": "Du hast bisher keine Profile gesperrt.",
   "empty_column.bookmarked_statuses": "Du hast bisher keine Beiträge als Lesezeichen abgelegt. Sobald du einen Beitrag als Lesezeichen speicherst, wird er hier erscheinen.",
   "empty_column.community": "Die lokale Timeline ist leer. Schreibe einen öffentlichen Beitrag, um den Stein ins Rollen zu bringen!",
   "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Sobald du eine private Nachricht sendest oder empfängst, wird sie hier zu sehen sein.",
-  "empty_column.domain_blocks": "Du hast noch keine Domains blockiert.",
+  "empty_column.domain_blocks": "Du hast noch keine Domains gesperrt.",
   "empty_column.explore_statuses": "Momentan ist nichts im Trend. Schau später wieder vorbei!",
   "empty_column.favourited_statuses": "Du hast noch keine Beiträge favorisiert. Sobald du einen favorisierst, wird er hier erscheinen.",
   "empty_column.favourites": "Noch niemand hat diesen Beitrag favorisiert. Sobald es jemand tut, wird das hier angezeigt.",
@@ -299,7 +299,7 @@
   "intervals.full.hours": "{number, plural, one {# Stunde} other {# Stunden}}",
   "intervals.full.minutes": "{number, plural, one {# Minute} other {# Minuten}}",
   "keyboard_shortcuts.back": "zurücknavigieren",
-  "keyboard_shortcuts.blocked": "Liste blockierter Profile öffnen",
+  "keyboard_shortcuts.blocked": "Liste gesperrter Profile öffnen",
   "keyboard_shortcuts.boost": "Beitrag teilen",
   "keyboard_shortcuts.column": "Spalte fokussieren",
   "keyboard_shortcuts.compose": "Eingabefeld fokussieren",
@@ -344,11 +344,11 @@
   "lists.delete": "Liste löschen",
   "lists.edit": "Liste bearbeiten",
   "lists.edit.submit": "Titel ändern",
-  "lists.new.create": "Liste hinzufügen",
+  "lists.new.create": "Neue Liste erstellen",
-  "lists.new.title_placeholder": "Neuer Titel der Liste",
+  "lists.new.title_placeholder": "Titel der neuen Liste",
   "lists.replies_policy.followed": "Alle folgenden Profile",
   "lists.replies_policy.list": "Mitglieder der Liste",
-  "lists.replies_policy.none": "Niemand",
+  "lists.replies_policy.none": "Niemandem",
   "lists.replies_policy.title": "Antworten anzeigen für:",
   "lists.search": "Suche nach Leuten, denen du folgst",
   "lists.subheading": "Deine Listen",
@@ -356,19 +356,19 @@
   "loading_indicator.label": "Wird geladen …",
   "media_gallery.toggle_visible": "{number, plural, one {Bild verbergen} other {Bilder verbergen}}",
   "missing_indicator.label": "Nicht gefunden",
-  "missing_indicator.sublabel": "Die Ressource konnte nicht gefunden werden",
+  "missing_indicator.sublabel": "Der Inhalt konnte nicht gefunden werden",
   "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
   "mute_modal.duration": "Dauer",
-  "mute_modal.hide_notifications": "Benachrichtigungen von diesem Profil verbergen?",
+  "mute_modal.hide_notifications": "Benachrichtigungen dieses Profils verbergen?",
-  "mute_modal.indefinite": "Unbestimmt",
+  "mute_modal.indefinite": "Unbegrenzt",
   "navigation_bar.about": "Über",
-  "navigation_bar.blocks": "Blockierte Profile",
+  "navigation_bar.blocks": "Gesperrte Profile",
   "navigation_bar.bookmarks": "Lesezeichen",
   "navigation_bar.community_timeline": "Lokale Timeline",
   "navigation_bar.compose": "Neuen Beitrag verfassen",
   "navigation_bar.direct": "Direktnachrichten",
   "navigation_bar.discover": "Entdecken",
-  "navigation_bar.domain_blocks": "Blockierte Domains",
+  "navigation_bar.domain_blocks": "Gesperrte Domains",
   "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.explore": "Entdecken",
   "navigation_bar.favourites": "Favoriten",
@@ -384,42 +384,42 @@
   "navigation_bar.public_timeline": "Föderierte Timeline",
   "navigation_bar.search": "Suche",
   "navigation_bar.security": "Sicherheit",
-  "not_signed_in_indicator.not_signed_in": "Sie müssen sich anmelden, um diese Funktion zu nutzen.",
+  "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.",
   "notification.admin.report": "{target} wurde von {name} gemeldet",
-  "notification.admin.sign_up": "{name} hat sich registriert",
+  "notification.admin.sign_up": "{name} registrierte sich",
   "notification.favourite": "{name} hat deinen Beitrag favorisiert",
   "notification.reaction": "{name} hat auf deinen Beitrag reagiert",
   "notification.follow": "{name} folgt dir jetzt",
   "notification.follow_request": "{name} möchte dir folgen",
-  "notification.mention": "{name} hat dich erwähnt",
+  "notification.mention": "{name} erwähnte dich",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
-  "notification.reblog": "{name} hat deinen Beitrag geteilt",
+  "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.status": "{name} hat etwas mitgeteilt",
-  "notification.update": "{name} hat einen Beitrag bearbeitet",
+  "notification.update": "{name} bearbeitete einen Beitrag",
   "notifications.clear": "Mitteilungen löschen",
-  "notifications.clear_confirmation": "Bist du dir sicher, dass du alle Mitteilungen löschen möchtest?",
+  "notifications.clear_confirmation": "Bist du dir sicher, dass du diese Mitteilungen für immer löschen möchtest?",
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
   "notifications.column_settings.favourite": "Favorisierungen:",
   "notifications.column_settings.reaction": "Reaktionen:",
-  "notifications.column_settings.filter_bar.advanced": "Zeige alle Kategorien an",
+  "notifications.column_settings.filter_bar.advanced": "Erweiterte Filterleiste aktivieren",
-  "notifications.column_settings.filter_bar.category": "Schnellfilterleiste",
+  "notifications.column_settings.filter_bar.category": "Filterleiste:",
   "notifications.column_settings.filter_bar.show_bar": "Filterleiste anzeigen",
   "notifications.column_settings.follow": "Neue Follower:",
   "notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
   "notifications.column_settings.mention": "Erwähnungen:",
-  "notifications.column_settings.poll": "Ergebnisse von Umfragen:",
+  "notifications.column_settings.poll": "Umfrageergebnisse:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",
   "notifications.column_settings.reblog": "Geteilte Beiträge:",
-  "notifications.column_settings.show": "In der Timeline „Mitteilungen“ anzeigen",
+  "notifications.column_settings.show": "In diesem Feed anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
   "notifications.column_settings.status": "Neue Beiträge:",
-  "notifications.column_settings.unread_notifications.category": "Ungelesene Benachrichtigungen",
+  "notifications.column_settings.unread_notifications.category": "Ungelesene Mitteilungen:",
-  "notifications.column_settings.unread_notifications.highlight": "Ungelesene Benachrichtigungen hervorheben",
+  "notifications.column_settings.unread_notifications.highlight": "Ungelesene Mitteilungen markieren",
-  "notifications.column_settings.update": "Bearbeitungen:",
+  "notifications.column_settings.update": "Bearbeitete Beiträge:",
-  "notifications.filter.all": "Alle",
+  "notifications.filter.all": "Alles",
   "notifications.filter.boosts": "Geteilte Beiträge",
   "notifications.filter.favourites": "Favorisierungen",
   "notifications.filter.follows": "Neue Follower",
@@ -438,12 +438,12 @@
   "picture_in_picture.restore": "Zurücksetzen",
   "poll.closed": "Beendet",
   "poll.refresh": "Aktualisieren",
-  "poll.total_people": "{count, plural, one {# Person} other {# Personen}}",
+  "poll.total_people": "{count, plural, one {# Profil} other {# Profile}}",
   "poll.total_votes": "{count, plural, one {# Stimme} other {# Stimmen}}",
   "poll.vote": "Abstimmen",
   "poll.voted": "Du hast für diese Auswahl gestimmt",
   "poll.votes": "{votes, plural, one {# Stimme} other {# Stimmen}}",
-  "poll_button.add_poll": "Eine Umfrage erstellen",
+  "poll_button.add_poll": "Umfrage erstellen",
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit des Beitrags anpassen",
   "privacy.direct.long": "Nur für die genannten Profile sichtbar",
@@ -462,20 +462,20 @@
   "relative_time.days": "{number}T",
   "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}",
   "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}",
-  "relative_time.full.just_now": "gerade eben",
+  "relative_time.full.just_now": "soeben",
   "relative_time.full.minutes": "vor {number, plural, one {# Minute} other {# Minuten}}",
   "relative_time.full.seconds": "vor {number, plural, one {1 Sekunde} other {# Sekunden}}",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "{number} Std",
   "relative_time.just_now": "jetzt",
-  "relative_time.minutes": "{number}m",
+  "relative_time.minutes": "{number} min",
-  "relative_time.seconds": "{number}s",
+  "relative_time.seconds": "{number} sek",
   "relative_time.today": "heute",
   "reply_indicator.cancel": "Abbrechen",
-  "report.block": "Blockieren",
+  "report.block": "Sperren",
-  "report.block_explanation": "Du wirst die Beiträge von diesem Konto nicht sehen. Das Konto wird nicht in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird wissen, dass du das Konto blockiert hast.",
+  "report.block_explanation": "Dir wird es nicht länger möglich sein, die Beiträge dieses Konto zu sehen. Das gesperrte Profil wird nicht mehr in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird mitbekommen, dass du ihr Konto gesperrt hast.",
   "report.categories.other": "Andere",
   "report.categories.spam": "Spam",
-  "report.categories.violation": "Der Inhalt verletzt eine oder mehrere Server-Regeln",
+  "report.categories.violation": "Der Inhalt verletzt eine oder mehrere Serverregeln",
   "report.category.subtitle": "Wähle die passendste Kategorie",
   "report.category.title": "Sag uns, was das Problem mit diesem {type} ist",
   "report.category.title_account": "Profil",
@@ -487,31 +487,31 @@
   "report.mute": "Stummschalten",
   "report.mute_explanation": "Du wirst die Beiträge vom Konto nicht mehr sehen. Das Konto kann dir immer noch folgen, und die Person hinter dem Konto wird deine Beiträge sehen können und nicht wissen, dass du sie stummgeschaltet hast.",
   "report.next": "Weiter",
-  "report.placeholder": "Zusätzliche Kommentare",
+  "report.placeholder": "Ergänzende Hinweise",
   "report.reasons.dislike": "Das gefällt mir nicht",
   "report.reasons.dislike_description": "Es ist etwas, das du nicht sehen willst",
-  "report.reasons.other": "Es geht um etwas anderes",
+  "report.reasons.other": "Es ist etwas anderes",
-  "report.reasons.other_description": "Das Problem passt nicht in die Kategorien",
+  "report.reasons.other_description": "Der Vorfall passt zu keiner dieser Kategorien",
   "report.reasons.spam": "Das ist Spam",
   "report.reasons.spam_description": "Bösartige Links, gefälschtes Engagement oder wiederholte Antworten",
   "report.reasons.violation": "Es verstößt gegen Serverregeln",
   "report.reasons.violation_description": "Du weißt, welche Regeln verletzt werden",
-  "report.rules.subtitle": "Alles Zutreffende auswählen",
+  "report.rules.subtitle": "Wähle alle zutreffenden Inhalte aus",
   "report.rules.title": "Welche Regeln werden verletzt?",
-  "report.statuses.subtitle": "Alles Zutreffende auswählen",
+  "report.statuses.subtitle": "Wähle alle zutreffenden Inhalte aus",
   "report.statuses.title": "Gibt es Beiträge, die diesen Bericht unterstützen?",
-  "report.submit": "Absenden",
+  "report.submit": "Abschicken",
   "report.target": "{target} melden",
   "report.thanks.take_action": "Das sind deine Möglichkeiten zu bestimmen, was du auf Mastodon sehen möchtest:",
-  "report.thanks.take_action_actionable": "Während wir dies überprüfen, kannst du gegen @{name} vorgehen:",
+  "report.thanks.take_action_actionable": "Während wir den Vorfall überprüfen, kannst du gegen @{name} weitere Maßnahmen ergreifen:",
-  "report.thanks.title": "Möchtest du das nicht sehen?",
+  "report.thanks.title": "Möchtest du das nicht mehr sehen?",
   "report.thanks.title_actionable": "Vielen Dank für die Meldung, wir werden uns das ansehen.",
   "report.unfollow": "@{name} entfolgen",
   "report.unfollow_explanation": "Du folgst diesem Konto. Um die Beiträge nicht mehr auf deiner Startseite zu sehen, entfolge dem Konto.",
   "report_notification.attached_statuses": "{count, plural, one {{count} angehangener Beitrag} other {{count} angehängte Beiträge}}",
-  "report_notification.categories.other": "Nicht Aufgelistet",
+  "report_notification.categories.other": "Nicht aufgeführt",
   "report_notification.categories.spam": "Spam",
-  "report_notification.categories.violation": "Regelbruch",
+  "report_notification.categories.violation": "Regelverstoß",
   "report_notification.open": "Meldung öffnen",
   "search.placeholder": "Suche",
   "search.search_or_paste": "Suchen oder URL einfügen",
@@ -522,7 +522,7 @@
   "search_popout.tips.text": "Einfache Texteingabe gibt Anzeigenamen, Benutzernamen und Hashtags zurück",
   "search_popout.tips.user": "Profil",
   "search_results.accounts": "Profile",
-  "search_results.all": "Alle",
+  "search_results.all": "Alles",
   "search_results.hashtags": "Hashtags",
   "search_results.nothing_found": "Nichts für diese Suchbegriffe gefunden",
   "search_results.statuses": "Beiträge",
@@ -561,7 +561,7 @@
   "status.history.edited": "{name} bearbeitete {date}",
   "status.load_more": "Weitere laden",
   "status.media_hidden": "Medien versteckt",
-  "status.mention": "@{name} erwähnen",
+  "status.mention": "@{name} im Beitrag erwähnen",
   "status.more": "Mehr",
   "status.mute": "@{name} stummschalten",
   "status.mute_conversation": "Unterhaltung stummschalten",
@@ -586,7 +586,7 @@
   "status.show_less_all": "Alle Inhaltswarnungen zuklappen",
   "status.show_more": "Mehr anzeigen",
   "status.show_more_all": "Alle Inhaltswarnungen aufklappen",
-  "status.show_original": "Original anzeigen",
+  "status.show_original": "Ursprünglichen Beitrag anzeigen",
   "status.translate": "Übersetzen",
   "status.translated_from_with": "Aus {lang} mittels {provider} übersetzt",
   "status.uncached_media_warning": "Nicht verfügbar",
@@ -595,33 +595,33 @@
   "subscribed_languages.lead": "Nach der Änderung werden nur noch Beiträge in den ausgewählten Sprachen in den Timelines deiner Startseite und deiner Listen angezeigt. Wähle keine Sprache aus, um alle Beiträge zu sehen.",
   "subscribed_languages.save": "Änderungen speichern",
   "subscribed_languages.target": "Abonnierte Sprachen für {target} ändern",
-  "suggestions.dismiss": "Empfehlung ausblenden",
+  "suggestions.dismiss": "Vorschlag ablehnen",
   "suggestions.header": "Du bist möglicherweise interessiert an …",
   "tabs_bar.federated_timeline": "Föderiert",
   "tabs_bar.home": "Startseite",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Mitteilungen",
-  "time_remaining.days": "{number, plural, one {# Tag} other {# Tage}} verbleibend",
+  "time_remaining.days": "noch {number, plural, one {# Tag} other {# Tage}}",
-  "time_remaining.hours": "{number, plural, one {# Stunde} other {# Stunden}} verbleibend",
+  "time_remaining.hours": "noch {number, plural, one {# Stunde} other {# Stunden}}",
-  "time_remaining.minutes": "{number, plural, one {# Minute} other {# Minuten}} verbleibend",
+  "time_remaining.minutes": "noch {number, plural, one {# Minute} other {# Minuten}}",
-  "time_remaining.moments": "Schließt in Kürze",
+  "time_remaining.moments": "Wird gleich beendet",
-  "time_remaining.seconds": "{number, plural, one {# Sekunde} other {# Sekunden}} verbleibend",
+  "time_remaining.seconds": "noch {number, plural, one {# Sekunde} other {# Sekunden}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} von anderen Servern werden nicht angezeigt.",
   "timeline_hint.resources.followers": "Follower",
   "timeline_hint.resources.follows": "Folge ich",
   "timeline_hint.resources.statuses": "Ältere Beiträge",
-  "trends.counter_by_accounts": "{count, plural, one {{count} Person} other {{count} Personen}} {days, plural, one {am vergangenen Tag} other {in den vergangenen {days} Tagen}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} Profil} other {{counter} Profile}} {days, plural, one {seit gestern} other {in {days} Tagen}}",
-  "trends.trending_now": "In den Trends",
+  "trends.trending_now": "Aktuelle Trends",
   "tooltips.reactions": "Reaktionen",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
-  "units.short.billion": "{count}B",
+  "units.short.billion": "{count} Mrd",
-  "units.short.million": "{count}M",
+  "units.short.million": "{count} Mio",
-  "units.short.thousand": "{count}K",
+  "units.short.thousand": "{count} Tsd",
   "upload_area.title": "Zum Hochladen hereinziehen",
-  "upload_button.label": "Mediendatei hinzufügen",
+  "upload_button.label": "Bilder, Videos oder Audios hinzufügen",
-  "upload_error.limit": "Dateiupload-Limit erreicht.",
+  "upload_error.limit": "Dateiupload-Limit überschritten.",
-  "upload_error.poll": "Dateiuploads sind in Kombination mit Umfragen nicht erlaubt.",
+  "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
-  "upload_form.audio_description": "Beschreibe die Audiodatei für Menschen mit Hörschädigungen",
+  "upload_form.audio_description": "Beschreibung für Gehörlose und hörbehinderte Menschen",
   "upload_form.description": "Bildbeschreibung für blinde und sehbehinderte Menschen",
   "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
   "upload_form.edit": "Bearbeiten",

app/javascript/mastodon/locales/defaultMessages.json

@@ -3975,13 +3975,13 @@
         "defaultMessage": "Publish",
         "id": "compose_form.publish_form"
       },
-      {
-        "defaultMessage": "Sign in",
-        "id": "sign_in_banner.sign_in"
-      },
       {
         "defaultMessage": "Create account",
         "id": "sign_in_banner.create_account"
+      },
+      {
+        "defaultMessage": "Sign in",
+        "id": "sign_in_banner.sign_in"
       }
     ],
     "path": "app/javascript/mastodon/features/ui/components/header.json"

app/javascript/mastodon/locales/el.json

@@ -591,7 +591,7 @@
   "status.unpin": "Ξεκαρφίτσωσε από το προφίλ",
   "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
   "subscribed_languages.save": "Αποθήκευση αλλαγών",
-  "subscribed_languages.target": "Change subscribed languages for {target}",
+  "subscribed_languages.target": "Αλλαγή εγγεγραμμένων γλωσσών για {target}",
   "suggestions.dismiss": "Απόρριψη πρότασης",
   "suggestions.header": "Ίσως να ενδιαφέρεσαι για…",
   "tabs_bar.federated_timeline": "Ομοσπονδιακή",

app/javascript/mastodon/locales/eo.json

@@ -9,8 +9,8 @@
   "about.domain_blocks.suspended.explanation": "Neniuj datumoj el tiu servilo estos prilaboritaj, konservitaj, aŭ interŝanĝitaj, do neeblas interagi aŭ komuniki kun uzantoj de tiu servilo.",
   "about.domain_blocks.suspended.title": "Suspendita",
   "about.not_available": "Ĉi tiu informo ne estas disponebla ĉe ĉi tiu servilo.",
-  "about.powered_by": "Malcentralizita socia reto pere de {mastodon}",
+  "about.powered_by": "Malcentrigita socia retejo pere de {mastodon}",
-  "about.rules": "Reguloj de la servilo",
+  "about.rules": "Regularo de la servilo",
   "account.account_note_header": "Noto",
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
   "account.badges.bot": "Roboto",
@@ -47,13 +47,13 @@
   "account.mention": "Mencii @{name}",
   "account.moved_to": "{name} indikis, ke ria nova konto estas nun:",
   "account.mute": "Silentigi @{name}",
-  "account.mute_notifications": "Silentigi sciigojn de @{name}",
+  "account.mute_notifications": "Silentigi la sciigojn de @{name}",
   "account.muted": "Silentigita",
   "account.open_original_page": "Malfermi la originalan paĝon",
   "account.posts": "Afiŝoj",
   "account.posts_with_replies": "Mesaĝoj kaj respondoj",
   "account.report": "Raporti @{name}",
-  "account.requested": "Atendo de aprobo. Alklaku por nuligi peton de sekvado",
+  "account.requested": "Atendo de aprobo. Klaku por nuligi la peton por sekvado",
   "account.share": "Diskonigi la profilon de @{name}",
   "account.show_reblogs": "Montri diskonigojn de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Afiŝo} other {{counter} Afiŝoj}}",
@@ -285,7 +285,7 @@
   "home.show_announcements": "Montri anoncojn",
   "interaction_modal.description.favourite": "Kun konto de Mastodon, vi povos stelumi ĉi tiun mesaĝon por konservi ĝin kaj por sciigi al la afiŝinto, ke vi estimas ĝin.",
   "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povos sekvi {name} por vidi ties mesaĝojn en via hejmo.",
-  "interaction_modal.description.reblog": "Kun konto de Mastodon, vi povos diskonigi ĉi tiun mesaĝon por ke viaj propraj sekvantoj vidu ĝin.",
+  "interaction_modal.description.reblog": "Kun konto de Mastodon, vi povas diskonigi ĉi tiun mesaĝon, por ke viaj propraj sekvantoj vidu ĝin.",
   "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu mesaĝo.",
   "interaction_modal.on_another_server": "En alia servilo",
   "interaction_modal.on_this_server": "En ĉi tiu servilo",
@@ -293,7 +293,7 @@
   "interaction_modal.preamble": "Ĉar Mastodon estas malcentraliza, vi povas uzi jam ekzistantan konton, gastigatan de alia servilo Mastodon aŭ konforma platformo, se vi ne havas konton ĉe tiu ĉi.",
   "interaction_modal.title.favourite": "Stelumi la afiŝon de {name}",
   "interaction_modal.title.follow": "Sekvi {name}",
-  "interaction_modal.title.reblog": "Suprenigi la afiŝon de {name}",
+  "interaction_modal.title.reblog": "Akceli la afiŝon de {name}",
   "interaction_modal.title.reply": "Respondi al la afiŝo de {name}",
   "intervals.full.days": "{number, plural, one {# tago} other {# tagoj}}",
   "intervals.full.hours": "{number, plural, one {# horo} other {# horoj}}",
@@ -323,7 +323,7 @@
   "keyboard_shortcuts.pinned": "malfermi la liston de alpinglitaj mesaĝoj",
   "keyboard_shortcuts.profile": "malfermi la profilon de la aŭtoro",
   "keyboard_shortcuts.reply": "respondi",
-  "keyboard_shortcuts.requests": "malfermi la liston de petoj de sekvado",
+  "keyboard_shortcuts.requests": "Malfermi la liston de petoj por sekvado",
   "keyboard_shortcuts.search": "enfokusigi la serĉilon",
   "keyboard_shortcuts.spoilers": "Montri/kaŝi la kampon de averto de enhavo (\"CW\")",
   "keyboard_shortcuts.start": "malfermi la kolumnon «por komenci»",
@@ -430,7 +430,7 @@
   "notifications.permission_denied": "Labortablaj sciigoj ne disponeblas pro peto antaŭe rifuzita de retumiloj",
   "notifications.permission_denied_alert": "Labortablaj sciigoj ne povas esti ebligitaj, ĉar retumilpermeso antaŭe estis rifuzita",
   "notifications.permission_required": "Labortablaj sciigoj ne disponeblas ĉar la bezonata permeso ne estis donita.",
-  "notifications_permission_banner.enable": "Ebligi retumilajn sciigojn",
+  "notifications_permission_banner.enable": "Ŝalti retumilajn sciigojn",
   "notifications_permission_banner.how_to_control": "Por ricevi sciigojn kiam Mastodon ne estas malfermita, ebligu labortablajn sciigojn. Vi povas regi precize kiuj specoj de interagoj generas labortablajn sciigojn per la supra butono {icon} post kiam ili estas ebligitaj.",
   "notifications_permission_banner.title": "Neniam preterlasas iun ajn",
   "picture_in_picture.restore": "Remetu ĝin",
@@ -492,7 +492,7 @@
   "report.reasons.other_description": "La problemo ne taŭgas en aliaj kategorioj",
   "report.reasons.spam": "Ĝi estas trudaĵo",
   "report.reasons.spam_description": "Trompaj ligiloj, falsa/artefarita aktiveco, aŭ ripetaj respondoj",
-  "report.reasons.violation": "Ĝi malobservas la regulojn de la servilo",
+  "report.reasons.violation": "Ĝi malobservas la regularon de la servilo",
   "report.reasons.violation_description": "Vi scias ke ĝi malobeas specifan regulon",
   "report.rules.subtitle": "Elektu ĉiujn, kiuj validas",
   "report.rules.title": "Kiuj reguloj estas malobservataj?",
@@ -536,7 +536,7 @@
   "sign_in_banner.create_account": "Krei konton",
   "sign_in_banner.sign_in": "Saluti",
   "sign_in_banner.text": "Ensalutu por sekvi profilojn aŭ kradvortojn, stelumi, kunhavigi kaj respondi afiŝojn aŭ interagi per via konto de alia servilo.",
-  "status.admin_account": "Malfermi la kontrolan interfacon por @{name}",
+  "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
   "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco",
   "status.block": "Bloki @{name}",
   "status.bookmark": "Aldoni al la legosignoj",

app/javascript/mastodon/locales/es-AR.json

@@ -222,7 +222,7 @@
   "empty_column.follow_requests": "Todavía no tenés ninguna solicitud de seguimiento. Cuando recibás una, se mostrará acá.",
   "empty_column.hashtag": "Todavía no hay nada con esta etiqueta.",
   "empty_column.home": "¡Tu línea temporal principal está vacía! Seguí a más cuentas para llenarla. {suggestions}",
-  "empty_column.home.suggestions": "Mirá algunas sugerencias",
+  "empty_column.home.suggestions": "Mirá algunas sugerencias.",
   "empty_column.list": "Todavía no hay nada en esta lista. Cuando miembros de esta lista envíen nuevos mensaje, se mostrarán acá.",
   "empty_column.lists": "Todavía no tenés ninguna lista. Cuando creés una, se mostrará acá.",
   "empty_column.mutes": "Todavía no silenciaste a ningún usuario.",

app/javascript/mastodon/locales/es-MX.json

@@ -1,7 +1,7 @@
 {
   "about.blocks": "Servidores moderados",
   "about.contact": "Contacto:",
-  "about.disclaimer": "Mastodon es un software libre de código abierto, y una marca comercial de Mastodon gGmbH.",
+  "about.disclaimer": "Mastodon es software libre de código abierto, y una marca comercial de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razón no disponible",
   "about.domain_blocks.preamble": "Mastodon generalmente te permite ver contenido e interactuar con usuarios de cualquier otro servidor del fediverso. Estas son las excepciones que se han hecho en este servidor en particular.",
   "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busques explicitamente o vayas a el siguiendo alguna cuenta.",

app/javascript/mastodon/locales/fr.json

@@ -3,7 +3,7 @@
   "about.contact": "Contact :",
   "about.disclaimer": "Mastodon est un logiciel libre, open-source et une marque déposée de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Raison non disponible",
-  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateurs de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
+  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur⋅rice⋅s de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
   "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas les profils et le contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.",
   "about.domain_blocks.silenced.title": "Limité",
   "about.domain_blocks.suspended.explanation": "Aucune donnée de ce serveur ne sera traitée, enregistrée ou échangée, rendant impossible toute interaction ou communication avec les utilisateurs de ce serveur.",
@@ -72,7 +72,7 @@
   "admin.dashboard.retention.cohort": "Mois d'inscription",
   "admin.dashboard.retention.cohort_size": "Nouveaux utilisateurs",
   "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Débit limité",
+  "alert.rate_limited.title": "Nombre de requêtes limité",
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups !",
   "announcement.announcement": "Annonce",

app/javascript/mastodon/locales/gd.json

@@ -385,7 +385,7 @@
   "navigation_bar.search": "Lorg",
   "navigation_bar.security": "Tèarainteachd",
   "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.",
-  "notification.admin.report": "Rinn {name} mu {target}",
+  "notification.admin.report": "Rinn {name} gearan mu {target}",
   "notification.admin.sign_up": "Chlàraich {name}",
   "notification.favourite": "Is annsa le {name} am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",

app/javascript/mastodon/locales/is.json

@@ -32,9 +32,9 @@
   "account.follow": "Fylgjast með",
   "account.followers": "Fylgjendur",
   "account.followers.empty": "Ennþá fylgist enginn með þessum notanda.",
-  "account.followers_counter": "{count, plural, one {{counter} fylgjandi} other {{counter} fylgjendur}}",
+  "account.followers_counter": "{count, plural, one {Fylgjandi: {counter}} other {Fylgjendur: {counter}}}",
   "account.following": "Fylgist með",
-  "account.following_counter": "{count, plural, one {{counter} fylgist með} other {{counter} fylgjast með}}",
+  "account.following_counter": "{count, plural, one {Fylgist með: {counter}} other {Fylgist með: {counter}}}",
   "account.follows.empty": "Þessi notandi fylgist ennþá ekki með neinum.",
   "account.follows_you": "Fylgir þér",
   "account.go_to_profile": "Fara í notandasnið",
@@ -56,7 +56,7 @@
   "account.requested": "Bíður eftir samþykki. Smelltu til að hætta við beiðni um að fylgjast með",
   "account.share": "Deila notandasniði fyrir @{name}",
   "account.show_reblogs": "Sýna endurbirtingar frá @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
+  "account.statuses_counter": "{count, plural, one {Færsla: {counter}} other {Færslur: {counter}}}",
   "account.unblock": "Aflétta útilokun af @{name}",
   "account.unblock_domain": "Aflétta útilokun lénsins {domain}",
   "account.unblock_short": "Hætta að loka á",
@@ -258,7 +258,7 @@
   "follow_request.authorize": "Heimila",
   "follow_request.reject": "Hafna",
   "follow_requests.unlocked_explanation": "Jafnvel þótt aðgangurinn þinn sé ekki læstur, hafa umsjónarmenn {domain} ímyndað sér að þú gætir viljað yfirfara handvirkt fylgjendabeiðnir frá þessum notendum.",
-  "footer.about": "Um hugbúnaðinn",
+  "footer.about": "Nánari upplýsingar",
   "footer.directory": "Notandasniðamappa",
   "footer.get_app": "Ná í forritið",
   "footer.invite": "Bjóða fólki",

app/javascript/mastodon/locales/ku.json

@@ -131,7 +131,7 @@
   "compose_form.lock_disclaimer": "Ajimêrê te ne {locked}. Herkes dikare te bişopîne da ku şandiyên te yên tenê ji şopînerên re têne xuyakirin bibînin.",
   "compose_form.lock_disclaimer.lock": "girtî ye",
   "compose_form.placeholder": "Çi di hişê te derbas dibe?",
-  "compose_form.poll.add_option": "Hilbijarekî tevlî bike",
+  "compose_form.poll.add_option": "Hilbijartinekî tevlî bike",
   "compose_form.poll.duration": "Dema rapirsî yê",
   "compose_form.poll.option_placeholder": "{number} Hilbijêre",
   "compose_form.poll.remove_option": "Vê hilbijarê rake",
@@ -167,7 +167,7 @@
   "confirmations.mute.explanation": "Ev ê şandinên ji wan tê û şandinên ku behsa wan dike veşêre, lê hê jî maf dide ku ew şandinên te bibînin û te bişopînin.",
   "confirmations.mute.message": "Bi rastî tu dixwazî {name} bêdeng bikî?",
   "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
-  "confirmations.redraft.message": "Bi rastî tu dixwazî şandî ye jê bibî û nûve reşnivîsek çê bikî? Bijarte û şandî wê wenda bibin û bersivên ji bo şandiyê resen wê sêwî bimînin.",
+  "confirmations.redraft.message": "Bi rastî tu dixwazî şandî ye jê bibî û ji nû ve reşnivîsek çê bikî? Bijarte û şandî wê wenda bibin û bersivên ji bo şandiyê resen wê sêwî bimînin.",
   "confirmations.reply.confirm": "Bersivê bide",
   "confirmations.reply.message": "Bersiva niha li ser peyama ku tu niha berhev dikî dê binivsîne. Ma pê bawer î ku tu dixwazî bidomînî?",
   "confirmations.unfollow.confirm": "Neşopîne",
@@ -216,7 +216,7 @@
   "empty_column.direct": "Hîn peyamên te yên rasterast tune ne. Dema ku tu yekî bişînî an jî wergirî, ew ê li vir xuya bibe.",
   "empty_column.domain_blocks": "Hîn tu navperên ku hatine astengkirin tune ne.",
   "empty_column.explore_statuses": "Tiştek niha di rojevê de tune. Paşê vegere!",
-  "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijarte tune ne. Dema ku te yekî bijart, ew ê li vir xuya bibe.",
+  "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijare tunene. Gava ku te yekî bijart, ew ê li vir xûya bike.",
   "empty_column.favourites": "Hîn tu kes vê peyamê nebijartiye. Gava ku hin kes bijartin, ew ê li vir xûya bikin.",
   "empty_column.follow_recommendations": "Wusa dixuye ku ji bo we tu pêşniyar nehatine çêkirin. Hûn dikarin lêgerînê bikarbînin da ku li kesên ku hûn nas dikin bigerin an hashtagên trendî bigerin.",
   "empty_column.follow_requests": "Hê jî daxwaza şopandinê tunne ye. Dema daxwazek hat, yê li vir were nîşan kirin.",
@@ -289,7 +289,7 @@
   "interaction_modal.description.reply": "Bi ajimêrekê li ser Mastodon, tu dikarî bersiva vê şandiyê bidî.",
   "interaction_modal.on_another_server": "Li ser rajekareke cuda",
   "interaction_modal.on_this_server": "Li ser ev rajekar",
-  "interaction_modal.other_server_instructions": "Vê girêdanê jê bigire û pêve bike di zeviya lêgerînê de ji sepana xwe ya Mastodon a bijarte yan jî navrûyê bikarhêneriyê ya tevnê ji rajekarê Mastodon.",
+  "interaction_modal.other_server_instructions": "Vê girêdanê jê bigire û pêve bike di zeviya lêgerînê de ji sepana xwe ya Mastodon a bijartekirî yan jî navrûyê bikarhêneriyê ya tevnê ji rajekarê Mastodon.",
   "interaction_modal.preamble": "Ji ber ku Mastodon nenavendî ye, tu dikarî ajimêrê xwe ya heyî ku ji aliyê rajekarek din a Mastodon an platformek lihevhatî ve hatî pêşkêşkirin bi kar bînî ku ajimêrê te li ser vê yekê tune be.",
   "interaction_modal.title.favourite": "Şandiyê {name} bijarte bike",
   "interaction_modal.title.follow": "{name} bişopîne",
@@ -308,7 +308,7 @@
   "keyboard_shortcuts.down": "Di lîsteyê de dakêşe jêr",
   "keyboard_shortcuts.enter": "Şandiyê veke",
   "keyboard_shortcuts.favourite": "Şandiya bijarte",
-  "keyboard_shortcuts.favourites": "Lîsteyên bijarte veke",
+  "keyboard_shortcuts.favourites": "Rêzokê bijarteyan veke",
   "keyboard_shortcuts.federated": "Demnameya giştî veke",
   "keyboard_shortcuts.heading": "Kurterêyên klavyeyê",
   "keyboard_shortcuts.home": "Demnameyê veke",
@@ -535,7 +535,7 @@
   "server_banner.server_stats": "Amarên rajekar:",
   "sign_in_banner.create_account": "Ajimêr biafirîne",
   "sign_in_banner.sign_in": "Têkeve",
-  "sign_in_banner.text": "Têkeve ji bo şopandina profîlan an hashtagan, bijarte, parvekirin û bersivdana şandiyan, an ji ajimêrê xwe li ser rajekarek cuda têkilî deyine.",
+  "sign_in_banner.text": "Têkeve ji bo şopandina profîlan an hashtagan, bijartekirin, parvekirin û bersivdana şandiyan, an ji ajimêrê xwe li ser rajekarek cuda têkilî deyine.",
   "status.admin_account": "Ji bo @{name} navrûya venihêrtinê veke",
   "status.admin_status": "Vê şandîyê di navrûya venihêrtinê de veke",
   "status.block": "@{name} asteng bike",
@@ -550,7 +550,7 @@
   "status.edited": "Di {date} de hate serrastkirin",
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
   "status.embed": "Hedimandî",
-  "status.favourite": "Bijarte",
+  "status.favourite": "Bijarte bike",
   "status.filter": "Vê şandiyê parzûn bike",
   "status.filtered": "Parzûnkirî",
   "status.hide": "Şandiyê veşêre",

app/javascript/mastodon/locales/lt.json

@@ -36,35 +36,35 @@
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
+  "account.follows_you": "Seka jus",
-  "account.go_to_profile": "Go to profile",
+  "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined_short": "Joined",
+  "account.joined_short": "Prisijungė",
   "account.languages": "Change subscribed languages",
   "account.link_verified_on": "Ownership of this link was checked on {date}",
   "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Media",
   "account.mention": "Mention @{name}",
   "account.moved_to": "{name} has indicated that their new account is now:",
-  "account.mute": "Mute @{name}",
+  "account.mute": "Užtildyti @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.mute_notifications": "Užtildyti žinutes iš @{name}",
   "account.muted": "Užtildytas",
   "account.open_original_page": "Open original page",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
+  "account.report": "Pranešti apie @{name}",
   "account.requested": "Awaiting approval",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unhide {domain}",
-  "account.unblock_short": "Unblock",
+  "account.unblock_short": "Atblokuoti",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Nebesekti",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account.unmute_short": "Unmute",
+  "account.unmute_short": "Atitildyti",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",

app/javascript/mastodon/locales/lv.json

@@ -2,7 +2,7 @@
   "about.blocks": "Moderētie serveri",
   "about.contact": "Kontakts:",
   "about.disclaimer": "Mastodon ir bezmaksas atvērtā pirmkoda programmatūra un Mastodon gGmbH preču zīme.",
-  "about.domain_blocks.no_reason_available": "Iemesls nav pieejams",
+  "about.domain_blocks.no_reason_available": "Iemesls nav norādīts",
   "about.domain_blocks.preamble": "Mastodon parasti ļauj apskatīt saturu un mijiedarboties ar lietotājiem no jebkura cita federācijas servera. Šie ir izņēmumi, kas veikti šajā konkrētajā serverī.",
   "about.domain_blocks.silenced.explanation": "Parasti tu neredzēsi profilus un saturu no šī servera, ja vien tu nepārprotami izvēlēsies to pārskatīt vai sekot.",
   "about.domain_blocks.silenced.title": "Ierobežotās",
@@ -23,55 +23,55 @@
   "account.direct": "Privāta ziņa @{name}",
   "account.disable_notifications": "Pārtraukt man paziņot, kad @{name} publicē ierakstu",
   "account.domain_blocked": "Domēns ir bloķēts",
-  "account.edit_profile": "Labot profilu",
+  "account.edit_profile": "Rediģēt profilu",
   "account.enable_notifications": "Paziņot man, kad @{name} publicē ierakstu",
-  "account.endorse": "Izcelts profilā",
+  "account.endorse": "Izcelt profilā",
   "account.featured_tags.last_status_at": "Beidzamā ziņa {date}",
-  "account.featured_tags.last_status_never": "Publikāciju nav",
+  "account.featured_tags.last_status_never": "Ierakstu nav",
-  "account.featured_tags.title": "{name} piedāvātie haštagi",
+  "account.featured_tags.title": "{name} izceltie tēmturi",
   "account.follow": "Sekot",
   "account.followers": "Sekotāji",
   "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
-  "account.followers_counter": "{count, plural, one {{counter} Sekotājs} other {{counter} Sekotāji}}",
+  "account.followers_counter": "{count, plural, zero {{counter} sekotāju} one {{counter} sekotājs} other {{counter} sekotāji}}",
   "account.following": "Seko",
   "account.following_counter": "{count, plural, one {{counter} Sekojamais} other {{counter} Sekojamie}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.follows_you": "Seko tev",
-  "account.go_to_profile": "Dodieties uz profilu",
+  "account.go_to_profile": "Doties uz profilu",
   "account.hide_reblogs": "Paslēpt pastiprinātos ierakstus no lietotāja @{name}",
   "account.joined_short": "Pievienojās",
   "account.languages": "Mainīt abonētās valodas",
   "account.link_verified_on": "Šīs saites piederība ir pārbaudīta {date}",
   "account.locked_info": "Šī konta privātuma statuss ir slēgts. Īpašnieks izskatīs, kurš viņam drīkst sekot.",
   "account.media": "Multivide",
-  "account.mention": "Piemin @{name}",
+  "account.mention": "Pieminēt @{name}",
   "account.moved_to": "{name} norādīja, ka viņu jaunais konts tagad ir:",
   "account.mute": "Apklusināt @{name}",
   "account.mute_notifications": "Nerādīt paziņojumus no @{name}",
-  "account.muted": "Noklusināts",
+  "account.muted": "Apklusināts",
   "account.open_original_page": "Atvērt oriģinālo lapu",
-  "account.posts": "Ziņas",
+  "account.posts": "Ieraksti",
-  "account.posts_with_replies": "Ziņas un atbildes",
+  "account.posts_with_replies": "Ieraksti un atbildes",
-  "account.report": "Ziņot par lietotāju @{name}",
+  "account.report": "Sūdzēties par @{name}",
   "account.requested": "Gaidām apstiprinājumu. Nospied lai atceltu sekošanas pieparasījumu",
   "account.share": "Dalīties ar @{name} profilu",
   "account.show_reblogs": "Parādīt @{name} pastiprinātos ierakstus",
-  "account.statuses_counter": "{count, plural, one {{counter} ziņa} other {{counter} ziņas}}",
+  "account.statuses_counter": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
   "account.unblock": "Atbloķēt lietotāju @{name}",
   "account.unblock_domain": "Atbloķēt domēnu {domain}",
   "account.unblock_short": "Atbloķēt",
-  "account.unendorse": "Neattēlot profilā",
+  "account.unendorse": "Neizcelt profilā",
   "account.unfollow": "Pārstāt sekot",
   "account.unmute": "Noņemt apklusinājumu @{name}",
-  "account.unmute_notifications": "Rādīt paziņojumus no lietotāja @{name}",
+  "account.unmute_notifications": "Rādīt paziņojumus no @{name}",
-  "account.unmute_short": "Ieslēgt skaņu",
+  "account.unmute_short": "Noņemt apklusinājumu",
   "account_note.placeholder": "Noklikšķiniet, lai pievienotu piezīmi",
   "admin.dashboard.daily_retention": "Lietotāju saglabāšanas rādītājs dienā pēc reģistrēšanās",
   "admin.dashboard.monthly_retention": "Lietotāju saglabāšanas rādītājs mēnesī pēc reģistrēšanās",
   "admin.dashboard.retention.average": "Vidēji",
   "admin.dashboard.retention.cohort": "Reģistrēšanās mēnesis",
   "admin.dashboard.retention.cohort_size": "Jauni lietotāji",
-  "alert.rate_limited.message": "Lūdzu, mēģini vēlreiz pāc {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Lūdzu, mēģini vēlreiz pēc {retry_time, time, medium}.",
   "alert.rate_limited.title": "Biežums ierobežots",
   "alert.unexpected.message": "Radās negaidīta kļūda.",
   "alert.unexpected.title": "Ups!",
@@ -81,26 +81,26 @@
   "autosuggest_hashtag.per_week": "{count} nedēļā",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
-  "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā vai pārlūkprogrammas saderības problēma.",
+  "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
-  "bundle_column_error.error.title": "Ak, nē!",
+  "bundle_column_error.error.title": "Ak vai!",
   "bundle_column_error.network.body": "Mēģinot ielādēt šo lapu, radās kļūda. Tas varētu būt saistīts ar īslaicīgu interneta savienojuma vai šī servera problēmu.",
   "bundle_column_error.network.title": "Tīkla kļūda",
-  "bundle_column_error.retry": "Mēģini vēlreiz",
+  "bundle_column_error.retry": "Mēģināt vēlreiz",
   "bundle_column_error.return": "Atgriezties",
   "bundle_column_error.routing.body": "Pieprasīto lapu nevarēja atrast. Vai esi pārliecināts, ka URL adreses joslā ir pareizs?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Aizvērt",
   "bundle_modal_error.message": "Kaut kas nogāja greizi, ielādējot šo komponenti.",
-  "bundle_modal_error.retry": "Mēģini vēlreiz",
+  "bundle_modal_error.retry": "Mēģināt vēlreiz",
   "closed_registrations.other_server_instructions": "Tā kā Mastodon ir decentralizēts, tu vari izveidot kontu citā serverī un joprojām mijiedarboties ar šo.",
-  "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu domēnā {domain}, taču, lūdzu, ņem vērā, ka, lai izmantotu Mastodon, tev nav nepieciešams konts tieši domēnā {domain}.",
+  "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu domēnā {domain}, taču ņem vērā, ka tev nav nepieciešams konts tieši domēnā {domain}, lai izmantotu Mastodon.",
   "closed_registrations_modal.find_another_server": "Atrast citu serveri",
-  "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur tu izveido savu kontu, varēsit sekot līdzi un sazināties ar ikvienu šajā serverī. Tu pat vari vadīt to pats!",
+  "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur tu izveido savu kontu, varēsi sekot līdzi un sazināties ar ikvienu šajā serverī. Tu pat vari vadīt to pats!",
   "closed_registrations_modal.title": "Reģistrēšanās Mastodon",
   "column.about": "Par",
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Grāmatzīmes",
-  "column.community": "Vietējā ziņu līnija",
+  "column.community": "Vietējā laika līnija",
   "column.direct": "Privātie ziņojumi",
   "column.directory": "Pārlūkot profilus",
   "column.domain_blocks": "Bloķētie domēni",
@@ -111,11 +111,11 @@
   "column.mutes": "Apklusinātie lietotāji",
   "column.notifications": "Paziņojumi",
   "column.pins": "Piespraustie ziņojumi",
-  "column.public": "Apvienotā ziņu lenta",
+  "column.public": "Apvienotā laika līnija",
   "column_back_button.label": "Atpakaļ",
   "column_header.hide_settings": "Paslēpt iestatījumus",
-  "column_header.moveLeft_settings": "Pārvietot kolonu pa kreisi",
+  "column_header.moveLeft_settings": "Pārvietot kolonnu pa kreisi",
-  "column_header.moveRight_settings": "Pārvietot kolonu pa labi",
+  "column_header.moveRight_settings": "Pārvietot kolonnu pa labi",
   "column_header.pin": "Piespraust",
   "column_header.show_settings": "Rādīt iestatījumus",
   "column_header.unpin": "Atspraust",
@@ -127,7 +127,7 @@
   "compose.language.search": "Meklēt valodas...",
   "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
   "compose_form.encryption_warning": "Ziņas vietnē Mastodon nav pilnībā šifrētas. Nedalies ar sensitīvu informāciju caur Mastodon.",
-  "compose_form.hashtag_warning": "Ziņojumu nebūs iespējams atrast zem haštagiem jo tas nav publisks. Tikai publiskos ziņojumus ir iespējams meklēt pēc tiem.",
+  "compose_form.hashtag_warning": "Šo ziņu nebūs iespējams atrast tēmturos, jo tā ir nerindota. Tēmturos ir redzamas tikai publiskas ziņas.",
   "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot lai apskatītu tikai sekotājiem paredzētos ziņojumus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
   "compose_form.placeholder": "Kas tev padomā?",
@@ -135,41 +135,41 @@
   "compose_form.poll.duration": "Aptaujas ilgums",
   "compose_form.poll.option_placeholder": "Izvēle Nr. {number}",
   "compose_form.poll.remove_option": "Noņemt šo izvēli",
-  "compose_form.poll.switch_to_multiple": "Maini aptaujas veidu, lai atļautu vairākas izvēles",
+  "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
-  "compose_form.poll.switch_to_single": "Maini aptaujas veidu, lai atļautu vienu izvēli",
+  "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
   "compose_form.publish": "Publicēt",
   "compose_form.publish_form": "Publicēt",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Saglabāt izmaiņas",
   "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}",
   "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēts kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēta kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
   "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit",
   "confirmation_modal.cancel": "Atcelt",
-  "confirmations.block.block_and_report": "Bloķēt un ziņot",
+  "confirmations.block.block_and_report": "Bloķēt un sūdzēties",
   "confirmations.block.confirm": "Bloķēt",
-  "confirmations.block.message": "Vai tiešām vēlies bloķēt lietotāju {name}?",
+  "confirmations.block.message": "Vai tiešām vēlies bloķēt {name}?",
   "confirmations.cancel_follow_request.confirm": "Atsaukt pieprasījumu",
   "confirmations.cancel_follow_request.message": "Vai tiešām vēlies atsaukt pieprasījumu sekot {name}?",
   "confirmations.delete.confirm": "Dzēst",
-  "confirmations.delete.message": "Vai tiešām vēlaties dzēst šo ziņu?",
+  "confirmations.delete.message": "Vai tiešām vēlies dzēst šo ziņu?",
   "confirmations.delete_list.confirm": "Dzēst",
   "confirmations.delete_list.message": "Vai tiešam vēlies neatgriezeniski dzēst šo sarakstu?",
-  "confirmations.discard_edit_media.confirm": "Izmest",
+  "confirmations.discard_edit_media.confirm": "Atmest",
-  "confirmations.discard_edit_media.message": "Vai tev ir nesaglabātas izmaiņas multivides aprakstā vai priekšskatījumā, vai tomēr atmest tās?",
+  "confirmations.discard_edit_media.message": "Tev ir nesaglabātas izmaiņas multivides aprakstā vai priekšskatījumā. Vēlies tās atmest?",
   "confirmations.domain_block.confirm": "Bloķēt visu domēnu",
-  "confirmations.domain_block.message": "Vai tu tiešām, tiešam vēlies bloķēt visu domēnu {domain}? Lielākajā daļā gadījumu pietiek ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
+  "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
   "confirmations.mute.explanation": "Šādi no viņiem tiks slēptas ziņas un ziņas, kurās viņi tiek pieminēti, taču viņi joprojām varēs redzēt tavas ziņas un sekot tev.",
   "confirmations.mute.message": "Vai tiešām vēlies apklusināt {name}?",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
-  "confirmations.redraft.message": "Vai tiešām vēlies dzēst un pārrakstīt šo ierakstu? Favorīti un paceltie ieraksti tiks dzēsti, kā arī atbildes tiks atsaistītas no šī ieraksta.",
+  "confirmations.redraft.message": "Vai tiešām vēlies dzēst un pārrakstīt šo ierakstu? Favorīti un pastiprinātie ieraksti tiks dzēsti, un atbildes tiks atsaistītas no šī ieraksta.",
   "confirmations.reply.confirm": "Atbildēt",
-  "confirmations.reply.message": "Atbildot tagad tava ziņa ko šobrīd raksti tiks pārrakstīta. Vai tiešām vēlies turpināt?",
+  "confirmations.reply.message": "Ja tagad atbildēsi, tavs ziņas uzmetums tiks dzēsts. Vai tiešām vēlies turpināt?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
   "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
   "conversation.delete": "Dzēst sarunu",
@@ -181,16 +181,16 @@
   "directory.federated": "No pazīstamas federācijas",
   "directory.local": "Tikai no {domain}",
   "directory.new_arrivals": "Jaunpienācēji",
-  "directory.recently_active": "Nesen aktīvs",
+  "directory.recently_active": "Nesen aktīvie",
   "disabled_account_banner.account_settings": "Konta iestatījumi",
-  "disabled_account_banner.text": "Jūsu konts {disabledAccount} pašlaik ir atspējots.",
+  "disabled_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots.",
   "dismissable_banner.community_timeline": "Šīs ir jaunākās publiskās ziņas no personām, kuru kontus mitina {domain}.",
   "dismissable_banner.dismiss": "Atcelt",
   "dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.",
   "dismissable_banner.explore_statuses": "Šīs ziņas no šī un citiem decentralizētajā tīkla serveriem šobrīd gūst panākumus šajā serverī.",
   "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
   "dismissable_banner.public_timeline": "Šīs ir jaunākās publiskās ziņas no cilvēkiem šajā un citos decentralizētā tīkla serveros, par kuriem šis serveris zina.",
-  "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzmo kodu.",
+  "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
   "embed.preview": "Tas izskatīsies šādi:",
   "emoji_button.activity": "Aktivitāte",
   "emoji_button.clear": "Notīrīt",
@@ -210,24 +210,24 @@
   "empty_column.account_suspended": "Konta darbība ir apturēta",
   "empty_column.account_timeline": "Šeit ziņojumu nav!",
   "empty_column.account_unavailable": "Profils nav pieejams",
-  "empty_column.blocks": "Patreiz tu neesi nevienu bloķējis.",
+  "empty_column.blocks": "Pašreiz tu neesi nevienu bloķējis.",
-  "empty_column.bookmarked_statuses": "Patreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
+  "empty_column.bookmarked_statuses": "Pašreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
-  "empty_column.community": "Vietējā ziņu lenta ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
+  "empty_column.community": "Vietējā laika līnija ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
-  "empty_column.direct": "Patrez tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.",
+  "empty_column.direct": "Pašreiz tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.",
   "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
   "empty_column.explore_statuses": "Pašlaik nekā aktuāla nav. Pārbaudi vēlāk!",
   "empty_column.favourited_statuses": "Patreiz tev nav neviena izceltā ieraksta. Kad kādu izcelsi, tas parādīsies šeit.",
-  "empty_column.favourites": "Neviens šo ziņojumu vel nav izcēlis. Kad būs, tie parādīsies šeit.",
+  "empty_column.favourites": "Neviens šo ziņojumu vel nav izcēlis. Kad kāds to izdarīs, tas parādīsies šeit.",
-  "empty_column.follow_recommendations": "Šķiet, ka tev nevarēja ģenerēt ieteikumus. Vari mēģināt izmantot meklēšanu, lai meklētu cilvēkus, kurus tu varētu pazīt, vai izpētīt populārākās atsauces.",
+  "empty_column.follow_recommendations": "Neizdevās ģenerēt tev pielāgotus ieteikumus. Vari mēģināt izmantot meklēšanu, lai meklētu cilvēkus, kurus tu varētu pazīt, vai izpētīt populārākos tēmturus.",
   "empty_column.follow_requests": "Šobrīd neviens nav pieteicies tev sekot. Kad kāds pieteiksies tas parādīsies šeit.",
   "empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.",
-  "empty_column.home": "Tava vietējā ziņu lenta ir tukša! Lai to aizpildītu, piesekojies vairāk cilvēkiem. {suggestions}",
+  "empty_column.home": "Tava mājas laika līnija ir tukša! Lai to aizpildītu, pieseko vairāk cilvēkiem. {suggestions}",
   "empty_column.home.suggestions": "Apskatīt dažus ieteikumus",
-  "empty_column.list": "Šis saraksts patreiz ir tukšs. Kad šī saraksta dalībnieki publicēs jaunas ziņas, tās parādīsies šeit.",
+  "empty_column.list": "Šis saraksts pašreiz ir tukšs. Kad šī saraksta dalībnieki publicēs jaunas ziņas, tās parādīsies šeit.",
-  "empty_column.lists": "Patreiz tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
+  "empty_column.lists": "Pašreiz tev nav neviena saraksta. Kad tādu izveidosi, tas parādīsies šeit.",
   "empty_column.mutes": "Neviens lietotājs vēl nav apklusināts.",
   "empty_column.notifications": "Tev vēl nav paziņojumu. Kad citi cilvēki ar tevi mijiedarbosies, tu to redzēsi šeit.",
-  "empty_column.public": "Šeit vēl nekā nav! Ieraksti ko publiski vai sāc sekot lietotājiem no citiem serveriem, lai veidotu saturu",
+  "empty_column.public": "Šeit vēl nekā nav! Ieraksti ko publiski vai pieseko lietotājiem no citiem serveriem",
   "error.unexpected_crash.explanation": "Koda kļūdas vai pārlūkprogrammas saderības problēmas dēļ šo lapu nevarēja parādīt pareizi.",
   "error.unexpected_crash.explanation_addons": "Šo lapu nevarēja parādīt pareizi. Šo kļūdu, iespējams, izraisīja pārlūkprogrammas papildinājums vai automātiskās tulkošanas rīki.",
   "error.unexpected_crash.next_steps": "Mēģini atsvaidzināt lapu. Ja tas nepalīdz, iespējams, varēsi lietot Mastodon, izmantojot citu pārlūkprogrammu vai vietējo lietotni.",
@@ -242,7 +242,7 @@
   "filter_modal.added.expired_title": "Filtrs beidzies!",
   "filter_modal.added.review_and_configure": "Lai pārskatītu un tālāk konfigurētu šo filtru kategoriju, dodies uz {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Filtra iestatījumi",
-  "filter_modal.added.settings_link": "iestatījumu lapa",
+  "filter_modal.added.settings_link": "iestatījumu lapu",
   "filter_modal.added.short_explanation": "Šī ziņa ir pievienota šai filtra kategorijai: {title}.",
   "filter_modal.added.title": "Filtrs pievienots!",
   "filter_modal.select_filter.context_mismatch": "neattiecas uz šo kontekstu",
@@ -252,7 +252,7 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
-  "follow_recommendations.done": "Izpildīts",
+  "follow_recommendations.done": "Darīts",
   "follow_recommendations.heading": "Seko cilvēkiem, no kuriem vēlies redzēt ziņas! Šeit ir daži ieteikumi.",
   "follow_recommendations.lead": "Ziņas no cilvēkiem, kuriem seko, mājas plūsmā tiks parādītas hronoloģiskā secībā. Nebaidies kļūdīties, tu tikpat viegli vari pārtraukt sekot cilvēkiem jebkurā laikā!",
   "follow_request.authorize": "Autorizēt",
@@ -275,18 +275,18 @@
   "hashtag.column_settings.tag_mode.all": "Visi no šiem",
   "hashtag.column_settings.tag_mode.any": "Kāds no šiem",
   "hashtag.column_settings.tag_mode.none": "Neviens no šiem",
-  "hashtag.column_settings.tag_toggle": "Iekļaut šai kolonnai papildu tagus",
+  "hashtag.column_settings.tag_toggle": "Pievienot kolonnai papildu tēmturus",
-  "hashtag.follow": "Seko mirkļbirkai",
+  "hashtag.follow": "Sekot tēmturim",
-  "hashtag.unfollow": "Pārstāj sekot mirkļbirkai",
+  "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "home.column_settings.basic": "Pamata",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",
   "home.show_announcements": "Rādīt paziņojumus",
-  "interaction_modal.description.favourite": "Izmantojot kontu pakalpojumā Mastodon, vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē un saglabā vēlākai lasīšanai.",
+  "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
-  "interaction_modal.description.follow": "Izmantojot Mastodon kontu, tu vari sekot lietotājam {name}, lai saņemtu viņa ziņas savā mājas plūsmā.",
+  "interaction_modal.description.follow": "Ar Mastodon kontu tu vari sekot {name}, lai saņemtu viņu ziņas savā mājas plūsmā.",
-  "interaction_modal.description.reblog": "Izmantojot Mastodon kontu, tu vari pastiprināt šo ierakstu, lai kopīgotu to ar saviem sekotājiem.",
+  "interaction_modal.description.reblog": "Ar Mastodon kontu tu vari pastiprināt šo ierakstu, lai kopīgotu to ar saviem sekotājiem.",
-  "interaction_modal.description.reply": "Izmantojot kontu Mastodon, tu vari atbildēt uz šo ziņu.",
+  "interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.",
   "interaction_modal.on_another_server": "Citā serverī",
   "interaction_modal.on_this_server": "Šajā serverī",
   "interaction_modal.other_server_instructions": "Nokopē un ielīmē šo URL savas Mastodon lietotnes vai Mastodon tīmekļa vietnes meklēšanas laukā.",
@@ -309,12 +309,12 @@
   "keyboard_shortcuts.enter": "Atvērt ziņu",
   "keyboard_shortcuts.favourite": "Pievienot izlasei",
   "keyboard_shortcuts.favourites": "Atvērt izlašu sarakstu",
-  "keyboard_shortcuts.federated": "Atvērt apvienoto ziņu lenti",
+  "keyboard_shortcuts.federated": "Atvērt apvienoto laika līniju",
-  "keyboard_shortcuts.heading": "Klaviatūras saīsnes",
+  "keyboard_shortcuts.heading": "Īsinājumtaustiņi",
-  "keyboard_shortcuts.home": "Atvērt vietējo ziņu lenti",
+  "keyboard_shortcuts.home": "Atvērt mājas laika līniju",
   "keyboard_shortcuts.hotkey": "Ātrais taustiņš",
   "keyboard_shortcuts.legend": "Parādīt šo leģendu",
-  "keyboard_shortcuts.local": "Atvērt vietējo ziņu lenti",
+  "keyboard_shortcuts.local": "Atvērt vietējo laika līniju",
   "keyboard_shortcuts.mention": "Pieminēt autoru",
   "keyboard_shortcuts.muted": "Atvērt apklusināto lietotāju sarakstu",
   "keyboard_shortcuts.my_profile": "Atvērt savu profilu",
@@ -325,17 +325,17 @@
   "keyboard_shortcuts.reply": "Atbildēt",
   "keyboard_shortcuts.requests": "Atvērt sekošanas pieprasījumu sarakstu",
   "keyboard_shortcuts.search": "Fokusēt meklēšanas joslu",
-  "keyboard_shortcuts.spoilers": "Rādīt/slēpt CW lauku",
+  "keyboard_shortcuts.spoilers": "Rādīt/slēpt satura brīdinājumu lauku",
   "keyboard_shortcuts.start": "Atvērt kolonnu “Darba sākšana”",
-  "keyboard_shortcuts.toggle_hidden": "Rādīt/slēpt tekstu aiz CW",
+  "keyboard_shortcuts.toggle_hidden": "Rādīt/slēpt tekstu aiz satura brīdinājuma",
   "keyboard_shortcuts.toggle_sensitivity": "Rādīt/slēpt multividi",
-  "keyboard_shortcuts.toot": "Sāc jaunu ziņu",
+  "keyboard_shortcuts.toot": "Sākt jaunu ziņu",
-  "keyboard_shortcuts.unfocus": "Atfokusēt teksta veidošanu/meklēšanu",
+  "keyboard_shortcuts.unfocus": "Atfokusēt veidojamā teksta/meklēšanas lauku",
   "keyboard_shortcuts.up": "Pārvietot sarakstā uz augšu",
   "lightbox.close": "Aizvērt",
   "lightbox.compress": "Saspiest attēla skata lodziņu",
   "lightbox.expand": "Izvērst attēla skata lodziņu",
-  "lightbox.next": "Tālāk",
+  "lightbox.next": "Nākamais",
   "lightbox.previous": "Iepriekšējais",
   "limited_account_hint.action": "Tik un tā rādīt profilu",
   "limited_account_hint.title": "{domain} moderatori ir paslēpuši šo profilu.",
@@ -346,25 +346,25 @@
   "lists.edit.submit": "Mainīt virsrakstu",
   "lists.new.create": "Pievienot sarakstu",
   "lists.new.title_placeholder": "Jaunais saraksta nosaukums",
-  "lists.replies_policy.followed": "Jebkurš sekots lietotājs",
+  "lists.replies_policy.followed": "Jebkuram sekotajam lietotājam",
-  "lists.replies_policy.list": "Saraksta dalībnieki",
+  "lists.replies_policy.list": "Saraksta dalībniekiem",
   "lists.replies_policy.none": "Nevienam",
-  "lists.replies_policy.title": "Rādīt atbildes uz:",
+  "lists.replies_policy.title": "Rādīt atbildes:",
   "lists.search": "Meklēt starp cilvēkiem, kuriem tu seko",
   "lists.subheading": "Tavi saraksti",
   "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
   "loading_indicator.label": "Ielādē...",
-  "media_gallery.toggle_visible": "{number, plural, one {Slēpt # attēlu} other {Slēpt # attēlus}}",
+  "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
   "missing_indicator.label": "Nav atrasts",
   "missing_indicator.sublabel": "Šo resursu nevarēja atrast",
-  "moved_to_account_banner.text": "Jūsu konts {disabledAccount} pašlaik ir atspējots, jo esat pārcēlies uz kontu {movedToAccount}.",
+  "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo pārcēlies uz kontu {movedToAccount}.",
   "mute_modal.duration": "Ilgums",
   "mute_modal.hide_notifications": "Slēpt paziņojumus no šī lietotāja?",
-  "mute_modal.indefinite": "Nenoteikts",
+  "mute_modal.indefinite": "Beztermiņa",
   "navigation_bar.about": "Par",
   "navigation_bar.blocks": "Bloķētie lietotāji",
   "navigation_bar.bookmarks": "Grāmatzīmes",
-  "navigation_bar.community_timeline": "Vietējā ziņu lenta",
+  "navigation_bar.community_timeline": "Vietējā laika līnija",
   "navigation_bar.compose": "Veidot jaunu ziņu",
   "navigation_bar.direct": "Privātie ziņojumi",
   "navigation_bar.discover": "Atklāt",
@@ -372,33 +372,33 @@
   "navigation_bar.edit_profile": "Rediģēt profilu",
   "navigation_bar.explore": "Pārlūkot",
   "navigation_bar.favourites": "Izlases",
-  "navigation_bar.filters": "Klusināti vārdi",
+  "navigation_bar.filters": "Apklusinātie vārdi",
   "navigation_bar.follow_requests": "Sekošanas pieprasījumi",
   "navigation_bar.follows_and_followers": "Sekojamie un sekotāji",
   "navigation_bar.lists": "Saraksti",
   "navigation_bar.logout": "Iziet",
   "navigation_bar.mutes": "Apklusinātie lietotāji",
-  "navigation_bar.personal": "Personīgi",
+  "navigation_bar.personal": "Personīgie",
   "navigation_bar.pins": "Piespraustās ziņas",
   "navigation_bar.preferences": "Iestatījumi",
-  "navigation_bar.public_timeline": "Apvienotā ziņu lenta",
+  "navigation_bar.public_timeline": "Apvienotā laika līnija",
   "navigation_bar.search": "Meklēt",
   "navigation_bar.security": "Drošība",
   "not_signed_in_indicator.not_signed_in": "Lai piekļūtu šim resursam, tev ir jāpierakstās.",
-  "notification.admin.report": "{name} ziņoja par {target}",
+  "notification.admin.report": "{name} sūdzējās par {target}",
-  "notification.admin.sign_up": "{name} ir pierakstījies",
+  "notification.admin.sign_up": "{name} pierakstījās",
-  "notification.favourite": "{name} izcēla tavu ziņu",
+  "notification.favourite": "{name} patika tava ziņa",
   "notification.follow": "{name} uzsāka tev sekot",
-  "notification.follow_request": "{name} vēlas tev sekot",
+  "notification.follow_request": "{name} nosūtīja tev sekošanas pieprasījumu",
   "notification.mention": "{name} pieminēja tevi",
-  "notification.own_poll": "Tava aptauja ir pabeigta",
+  "notification.own_poll": "Tava aptauja ir noslēgusies",
-  "notification.poll": "Aprauja, kurā tu piedalījies, ir pabeigta",
+  "notification.poll": "Aptauja, kurā tu piedalījies, ir noslēgusies",
   "notification.reblog": "{name} pastiprināja tavu ierakstu",
   "notification.status": "{name} tikko publicēja",
-  "notification.update": "{name} ir rediģējis rakstu",
+  "notification.update": "{name} rediģēja ierakstu",
   "notifications.clear": "Notīrīt paziņojumus",
   "notifications.clear_confirmation": "Vai tiešām vēlies neatgriezeniski notīrīt visus savus paziņojumus?",
-  "notifications.column_settings.admin.report": "Jauni ziņojumi:",
+  "notifications.column_settings.admin.report": "Jaunas sūdzības:",
   "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
   "notifications.column_settings.alert": "Darbvirsmas paziņojumi",
   "notifications.column_settings.favourite": "Izlases:",
@@ -406,14 +406,14 @@
   "notifications.column_settings.filter_bar.category": "Ātro filtru josla",
   "notifications.column_settings.filter_bar.show_bar": "Rādīt filtru joslu",
   "notifications.column_settings.follow": "Jauni sekotāji:",
-  "notifications.column_settings.follow_request": "Jauni sekotāju pieprasījumi:",
+  "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
   "notifications.column_settings.mention": "Pieminējumi:",
   "notifications.column_settings.poll": "Aptaujas rezultāti:",
   "notifications.column_settings.push": "Uznirstošie paziņojumi",
   "notifications.column_settings.reblog": "Pastiprinātie ieraksti:",
   "notifications.column_settings.show": "Rādīt kolonnā",
   "notifications.column_settings.sound": "Atskaņot skaņu",
-  "notifications.column_settings.status": "Jaunas ziņas:",
+  "notifications.column_settings.status": "Jauni ieraksti:",
   "notifications.column_settings.unread_notifications.category": "Nelasītie paziņojumi",
   "notifications.column_settings.unread_notifications.highlight": "Iezīmēt nelasītos paziņojumus",
   "notifications.column_settings.update": "Labojumi:",
@@ -431,19 +431,19 @@
   "notifications.permission_denied_alert": "Darbvirsmas paziņojumus nevar iespējot, jo pārlūkprogrammai atļauja tika iepriekš atteikta",
   "notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
   "notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
-  "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības ģenerē darbvirsmas paziņojumus, izmantojot iepriekš redzamo pogu {icon}, ja tie ir iespējoti.",
+  "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības ģenerē darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
   "notifications_permission_banner.title": "Nekad nepalaid neko garām",
-  "picture_in_picture.restore": "Novietot apakšā",
+  "picture_in_picture.restore": "Novietot atpakaļ",
   "poll.closed": "Pabeigta",
   "poll.refresh": "Atsvaidzināt",
-  "poll.total_people": "{count, plural, one {# persona} other {# cilvēki}}",
+  "poll.total_people": "{count, plural, zero {# cilvēku} one {# persona} other {# cilvēki}}",
-  "poll.total_votes": "{count, plural, one {# balsojums} other {# balsojumi}}",
+  "poll.total_votes": "{count, plural, zero {# balsojumu} one {# balsojums} other {# balsojumi}}",
   "poll.vote": "Balsot",
   "poll.voted": "Tu balsoji par šo atbildi",
-  "poll.votes": "{votes, plural, one {# balss} other {# balsis}}",
+  "poll.votes": "{votes, plural, zero {# balsu} one {# balss} other {# balsis}}",
   "poll_button.add_poll": "Pievienot aptauju",
   "poll_button.remove_poll": "Noņemt aptauju",
-  "privacy.change": "Mainīt ziņas privātumu",
+  "privacy.change": "Mainīt ieraksta privātumu",
   "privacy.direct.long": "Redzama tikai pieminētajiem lietotājiem",
   "privacy.direct.short": "Tikai minētie cilvēki",
   "privacy.private.long": "Redzama tikai sekotājiem",
@@ -453,7 +453,7 @@
   "privacy.unlisted.long": "Redzama visiem, bet izslēgta no satura atklāšanas funkcijām",
   "privacy.unlisted.short": "Nerindota",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
-  "privacy_policy.title": "Privātuma Politika",
+  "privacy_policy.title": "Privātuma politika",
   "refresh": "Atsvaidzināt",
   "regeneration_indicator.label": "Ielādē…",
   "regeneration_indicator.sublabel": "Tiek gatavota tava plūsma!",
@@ -470,63 +470,63 @@
   "relative_time.today": "šodien",
   "reply_indicator.cancel": "Atcelt",
   "report.block": "Bloķēt",
-  "report.block_explanation": "Tu neredzēsi viņu ziņas. Viņi nevarēs redzēt tavas ziņas vai sekot tev. Viņi varēs pateikt, ka ir bloķēti.",
+  "report.block_explanation": "Tu neredzēsi viņu ziņas. Viņi nevarēs redzēt tavas ziņas vai sekot tev. Viņi varēs saprast, ka ir bloķēti.",
   "report.categories.other": "Citi",
   "report.categories.spam": "Spams",
   "report.categories.violation": "Saturs pārkāpj vienu vai vairākus servera noteikumus",
   "report.category.subtitle": "Izvēlieties labāko atbilstību",
   "report.category.title": "Pastāsti mums, kas notiek ar šo {type}",
-  "report.category.title_account": "profils",
+  "report.category.title_account": "profilu",
-  "report.category.title_status": "ziņa",
+  "report.category.title_status": "ierakstu",
-  "report.close": "Izpildīts",
+  "report.close": "Darīts",
-  "report.comment.title": "Vai ir vēl kas, tavuprāt, mums būtu jāzina?",
+  "report.comment.title": "Vai, tavuprāt, mums vēl būtu kas jāzina?",
   "report.forward": "Pārsūtīt {target}",
-  "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu ziņojuma kopiju arī tam?",
+  "report.forward_hint": "Konts ir no cita servera. Vai nosūtīt anonimizētu sūdzības kopiju arī tam?",
   "report.mute": "Apklusināt",
-  "report.mute_explanation": "Tu neredzēsi viņu ziņas. Viņi joprojām var tev sekot un redzēt tavas ziņas un nezinās, ka viņiem ir izslēgta skaņa.",
+  "report.mute_explanation": "Tu neredzēsi viņu ziņas. Viņi joprojām var tev sekot un redzēt tavas ziņas un nezinās, ka viņi ir apklusināti.",
-  "report.next": "Nākamais",
+  "report.next": "Tālāk",
   "report.placeholder": "Papildu komentāri",
   "report.reasons.dislike": "Man tas nepatīk",
   "report.reasons.dislike_description": "Tas nav kaut kas, ko tu vēlies redzēt",
   "report.reasons.other": "Tas ir kaut kas cits",
-  "report.reasons.other_description": "Šis jautājums neietilpst citās kategorijās",
+  "report.reasons.other_description": "Šī sūdzība neatbilst pārējām kategorijām",
   "report.reasons.spam": "Tas ir spams",
   "report.reasons.spam_description": "Ļaunprātīgas saites, viltus iesaistīšana vai atkārtotas atbildes",
   "report.reasons.violation": "Tas pārkāpj servera noteikumus",
-  "report.reasons.violation_description": "Tu zini, ka tas pārkāpj īpašus noteikumus",
+  "report.reasons.violation_description": "Tu zini, ka tas pārkāpj konkrētus noteikumus",
   "report.rules.subtitle": "Atlasi visus atbilstošos",
   "report.rules.title": "Kuri noteikumi tiek pārkāpti?",
   "report.statuses.subtitle": "Atlasi visus atbilstošos",
-  "report.statuses.title": "Vai ir kādas ziņas, kas atbalsta šo ziņojumu?",
+  "report.statuses.title": "Vai ir kādas ziņas, kas atbalsta šo sūdzību?",
   "report.submit": "Iesniegt",
-  "report.target": "Ziņošana par: {target}",
+  "report.target": "Sūdzība par {target}",
   "report.thanks.take_action": "Tālāk ir norādītas iespējas, kā kontrolēt Mastodon redzamo saturu:",
   "report.thanks.take_action_actionable": "Kamēr mēs to izskatām, tu vari veikt darbības pret @{name}:",
   "report.thanks.title": "Vai nevēlies to redzēt?",
   "report.thanks.title_actionable": "Paldies, ka ziņoji, mēs to izskatīsim.",
   "report.unfollow": "Pārtraukt sekošanu @{name}",
-  "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu viņu ziņas savā ziņu plūsmā, pārtrauc viņiem sekot.",
+  "report.unfollow_explanation": "Tu seko šim kontam. Lai vairs neredzētu viņu ziņas savā mājas plūsmā, pārtrauc viņiem sekot.",
-  "report_notification.attached_statuses": "Pievienoti {count, plural,one {{count} sūtījums} other {{count} sūtījumi}}",
+  "report_notification.attached_statuses": "{count, plural, zero {Pievienota {count} ierakstu} one {Pievienots {count} ieraksts} other {Pievienoti {count} ieraksti}}",
   "report_notification.categories.other": "Cita",
   "report_notification.categories.spam": "Spams",
   "report_notification.categories.violation": "Noteikumu pārkāpums",
-  "report_notification.open": "Atvērt ziņojumu",
+  "report_notification.open": "Atvērt sūdzību",
   "search.placeholder": "Meklēšana",
-  "search.search_or_paste": "Meklēt vai iekopēt URL",
+  "search.search_or_paste": "Meklē vai iekopē URL",
   "search_popout.search_format": "Paplašināts meklēšanas formāts",
-  "search_popout.tips.full_text": "Vienkāršs teksts atgriež ziņas, kuras esi rakstījis, atzīmējis kā favorītus, pastiprinājis vai pieminējis, kā arī atbilstošie lietotājvārdi, parādāmie vārdi un tēmturi.",
+  "search_popout.tips.full_text": "Vienkāršs teksts atgriež ierakstus, kurus rakstīji, atzīmēji kā favorītus, pastiprināji vai pieminēji, kā arī atbilstošus lietotājvārdus, parādāmos vārdus un tēmturus.",
-  "search_popout.tips.hashtag": "mirkļbirka",
+  "search_popout.tips.hashtag": "tēmturis",
-  "search_popout.tips.status": "ziņa",
+  "search_popout.tips.status": "ieraksts",
-  "search_popout.tips.text": "Vienkāršs teksts atgriež atbilstošus parādāmos vārdus, lietotājvārdus un mirkļbirkas",
+  "search_popout.tips.text": "Vienkāršs teksts atgriež atbilstošus parādāmos vārdus, lietotājvārdus un tēmturus",
   "search_popout.tips.user": "lietotājs",
   "search_results.accounts": "Cilvēki",
   "search_results.all": "Visi",
   "search_results.hashtags": "Tēmturi",
   "search_results.nothing_found": "Nevarēja atrast neko šiem meklēšanas vienumiem",
-  "search_results.statuses": "Ziņas",
+  "search_results.statuses": "Ieraksti",
   "search_results.statuses_fts_disabled": "Šajā Mastodon serverī nav iespējota ziņu meklēšana pēc to satura.",
   "search_results.title": "Meklēt {q}",
-  "search_results.total": "{count, number} {count, plural, one {rezultāts} other {rezultāti}}",
+  "search_results.total": "{count, number} {count, plural, zero {rezultātu} one {rezultāts} other {rezultāti}}",
   "server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
   "server_banner.active_users": "aktīvie lietotāji",
   "server_banner.administered_by": "Administrē:",
@@ -535,12 +535,12 @@
   "server_banner.server_stats": "Servera statistika:",
   "sign_in_banner.create_account": "Izveidot kontu",
   "sign_in_banner.sign_in": "Pierakstīties",
-  "sign_in_banner.text": "Pieraksties, lai sekotu profiliem vai atsaucēm, pievienotu izlasei, kopīgotu ziņas un atbildētu uz tām vai mijiedarbotos no sava konta citā serverī.",
+  "sign_in_banner.text": "Pieraksties, lai sekotu profiliem vai atsaucēm, pievienotu ziņas izlasei, kopīgotu ziņas un atbildētu uz tām vai mijiedarbotos no sava konta citā serverī.",
   "status.admin_account": "Atvērt @{name} moderēšanas saskarni",
   "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
   "status.block": "Bloķēt @{name}",
   "status.bookmark": "Grāmatzīme",
-  "status.cancel_reblog_private": "Nepastiprināt",
+  "status.cancel_reblog_private": "Noņemt pastiprinājumu",
   "status.cannot_reblog": "Nevar pastiprināt šo ierakstu",
   "status.copy": "Kopēt saiti uz ziņu",
   "status.delete": "Dzēst",
@@ -548,14 +548,14 @@
   "status.direct": "Privāta ziņa @{name}",
   "status.edit": "Rediģēt",
   "status.edited": "Rediģēts {date}",
-  "status.edited_x_times": "Rediģēts {count, plural, one {{count} reize} other {{count} reizes}}",
+  "status.edited_x_times": "Rediģēts {count, plural, one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iestrādāt",
   "status.favourite": "Patīk",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
-  "status.hide": "Slēpt",
+  "status.hide": "Slēpt ierakstu",
-  "status.history.created": "{name} izveidots {date}",
+  "status.history.created": "{name} izveidoja {date}",
-  "status.history.edited": "{name} rediģēts {date}",
+  "status.history.edited": "{name} rediģēja {date}",
   "status.load_more": "Ielādēt vairāk",
   "status.media_hidden": "Medijs ir paslēpts",
   "status.mention": "Pieminēt @{name}",
@@ -575,7 +575,7 @@
   "status.replied_to": "Atbildēja {name}",
   "status.reply": "Atbildēt",
   "status.replyAll": "Atbildēt uz tematu",
-  "status.report": "Ziņot par @{name}",
+  "status.report": "Sūdzēties par @{name}",
   "status.sensitive_warning": "Sensitīvs saturs",
   "status.share": "Kopīgot",
   "status.show_filter_reason": "Tomēr rādīt",
@@ -585,53 +585,53 @@
   "status.show_more_all": "Rādīt vairāk visiem",
   "status.show_original": "Rādīt oriģinālu",
   "status.translate": "Tulkot",
-  "status.translated_from_with": "Tulkots no {lang} izmantojot {provider}",
+  "status.translated_from_with": "Tulkots no {lang}, izmantojot {provider}",
   "status.uncached_media_warning": "Nav pieejams",
-  "status.unmute_conversation": "Atvērt sarunu",
+  "status.unmute_conversation": "Noņemt sarunas apklusinājumu",
   "status.unpin": "Noņemt no profila",
-  "subscribed_languages.lead": "Pēc izmaiņu veikšanas tavā mājas lapā un saraksta laika skalās tiks rādītas tikai ziņas atlasītajās valodās. Neatlasi nevienu, lai saņemtu ziņas visās valodās.",
+  "subscribed_languages.lead": "Pēc izmaiņu veikšanas tavā mājas un sarakstu laika līnijā tiks rādītas tikai ziņas atlasītajās valodās. Neatlasi nevienu, lai saņemtu ziņas visās valodās.",
   "subscribed_languages.save": "Saglabāt izmaiņas",
   "subscribed_languages.target": "Mainīt abonētās valodas priekš {target}",
   "suggestions.dismiss": "Noraidīt ieteikumu",
   "suggestions.header": "Jūs varētu interesēt arī…",
-  "tabs_bar.federated_timeline": "Federētā",
+  "tabs_bar.federated_timeline": "Apvienotā",
   "tabs_bar.home": "Sākums",
   "tabs_bar.local_timeline": "Vietējā",
   "tabs_bar.notifications": "Paziņojumi",
-  "time_remaining.days": "Atlikušas {number, plural, one {# diena} other {# dienas}}",
+  "time_remaining.days": "{number, plural, one {Atlikusi # diena} other {Atlikušas # dienas}}",
-  "time_remaining.hours": "Atlikušas {number, plural, one {# stunda} other {# stundas}}",
+  "time_remaining.hours": "{number, plural, one {Atlikusi # stunda} other {Atlikušas # stundas}}",
-  "time_remaining.minutes": "Atlikušas {number, plural, one {# minūte} other {# minūtes}}",
+  "time_remaining.minutes": "{number, plural, one {Atlikusi # minūte} other {Atlikušas # minūtes}}",
   "time_remaining.moments": "Atlikuši daži mirkļi",
-  "time_remaining.seconds": "Atlikušas {number, plural, one {# sekunde} other {# sekundes}}",
+  "time_remaining.seconds": "{number, plural, one {Atlikusi # sekunde} other {Atlikušas # sekundes}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} no citiem serveriem nav parādīti.",
   "timeline_hint.resources.followers": "Sekotāji",
-  "timeline_hint.resources.follows": "Seko",
+  "timeline_hint.resources.follows": "Sekojošie",
-  "timeline_hint.resources.statuses": "Vecākas ziņas",
+  "timeline_hint.resources.statuses": "Vecāki ieraksti",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} cilvēki}} par {days, plural, one {dienu} other {{days} dienām}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} cilvēki}} par {days, plural, one {# dienu} other {{days} dienām}}",
-  "trends.trending_now": "Šobrīd tendences",
+  "trends.trending_now": "Aktuālās tendences",
-  "ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",
+  "ui.beforeunload": "Ja pametīsiet Mastodon, jūsu melnraksts tiks zaudēts.",
-  "units.short.billion": "{count}M",
+  "units.short.billion": "{count}Mjd",
-  "units.short.million": "{count}M",
+  "units.short.million": "{count}Mjn",
   "units.short.thousand": "{count}Tk",
   "upload_area.title": "Velc un nomet, lai augšupielādētu",
   "upload_button.label": "Pievienot bildi, video vai audio datni",
   "upload_error.limit": "Sasniegts datņu augšupielādes ierobežojums.",
   "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
-  "upload_form.audio_description": "Aprakstiet cilvēkiem ar dzirdes zudumu",
+  "upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
-  "upload_form.description": "Aprakstiet vājredzīgajiem",
+  "upload_form.description": "Pievieno aprakstu vājredzīgajiem",
   "upload_form.description_missing": "Apraksts nav pievienots",
   "upload_form.edit": "Rediģēt",
   "upload_form.thumbnail": "Nomainīt sīktēlu",
   "upload_form.undo": "Dzēst",
-  "upload_form.video_description": "Aprakstiet cilvēkiem ar dzirdes vai redzes traucējumiem",
+  "upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
   "upload_modal.analyzing_picture": "Analizē attēlu…",
-  "upload_modal.apply": "Apstiprināt",
+  "upload_modal.apply": "Pielietot",
   "upload_modal.applying": "Pielieto…",
   "upload_modal.choose_image": "Izvēlēties attēlu",
-  "upload_modal.description_placeholder": "Raibais runcis rīgā ratu rumbā rūc",
+  "upload_modal.description_placeholder": "Raibais runcis Rīgā ratu rumbā rūc",
   "upload_modal.detect_text": "Noteikt tekstu no attēla",
   "upload_modal.edit_media": "Rediģēt mediju",
-  "upload_modal.hint": "Noklikšķiniet vai velciet apli priekšskatījumā, lai izvēlētos fokusa punktu, kas vienmēr būs redzams visos sīktēlos.",
+  "upload_modal.hint": "Noklikšķini vai velc apli priekšskatījumā, lai izvēlētos fokusa punktu, kas vienmēr būs redzams visos sīktēlos.",
   "upload_modal.preparing_ocr": "Sagatavo OCR…",
   "upload_modal.preview_label": "Priekšskatīt ({ratio})",
   "upload_progress.label": "Augšupielādē...",

app/javascript/mastodon/locales/ms.json

@@ -1,15 +1,15 @@
 {
-  "about.blocks": "Pelayan yang dimoderasi",
+  "about.blocks": "Pelayan yang disederhanakan",
   "about.contact": "Hubungi:",
   "about.disclaimer": "Mastodon ialah perisian sumber terbuka percuma, dan merupakan tanda dagangan Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Sebab tidak tersedia",
   "about.domain_blocks.preamble": "Secara amnya, Mastodon membenarkan anda melihat kandungan daripada dan berinteraksi dengan pengguna daripada mana-mana pelayan dalam dunia persekutuan. Berikut ialah pengecualian yang telah dibuat pada pelayan ini secara khususnya.",
   "about.domain_blocks.silenced.explanation": "Secara amnya, anda tidak akan melihat profil dan kandungan daripada pelayan ini, kecuali anda mencarinya secara khusus atau ikut serta dengan mengikutinya.",
   "about.domain_blocks.silenced.title": "Terhad",
-  "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
+  "about.domain_blocks.suspended.explanation": "Tiada data daripada pelayan ini yang akan diproses, disimpan atau ditukar, menjadikan sebarang interaksi atau perhubungan dengan pengguna daripada pelayan ini adalah mustahil.",
-  "about.domain_blocks.suspended.title": "Digantungkan",
+  "about.domain_blocks.suspended.title": "Digantung",
   "about.not_available": "Maklumat ini belum tersedia pada pelayan ini.",
-  "about.powered_by": "Media sosial terpencar dikuasakan oleh {mastodon}",
+  "about.powered_by": "Media sosial terpencar yang dikuasakan oleh {mastodon}",
   "about.rules": "Peraturan pelayan",
   "account.account_note_header": "Catatan",
   "account.add_or_remove_from_list": "Tambah atau Buang dari senarai",
@@ -21,25 +21,25 @@
   "account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
   "account.cancel_follow_request": "Menarik balik permintaan mengikut",
   "account.direct": "Mesej terus @{name}",
-  "account.disable_notifications": "Berhenti memaklumi saya apabila @{name} mengirim hantaran",
+  "account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
   "account.domain_blocked": "Domain disekat",
   "account.edit_profile": "Sunting profil",
   "account.enable_notifications": "Maklumi saya apabila @{name} mengirim hantaran",
   "account.endorse": "Tampilkan di profil",
   "account.featured_tags.last_status_at": "Hantaran terakhir pada {date}",
   "account.featured_tags.last_status_never": "Tiada hantaran",
-  "account.featured_tags.title": "Tanda pagar terpilih {name}",
+  "account.featured_tags.title": "Tanda pagar pilihan {name}",
   "account.follow": "Ikuti",
   "account.followers": "Pengikut",
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
   "account.followers_counter": "{count, plural, one {{counter} Pengikut} other {{counter} Pengikut}}",
-  "account.following": "Following",
+  "account.following": "Mengikuti",
   "account.following_counter": "{count, plural, one {{counter} Diikuti} other {{counter} Diikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti sesiapa.",
   "account.follows_you": "Mengikuti anda",
   "account.go_to_profile": "Pergi ke profil",
   "account.hide_reblogs": "Sembunyikan galakan daripada @{name}",
-  "account.joined_short": "Joined",
+  "account.joined_short": "Menyertai",
   "account.languages": "Tukar bahasa yang dilanggan",
   "account.link_verified_on": "Pemilikan pautan ini telah disemak pada {date}",
   "account.locked_info": "Status privasi akaun ini dikunci. Pemiliknya menyaring sendiri siapa yang boleh mengikutinya.",
@@ -53,10 +53,10 @@
   "account.posts": "Hantaran",
   "account.posts_with_replies": "Hantaran dan balasan",
   "account.report": "Laporkan @{name}",
-  "account.requested": "Menunggu kelulusan. Klik untuk batalkan permintaan ikutan",
+  "account.requested": "Menunggu kelulusan. Klik untuk batalkan permintaan ikut",
   "account.share": "Kongsi profil @{name}",
   "account.show_reblogs": "Tunjukkan galakan daripada @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Hantaran} other {{counter} Hantaran}}",
+  "account.statuses_counter": "{count, plural, other {{counter} kiriman}}",
   "account.unblock": "Nyahsekat @{name}",
   "account.unblock_domain": "Nyahsekat domain {domain}",
   "account.unblock_short": "Nyahsekat",
@@ -64,12 +64,12 @@
   "account.unfollow": "Nyahikut",
   "account.unmute": "Nyahbisukan @{name}",
   "account.unmute_notifications": "Nyahbisukan pemberitahuan daripada @{name}",
-  "account.unmute_short": "Buka suara",
+  "account.unmute_short": "Nyahbisu",
-  "account_note.placeholder": "Klik untuk tambah catatan",
+  "account_note.placeholder": "Klik untuk menambah catatan",
-  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.daily_retention": "Kadar pengekalan pengguna mengikut hari selepas mendaftar",
-  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.monthly_retention": "Kadar pengekalan pengguna mengikut bulan selepas mendaftar",
   "admin.dashboard.retention.average": "Purata",
-  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort": "Bulan pendaftaran",
   "admin.dashboard.retention.cohort_size": "Pengguna baru",
   "alert.rate_limited.message": "Sila cuba semula selepas {retry_time, time, medium}.",
   "alert.rate_limited.title": "Kadar terhad",
@@ -83,7 +83,7 @@
   "bundle_column_error.copy_stacktrace": "Salin laporan ralat",
   "bundle_column_error.error.body": "Halaman yang diminta gagal dipaparkan. Ini mungkin disebabkan oleh pepijat dalam kod kami, atau masalah keserasian pelayar.",
   "bundle_column_error.error.title": "Alamak!",
-  "bundle_column_error.network.body": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
+  "bundle_column_error.network.body": "Terdapat suatu ralat apabila cuba memuatkan halaman ini. Keadaan ini mungkin berlaku disebabkan oleh masalah pada sambungan internet anda atau pelayan ini.",
   "bundle_column_error.network.title": "Ralat rangkaian",
   "bundle_column_error.retry": "Cuba lagi",
   "bundle_column_error.return": "Kembali ke halaman utama",
@@ -158,7 +158,7 @@
   "confirmations.delete_list.confirm": "Padam",
   "confirmations.delete_list.message": "Adakah anda pasti anda ingin memadam senarai ini secara kekal?",
   "confirmations.discard_edit_media.confirm": "Singkir",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.message": "Anda belum menyimpan perubahan pada penerangan atau pratonton media. Anda ingin membuangnya?",
   "confirmations.domain_block.confirm": "Sekat keseluruhan domain",
   "confirmations.domain_block.message": "Adakah anda betul-betul, sungguh-sungguh pasti anda ingin menyekat keseluruhan {domain}? Selalunya, beberapa sekatan atau pembisuan tersasar sudah memadai dan lebih diutamakan. Anda tidak akan nampak kandungan daripada domain tersebut di mana-mana garis masa awam mahupun pemberitahuan anda. Pengikut anda daripada domain tersebut juga akan dibuang.",
   "confirmations.logout.confirm": "Log keluar",
@@ -440,7 +440,7 @@
   "poll.total_votes": "{count, plural, other {# undian}}",
   "poll.vote": "Undi",
   "poll.voted": "Anda mengundi jawapan ini",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll.votes": "{votes, plural, other {# undi}}",
   "poll_button.add_poll": "Tambah undian",
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
@@ -458,11 +458,11 @@
   "regeneration_indicator.label": "Memuatkan…",
   "regeneration_indicator.sublabel": "Suapan rumah anda sedang disediakan!",
   "relative_time.days": "{number}h",
-  "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
+  "relative_time.full.days": "{number, plural, other {# hari}} yang lalu",
-  "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
+  "relative_time.full.hours": "{number, plural, other {# jam}} yang lalu",
   "relative_time.full.just_now": "sebentar tadi",
-  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.minutes": "{number, plural, other {# minit}} yang lalu",
-  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.full.seconds": "{number, plural, other {# saat}} yang lalu",
   "relative_time.hours": "{number}j",
   "relative_time.just_now": "sekarang",
   "relative_time.minutes": "{number}m",
@@ -491,7 +491,7 @@
   "report.reasons.other": "Inilah sesuatu yang lain",
   "report.reasons.other_description": "Isu ini tidak sesuai untuk kategori lain",
   "report.reasons.spam": "Inilah spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.spam_description": "Pautan berbahaya, keterlibatan palsu atau balasan berulang",
   "report.reasons.violation": "Ini melanggar peraturan pelayan",
   "report.reasons.violation_description": "Anda menyedari bahawa ini melanggar peraturan yang tertentu",
   "report.rules.subtitle": "Pilih semua yang berkenaan",
@@ -506,7 +506,7 @@
   "report.thanks.title_actionable": "Terima kasih untuk laporan anda, kami akan menyemaknya.",
   "report.unfollow": "Nyahikut @{name}",
   "report.unfollow_explanation": "Anda sedang mengikuti akaun ini. Untuk memadam siaran mereka daripada suapan berita anda, nyahikutkan mereka.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.attached_statuses": "{count, plural, other {{count} hantaran}} dilampirkan",
   "report_notification.categories.other": "Lain-lain",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Langgaran peraturan",
@@ -548,7 +548,7 @@
   "status.direct": "Mesej terus @{name}",
   "status.edit": "Sunting",
   "status.edited": "Disunting {date}",
-  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
   "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
   "status.filter": "Tapiskan hantaran ini",
@@ -607,7 +607,7 @@
   "timeline_hint.resources.followers": "Pengikut",
   "timeline_hint.resources.follows": "Ikutan",
   "timeline_hint.resources.statuses": "Hantaran lebih lama",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
+  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} dalam {days, plural, other {{days} hari}} yang lalu",
   "trends.trending_now": "Sohor kini",
   "ui.beforeunload": "Rangka anda akan terhapus jika anda meninggalkan Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/oc.json

@@ -126,7 +126,7 @@
   "compose.language.change": "Cambiar de lenga",
   "compose.language.search": "Recercar de lengas...",
   "compose_form.direct_message_warning_learn_more": "Ne saber mai",
-  "compose_form.encryption_warning": "Las pubicacions sus Mastodon son pas chifradas del cap a la fin. Partegetz pas d’informacions sensiblas sus Mastodon.",
+  "compose_form.encryption_warning": "Las publicacions sus Mastodon son pas chifradas del cap a la fin. Partegetz pas d’informacions sensiblas sus Mastodon.",
   "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pòt pas cercar que los tuts publics per etiqueta.",
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",

app/javascript/mastodon/locales/sco.json

@@ -3,7 +3,7 @@
   "about.contact": "Contack:",
   "about.disclaimer": "Mastodon is free, open-soorced saftware, an a trademairk o Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Raison no available",
-  "about.domain_blocks.preamble": "Mastodon generally alloos ye tae view content frae an interact wi uisers fae onie ither server in the fediverse.",
+  "about.domain_blocks.preamble": "On the hail, Mastodon lats ye view content frae an interack wi uisers fae onie ither server in the fediverse.",
   "about.domain_blocks.silenced.explanation": "Ye'll generally no see profiles an content frae this server, unless ye explicitly luik it up or opt intae it bi follaein.",
   "about.domain_blocks.silenced.title": "Limitit",
   "about.domain_blocks.suspended.explanation": "Nae data frae this server wull bi processed, stored or exchynged, makkin onie interaction or communication wi uisers frae this server no possible.",
@@ -78,7 +78,7 @@
   "announcement.announcement": "Annooncement",
   "attachments_list.unprocessed": "(No processed)",
   "audio.hide": "Stow audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
+  "autosuggest_hashtag.per_week": "{count} a week",
   "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
@@ -95,7 +95,7 @@
   "closed_registrations.other_server_instructions": "Seein Mastodon is decentralized ye kin mak a accoont on anither server an stull interact wi this ane.",
   "closed_registrations_modal.description": "Makkin a accoont on {domain} isnae possible the noo, but mind ye dinnae need a accoont on {domain} specific for tae uise Mastodon.",
   "closed_registrations_modal.find_another_server": "Fin anither server",
-  "closed_registrations_modal.preamble": "Mastodon is decentralized, sae nae maitter whaur ye mak yer accoont, ye'll be able tae follae an interact wi oniebody on this server. Ye kin even sel-host it!",
+  "closed_registrations_modal.preamble": "Mastodon is decentralized, sae nae maitter whaur ye mak yer accoont, ye'll can follae an interack wi oniebody on this server. Ye kin even sel-host it!",
   "closed_registrations_modal.title": "Signin up on Mastodon",
   "column.about": "Aboot",
   "column.blocks": "Dingied uisers",
@@ -115,7 +115,7 @@
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settins",
   "column_header.moveLeft_settings": "Shift column tae the left",
-  "column_header.moveRight_settings": "Shift coloumn tae the richt",
+  "column_header.moveRight_settings": "Shift column tae the richt",
   "column_header.pin": "Preen",
   "column_header.show_settings": "Shaw settins",
   "column_header.unpin": "Unpreen",
@@ -126,9 +126,9 @@
   "compose.language.change": "Chynge Leid",
   "compose.language.search": "Seirch leids...",
   "compose_form.direct_message_warning_learn_more": "Lairn mair",
-  "compose_form.encryption_warning": "Posts on Mastodon urnae en-tae-en encryptit. Dinnae share onie sensitive information ower Mastodon.",
+  "compose_form.encryption_warning": "Posts on Mastodon isnae en-tae-en encryptit. Dinnae share onie sensitive information ower Mastodon.",
   "compose_form.hashtag_warning": "This post wulnae be listit unner onie hashtag seein it is no listit. Ainly public posts kin be seirchit oot bi hashtag.",
-  "compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye folir tae luik at yer follaer-ainly posts.",
+  "compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
   "compose_form.lock_disclaimer.lock": "lockit",
   "compose_form.placeholder": "Whit's on yer mind?",
   "compose_form.poll.add_option": "Pit in a chyce",
@@ -167,11 +167,11 @@
   "confirmations.mute.explanation": "This'll hide posts fae them an posts mentionin them, but it'll stull alloo them tae see yer posts an follae ye.",
   "confirmations.mute.message": "Ye sure thit ye'r wantin tae wheesht {name}?",
   "confirmations.redraft.confirm": "Delete an stert anew",
-  "confirmations.redraft.message": "Ye sure thit ye'r wantin tae delete this post an stert again? Favourites an boosts'll be lost, an the replies tae the original post'll be orphant.",
+  "confirmations.redraft.message": "Ye shuir thit ye'r wantin tae delete this post an stert again? Favourites an boosts'll be lost, an the replies tae the original post'll be orphant.",
   "confirmations.reply.confirm": "Reply",
   "confirmations.reply.message": "Replyin noo'll owerwrite the message ye'r screivin the noo. Ur ye sure thit ye'r wantin tae dae that?",
   "confirmations.unfollow.confirm": "Unfollae",
-  "confirmations.unfollow.message": "Ye sure thit ye'r wantin tae unfollae {name}?",
+  "confirmations.unfollow.message": "Ye shuir thit ye'r wantin tae unfollae {name}?",
   "conversation.delete": "Delete the conversation",
   "conversation.mark_as_read": "Mairk as seen",
   "conversation.open": "Luik at conversation",
@@ -184,7 +184,7 @@
   "directory.recently_active": "Active recent",
   "disabled_account_banner.account_settings": "Accoont settins",
   "disabled_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo.",
-  "dismissable_banner.community_timeline": "Here the maist recent public posts fae fowk thit's accoonts ur hostit bi {domain}.",
+  "dismissable_banner.community_timeline": "Here the maist recent public posts fae fowk thit's accoonts is hostit bi {domain}.",
   "dismissable_banner.dismiss": "Pit awa",
   "dismissable_banner.explore_links": "Thir news stories is bein talked aboot bi fowk on this an ither servers o the decentralized netwirk richt noo.",
   "dismissable_banner.explore_statuses": "Thir posts fae this an ither servers in this decentralized netwirk ur gainin traction on this server richt noo.",
@@ -226,12 +226,12 @@
   "empty_column.list": "There naethin in this list yit. Whan memmers o this list publish new posts, ye'll see them here.",
   "empty_column.lists": "Ye dinnae hae onie lists yit. Ance ye mak ane, it'll shaw up here.",
   "empty_column.mutes": "Ye'v no wheesht onie uisers yit.",
-  "empty_column.notifications": "Ye dinnae hae onie notes yit. Whan ither fowk interack wi ye, ye'll see it here.",
+  "empty_column.notifications": "Ye dinnae hae onie notes yit. Whan ither fowk interacks wi ye, ye'll see it here.",
   "empty_column.public": "There naethin here! Scrieve socht public, or follae uisers fae ither servers fir tae full it up",
   "error.unexpected_crash.explanation": "Doon tae a bug in wir code or a brooser compatibility maitter, this page cuidnae get displayed richt.",
   "error.unexpected_crash.explanation_addons": "This page cannae be displayit richt. This error is maist lik tae be doon tae a brooser add-on or autimatic owersettin tools.",
   "error.unexpected_crash.next_steps": "Gie refreshin the page a shot. Gin thon disnae help ye, ye kin mibbie stull be able tae uise Mastodon throu anither brooser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try oot pittin them aff an rejiggin the page. Gin thonndisnae wirk, ye kin mibbie be able tae uise Mastodon on a different brooser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try oot pittin them aff an rejiggin the page. Gin thon disnae wirk, ye kin mibbie uise Mastodon on a different brooser or native app.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace tae yer clipboord",
   "errors.unexpected_crash.report_issue": "Sen in a issue",
   "explore.search_results": "Seirch finnins",

app/javascript/mastodon/locales/sk.json

@@ -158,7 +158,7 @@
   "confirmations.delete_list.confirm": "Vymaž",
   "confirmations.delete_list.message": "Si si istý/á, že chceš natrvalo vymazať tento zoznam?",
   "confirmations.discard_edit_media.confirm": "Zahoď",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
   "confirmations.domain_block.confirm": "Skry celú doménu",
   "confirmations.domain_block.message": "Si si naozaj istý/á, že chceš blokovať celú doménu {domain}? Vo väčšine prípadov stačí blokovať alebo ignorovať pár konkrétnych užívateľov, čo sa doporučuje. Neuvidíš obsah z tejto domény v žiadnej verejnej časovej osi, ani v oznámeniach. Tvoji následovníci pochádzajúci z tejto domény budú odstránení.",
   "confirmations.logout.confirm": "Odhlás sa",
@@ -183,13 +183,13 @@
   "directory.new_arrivals": "Nové príchody",
   "directory.recently_active": "Nedávno aktívne",
   "disabled_account_banner.account_settings": "Nastavenia účtu",
-  "disabled_account_banner.text": "Your account {disabledAccount} is currently disabled.",
+  "disabled_account_banner.text": "Vaše konto {disabledAccount} je momentálne vypnuté.",
-  "dismissable_banner.community_timeline": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
+  "dismissable_banner.community_timeline": "Toto sú najnovšie verejné príspevky od ľudí, ktorých účty sú hostované na {domain}.",
-  "dismissable_banner.dismiss": "Dismiss",
+  "dismissable_banner.dismiss": "Zrušiť",
-  "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_links": "O týchto správach práve teraz hovoria ľudia na tomto a ďalších serveroch decentralizovanej siete.",
-  "dismissable_banner.explore_statuses": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
+  "dismissable_banner.explore_statuses": "Tieto príspevky z tohto a ďalších serverov v decentralizovanej sieti získavajú na tomto serveri práve teraz na sile.",
-  "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_tags": "Tieto hashtagy práve teraz získavajú popularitu medzi ľuďmi na tomto a ďalších serveroch decentralizovanej siete.",
-  "dismissable_banner.public_timeline": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
+  "dismissable_banner.public_timeline": "Toto sú najnovšie verejné príspevky od ľudí z tohto a ďalších serverov decentralizovanej siete, o ktorých tento server vie.",
   "embed.instructions": "Umiestni kód uvedený nižšie pre pridanie tohto statusu na tvoju web stránku.",
   "embed.preview": "Tu je ako to bude vyzerať:",
   "emoji_button.activity": "Aktivita",
@@ -215,7 +215,7 @@
   "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
   "empty_column.direct": "Ešte nemáš žiadne priame správy. Keď nejakú pošleš, alebo dostaneš, ukáže sa tu.",
   "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Momentálne nie je nič trendové. Pozrite sa neskôr!",
   "empty_column.favourited_statuses": "Nemáš obľúbené ešte žiadne príspevky. Keď si nejaký obľúbiš, bude zobrazený práve tu.",
   "empty_column.favourites": "Tento toot si ešte nikto neobľúbil. Ten kto si ho obľúbi, bude zobrazený tu.",
   "empty_column.follow_recommendations": "Zdá sa že pre Vás nemohli byť vygenerované žiadne návrhy. Môžete skúsiť použiť vyhľadávanie aby ste našli ľudi ktorých poznáte, alebo preskúmať trendujúce heštegy.",
@@ -236,22 +236,22 @@
   "errors.unexpected_crash.report_issue": "Nahlás problém",
   "explore.search_results": "Výsledky hľadania",
   "explore.title": "Objavuj",
-  "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
+  "filter_modal.added.context_mismatch_explanation": "Táto kategória filtrov sa nevzťahuje na kontext, v ktorom ste získali prístup k tomuto príspevku. Ak chcete, aby sa príspevok filtroval aj v tomto kontexte, budete musieť filter upraviť.",
-  "filter_modal.added.context_mismatch_title": "Context mismatch!",
+  "filter_modal.added.context_mismatch_title": "Nesúlad kontextu!",
-  "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
+  "filter_modal.added.expired_explanation": "Platnosť tejto kategórie filtra vypršala, aby sa použila, je potrebné zmeniť dátum vypršania platnosti.",
-  "filter_modal.added.expired_title": "Expired filter!",
+  "filter_modal.added.expired_title": "Vypršala platnosť filtra!",
-  "filter_modal.added.review_and_configure": "To review and further configure this filter category, go to the {settings_link}.",
+  "filter_modal.added.review_and_configure": "Ak chcete skontrolovať a ďalej konfigurovať túto kategóriu filtrov, prejdite na odkaz {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Nastavenie triedenia",
-  "filter_modal.added.settings_link": "settings page",
+  "filter_modal.added.settings_link": "stránka s nastaveniami",
-  "filter_modal.added.short_explanation": "This post has been added to the following filter category: {title}.",
+  "filter_modal.added.short_explanation": "Tento príspevok bol pridaný do nasledujúcej kategórie filtrov: {title}.",
   "filter_modal.added.title": "Triedenie pridané!",
-  "filter_modal.select_filter.context_mismatch": "does not apply to this context",
+  "filter_modal.select_filter.context_mismatch": "sa na tento kontext nevzťahuje",
   "filter_modal.select_filter.expired": "vypršalo",
-  "filter_modal.select_filter.prompt_new": "New category: {name}",
+  "filter_modal.select_filter.prompt_new": "Nová kategória: {name}",
-  "filter_modal.select_filter.search": "Search or create",
+  "filter_modal.select_filter.search": "Vyhľadávať alebo vytvoriť",
-  "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
+  "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
-  "filter_modal.select_filter.title": "Filter this post",
+  "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
-  "filter_modal.title.status": "Filter a post",
+  "filter_modal.title.status": "Filtrovanie príspevku",
   "follow_recommendations.done": "Hotovo",
   "follow_recommendations.heading": "Následuj ľudí od ktorých by si chcel/a vidieť príspevky! Tu sú nejaké návrhy.",
   "follow_recommendations.lead": "Príspevky od ľudi ktorých sledujete sa zobrazia v chronologickom poradí na Vašej nástenke. Nebojte sa spraviť chyby, vždy môžete zrušiť sledovanie konkrétnych ľudí!",
@@ -259,8 +259,8 @@
   "follow_request.reject": "Odmietni",
   "follow_requests.unlocked_explanation": "Síce Váš učet nie je uzamknutý, ale {domain} tím si myslel že môžete chcieť skontrolovať žiadosti o sledovanie z týchto účtov manuálne.",
   "footer.about": "O",
-  "footer.directory": "Profiles directory",
+  "footer.directory": "Adresár profilov",
-  "footer.get_app": "Get the app",
+  "footer.get_app": "Stiahnuť aplikáciu",
   "footer.invite": "Pozvi ľudí",
   "footer.keyboard_shortcuts": "Klávesové skratky",
   "footer.privacy_policy": "Zásady súkromia",
@@ -283,14 +283,14 @@
   "home.column_settings.show_replies": "Ukáž odpovede",
   "home.hide_announcements": "Skry oboznámenia",
   "home.show_announcements": "Ukáž oboznámenia",
-  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok obľúbiť, aby ste dali autorovi vedieť, že ho oceňujete, a uložiť si ho na neskôr.",
-  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.description.follow": "Ak máte konto na Mastodone, môžete sledovať {name} a dostávať príspevky do svojho domovského kanála.",
-  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.description.reblog": "Ak máte účet na Mastodone, môžete tento príspevok posilniť a zdieľať ho s vlastnými sledovateľmi.",
-  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.description.reply": "Ak máte účet na Mastodone, môžete reagovať na tento príspevok.",
   "interaction_modal.on_another_server": "Na inom serveri",
   "interaction_modal.on_this_server": "Na tomto serveri",
-  "interaction_modal.other_server_instructions": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
+  "interaction_modal.other_server_instructions": "Skopírujte a vložte túto adresu URL do vyhľadávacieho poľa vašej obľúbenej aplikácie Mastodon alebo do webového rozhrania vášho servera Mastodon.",
-  "interaction_modal.preamble": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
+  "interaction_modal.preamble": "Keďže Mastodon je decentralizovaný, ak nemáte účet na tomto serveri, môžete použiť svoj existujúci účet hostovaný na inom serveri Mastodon alebo kompatibilnej platforme.",
   "interaction_modal.title.favourite": "Obľúbiť si {name}ov/in príspevok",
   "interaction_modal.title.follow": "Nasleduj {name}",
   "interaction_modal.title.reblog": "Vyzdvihni {name}ov/in príspevok",
@@ -338,7 +338,7 @@
   "lightbox.next": "Ďalšie",
   "lightbox.previous": "Predchádzajúci",
   "limited_account_hint.action": "Ukáž profil aj tak",
-  "limited_account_hint.title": "This profile has been hidden by the moderators of {domain}.",
+  "limited_account_hint.title": "Tento profil bol skrytý moderátormi stránky {domain}.",
   "lists.account.add": "Pridaj do zoznamu",
   "lists.account.remove": "Odober zo zoznamu",
   "lists.delete": "Vymaž list",
@@ -357,7 +357,7 @@
   "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
   "missing_indicator.label": "Nenájdené",
   "missing_indicator.sublabel": "Tento zdroj sa ešte nepodarilo nájsť",
-  "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
+  "moved_to_account_banner.text": "Vaše konto {disabledAccount} je momentálne zablokované, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.duration": "Trvanie",
   "mute_modal.hide_notifications": "Skry oznámenia od tohto používateľa?",
   "mute_modal.indefinite": "Bez obmedzenia",
@@ -384,7 +384,7 @@
   "navigation_bar.public_timeline": "Federovaná časová os",
   "navigation_bar.search": "Hľadaj",
   "navigation_bar.security": "Zabezbečenie",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, musíte sa prihlásiť.",
   "notification.admin.report": "{name} nahlásil/a {target}",
   "notification.admin.sign_up": "{name} sa zaregistroval/a",
   "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
@@ -431,7 +431,7 @@
   "notifications.permission_denied_alert": "Oboznámenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača o to, bola už skôr zamietnutá",
   "notifications.permission_required": "Oboznámenia na ploche sú nedostupné, pretože potrebné povolenia neboli udelené.",
   "notifications_permission_banner.enable": "Povoliť oboznámenia na plochu",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nikdy nezmeškaj jedinú vec",
   "picture_in_picture.restore": "Vrátiť späť",
   "poll.closed": "Uzatvorená",
@@ -450,7 +450,7 @@
   "privacy.private.short": "Iba pre sledujúcich",
   "privacy.public.long": "Viditeľné pre všetkých",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Viditeľné pre všetkých, ale odmietnuté funkcie zisťovania",
   "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Zásady súkromia",
@@ -470,33 +470,33 @@
   "relative_time.today": "dnes",
   "reply_indicator.cancel": "Zrušiť",
   "report.block": "Blokuj",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block_explanation": "Ich príspevky neuvidíte. Nebudú môcť vidieť vaše príspevky ani vás sledovať. Budú môcť zistiť, že sú zablokovaní.",
   "report.categories.other": "Ostatné",
   "report.categories.spam": "Spam",
-  "report.categories.violation": "Content violates one or more server rules",
+  "report.categories.violation": "Obsah porušuje jedno alebo viacero pravidiel servera",
-  "report.category.subtitle": "Choose the best match",
+  "report.category.subtitle": "Vyberte si najlepšiu voľbu",
-  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title": "Povedzte nám, čo sa deje s týmto {type}",
   "report.category.title_account": "profilom",
   "report.category.title_status": "príspevkom",
   "report.close": "Hotovo",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.comment.title": "Je ešte niečo, čo by sme podľa vás mali vedieť?",
   "report.forward": "Posuň ku {target}",
   "report.forward_hint": "Tento účet je z iného serveru. Chceš poslať anonymnú kópiu hlásenia aj tam?",
   "report.mute": "Nevšímaj si",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.mute_explanation": "Ich príspevky neuvidíte. Stále vás môžu sledovať a vidieť vaše príspevky a nebudú vedieť, že sú stlmené.",
   "report.next": "Ďalej",
   "report.placeholder": "Ďalšie komentáre",
   "report.reasons.dislike": "Nepáči sa mi",
   "report.reasons.dislike_description": "Nieje to niečo, čo chceš vidieť",
   "report.reasons.other": "Je to niečo iné",
-  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.other_description": "Tento problém nepatrí do iných kategórií",
   "report.reasons.spam": "Je to spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.spam_description": "Škodlivé odkazy, falošné zapojenie alebo opakované odpovede",
   "report.reasons.violation": "Porušuje pravidlá servera",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.reasons.violation_description": "Ste si vedomí, že porušuje špecifické pravidlá",
-  "report.rules.subtitle": "Select all that apply",
+  "report.rules.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
-  "report.rules.title": "Which rules are being violated?",
+  "report.rules.title": "Ktoré pravidlá sa porušujú?",
-  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.subtitle": "Vyberte všetky, ktoré sa vzťahujú",
   "report.statuses.title": "Are there any posts that back up this report?",
   "report.submit": "Odošli",
   "report.target": "Nahlás {target}",

app/javascript/mastodon/locales/sr-Latn.json

@@ -3,7 +3,7 @@
   "about.contact": "Kontakt:",
   "about.disclaimer": "Mastodon je besplatan softver otvorenog koda i zaštićeni znak kompanije Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razlog nije naveden",
-  "about.domain_blocks.preamble": "Mastodon Vam dozvoljava da vidite i komunicirate sa korisnicima sa drugih servera u fediversu. Ovo su izuzeci koji su napravljeni na ovom serveru.",
+  "about.domain_blocks.preamble": "Mastodon vam generalno omogućava da vidite sadržaj i komunicirate sa korisnicima sa bilo kog drugog servera u fediverzumu. Ovo su izuzeci koji su napravljeni na ovom serveru.",
   "about.domain_blocks.silenced.explanation": "U načelu nećete videti profile i sadržaj sa ovog servera, osim ako ga eksplicitno ne potražite ili se uključite tako što ćete ga pratiti.",
   "about.domain_blocks.silenced.title": "Ograničen",
   "about.domain_blocks.suspended.explanation": "Podaci sa ovog servera neće se obrađivati, čuvati ili razmenjivati, što onemogućava bilo kakvu interakciju ili komunikaciju sa korisnicima sa ovog servera.",
@@ -16,64 +16,64 @@
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupa",
   "account.block": "Blokiraj @{name}",
-  "account.block_domain": "Sakrij sve sa domena {domain}",
+  "account.block_domain": "Blokiraj domen {domain}",
   "account.blocked": "Blokiran",
-  "account.browse_more_on_origin_server": "Pogledajte još na originalnom profilu",
+  "account.browse_more_on_origin_server": "Pregledajte još na originalnom profilu",
   "account.cancel_follow_request": "Povuci zahtev za praćenje",
   "account.direct": "Direktna poruka @{name}",
-  "account.disable_notifications": "Prekini obaveštavanje za objave korisnika @{name}",
+  "account.disable_notifications": "Zaustavi obaveštavanje za objave korisnika @{name}",
-  "account.domain_blocked": "Domen blokiran",
+  "account.domain_blocked": "Domen je blokiran",
   "account.edit_profile": "Uredi profil",
   "account.enable_notifications": "Obavesti me kada @{name} objavi",
-  "account.endorse": "Istaknuto na profilu",
+  "account.endorse": "Istakni na profilu",
   "account.featured_tags.last_status_at": "Poslednja objava {date}",
   "account.featured_tags.last_status_never": "Nema objava",
-  "account.featured_tags.title": "Istaknuti heštegovi korisnika {name}",
+  "account.featured_tags.title": "Istaknute heš oznake korisnika {name}",
-  "account.follow": "Zaprati",
+  "account.follow": "Prati",
   "account.followers": "Pratioci",
-  "account.followers.empty": "Trenutno niko ne prati ovog korisnika.",
+  "account.followers.empty": "Još uvek niko ne prati ovog korisnika.",
   "account.followers_counter": "{count, plural, one {{counter} pratilac} few {{counter} pratioca} other {{counter} pratilaca}}",
-  "account.following": "Praćeni",
+  "account.following": "Prati",
   "account.following_counter": "{count, plural, one {{counter} prati} few {{counter} prati} other {{counter} prati}}",
-  "account.follows.empty": "Korisnik trenutno ne prati nikoga.",
+  "account.follows.empty": "Ovaj korisnik još uvek nikog ne prati.",
-  "account.follows_you": "Prati Vas",
+  "account.follows_you": "Prati vas",
   "account.go_to_profile": "Idi na profil",
-  "account.hide_reblogs": "Sakrij podrške korisnika @{name}",
+  "account.hide_reblogs": "Sakrij podržavanja od @{name}",
   "account.joined_short": "Pridružio se",
   "account.languages": "Promeni pretplaćene jezike",
   "account.link_verified_on": "Vlasništvo nad ovom vezom je provereno {date}",
   "account.locked_info": "Status privatnosti ovog naloga je podešen na zaključano. Vlasnik ručno pregleda ko ga može pratiti.",
-  "account.media": "Mediji",
+  "account.media": "Multimedija",
   "account.mention": "Pomeni korisnika @{name}",
   "account.moved_to": "Korisnik {name} je naznačio da je njegov novi nalog sada:",
-  "account.mute": "Ućutkaj korisnika @{name}",
+  "account.mute": "Ignoriši korisnika @{name}",
-  "account.mute_notifications": "Isključi obaveštenja od korisnika @{name}",
+  "account.mute_notifications": "Ignoriši obaveštenja od @{name}",
-  "account.muted": "Ućutkan",
+  "account.muted": "Ignorisan",
   "account.open_original_page": "Otvori originalnu stranicu",
   "account.posts": "Objave",
   "account.posts_with_replies": "Objave i odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čekam odobrenje. Kliknite da poništite zahtev za praćenje",
+  "account.requested": "Čekanje odobrenja. Kliknite za otkazivanje zahteva za praćenje",
   "account.share": "Podeli profil korisnika @{name}",
-  "account.show_reblogs": "Prikaži podrške od korisnika @{name}",
+  "account.show_reblogs": "Prikaži podržavanja od korisnika @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} objava} few {{counter} objave} other {{counter} objava}}",
+  "account.statuses_counter": "{count, plural, one {{counter} objavio} few {{counter} objavio} other {{counter} objavio}}",
   "account.unblock": "Odblokiraj korisnika @{name}",
   "account.unblock_domain": "Odblokiraj domen {domain}",
   "account.unblock_short": "Odblokiraj",
   "account.unendorse": "Ne ističi na profilu",
   "account.unfollow": "Otprati",
-  "account.unmute": "Ukloni ućutkavanje korisniku @{name}",
+  "account.unmute": "Ne ignoriši @{name}",
-  "account.unmute_notifications": "Uključi nazad obaveštenja od korisnika @{name}",
+  "account.unmute_notifications": "Ne ignoriši obaveštenja od @{name}",
-  "account.unmute_short": "Isključi ućutkivanje",
+  "account.unmute_short": "Ne ignoriši",
   "account_note.placeholder": "Kliknite da dodate napomenu",
   "admin.dashboard.daily_retention": "Stopa zadržavanja korisnika po danima nakon registracije",
   "admin.dashboard.monthly_retention": "Stopa zadržavanja korisnika po mesecima nakon registracije",
   "admin.dashboard.retention.average": "Prosek",
   "admin.dashboard.retention.cohort": "Mesec pristupanja",
   "admin.dashboard.retention.cohort_size": "Novi korisnici",
-  "alert.rate_limited.message": "Molimo pokušajte ponovo posle {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Pokušajte ponovo posle {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Ograničena brzina",
+  "alert.rate_limited.title": "Ograničenje zahteva",
-  "alert.unexpected.message": "Pojavila se neočekivana greška.",
+  "alert.unexpected.message": "Došlo je do neočekivane greške.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
@@ -81,125 +81,125 @@
   "autosuggest_hashtag.per_week": "{count} nedeljno",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
-  "bundle_column_error.error.body": "Tražena stranica nije mogla da bude prikazana. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
+  "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
   "bundle_column_error.error.title": "O, ne!",
-  "bundle_column_error.network.body": "Došlo je do greške pri pokušaju učitavanja ove stranice. Razlog može biti trenutni problem sa Vašom internet vezom ili sa ovim serverom.",
+  "bundle_column_error.network.body": "Došlo je do greške pri pokušaju učitavanja ove stranice. Razlog može biti trenutni problem sa vašom internet vezom ili sa ovim serverom.",
   "bundle_column_error.network.title": "Greška na mreži",
   "bundle_column_error.retry": "Pokušajte ponovo",
   "bundle_column_error.return": "Idi na početak",
-  "bundle_column_error.routing.body": "Tražena stranica nije pronađena. Da li ste sigurni da je URL u polju za adresu ispravan?",
+  "bundle_column_error.routing.body": "Nije moguće pronaći traženu stranicu. Da li ste sigurni da je URL u adresnom polju ispravan?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zatvori",
   "bundle_modal_error.message": "Nešto nije bilo u redu pri učitavanju ove komponente.",
   "bundle_modal_error.retry": "Pokušajte ponovo",
   "closed_registrations.other_server_instructions": "Pošto je Mastodon decentralizovan, možete napraviti nalog na drugom serveru ali i dalje komunicirati sa ovim.",
-  "closed_registrations_modal.description": "Pravljenje naloga na {domain} trenutno nije moguće, ali imajte u vidu da Vam ne treba nalog zasebno na {domain} da biste koristili Mastodon.",
+  "closed_registrations_modal.description": "Kreiranje naloga na {domain} trenutno nije moguće, ali imajte u vidu da vam ne treba nalog zasebno na {domain} da biste koristili Mastodon.",
   "closed_registrations_modal.find_another_server": "Pronađite drugi server",
   "closed_registrations_modal.preamble": "Mastodon je decentralizovan, tako da bez obzira gde kreirate svoj nalog, moći ćete da pratite i komunicirate sa bilo kim na ovom serveru. Možete čak i sami da ga hostujete!",
-  "closed_registrations_modal.title": "Prijavljivanje na Mastodon",
+  "closed_registrations_modal.title": "Registracija za Mastodon",
-  "column.about": "O",
+  "column.about": "Osnovni podaci",
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Obeleživači",
   "column.community": "Lokalna vremenska linija",
   "column.direct": "Direktne poruke",
-  "column.directory": "Pretraži profile",
+  "column.directory": "Pregledaj profile",
-  "column.domain_blocks": "Skriveni domeni",
+  "column.domain_blocks": "Blokirani domeni",
-  "column.favourites": "Omiljene",
+  "column.favourites": "Omiljeno",
   "column.follow_requests": "Zahtevi za praćenje",
   "column.home": "Početna",
   "column.lists": "Liste",
-  "column.mutes": "Ućutkani korisnici",
+  "column.mutes": "Ignorisani korisnici",
   "column.notifications": "Obaveštenja",
   "column.pins": "Zakačene objave",
   "column.public": "Združena vremenska linija",
   "column_back_button.label": "Nazad",
-  "column_header.hide_settings": "Sakrij postavke",
+  "column_header.hide_settings": "Sakrij podešavanja",
-  "column_header.moveLeft_settings": "Pomeri kolonu ulevo",
+  "column_header.moveLeft_settings": "Premesti kolonu ulevo",
-  "column_header.moveRight_settings": "Pomeri kolonu udesno",
+  "column_header.moveRight_settings": "Premesti kolonu udesno",
-  "column_header.pin": "Prikači",
+  "column_header.pin": "Zakači",
-  "column_header.show_settings": "Prikaži postavke",
+  "column_header.show_settings": "Prikaži podešavanja",
   "column_header.unpin": "Otkači",
-  "column_subheading.settings": "Postavke",
+  "column_subheading.settings": "Podešavanja",
   "community.column_settings.local_only": "Samo lokalno",
-  "community.column_settings.media_only": "Samo Mediji",
+  "community.column_settings.media_only": "Samo multimedija",
   "community.column_settings.remote_only": "Samo udaljeno",
   "compose.language.change": "Promeni jezik",
   "compose.language.search": "Pretraga jezika...",
   "compose_form.direct_message_warning_learn_more": "Saznajte više",
-  "compose_form.encryption_warning": "Objave na Mastodonu nisu end-to-end enkriptovane. Nemojte deliti nikakve osetljive informacije preko Mastodona.",
+  "compose_form.encryption_warning": "Objave na Mastodon-u nisu potpuno šifrovane. Nemojte deliti nikakve osetljive informacije preko Mastodon-a.",
-  "compose_form.hashtag_warning": "Ova truba neće biti izlistana pod bilo kojom tarabom jer je sakrivena. Samo javne trube mogu biti pretražene tarabom.",
+  "compose_form.hashtag_warning": "Ova objava neće biti navedena ni pod jednom heš oznakom jer je nenavedena. Samo javne objave mogu se pretraživati po heš oznakama.",
-  "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da Vas zaprati i da vidi objave namenjene samo Vašim pratiocima.",
+  "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da vas prati i da vidi vaše objave namenjene samo za vaše pratioce.",
   "compose_form.lock_disclaimer.lock": "zaključan",
-  "compose_form.placeholder": "Šta Vam je na umu?",
+  "compose_form.placeholder": "O čemu razmišljate?",
   "compose_form.poll.add_option": "Dodajte izbor",
   "compose_form.poll.duration": "Trajanje ankete",
   "compose_form.poll.option_placeholder": "Izbor {number}",
-  "compose_form.poll.remove_option": "Odstrani ovaj izbor",
+  "compose_form.poll.remove_option": "Ukloni ovaj izbor",
   "compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
   "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
   "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sačuvaj izmene",
+  "compose_form.save_changes": "Sačuvaj promene",
-  "compose_form.sensitive.hide": "Označi multimediju kao osetljivu",
+  "compose_form.sensitive.hide": "{count, plural, one {Označi multimediju kao osetljivu} few {Označi multimediju kao osetljivu} other {Označi multimediju kao osetljivu}}",
-  "compose_form.sensitive.marked": "Mediji su označeni kao osetljivi",
+  "compose_form.sensitive.marked": "{count, plural, one {Multimedija je označena kao osetljiva} few {Multimedija je označena kao osetljiva} other {Multimedija je označena kao osetljiva}}",
-  "compose_form.sensitive.unmarked": "Mediji su označeni kao ne-osetljivi",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedija nije označena kao osetljiva} few {Multimedija nije označena kao osetljiva} other {Multimedija nije označena kao osetljiva}}",
-  "compose_form.spoiler.marked": "Tekst je sakriven iza upozorenja",
+  "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
-  "compose_form.spoiler.unmarked": "Tekst nije sakriven",
+  "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
-  "compose_form.spoiler_placeholder": "Ovde upišite upozorenje",
+  "compose_form.spoiler_placeholder": "Ovde napišite upozorenje",
-  "confirmation_modal.cancel": "Poništi",
+  "confirmation_modal.cancel": "Otkaži",
-  "confirmations.block.block_and_report": "Blokiraj i Prijavi",
+  "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
   "confirmations.block.message": "Da li ste sigurni da želite da blokirate korisnika {name}?",
   "confirmations.cancel_follow_request.confirm": "Povuci zahtev",
   "confirmations.cancel_follow_request.message": "Da li ste sigurni da želite da povučete zahtev da pratite {name}?",
-  "confirmations.delete.confirm": "Obriši",
+  "confirmations.delete.confirm": "Izbriši",
-  "confirmations.delete.message": "Da li ste sigurni da želite obrišete ovaj status?",
+  "confirmations.delete.message": "Da li ste sigurni da želite izrišete ovu objavu?",
-  "confirmations.delete_list.confirm": "Obriši",
+  "confirmations.delete_list.confirm": "Izbriši",
-  "confirmations.delete_list.message": "Da li ste sigurni da želite da bespovratno obrišete ovu listu?",
+  "confirmations.delete_list.message": "Da li ste sigurni da želite da trajno izbrišete ovu listu?",
   "confirmations.discard_edit_media.confirm": "Odbaci",
-  "confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili predpregledu medija, da li ipak hoćete da ih odbacite?",
+  "confirmations.discard_edit_media.message": "Imate nesačuvane promene u opisu ili pregledu medija, da li ipak hoćete da ih odbacite?",
-  "confirmations.domain_block.confirm": "Sakrij ceo domen",
+  "confirmations.domain_block.confirm": "Blokiraj ceo domen",
-  "confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, nekoliko dobro promišljenih blokiranja ili ućutkavanja su dovoljna i preporučljiva.",
+  "confirmations.domain_block.message": "Da li ste zaista sigurni da želite da blokirate ceo domen {domain}? U većini slučajeva, dovoljno je i poželjno nekoliko ciljanih blokiranja ili ignorisanja. Nećete videti sadržaj sa tog domena ni u jednoj javnoj vremenskoj liniji ili u vašim obaveštenjima. Vaši pratioci sa tog domena će biti uklonjeni.",
   "confirmations.logout.confirm": "Odjavi se",
   "confirmations.logout.message": "Da li se sigurni da želite da se odjavite?",
-  "confirmations.mute.confirm": "Ućutkaj",
+  "confirmations.mute.confirm": "Ignoriši",
-  "confirmations.mute.explanation": "Ovo će sakriti objave od njih i objave koje ih pominju, ali će im i dalje dozvoliti da vide vaše postove i da vas zaprate.",
+  "confirmations.mute.explanation": "Ovo će sakriti objave od korisnika i objave koje ga pominju, ali će mu i dalje biti dozvoljeno da vidi vaše objave i da vas prati.",
-  "confirmations.mute.message": "Da li stvarno želite da ućutkate korisnika {name}?",
+  "confirmations.mute.message": "Da li stvarno želite da ignorišete korisnika {name}?",
   "confirmations.redraft.confirm": "Izbriši i prepravi",
-  "confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovaj status i da ga prepravite? Sva stavljanja u omiljene trube, kao i podrške će biti izgubljene, a odgovori na originalni post će biti poništeni.",
+  "confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovu objavu i da je prepravite? Podržavanja i oznake kao omiljenih će biti izgubljeni, a odgovori će ostati bez originalne objave.",
   "confirmations.reply.confirm": "Odgovori",
-  "confirmations.reply.message": "Odgovaranjem ćete obrisati poruku koju sastavljate. Jeste li sigurni da želite da nastavite?",
+  "confirmations.reply.message": "Odgovaranjem ćete obrisati poruku koju sastavljate. Da li sigurni da želite da nastavite?",
   "confirmations.unfollow.confirm": "Otprati",
   "confirmations.unfollow.message": "Da li ste sigurni da želite da otpratite korisnika {name}?",
-  "conversation.delete": "Obriši prepisku",
+  "conversation.delete": "Izbriši razgovor",
   "conversation.mark_as_read": "Označi kao pročitano",
-  "conversation.open": "Prikaži prepisku",
+  "conversation.open": "Prikaži razgovor",
   "conversation.with": "Sa {names}",
   "copypaste.copied": "Kopirano",
   "copypaste.copy": "Kopiraj",
-  "directory.federated": "Sa znanih združenih instanci",
+  "directory.federated": "Sa znanog fideverzuma",
   "directory.local": "Samo sa {domain}",
   "directory.new_arrivals": "Novopridošli",
   "directory.recently_active": "Nedavno aktivni",
   "disabled_account_banner.account_settings": "Podešavanja naloga",
   "disabled_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen.",
-  "dismissable_banner.community_timeline": "Ovo su najnovije javne objave korisnika čije naloge hostuje {domain}.",
+  "dismissable_banner.community_timeline": "Ovo su najnovije javne objave ljudi čije naloge hostuje {domain}.",
   "dismissable_banner.dismiss": "Odbaci",
   "dismissable_banner.explore_links": "O ovim vestima upravo sada razgovaraju ljudi na ovom i drugim serverima decentralizovane mreže.",
-  "dismissable_banner.explore_statuses": "Ove objave sa ovog i drugih servera u decentralizovanoj mreži postaju sve popularniji na ovom serveru.",
+  "dismissable_banner.explore_statuses": "Ove objave sa ovog i drugih servera u decentralizovanoj mreži postaju sve popularnije na ovom serveru.",
-  "dismissable_banner.explore_tags": "Ovi heštagovi postaju sve popularniji među korisnicima na ovom i drugim serverima decentralizovane mreže.",
+  "dismissable_banner.explore_tags": "Ove heš oznake postaju sve popularnije među ljudima na ovom i drugim serverima decentralizovane mreže.",
-  "dismissable_banner.public_timeline": "Ovo su najnovije javne objave korisnika na ovom i drugim serverima decentralizovane mreže koji su ovom serveru poznati.",
+  "dismissable_banner.public_timeline": "Ovo su najnovije javne objave ljudi na ovom i drugim serverima decentralizovane mreže za koje ovaj server zna.",
-  "embed.instructions": "Ugradi ovaj status na Vaš veb sajt kopiranjem koda ispod.",
+  "embed.instructions": "Ugradite ovu objavu na svoj veb sajt kopiranjem koda ispod.",
-  "embed.preview": "Ovako će da izgleda:",
+  "embed.preview": "Evo kako će to izgledati:",
   "emoji_button.activity": "Aktivnost",
-  "emoji_button.clear": "Očisti",
+  "emoji_button.clear": "Obriši",
-  "emoji_button.custom": "Proizvoljno",
+  "emoji_button.custom": "Prilagođeno",
-  "emoji_button.flags": "Zastave",
+  "emoji_button.flags": "Zastavice",
   "emoji_button.food": "Hrana i piće",
   "emoji_button.label": "Ubaci emodži",
   "emoji_button.nature": "Priroda",
-  "emoji_button.not_found": "Nema emodžija!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Nema pronađih odgovarajućih emodžija",
   "emoji_button.objects": "Objekti",
   "emoji_button.people": "Ljudi",
   "emoji_button.recent": "Najčešće korišćeni",
@@ -207,142 +207,142 @@
   "emoji_button.search_results": "Rezultati pretrage",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Putovanja i mesta",
-  "empty_column.account_suspended": "Nalog suspendovan",
+  "empty_column.account_suspended": "Nalog je suspendovan",
-  "empty_column.account_timeline": "Ovde nema truba!",
+  "empty_column.account_timeline": "Nema objava ovde!",
   "empty_column.account_unavailable": "Profil je nedostupan",
-  "empty_column.blocks": "Još uvek nemate blokiranih korisnika.",
+  "empty_column.blocks": "Još uvek niste blokirali nijednog korisnika.",
-  "empty_column.bookmarked_statuses": "Još uvek nemate obeležene trube. Kada ih obeležite, pojaviće se ovde.",
+  "empty_column.bookmarked_statuses": "Još uvek nemate objava dodanih u obeleživače. Kada dodate neku, pojaviće se ovde.",
   "empty_column.community": "Lokalna vremenska linija je prazna. Napišite nešto javno da započnete!",
-  "empty_column.direct": "Još uvek nemaš nijednu direktnu poruku. Kada je pošalješ ili primiš, ona će se pojaviti ovde.",
+  "empty_column.direct": "Još uvek nemate nijednu direktnu poruku. Kada pošaljete ili primite neku, pojaviće se ovde.",
-  "empty_column.domain_blocks": "Još uvek nema sakrivenih domena.",
+  "empty_column.domain_blocks": "Još uvek nema blokiranih domena.",
-  "empty_column.explore_statuses": "Trenutno ništa nije u trendu. Proveri ponovo kasnije!",
+  "empty_column.explore_statuses": "Trenutno ništa nije u trendu. Proverite ponovo kasnije!",
-  "empty_column.favourited_statuses": "Još uvek nemate truba koje su vam se svidele. Kada vam se jedna svidi, pojaviće se ovde.",
+  "empty_column.favourited_statuses": "Još uvek nemate objava označenih kao omiljene. Kada označite neku, pojaviće se ovde.",
-  "empty_column.favourites": "Još uvek se nikome nije svidela ova truba. Kada se nekome svidi, pojaviće se ovde.",
+  "empty_column.favourites": "Niko još nije označio ovu objavu kao omiljenu. Kada neko to uradi, pojaviće se ovde.",
-  "empty_column.follow_recommendations": "Izgleda da ne može da se generiše bilo kakav predlog za tebe. Možeš da pokušaš da koristiš pretragu da pronađeš osobe koje možda poznaješ ili istražiš popularne heštegove.",
+  "empty_column.follow_recommendations": "Izgleda da ne mogu da se generišu bilo kakvi predlozi za vas. Možete pokušati da koristite pretragu kako biste potražili ljude koje možda poznajete ili istražili popularne heš oznake.",
   "empty_column.follow_requests": "Još uvek nemate zahteva za praćenje. Kada primite zahtev, pojaviće se ovde.",
-  "empty_column.hashtag": "Trenutno nema ništa na ovoj označenoj tarabi.",
+  "empty_column.hashtag": "Još uvek nema ničega u ovoj heš oznaci.",
-  "empty_column.home": "Vaša vremenska linija je prazna! Posetite {public} ili koristite pretragu da počnete i da upoznate nove ljude.",
+  "empty_column.home": "Vaša početna vremenska linija je prazna! Pratite više ljudi da biste je popunili. {suggestions}",
   "empty_column.home.suggestions": "Pogledajte neke predloge",
-  "empty_column.list": "U ovoj listi još nema ničega. Kada članovi liste objave nove statuse, oni će se pojaviti ovde.",
+  "empty_column.list": "U ovoj listi još nema ničega. Kada članovi ove liste objave nešto novo, pojaviće se ovde.",
   "empty_column.lists": "Još uvek nemate nijednu listu. Kada napravite jednu, pojaviće se ovde.",
-  "empty_column.mutes": "Još uvek nemate ućutkanih korisnika.",
+  "empty_column.mutes": "Još uvek ne ignorišete nijednog korisnika.",
-  "empty_column.notifications": "Trenutno nemate obaveštenja. Družite se malo da započnete razgovor.",
+  "empty_column.notifications": "Još uvek nemate nikakva obaveštenja. Kada drugi ljudi budu u interakciji sa vama, videćete to ovde.",
-  "empty_column.public": "Ovde nema ničega! Napišite nešto javno, ili nađite korisnike sa drugih instanci koje ćete zapratiti da popunite ovu prazninu",
+  "empty_column.public": "Ovde nema ničega! Napišite nešto javno ili ručno pratite korisnike sa drugih servera da biste ovo popunili",
   "error.unexpected_crash.explanation": "Zbog greške u našem kodu ili problema sa kompatibilnošću pregledača, ova stranica se nije mogla pravilno prikazati.",
   "error.unexpected_crash.explanation_addons": "Ova stranica se nije mogla pravilno prikazati. Ovu grešku verovatno uzrokuju dodaci pregledača ili alati za automatsko prevođenje.",
   "error.unexpected_crash.next_steps": "Pokušajte da osvežite stranicu. Ako to ne pomogne, možda ćete i dalje moći da koristite Mastodon putem drugog pregledača ili matične aplikacije.",
   "error.unexpected_crash.next_steps_addons": "Pokušajte da ih onemogućite i osvežite stranicu. Ako to ne pomogne, možda ćete i dalje moći da koristite Mastodon preko drugog pregledača ili matične aplikacije.",
-  "errors.unexpected_crash.copy_stacktrace": "Kopiraj \"stacktrace\" u klipbord",
+  "errors.unexpected_crash.copy_stacktrace": "Kopiraj „stacktrace” u klipbord",
   "errors.unexpected_crash.report_issue": "Prijavi problem",
   "explore.search_results": "Rezultati pretrage",
   "explore.title": "Istraži",
-  "filter_modal.added.context_mismatch_explanation": "Ova kategorija filtera se ne odnosi na kontekst u kojem si pristupio ovoj objavi. Ako želiš da se objava filtrira i u ovom kontekstu, moraćeš da urediš filter.",
+  "filter_modal.added.context_mismatch_explanation": "Ova kategorija filtera se ne odnosi na kontekst u kojem ste pristupili ovoj objavi. Ako želite da se objava filtrira i u ovom kontekstu, morate urediti filter.",
   "filter_modal.added.context_mismatch_title": "Kontekst se ne podudara!",
-  "filter_modal.added.expired_explanation": "Ova kategorija filtera je istekla, moraćeš da promeniš datum isteka da bi se primenjivala.",
+  "filter_modal.added.expired_explanation": "Ova kategorija filtera je istekla, morate promeniti datum isteka da bi se primenjivala.",
   "filter_modal.added.expired_title": "Filter je istekao!",
-  "filter_modal.added.review_and_configure": "Da biste pregledao i dalje konfigurisao ovu kategoriju filtera, idi na {settings_link}.",
+  "filter_modal.added.review_and_configure": "Za pregled i dalju konfiguraciju ove kategorije filtera, idite na {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Podešavanja filtera",
-  "filter_modal.added.settings_link": "stranica sa podešavanjima",
+  "filter_modal.added.settings_link": "stranica podešavanja",
   "filter_modal.added.short_explanation": "Ova objava je dodata u sledeću kategoriju filtera: {title}.",
   "filter_modal.added.title": "Filter je dodat!",
   "filter_modal.select_filter.context_mismatch": "ne odnosi se na ovaj kontekst",
   "filter_modal.select_filter.expired": "isteklo",
   "filter_modal.select_filter.prompt_new": "Nova kategorija: {name}",
   "filter_modal.select_filter.search": "Pretraži ili kreiraj",
-  "filter_modal.select_filter.subtitle": "Koristi postojeću kategoriju ili kreiraj novu",
+  "filter_modal.select_filter.subtitle": "Koristite postojeću kategoriju ili kreirajte novu",
   "filter_modal.select_filter.title": "Filtriraj ovu objavu",
   "filter_modal.title.status": "Filtriraj objavu",
-  "follow_recommendations.done": "Završeno",
+  "follow_recommendations.done": "Gotovo",
-  "follow_recommendations.heading": "Prati korsnike čije objave želiš da vidiš! Evo nekih predloga.",
+  "follow_recommendations.heading": "Pratite ljude čije objave želite da vidite! Evo nekih predloga.",
-  "follow_recommendations.lead": "Objave korisnika koje pratiš će se pojavljivati hronološkim redosledom u osnovnom izvoru objava. Ne plaši se greške, možeš prestati da pratiš korisnike u bilo kom trenutku!",
+  "follow_recommendations.lead": "Objave korisnika koje pratite će se pojavljivati hronološkim redosledom na početnoj stranici. Ne plašite se grešaka, možete otpratiti korisnike u bilo kom trenutku!",
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Odbij",
-  "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} je pomislilo da biste možda želeli ručno da pregledate zahteve za praćenje sa ovih naloga.",
+  "follow_requests.unlocked_explanation": "Iako vaš nalog nije zaključan, osoblje {domain} smatra da biste možda želeli da ručno pregledate zahteve za praćenje sa ovih naloga.",
-  "footer.about": "O",
+  "footer.about": "Osnovni podaci",
   "footer.directory": "Direktorijum profila",
   "footer.get_app": "Preuzmite aplikaciju",
-  "footer.invite": "Pozovite korisnike",
+  "footer.invite": "Pozovi osobe",
-  "footer.keyboard_shortcuts": "Prečice na tastaturi",
+  "footer.keyboard_shortcuts": "Tasterske prečice",
   "footer.privacy_policy": "Politika privatnosti",
   "footer.source_code": "Prikaži izvorni kod",
   "generic.saved": "Sačuvano",
-  "getting_started.heading": "Da počnete",
+  "getting_started.heading": "Prvi koraci",
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "ili {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "hashtag.column_settings.select.no_options_message": "Nisu pronađeni predlozi",
-  "hashtag.column_settings.select.placeholder": "Unesi hešteg…",
+  "hashtag.column_settings.select.placeholder": "Unesite heš oznake…",
   "hashtag.column_settings.tag_mode.all": "Sve ove",
   "hashtag.column_settings.tag_mode.any": "Bilo koje od ovih",
-  "hashtag.column_settings.tag_mode.none": "Ništa od ovih",
+  "hashtag.column_settings.tag_mode.none": "Nijedan od ovih",
-  "hashtag.column_settings.tag_toggle": "Uključi i dodatne oznake za ovu kolonu",
+  "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovu kolonu",
   "hashtag.follow": "Prati heš oznaku",
-  "hashtag.unfollow": "Prestani sa praćenjem heš oznake",
+  "hashtag.unfollow": "Otprati heš oznaku",
   "home.column_settings.basic": "Osnovno",
-  "home.column_settings.show_reblogs": "Prikaži i podržavanja",
+  "home.column_settings.show_reblogs": "Prikaži podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
   "home.hide_announcements": "Sakrij najave",
   "home.show_announcements": "Prijaži najave",
-  "interaction_modal.description.favourite": "Sa nalogom na Mastodonu, možeš da označiš ovu objavu kao omiljenu da bi dao do znanja autoru da ti se sviđa i sačuvao je za kasnije.",
+  "interaction_modal.description.favourite": "Sa nalogom na Mastodon-u, možete označiti ovu objavu kao omiljenu kako biste dali do znanja autoru da vam se sviđa i sačuvali je za kasnije.",
-  "interaction_modal.description.follow": "Sa nalogom na Mastodonu, možeš da pratiš korisnika {name} da biste primao njihove objave u svom osnovnom izvoru objave.",
+  "interaction_modal.description.follow": "Sa nalogom na Mastodon-u, možete pratiti korisnika {name} kako biste primali njegove objave na početnoj stranici.",
-  "interaction_modal.description.reblog": "Sa nalogom na Mastodonu, možeš podržati ovu objavu da bi je podelio sa svojim pratiocima.",
+  "interaction_modal.description.reblog": "Sa nalogom na Mastodon-u, možete podržati ovu objavu kako bite je podelili sa svojim pratiocima.",
-  "interaction_modal.description.reply": "Sa nalogom na Mastodonu, možeš odgovoriti na ovu objavu.",
+  "interaction_modal.description.reply": "Sa nalogom na Mastodon-u, možete odgovoriti na ovu objavu.",
   "interaction_modal.on_another_server": "Na drugom serveru",
   "interaction_modal.on_this_server": "Na ovom serveru",
-  "interaction_modal.other_server_instructions": "Kopiraj ovaj URL i prenesi ga u polje za pretragu svoje omiljene Mastodon aplikacije ili veb interfejs svog Mastodon servera.",
+  "interaction_modal.other_server_instructions": "Kopirajte i nalepite ovu URL adresu u polje pretrage svoje omiljene Mastodon aplikacije ili veb okruženje svog Mastodon servera.",
-  "interaction_modal.preamble": "Pošto je Mastodon decentralizovan, možeš koristiti svoj postojeći nalog koji hostuje drugi Mastodon server ili kompatibilna platforma ako nemaš nalog na ovom.",
+  "interaction_modal.preamble": "Pošto je Mastodon decentralizovan, možete koristiti svoj postojeći nalog koji hostuje drugi Mastodon server ili kompatibilna platforma ako nemate nalog na ovom.",
   "interaction_modal.title.favourite": "Označi objavu korisnika {name} kao omiljenu",
   "interaction_modal.title.follow": "Prati {name}",
   "interaction_modal.title.reblog": "Podrži objavu korisnika {name}",
   "interaction_modal.title.reply": "Odgovori na objavu korisnika {name}",
-  "intervals.full.days": "{number, plural, one {# dan} other {# dana}}",
+  "intervals.full.days": "{number, plural, one {# dan} few {# dana} other {# dana}}",
-  "intervals.full.hours": "{number, plural, one {# sat} other {# sati}}",
+  "intervals.full.hours": "{number, plural, one {# sat} few {# sata} other {# sati}}",
-  "intervals.full.minutes": "{number, plural, one {# minut} other {# minuta}}",
+  "intervals.full.minutes": "{number, plural, one {# minut} few {# minuta} other {# minuta}}",
-  "keyboard_shortcuts.back": "da odete nazad",
+  "keyboard_shortcuts.back": "Idi nazad",
-  "keyboard_shortcuts.blocked": "da otvorite listu blokiranih korisnika",
+  "keyboard_shortcuts.blocked": "Otvori listu blokiranih korisnika",
-  "keyboard_shortcuts.boost": "da podržite",
+  "keyboard_shortcuts.boost": "Podrži objavu",
-  "keyboard_shortcuts.column": "da se prebacite na status u jednoj od kolona",
+  "keyboard_shortcuts.column": "Fokusiraj kolonu",
-  "keyboard_shortcuts.compose": "da se prebacite na pisanje novog tuta",
+  "keyboard_shortcuts.compose": "Fokusiraj polje za sastavljanje objave",
   "keyboard_shortcuts.description": "Opis",
-  "keyboard_shortcuts.direct": "da otvorite kolonu za direktne poruke",
+  "keyboard_shortcuts.direct": "za otvaranje kolone direktnih poruka",
-  "keyboard_shortcuts.down": "da se pomerite na dole u listi",
+  "keyboard_shortcuts.down": "Premesti nadole u listi",
-  "keyboard_shortcuts.enter": "da otvorite status",
+  "keyboard_shortcuts.enter": "Otvori objavu",
-  "keyboard_shortcuts.favourite": "da označite kao omiljeno",
+  "keyboard_shortcuts.favourite": "Označi objavu kao omiljenu",
-  "keyboard_shortcuts.favourites": "da otvorite listu favorita",
+  "keyboard_shortcuts.favourites": "Otvori listu omiljenih",
-  "keyboard_shortcuts.federated": "da otvorite združenu vremensku liniju",
+  "keyboard_shortcuts.federated": "Otvori združenu vremensku liniju",
-  "keyboard_shortcuts.heading": "Prečice na tastaturi",
+  "keyboard_shortcuts.heading": "Tasterske prečice",
-  "keyboard_shortcuts.home": "da otvorite vremensku liniju početne",
+  "keyboard_shortcuts.home": "Otvori početnu vremensku liniju",
   "keyboard_shortcuts.hotkey": "Prečica",
-  "keyboard_shortcuts.legend": "da prikažete ovaj podsetnik",
+  "keyboard_shortcuts.legend": "Prikaži ovu legendu",
-  "keyboard_shortcuts.local": "da otvorite lokalnu vremensku liniju",
+  "keyboard_shortcuts.local": "Otvori lokalnu vremensku liniju",
-  "keyboard_shortcuts.mention": "da pomenete autora",
+  "keyboard_shortcuts.mention": "Pomeni autora",
-  "keyboard_shortcuts.muted": "da otvorite listu ućutkanih korisnika",
+  "keyboard_shortcuts.muted": "Otvori listu ignorisanih korisnika",
-  "keyboard_shortcuts.my_profile": "Pogledajte vaš profil",
+  "keyboard_shortcuts.my_profile": "Otvorite svoj profil",
-  "keyboard_shortcuts.notifications": "da otvorite kolonu obaveštenja",
+  "keyboard_shortcuts.notifications": "Otvori kolonu obaveštenja",
-  "keyboard_shortcuts.open_media": "za otvaranje medija",
+  "keyboard_shortcuts.open_media": "Otvori multimediju",
-  "keyboard_shortcuts.pinned": "da otvorite listu zakačenih truba",
+  "keyboard_shortcuts.pinned": "Otvori listu zakačenih objava",
-  "keyboard_shortcuts.profile": "Pogledajte profil autora",
+  "keyboard_shortcuts.profile": "Otvori profil autora",
-  "keyboard_shortcuts.reply": "da odgovorite",
+  "keyboard_shortcuts.reply": "Odgovori na objavu",
-  "keyboard_shortcuts.requests": "da otvorite listu primljenih zahteva za praćenje",
+  "keyboard_shortcuts.requests": "Otvori listu zahteva za praćenje",
-  "keyboard_shortcuts.search": "da se prebacite na pretragu",
+  "keyboard_shortcuts.search": "Fokusiraj traku pretrage",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "Prikaži/sakrij polje teksta upozorenja o sadržaju (CW)",
-  "keyboard_shortcuts.start": "da otvorite kolonu \"počnimo\"",
+  "keyboard_shortcuts.start": "Otvori kolonu „prvi koraci”",
-  "keyboard_shortcuts.toggle_hidden": "da prikažete/sakrijte tekst iza CW-a",
+  "keyboard_shortcuts.toggle_hidden": "Prikaži/sakrij tekst iza CW-a",
-  "keyboard_shortcuts.toggle_sensitivity": "za prikazivanje/sakrivanje medija",
+  "keyboard_shortcuts.toggle_sensitivity": "Prikaži/sakrij multimediju",
   "keyboard_shortcuts.toot": "Započni novu objavu",
-  "keyboard_shortcuts.unfocus": "da odfokusirate/ne budete više na pretrazi/pravljenju nove trube",
+  "keyboard_shortcuts.unfocus": "Ukloni fokus sa polja za unos teksta/pretrage",
-  "keyboard_shortcuts.up": "da se pomerite na gore u listi",
+  "keyboard_shortcuts.up": "Premesti nagore u listi",
   "lightbox.close": "Zatvori",
-  "lightbox.compress": "Umanji pregled slike",
+  "lightbox.compress": "Komprimuj okvir za prikaz slike",
-  "lightbox.expand": "Uvećaj pregled slike",
+  "lightbox.expand": "Proširi okvir za prikaz slike",
-  "lightbox.next": "Sledeći",
+  "lightbox.next": "Sledeće",
-  "lightbox.previous": "Prethodni",
+  "lightbox.previous": "Prethodno",
   "limited_account_hint.action": "Ipak prikaži profil",
   "limited_account_hint.title": "Ovaj profil su sakrili moderatori {domain}.",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni sa liste",
-  "lists.delete": "Obriši listu",
+  "lists.delete": "Izbriši listu",
-  "lists.edit": "Izmeni listu",
+  "lists.edit": "Uredi listu",
   "lists.edit.submit": "Promeni naslov",
   "lists.new.create": "Dodaj listu",
   "lists.new.title_placeholder": "Naslov nove liste",
@@ -353,31 +353,31 @@
   "lists.search": "Pretraži među ljudima koje pratite",
   "lists.subheading": "Vaše liste",
   "load_pending": "{count, plural, one {# nova stavka} few {# nove stavke} other {# novih stavki}}",
-  "loading_indicator.label": "Učitavam...",
+  "loading_indicator.label": "Učitavanje...",
-  "media_gallery.toggle_visible": "Uključi/isključi vidljivost",
+  "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
   "missing_indicator.label": "Nije pronađeno",
-  "missing_indicator.sublabel": "Ovaj resurs nije pronađen",
+  "missing_indicator.sublabel": "Ovaj resurs nije moguće pronaći",
-  "moved_to_account_banner.text": "Tvoj nalog {disabledAccount} je trenutno onemogućen jer si prešao na {movedToAccount}.",
+  "moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
   "mute_modal.duration": "Trajanje",
-  "mute_modal.hide_notifications": "Sakrij obaveštenja od ovog korisnika?",
+  "mute_modal.hide_notifications": "Sakriti obaveštenja od ovog korisnika?",
   "mute_modal.indefinite": "Neodređen",
-  "navigation_bar.about": "O",
+  "navigation_bar.about": "Osnovni podaci",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.bookmarks": "Obeleživači",
   "navigation_bar.community_timeline": "Lokalna vremenska linija",
-  "navigation_bar.compose": "Sastavite novu trubu",
+  "navigation_bar.compose": "Sastavi novu objavu",
   "navigation_bar.direct": "Direktne poruke",
   "navigation_bar.discover": "Otkrij",
-  "navigation_bar.domain_blocks": "Sakriveni domeni",
+  "navigation_bar.domain_blocks": "Blokirani domeni",
   "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
-  "navigation_bar.favourites": "Omiljene",
+  "navigation_bar.favourites": "Omiljeno",
-  "navigation_bar.filters": "Prigušene reči",
+  "navigation_bar.filters": "Ignorisane reči",
   "navigation_bar.follow_requests": "Zahtevi za praćenje",
   "navigation_bar.follows_and_followers": "Praćenja i pratioci",
   "navigation_bar.lists": "Liste",
   "navigation_bar.logout": "Odjava",
-  "navigation_bar.mutes": "Ućutkani korisnici",
+  "navigation_bar.mutes": "Ignorisani korisnici",
   "navigation_bar.personal": "Lično",
   "navigation_bar.pins": "Zakačene objave",
   "navigation_bar.preferences": "Podešavanja",
@@ -387,19 +387,19 @@
   "not_signed_in_indicator.not_signed_in": "Morate da se prijavite da pristupite ovom resursu.",
   "notification.admin.report": "{name} je prijavio {target}",
   "notification.admin.sign_up": "{name} se registrovao",
-  "notification.favourite": "{name} je stavio/la Vaš status kao omiljeni",
+  "notification.favourite": "{name} je označio vašu objavu kao omiljenu",
-  "notification.follow": "{name} Vas je zapratio/la",
+  "notification.follow": "{name} vas je zapratio",
-  "notification.follow_request": "{name} je zatražio da Vas zaprati",
+  "notification.follow_request": "{name} je zatražio da vas prati",
-  "notification.mention": "{name} Vas je pomenuo/la",
+  "notification.mention": "{name} vas je pomenuo",
   "notification.own_poll": "Vaša anketa je završena",
   "notification.poll": "Završena je anketa u kojoj ste glasali",
-  "notification.reblog": "{name} je podržao/la Vaš status",
+  "notification.reblog": "{name} je podržao vašu objavu",
-  "notification.status": "{name} upravo objavio",
+  "notification.status": "{name} je upravo objavio",
-  "notification.update": "{name} je izmenio objavu",
+  "notification.update": "{name} je uredio objavu",
-  "notifications.clear": "Očisti obaveštenja",
+  "notifications.clear": "Obriši obaveštenja",
-  "notifications.clear_confirmation": "Da li ste sigurno da trajno želite da očistite Vaša obaveštenja?",
+  "notifications.clear_confirmation": "Da li ste sigurni da želite trajno da obrišete sva vaša obaveštenja?",
   "notifications.column_settings.admin.report": "Nove prijave:",
-  "notifications.column_settings.admin.sign_up": "Nove prijave:",
+  "notifications.column_settings.admin.sign_up": "Nove ragistracije:",
   "notifications.column_settings.alert": "Obaveštenja na radnoj površini",
   "notifications.column_settings.favourite": "Omiljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži sve kategorije",
@@ -409,18 +409,18 @@
   "notifications.column_settings.follow_request": "Novi zahtevi za praćenje:",
   "notifications.column_settings.mention": "Pominjanja:",
   "notifications.column_settings.poll": "Rezultati ankete:",
-  "notifications.column_settings.push": "Guraj obaveštenja",
+  "notifications.column_settings.push": "Prosleđena obaveštenja",
-  "notifications.column_settings.reblog": "Podrški:",
+  "notifications.column_settings.reblog": "Podržavanja:",
   "notifications.column_settings.show": "Prikaži u koloni",
-  "notifications.column_settings.sound": "Puštaj zvuk",
+  "notifications.column_settings.sound": "Reprodukuj zvuk",
-  "notifications.column_settings.status": "Novi tutovi:",
+  "notifications.column_settings.status": "Nove objave:",
   "notifications.column_settings.unread_notifications.category": "Nepročitana obaveštenja",
   "notifications.column_settings.unread_notifications.highlight": "Istakni nepročitana obaveštenja",
-  "notifications.column_settings.update": "Izmene:",
+  "notifications.column_settings.update": "Uređivanja:",
   "notifications.filter.all": "Sve",
-  "notifications.filter.boosts": "Podrški",
+  "notifications.filter.boosts": "Podržavanja",
-  "notifications.filter.favourites": "Omiljene",
+  "notifications.filter.favourites": "Omiljeno",
-  "notifications.filter.follows": "Praćeni",
+  "notifications.filter.follows": "Praćenja",
   "notifications.filter.mentions": "Pominjanja",
   "notifications.filter.polls": "Rezultati ankete",
   "notifications.filter.statuses": "Ažuriranja od ljudi koje pratite",
@@ -431,65 +431,65 @@
   "notifications.permission_denied_alert": "Obaveštenja na radnoj površini ne mogu biti omogućena, jer je dozvola pregledača ranije bila odbijena",
   "notifications.permission_required": "Obaveštenja na radnoj površini nisu dostupna jer potrebna dozvola nije dodeljena.",
   "notifications_permission_banner.enable": "Omogućiti obaveštenja na radnoj površini",
-  "notifications_permission_banner.how_to_control": "Da bi primao obaveštenja kada Mastodon nije otvoren, omogući obaveštenja na radnoj površini. Kada su obaveštenja na radnoj površini omogućena vrste interakcija koje ona generišu mogu se podešavati pomoću dugmeta {icon}.",
+  "notifications_permission_banner.how_to_control": "Da biste primali obaveštenja kada Mastodon nije otvoren, omogućite obaveštenja na radnoj površini. Kada su obaveštenja na radnoj površini omogućena vrste interakcija koje ona generišu mogu se podešavati pomoću dugmeta {icon}.",
-  "notifications_permission_banner.title": "Ništa ne propustite",
+  "notifications_permission_banner.title": "Nikada ništa ne propustite",
   "picture_in_picture.restore": "Vrati to nazad",
   "poll.closed": "Zatvoreno",
   "poll.refresh": "Osveži",
   "poll.total_people": "{count, plural, one {# osoba} few {# osobe} other {# osoba}}",
-  "poll.total_votes": "{count, plural, one {# glasanje} few {# glasanja} other {# glasanja}}",
+  "poll.total_votes": "{count, plural, one {# glas} few {# glasa} other {# glasova}}",
   "poll.vote": "Glasajte",
   "poll.voted": "Glasali ste za ovaj odgovor",
-  "poll.votes": "{votes, plural, one {# glas} other {#glasova}}",
+  "poll.votes": "{votes, plural, one {# glas} few {# glasa} other {# glasova}}",
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
-  "privacy.change": "Podesi status privatnosti",
+  "privacy.change": "Promeni privatnost objave",
-  "privacy.direct.long": "Objavi samo korisnicima koji su pomenuti",
+  "privacy.direct.long": "Vidljivo samo za pomenute korisnike",
-  "privacy.direct.short": "Samo za pomenute",
+  "privacy.direct.short": "Samo pomenute osobe",
-  "privacy.private.long": "Objavi samo pratiocima",
+  "privacy.private.long": "Vidljivo samo za pratioce",
   "privacy.private.short": "Samo pratioci",
-  "privacy.public.long": "Vidljivo svima",
+  "privacy.public.long": "Vidljivo za sve",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidljivo svima, ali isključeno iz mogućnosti otkrivanja",
+  "privacy.unlisted.long": "Vidljivo za sve, ali isključeno iz funkcije otkrivanja",
   "privacy.unlisted.short": "Neizlistano",
-  "privacy_policy.last_updated": "Poslednja izmena {date}",
+  "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
   "refresh": "Osveži",
   "regeneration_indicator.label": "Učitavanje…",
   "regeneration_indicator.sublabel": "Vaša početna stranica se priprema!",
-  "relative_time.days": "{number}d",
+  "relative_time.days": "{number} dan.",
-  "relative_time.full.days": "pre {number, plural, one {# dana} other {# dana}}",
+  "relative_time.full.days": "Pre {number, plural, one {# dan} few {# dana} other {# dana}}",
-  "relative_time.full.hours": "pre {number, plural, one {# sat} other {# sati}}",
+  "relative_time.full.hours": "pre {number, plural, one {# sat} few {# sata} other {# sati}}",
   "relative_time.full.just_now": "upravo sad",
-  "relative_time.full.minutes": "pre {number, plural, one {# minut} other {# minuta}}",
+  "relative_time.full.minutes": "pre {number, plural, one {# minut} few {# minuta} other {# minuta}}",
-  "relative_time.full.seconds": "pre {number, plural, one {# sekundu} other {# sekundi}}",
+  "relative_time.full.seconds": "pre {number, plural, one {# sekundu} few {# sekunde} other {# sekundi}}",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "{number} čas.",
   "relative_time.just_now": "sada",
-  "relative_time.minutes": "{number}m",
+  "relative_time.minutes": "{number} min.",
-  "relative_time.seconds": "{number}s",
+  "relative_time.seconds": "{number} sek.",
   "relative_time.today": "danas",
-  "reply_indicator.cancel": "Poništi",
+  "reply_indicator.cancel": "Otkaži",
   "report.block": "Blokiraj",
-  "report.block_explanation": "Nećete videti njegove/njene objave. Ni on/ona neće videti Vaše objave niti će moći da Vas prate. Takođe može da zna da je blokiran(a).",
+  "report.block_explanation": "Nećete videti objave korisnika. Ni on neće videti vaše objave niti će moći da vas prati. Takođe može da zna da je blokiran.",
   "report.categories.other": "Ostalo",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Sadržaj krši jedno ili više pravila servera",
   "report.category.subtitle": "Odaberite najpribližnije",
   "report.category.title": "Recite nam šta je problem sa ovim {type}",
   "report.category.title_account": "profilom",
-  "report.category.title_status": "postom",
+  "report.category.title_status": "objavom",
   "report.close": "Gotovo",
   "report.comment.title": "Da li ima nešto dodatno što treba da znamo?",
   "report.forward": "Proslediti {target}",
   "report.forward_hint": "Nalog je sa drugog servera. Poslati anonimnu kopiju prijave i tamo?",
-  "report.mute": "Ućutkaj",
+  "report.mute": "Ignoriši",
-  "report.mute_explanation": "Nećeš videti njihove objave. Oni i dalje mogu da te prate i vide tvoje objave i neće znati da su utišani.",
+  "report.mute_explanation": "Nećete videti objave korisnika. On i i dalje može da vas prati i vidi vaše objave i neće znati da je ignorisan.",
-  "report.next": "Sledeći",
+  "report.next": "Sledeće",
   "report.placeholder": "Dodatni komentari",
   "report.reasons.dislike": "Ne sviđa mi se",
-  "report.reasons.dislike_description": "Ovo nije nešto što želiš da vidiš",
+  "report.reasons.dislike_description": "Ovo nije nešto što želiš da vidite",
-  "report.reasons.other": "Ovo je nešto drugo",
+  "report.reasons.other": "Nešto drugo",
-  "report.reasons.other_description": "Pitanje se ne uklapa u druge kategorije",
+  "report.reasons.other_description": "Problem se ne uklapa u druge kategorije",
   "report.reasons.spam": "Ovo je spam",
   "report.reasons.spam_description": "Zlonamerne veze, lažno angažovanje ili odgovori koji se ponavljaju",
   "report.reasons.violation": "Krši pravila servera",
@@ -500,13 +500,13 @@
   "report.statuses.title": "Da li postoje bilo kakve objave koje podržavaju ovu prijavu?",
   "report.submit": "Pošalji",
   "report.target": "Prijavljujem {target}",
-  "report.thanks.take_action": "Ovo su Vaše opcije da kontrolišete šta vidite na Mastodonu:",
+  "report.thanks.take_action": "Ovo su Vaše opcije da kontrolišete šta vidite na Mastodon-u:",
-  "report.thanks.take_action_actionable": "Dok mi gledamo, možete primeniti sledeće radnje protiv @{name}:",
+  "report.thanks.take_action_actionable": "Dok mi pregledamo ovo, možete primeniti sledeće radnje protiv @{name}:",
   "report.thanks.title": "Ne želite da vidite ovo?",
   "report.thanks.title_actionable": "Hvala na prijavi, pregledaćemo je.",
   "report.unfollow": "Otprati @{name}",
-  "report.unfollow_explanation": "Pratiš ovaj nalog. Da ne bi više video njihove objave u svojom osnovnom nizu objava, prestani da ih pratiš.",
+  "report.unfollow_explanation": "Pratite ovaj nalog. Da ne biste više videli njegove objave na početnoj stranici, otpratite ga.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} objava} other {{count} objave}} u prilogu",
+  "report_notification.attached_statuses": "{count, plural, one {{count} objava} few {{count} objave} other {{count} objava}} u prilogu",
   "report_notification.categories.other": "Ostalo",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Kršenje pravila",
@@ -514,15 +514,15 @@
   "search.placeholder": "Pretraga",
   "search.search_or_paste": "Pretražite ili unesite adresu",
   "search_popout.search_format": "Napredni format pretrage",
-  "search_popout.tips.full_text": "Jednostavan tekst vraća statuse koje ste napisali, favorizovali, podržali ili bili pomenuti, kao i podudaranje korisničkih imena, prikazanih imena, i taraba.",
+  "search_popout.tips.full_text": "Jednostavan tekst vraća objave koje ste napisali, dodali u omiljene, podržali ili u kojima ste bili pomenuti, kao i podudaranje korisničkih imena, prikazana imena i heš oznake.",
-  "search_popout.tips.hashtag": "hešteg",
+  "search_popout.tips.hashtag": "heš oznaka",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.status": "objava",
-  "search_popout.tips.text": "Traženjem običnog teksta ćete dobiti sva pronađena imena, sva korisnička imena i sve nađene heštegove",
+  "search_popout.tips.text": "Jednostavan tekst vraća podudaranje imena za prikaz, korisnička imena i heš oznake",
   "search_popout.tips.user": "korisnik",
   "search_results.accounts": "Ljudi",
   "search_results.all": "Sve",
-  "search_results.hashtags": "Tarabe",
+  "search_results.hashtags": "Heš oznake",
-  "search_results.nothing_found": "Nema ništa za ovaj termin pretrage",
+  "search_results.nothing_found": "Nije moguće pronaći ništa za ove termine za pretragu",
   "search_results.statuses": "Objave",
   "search_results.statuses_fts_disabled": "Pretraga objava po sadržaju nije omogućena na ovom Mastodon serveru.",
   "search_results.title": "Pretraži {q}",
@@ -536,46 +536,46 @@
   "sign_in_banner.create_account": "Napravi nalog",
   "sign_in_banner.sign_in": "Prijavi se",
   "sign_in_banner.text": "Prijavite se da pratite profile ili heštegove, stavite objave kao omiljene, delite i odgovarate na njih ili komunicirate sa svog naloga sa drugog servera.",
-  "status.admin_account": "Otvori moderatorski interfejs za @{name}",
+  "status.admin_account": "Otvori moderatorsko okruženje za @{name}",
-  "status.admin_status": "Otvori ovaj status u moderatorskom interfejsu",
+  "status.admin_status": "Otvori ovu objavu u moderatorskom okruženju",
   "status.block": "Blokiraj @{name}",
-  "status.bookmark": "Obeleži",
+  "status.bookmark": "Dodaj u obeleživače",
   "status.cancel_reblog_private": "Ukloni podršku",
-  "status.cannot_reblog": "Ovaj status ne može da se podrži",
+  "status.cannot_reblog": "Ova objava se ne može podržati",
-  "status.copy": "Kopiraj vezu na status",
+  "status.copy": "Kopiraj vezu u objavu",
-  "status.delete": "Obriši",
+  "status.delete": "Izbriši",
-  "status.detailed_status": "Detaljni pregled razgovora",
+  "status.detailed_status": "Detaljan prikaz razgovora",
   "status.direct": "Direktna poruka @{name}",
-  "status.edit": "Izmeni",
+  "status.edit": "Uredi",
-  "status.edited": "Izmenjeno {date}",
+  "status.edited": "Uređeno {date}",
-  "status.edited_x_times": "Izmenjeno {count, plural, one {{count} put} other {{count} puta}}",
+  "status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",
-  "status.embed": "Ugradi na sajt",
+  "status.embed": "Ugradi",
   "status.favourite": "Omiljeno",
   "status.filter": "Filtriraj ovu objavu",
   "status.filtered": "Filtrirano",
-  "status.hide": "Sakrij tut",
+  "status.hide": "Sakrij objavu",
   "status.history.created": "{name} napisao/la {date}",
-  "status.history.edited": "{name} izmenio/la {date}",
+  "status.history.edited": "{name} uredio/la {date}",
   "status.load_more": "Učitaj još",
   "status.media_hidden": "Multimedija sakrivena",
-  "status.mention": "Pomeni korisnika @{name}",
+  "status.mention": "Pomeni @{name}",
   "status.more": "Još",
-  "status.mute": "Ućutkaj @{name}",
+  "status.mute": "Ignoriši @{name}",
-  "status.mute_conversation": "Ućutkaj prepisku",
+  "status.mute_conversation": "Ignoriši razgovor",
-  "status.open": "Proširi ovaj status",
+  "status.open": "Proširi ovu objavu",
   "status.pin": "Zakači na profil",
-  "status.pinned": "Zakačena truba",
+  "status.pinned": "Zakačene objave",
   "status.read_more": "Pročitajte više",
   "status.reblog": "Podrži",
-  "status.reblog_private": "Podrži da vidi prvobitna publika",
+  "status.reblog_private": "Podrži sa originalnom vidljivošću",
-  "status.reblogged_by": "{name} podržao/la",
+  "status.reblogged_by": "{name} je podržao/la",
-  "status.reblogs.empty": "Još uvek niko nije podržao ovu trubu. Kada bude podržana, pojaviće se ovde.",
+  "status.reblogs.empty": "Još uvek niko nije podržao ovu objavu. Kada bude podržana, pojaviće se ovde.",
-  "status.redraft": "Izbriši i prepravi",
+  "status.redraft": "Izbriši i preoblikuj",
   "status.remove_bookmark": "Ukloni obeleživač",
   "status.replied_to": "Odgovor za {name}",
   "status.reply": "Odgovori",
   "status.replyAll": "Odgovori na diskusiju",
-  "status.report": "Prijavi korisnika @{name}",
+  "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osetljiv sadržaj",
   "status.share": "Podeli",
   "status.show_filter_reason": "Ipak prikaži",
@@ -587,63 +587,63 @@
   "status.translate": "Prevedi",
   "status.translated_from_with": "Prevedeno sa {lang} koristeći {provider}",
   "status.uncached_media_warning": "Nije dostupno",
-  "status.unmute_conversation": "Uključi prepisku",
+  "status.unmute_conversation": "Ne ignoriši razgovor",
   "status.unpin": "Otkači sa profila",
   "subscribed_languages.lead": "Samo objave na označenim jezicima će se pojavljivati na početnoj liniji i na listama posle ove izmene. Odaberite ništa da primate objave na svim jezicima.",
   "subscribed_languages.save": "Sačuvaj izmene",
   "subscribed_languages.target": "Promeni jezike na koje je {target} prijavljen",
   "suggestions.dismiss": "Odbaci predlog",
-  "suggestions.header": "Možda će Vas zanimati…",
+  "suggestions.header": "Možda će vas zanimati…",
-  "tabs_bar.federated_timeline": "Federisano",
+  "tabs_bar.federated_timeline": "Združeno",
   "tabs_bar.home": "Početna",
   "tabs_bar.local_timeline": "Lokalno",
   "tabs_bar.notifications": "Obaveštenja",
   "time_remaining.days": "Ostalo {number, plural, one {# dan} few {# dana} other {# dana}}",
   "time_remaining.hours": "Ostalo {number, plural, one {# sat} few {# sata} other {# sati}}",
   "time_remaining.minutes": "Ostalo {number, plural, one {# minut} few {# minuta} other {# minuta}}",
-  "time_remaining.moments": "Preostao trenutak",
+  "time_remaining.moments": "Još nekoliko trenutaka",
   "time_remaining.seconds": "Ostalo {number, plural, one {# sekund} few {# sekunde} other {# sekundi}}",
   "timeline_hint.remote_resource_not_displayed": "{resource} sa drugih servera se ne prikazuju.",
   "timeline_hint.resources.followers": "Pratioci",
   "timeline_hint.resources.follows": "Praćeni",
-  "timeline_hint.resources.statuses": "Stariji tut",
+  "timeline_hint.resources.statuses": "Starije objave",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} korisnik} other {{counter} korisnika}} u proteklih {days, plural, one {dan} other {{days} dana}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} osobe} other {{counter} osoba}} u proteklih {days, plural, one {dan} few {{days} dana} other {{days} dana}}",
   "trends.trending_now": "U trendu sada",
-  "ui.beforeunload": "Ako napustite Mastodon, izgubićete napisani nacrt.",
+  "ui.beforeunload": "Vaš nacrt će biti izgubljen ako napustite Mastodon.",
-  "units.short.billion": "{count}B",
+  "units.short.billion": "{count} mlrd.",
-  "units.short.million": "{count}B",
+  "units.short.million": "{count} mil.",
-  "units.short.thousand": "{count}K",
+  "units.short.thousand": "{count} hilj.",
-  "upload_area.title": "Prevucite ovde da otpremite",
+  "upload_area.title": "Prevucite i otpustite za otpremanje",
-  "upload_button.label": "Dodaj multimediju (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "Dodaj slike, video ili audio datoteku",
-  "upload_error.limit": "Dostignuto ograničenje veličine za otpremanje.",
+  "upload_error.limit": "Dostignuto je ograničenje za otpremanje datoteka.",
   "upload_error.poll": "Otpremanje datoteka nije dozvoljeno sa anketama.",
-  "upload_form.audio_description": "Opišite za ljude sa oštećenjem sluha",
+  "upload_form.audio_description": "Opišite za osobe sa oštećenim sluhom",
   "upload_form.description": "Opišite za osobe sa oštećenim vidom",
-  "upload_form.description_missing": "Nema opisa",
+  "upload_form.description_missing": "Nema dodatog opisa",
   "upload_form.edit": "Uredi",
-  "upload_form.thumbnail": "Promeni prikaz slika",
+  "upload_form.thumbnail": "Promeni sličicu",
-  "upload_form.undo": "Obriši",
+  "upload_form.undo": "Izbriši",
-  "upload_form.video_description": "Opišite za ljude sa oštećenjem sluha ili vida",
+  "upload_form.video_description": "Opišite za osobe sa oštećenim sluhom ili vidom",
-  "upload_modal.analyzing_picture": "Analiza slike…",
+  "upload_modal.analyzing_picture": "Analiziranje slike…",
   "upload_modal.apply": "Primeni",
-  "upload_modal.applying": "Primenjujem…",
+  "upload_modal.applying": "Primena…",
-  "upload_modal.choose_image": "Izaberi sliku",
+  "upload_modal.choose_image": "Odaberite sliku",
   "upload_modal.description_placeholder": "Ljubazni fenjerdžija čađavog lica hoće da mi pokaže štos",
   "upload_modal.detect_text": "Otkrij tekst sa slike",
-  "upload_modal.edit_media": "Uredi miltimedijum",
+  "upload_modal.edit_media": "Uredi miltimediju",
-  "upload_modal.hint": "Klikni ili prevuci kružić na pregledu da bi izabrao tačku fokusa koja će uvek biti vidljiva na svim sličicama.",
+  "upload_modal.hint": "Kliknite ili prevucite kružić na pregledu za izbor tačke fokusa koja će uvek biti vidljiva na svim sličicama.",
   "upload_modal.preparing_ocr": "Priprema OCR-a…",
   "upload_modal.preview_label": "Pregled ({ratio})",
-  "upload_progress.label": "Otpremam...",
+  "upload_progress.label": "Otpremanje...",
   "upload_progress.processing": "Obrada…",
   "video.close": "Zatvori video",
   "video.download": "Preuzimanje datoteke",
-  "video.exit_fullscreen": "Napusti ceo ekran",
+  "video.exit_fullscreen": "Izađi iz režima celog ekrana",
   "video.expand": "Proširi video",
   "video.fullscreen": "Ceo ekran",
   "video.hide": "Sakrij video",
-  "video.mute": "Ugasi zvuk",
+  "video.mute": "Isključi zvuk",
   "video.pause": "Pauziraj",
-  "video.play": "Pusti",
+  "video.play": "Reprodukuj",
-  "video.unmute": "Vrati zvuk"
+  "video.unmute": "Uključi zvuk"
 }

app/javascript/mastodon/locales/sr.json

@@ -46,9 +46,9 @@
   "account.media": "Мултимедија",
   "account.mention": "Помени корисника @{name}",
   "account.moved_to": "Корисник {name} је назначио да је његов нови налог сада:",
-  "account.mute": "Ућуткај корисника @{name}",
+  "account.mute": "Игнориши корисника @{name}",
-  "account.mute_notifications": "Искључи обавештења од корисника @{name}",
+  "account.mute_notifications": "Игнориши обавештења од @{name}",
-  "account.muted": "Ућуткан",
+  "account.muted": "Игнорисан",
   "account.open_original_page": "Отвори оригиналну страницу",
   "account.posts": "Објаве",
   "account.posts_with_replies": "Објаве и одговори",
@@ -62,9 +62,9 @@
   "account.unblock_short": "Одблокирај",
   "account.unendorse": "Не истичи на профилу",
   "account.unfollow": "Отпрати",
-  "account.unmute": "Искључи ућуткавање кориснику @{name}",
+  "account.unmute": "Не игнориши @{name}",
-  "account.unmute_notifications": "Укључи поново обавештења од корисника @{name}",
+  "account.unmute_notifications": "Не игнориши обавештења од @{name}",
-  "account.unmute_short": "Искључи ућуткивање",
+  "account.unmute_short": "Не игнориши",
   "account_note.placeholder": "Кликните да додате напомену",
   "admin.dashboard.daily_retention": "Стопа задржавања корисника по данима након регистрације",
   "admin.dashboard.monthly_retention": "Стопа задржавања корисника по месецима након регистрације",
@@ -97,21 +97,21 @@
   "closed_registrations_modal.find_another_server": "Пронађите други сервер",
   "closed_registrations_modal.preamble": "Mastodon је децентрализован, тако да без обзира где креирате свој налог, моћи ћете да пратите и комуницирате са било ким на овом серверу. Можете чак и сами да га хостујете!",
   "closed_registrations_modal.title": "Регистрација за Mastodon",
-  "column.about": "О",
+  "column.about": "Основни подаци",
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Обележивачи",
   "column.community": "Локална временска линија",
   "column.direct": "Директне поруке",
   "column.directory": "Прегледај профиле",
   "column.domain_blocks": "Блокирани домени",
-  "column.favourites": "Омиљене",
+  "column.favourites": "Омиљено",
   "column.follow_requests": "Захтеви за праћење",
   "column.home": "Почетна",
   "column.lists": "Листе",
-  "column.mutes": "Ућуткани корисници",
+  "column.mutes": "Игнорисани корисници",
   "column.notifications": "Обавештења",
   "column.pins": "Закачене објаве",
-  "column.public": "Спољна временска линија",
+  "column.public": "Здружена временска линија",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Сакриј подешавања",
   "column_header.moveLeft_settings": "Премести колону улево",
@@ -130,7 +130,7 @@
   "compose_form.hashtag_warning": "Ова објава неће бити наведена ни под једном хеш ознаком јер је ненаведена. Само јавне објаве могу се претраживати по хеш ознакама.",
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да вас прати и да види ваше објаве намењене само за ваше пратиоце.",
   "compose_form.lock_disclaimer.lock": "закључан",
-  "compose_form.placeholder": "Шта вам је на уму?",
+  "compose_form.placeholder": "О чему размишљате?",
   "compose_form.poll.add_option": "Додајте избор",
   "compose_form.poll.duration": "Трајање анкете",
   "compose_form.poll.option_placeholder": "Избор {number}",
@@ -160,21 +160,21 @@
   "confirmations.discard_edit_media.confirm": "Одбаци",
   "confirmations.discard_edit_media.message": "Имате несачуване промене у опису или прегледу медија, да ли ипак хоћете да их одбаците?",
   "confirmations.domain_block.confirm": "Блокирај цео домен",
-  "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, довољно је и пожељно неколико циљаних блокирања или ућуткивања. Нећете видети садржај са тог домена ни у једној јавној временској линији или у вашим обавештењима. Ваши пратиоци са тог домена ће бити уклоњени.",
+  "confirmations.domain_block.message": "Да ли сте заиста сигурни да желите да блокирате цео домен {domain}? У већини случајева, довољно је и пожељно неколико циљаних блокирања или игнорисања. Нећете видети садржај са тог домена ни у једној јавној временској линији или у вашим обавештењима. Ваши пратиоци са тог домена ће бити уклоњени.",
   "confirmations.logout.confirm": "Одјави се",
   "confirmations.logout.message": "Да ли се сигурни да желите да се одјавите?",
-  "confirmations.mute.confirm": "Ућуткај",
+  "confirmations.mute.confirm": "Игнориши",
-  "confirmations.mute.explanation": "Ово ће сакрити објаве од њих и објаве које их помињу, али ће им и даље бити дозвољено да виде ваше објаве и да вас запрате.",
+  "confirmations.mute.explanation": "Ово ће сакрити објаве од корисника и објаве које га помињу, али ће му и даље бити дозвољено да види ваше објаве и да вас прати.",
-  "confirmations.mute.message": "Да ли стварно желите да ућуткате корисника {name}?",
+  "confirmations.mute.message": "Да ли стварно желите да игноришете корисника {name}?",
   "confirmations.redraft.confirm": "Избриши и преправи",
   "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете ову објаву и да је преправите? Подржавања и ознаке као омиљених ће бити изгубљени, а одговори ће остати без оригиналне објаве.",
   "confirmations.reply.confirm": "Одговори",
   "confirmations.reply.message": "Одговарањем ћете обрисати поруку коју састављате. Да ли сигурни да желите да наставите?",
   "confirmations.unfollow.confirm": "Отпрати",
   "confirmations.unfollow.message": "Да ли сте сигурни да желите да отпратите корисника {name}?",
-  "conversation.delete": "Избриши преписку",
+  "conversation.delete": "Избриши разговор",
   "conversation.mark_as_read": "Означи као прочитано",
-  "conversation.open": "Прикажи преписку",
+  "conversation.open": "Прикажи разговор",
   "conversation.with": "Са {names}",
   "copypaste.copied": "Копирано",
   "copypaste.copy": "Копирај",
@@ -184,12 +184,12 @@
   "directory.recently_active": "Недавно активни",
   "disabled_account_banner.account_settings": "Подешавања налога",
   "disabled_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен.",
-  "dismissable_banner.community_timeline": "Ово су најновије јавне објаве корисника чије налоге хостује {domain}.",
+  "dismissable_banner.community_timeline": "Ово су најновије јавне објаве људи чије налоге хостује {domain}.",
   "dismissable_banner.dismiss": "Одбаци",
   "dismissable_banner.explore_links": "О овим вестима управо сада разговарају људи на овом и другим серверима децентрализоване мреже.",
   "dismissable_banner.explore_statuses": "Ове објаве са овог и других сервера у децентрализованој мрежи постају све популарније на овом серверу.",
-  "dismissable_banner.explore_tags": "Ове хеш ознаке постају све популарније међу корисницима на овом и другим серверима децентрализоване мреже.",
+  "dismissable_banner.explore_tags": "Ове хеш ознаке постају све популарније међу људима на овом и другим серверима децентрализоване мреже.",
-  "dismissable_banner.public_timeline": "Ово су најновије јавне објаве корисника на овом и другим серверима децентрализоване мреже за које овај сервер зна.",
+  "dismissable_banner.public_timeline": "Ово су најновије јавне објаве људи на овом и другим серверима децентрализоване мреже за које овај сервер зна.",
   "embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.",
   "embed.preview": "Ево како ће то изгледати:",
   "emoji_button.activity": "Активност",
@@ -225,7 +225,7 @@
   "empty_column.home.suggestions": "Погледајте неке предлоге",
   "empty_column.list": "У овој листи још нема ничега. Када чланови ове листе објаве нешто ново, појавиће се овде.",
   "empty_column.lists": "Још увек немате ниједну листу. Када направите једну, појавиће се овде.",
-  "empty_column.mutes": "Још увек нисте ућуткали ниједног корисника.",
+  "empty_column.mutes": "Још увек не игноришете ниједног корисника.",
   "empty_column.notifications": "Још увек немате никаква обавештења. Када други људи буду у интеракцији са вама, видећете то овде.",
   "empty_column.public": "Овде нема ничега! Напишите нешто јавно или ручно пратите кориснике са других сервера да бисте ово попунили",
   "error.unexpected_crash.explanation": "Због грешке у нашем коду или проблема са компатибилношћу прегледача, ова страница се није могла правилно приказати.",
@@ -253,12 +253,12 @@
   "filter_modal.select_filter.title": "Филтрирај ову објаву",
   "filter_modal.title.status": "Филтрирај објаву",
   "follow_recommendations.done": "Готово",
-  "follow_recommendations.heading": "Пратите корснике чије објаве желите да видите! Ево неких предлога.",
+  "follow_recommendations.heading": "Пратите људе чије објаве желите да видите! Ево неких предлога.",
   "follow_recommendations.lead": "Објаве корисника које пратите ће се појављивати хронолошким редоследом на почетној страници. Не плашите се грешака, можете отпратити кориснике у било ком тренутку!",
   "follow_request.authorize": "Одобри",
   "follow_request.reject": "Одбиј",
   "follow_requests.unlocked_explanation": "Иако ваш налог није закључан, особље {domain} сматра да бисте можда желели да ручно прегледате захтеве за праћење са ових налога.",
-  "footer.about": "О",
+  "footer.about": "Основни подаци",
   "footer.directory": "Директоријум профила",
   "footer.get_app": "Преузмите апликацију",
   "footer.invite": "Позови особе",
@@ -307,16 +307,16 @@
   "keyboard_shortcuts.direct": "за отварање колоне директних порука",
   "keyboard_shortcuts.down": "Премести надоле у листи",
   "keyboard_shortcuts.enter": "Отвори објаву",
-  "keyboard_shortcuts.favourite": "Омиљена објава",
+  "keyboard_shortcuts.favourite": "Означи објаву као омиљену",
   "keyboard_shortcuts.favourites": "Отвори листу омиљених",
-  "keyboard_shortcuts.federated": "Отвори спољну временску линију",
+  "keyboard_shortcuts.federated": "Отвори здружену временску линију",
   "keyboard_shortcuts.heading": "Тастерске пречице",
-  "keyboard_shortcuts.home": "Отвори временску линију почетне странице",
+  "keyboard_shortcuts.home": "Отвори почетну временску линију",
   "keyboard_shortcuts.hotkey": "Пречица",
   "keyboard_shortcuts.legend": "Прикажи ову легенду",
   "keyboard_shortcuts.local": "Отвори локалну временску линију",
   "keyboard_shortcuts.mention": "Помени аутора",
-  "keyboard_shortcuts.muted": "Отвори листу ућутканих корисника",
+  "keyboard_shortcuts.muted": "Отвори листу игнорисаних корисника",
   "keyboard_shortcuts.my_profile": "Отворите свој профил",
   "keyboard_shortcuts.notifications": "Отвори колону обавештења",
   "keyboard_shortcuts.open_media": "Отвори мултимедију",
@@ -361,7 +361,7 @@
   "mute_modal.duration": "Трајање",
   "mute_modal.hide_notifications": "Сакрити обавештења од овог корисника?",
   "mute_modal.indefinite": "Неодређен",
-  "navigation_bar.about": "О",
+  "navigation_bar.about": "Основни подаци",
   "navigation_bar.blocks": "Блокирани корисници",
   "navigation_bar.bookmarks": "Обележивачи",
   "navigation_bar.community_timeline": "Локална временска линија",
@@ -371,17 +371,17 @@
   "navigation_bar.domain_blocks": "Блокирани домени",
   "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.explore": "Истражи",
-  "navigation_bar.favourites": "Омиљене",
+  "navigation_bar.favourites": "Омиљено",
-  "navigation_bar.filters": "Пригушене речи",
+  "navigation_bar.filters": "Игнорисане речи",
   "navigation_bar.follow_requests": "Захтеви за праћење",
   "navigation_bar.follows_and_followers": "Праћења и пратиоци",
   "navigation_bar.lists": "Листе",
   "navigation_bar.logout": "Одјава",
-  "navigation_bar.mutes": "Ућуткани корисници",
+  "navigation_bar.mutes": "Игнорисани корисници",
   "navigation_bar.personal": "Лично",
   "navigation_bar.pins": "Закачене објаве",
   "navigation_bar.preferences": "Подешавања",
-  "navigation_bar.public_timeline": "Спољна временска линија",
+  "navigation_bar.public_timeline": "Здружена временска линија",
   "navigation_bar.search": "Претрага",
   "navigation_bar.security": "Безбедност",
   "not_signed_in_indicator.not_signed_in": "Морате да се пријавите да приступите овом ресурсу.",
@@ -419,7 +419,7 @@
   "notifications.column_settings.update": "Уређивања:",
   "notifications.filter.all": "Све",
   "notifications.filter.boosts": "Подржавања",
-  "notifications.filter.favourites": "Омиљене",
+  "notifications.filter.favourites": "Омиљено",
   "notifications.filter.follows": "Праћења",
   "notifications.filter.mentions": "Помињања",
   "notifications.filter.polls": "Резултати анкете",
@@ -470,7 +470,7 @@
   "relative_time.today": "данас",
   "reply_indicator.cancel": "Откажи",
   "report.block": "Блокирај",
-  "report.block_explanation": "Нећете видети његове/њене објаве. Ни он/она неће видети Ваше објаве нити ће моћи да Вас прате. Такође може да зна да је блокиран(а).",
+  "report.block_explanation": "Нећете видети објаве корисника. Ни он неће видети ваше објаве нити ће моћи да вас прати. Такође може да зна да је блокиран.",
   "report.categories.other": "Остало",
   "report.categories.spam": "Спам",
   "report.categories.violation": "Садржај крши једно или више правила сервера",
@@ -482,8 +482,8 @@
   "report.comment.title": "Да ли има нешто додатно што треба да знамо?",
   "report.forward": "Проследити {target}",
   "report.forward_hint": "Налог је са другог сервера. Послати анонимну копију пријаве и тамо?",
-  "report.mute": "Ућуткај",
+  "report.mute": "Игнориши",
-  "report.mute_explanation": "Нећете видети његове/њене објаве. Он/она и и даље могу да вас прате и виде ваше објаве и неће знати да су ућуткани.",
+  "report.mute_explanation": "Нећете видети објаве корисника. Он и и даље може да вас прати и види ваше објаве и неће знати да је игнорисан.",
   "report.next": "Следеће",
   "report.placeholder": "Додатни коментари",
   "report.reasons.dislike": "Не свиђа ми се",
@@ -519,7 +519,7 @@
   "search_popout.tips.status": "објава",
   "search_popout.tips.text": "Једноставан текст враћа подударање имена за приказ, корисничка имена и хеш ознаке",
   "search_popout.tips.user": "корисник",
-  "search_results.accounts": "Особе",
+  "search_results.accounts": "Људи",
   "search_results.all": "Све",
   "search_results.hashtags": "Хеш ознаке",
   "search_results.nothing_found": "Није могуће пронаћи ништа за ове термине за претрагу",
@@ -544,7 +544,7 @@
   "status.cannot_reblog": "Ова објава се не може подржати",
   "status.copy": "Копирај везу у објаву",
   "status.delete": "Избриши",
-  "status.detailed_status": "Детаљни приказ разговора",
+  "status.detailed_status": "Детаљан приказ разговора",
   "status.direct": "Директна порука @{name}",
   "status.edit": "Уреди",
   "status.edited": "Уређено {date}",
@@ -560,8 +560,8 @@
   "status.media_hidden": "Мултимедија сакривена",
   "status.mention": "Помени @{name}",
   "status.more": "Још",
-  "status.mute": "Ућуткај @{name}",
+  "status.mute": "Игнориши @{name}",
-  "status.mute_conversation": "Ућуткај преписку",
+  "status.mute_conversation": "Игнориши разговор",
   "status.open": "Прошири ову објаву",
   "status.pin": "Закачи на профил",
   "status.pinned": "Закачене објаве",
@@ -587,14 +587,14 @@
   "status.translate": "Преведи",
   "status.translated_from_with": "Преведено са {lang} користећи {provider}",
   "status.uncached_media_warning": "Није доступно",
-  "status.unmute_conversation": "Укључи преписку",
+  "status.unmute_conversation": "Не игнориши разговор",
   "status.unpin": "Откачи са профила",
   "subscribed_languages.lead": "Само објаве на означеним језицима ће се појављивати на почетној линији и на листама после ове измене. Одаберите ништа да примате објаве на свим језицима.",
   "subscribed_languages.save": "Сачувај измене",
   "subscribed_languages.target": "Промени језике на које је {target} пријављен",
   "suggestions.dismiss": "Одбаци предлог",
   "suggestions.header": "Можда ће вас занимати…",
-  "tabs_bar.federated_timeline": "Спољно",
+  "tabs_bar.federated_timeline": "Здружено",
   "tabs_bar.home": "Почетна",
   "tabs_bar.local_timeline": "Локално",
   "tabs_bar.notifications": "Обавештења",
@@ -607,7 +607,7 @@
   "timeline_hint.resources.followers": "Пратиоци",
   "timeline_hint.resources.follows": "Праћени",
   "timeline_hint.resources.statuses": "Старије објаве",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} корисник} other {{counter} корисника}} у протеклих {days, plural, one {дан} other {{days} дана}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} особа} few {{counter} особе} other {{counter} особа}} у протеклих {days, plural, one {дан} few {{days} дана} other {{days} дана}}",
   "trends.trending_now": "У тренду сада",
   "ui.beforeunload": "Ваш нацрт ће бити изгубљен ако напустите Mastodon.",
   "units.short.billion": "{count} млрд.",

app/javascript/mastodon/locales/th.json

@@ -230,8 +230,8 @@
   "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมเส้นเวลาให้เต็ม",
   "error.unexpected_crash.explanation": "เนื่องจากข้อบกพร่องในโค้ดของเราหรือปัญหาความเข้ากันได้ของเบราว์เซอร์ จึงไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง",
   "error.unexpected_crash.explanation_addons": "ไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง ข้อผิดพลาดนี้เป็นไปได้ว่าเกิดจากส่วนเสริมของเบราว์เซอร์หรือเครื่องมือการแปลอัตโนมัติ",
-  "error.unexpected_crash.next_steps": "ลองรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอป",
+  "error.unexpected_crash.next_steps": "ลองรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอปเนทีฟ",
-  "error.unexpected_crash.next_steps_addons": "ลองปิดใช้งานส่วนเสริมหรือเครื่องมือแล้วรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอป",
+  "error.unexpected_crash.next_steps_addons": "ลองปิดใช้งานส่วนเสริมหรือเครื่องมือแล้วรีเฟรชหน้า หากนั่นไม่ช่วย คุณอาจยังสามารถใช้ Mastodon ได้ผ่านเบราว์เซอร์อื่นหรือแอปเนทีฟ",
   "errors.unexpected_crash.copy_stacktrace": "คัดลอกการติดตามสแตกไปยังคลิปบอร์ด",
   "errors.unexpected_crash.report_issue": "รายงานปัญหา",
   "explore.search_results": "ผลลัพธ์การค้นหา",

app/javascript/mastodon/locales/uk.json

@@ -36,7 +36,7 @@
   "account.following": "Ви стежите",
   "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписки}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
-  "account.follows_you": "Підписані на вас",
+  "account.follows_you": "Підписується на вас",
   "account.go_to_profile": "Перейти до профілю",
   "account.hide_reblogs": "Сховати поширення від @{name}",
   "account.joined_short": "Дата приєднання",

app/javascript/mastodon/locales/vi.json

@@ -554,8 +554,8 @@
   "status.filter": "Lọc tút này",
   "status.filtered": "Bộ lọc",
   "status.hide": "Ẩn tút",
-  "status.history.created": "{name} tạo lúc {date}",
+  "status.history.created": "{name} tạo vào {date}",
-  "status.history.edited": "{name} sửa lúc {date}",
+  "status.history.edited": "{name} sửa vào {date}",
   "status.load_more": "Tải thêm",
   "status.media_hidden": "Đã ẩn",
   "status.mention": "Nhắc đến @{name}",
@@ -572,7 +572,7 @@
   "status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
   "status.redraft": "Xóa và viết lại",
   "status.remove_bookmark": "Bỏ lưu",
-  "status.replied_to": "Trả lời đến {name}",
+  "status.replied_to": "{name} viết tiếp",
   "status.reply": "Trả lời",
   "status.replyAll": "Trả lời người đăng tút",
   "status.report": "Báo cáo @{name}",

app/javascript/mastodon/locales/whitelist_de.json

@@ -1,7 +1,4 @@
 [
-  "relative_time.seconds",
-  "relative_time.minutes",
-  "relative_time.hours",
   "account.badges.bot",
   "compose_form.publish_loud",
   "search_results.hashtags"

app/javascript/mastodon/locales/zh-CN.json

@@ -372,7 +372,7 @@
   "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
-  "navigation_bar.filters": "隐藏关键词",
+  "navigation_bar.filters": "忽略的关键词",
   "navigation_bar.follow_requests": "关注请求",
   "navigation_bar.follows_and_followers": "关注管理",
   "navigation_bar.lists": "列表",

app/javascript/mastodon/locales/zh-TW.json

@@ -211,22 +211,22 @@
   "empty_column.account_timeline": "這裡還沒有嘟文！",
   "empty_column.account_unavailable": "無法取得個人檔案",
   "empty_column.blocks": "您還沒有封鎖任何使用者。",
-  "empty_column.bookmarked_statuses": "您還沒建立任何書籤。當您建立書籤時，它將於此顯示。",
+  "empty_column.bookmarked_statuses": "您還沒有建立任何書籤。當您建立書籤時，它將於此顯示。",
   "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
   "empty_column.direct": "您還沒有任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
   "empty_column.domain_blocks": "尚未封鎖任何網域。",
   "empty_column.explore_statuses": "目前沒有熱門討論，請稍候再回來看看！",
-  "empty_column.favourited_statuses": "您還沒加過任何嘟文至最愛。當您收藏嘟文時，它將於此顯示。",
+  "empty_column.favourited_statuses": "您還沒有加過任何嘟文至最愛。當您收藏嘟文時，它將於此顯示。",
   "empty_column.favourites": "還沒有人加過這則嘟文至最愛。當有人收藏嘟文時，它將於此顯示。",
   "empty_column.follow_recommendations": "似乎未能為您產生任何建議。您可以嘗試使用搜尋來尋找您可能認識的人，或是探索熱門主題標籤。",
-  "empty_column.follow_requests": "您尚未收到任何跟隨請求。這裡將會顯示收到的跟隨請求。",
+  "empty_column.follow_requests": "您還沒有收到任何跟隨請求。這裡將會顯示收到的跟隨請求。",
   "empty_column.hashtag": "這個主題標籤下什麼也沒有。",
   "empty_column.home": "您的首頁時間軸是空的！前往 {suggestions} 或使用搜尋功能來認識其他人。",
   "empty_column.home.suggestions": "檢視部份建議",
   "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出了新的嘟文時，它們就會顯示於此。",
   "empty_column.lists": "您還沒有建立任何列表。當您建立列表時，它將於此顯示。",
   "empty_column.mutes": "您尚未靜音任何使用者。",
-  "empty_column.notifications": "您尚未收到任何通知，和別人互動開啟對話吧。",
+  "empty_column.notifications": "您還沒有收到任何通知，當您和別人開始互動時，它將於此顯示。",
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或著自己跟隨其他伺服器的使用者後就會有嘟文出現了",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
   "error.unexpected_crash.explanation_addons": "此頁面無法被正常顯示，這可能是由瀏覽器附加元件或網頁自動翻譯工具造成的。",

app/javascript/mastodon/reducers/status_lists.js

@@ -25,7 +25,7 @@ import {
   TRENDS_STATUSES_EXPAND_SUCCESS,
   TRENDS_STATUSES_EXPAND_FAIL,
 } from '../actions/trends';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 import {
   FAVOURITE_SUCCESS,
   UNFAVOURITE_SUCCESS,
@@ -43,22 +43,22 @@ const initialState = ImmutableMap({
   favourites: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   bookmarks: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   pins: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
   trending: ImmutableMap({
     next: null,
     loaded: false,
-    items: ImmutableList(),
+    items: ImmutableOrderedSet(),
   }),
 });
 
@@ -67,7 +67,7 @@ const normalizeList = (state, listType, statuses, next) => {
     map.set('next', next);
     map.set('loaded', true);
     map.set('isLoading', false);
-    map.set('items', ImmutableList(statuses.map(item => item.id)));
+    map.set('items', ImmutableOrderedSet(statuses.map(item => item.id)));
   }));
 };
 
@@ -75,20 +75,22 @@ const appendToList = (state, listType, statuses, next) => {
   return state.update(listType, listMap => listMap.withMutations(map => {
     map.set('next', next);
     map.set('isLoading', false);
-    map.set('items', map.get('items').concat(statuses.map(item => item.id)));
+    map.set('items', map.get('items').union(statuses.map(item => item.id)));
   }));
 };
 
 const prependOneToList = (state, listType, status) => {
-  return state.update(listType, listMap => listMap.withMutations(map => {
+  return state.updateIn([listType, 'items'], (list) => {
-    map.set('items', map.get('items').unshift(status.get('id')));
+    if (list.includes(status.get('id'))) {
-  }));
+      return list;
+    } else {
+      return ImmutableOrderedSet([status.get('id')]).union(list);
+    }
+  });
 };
 
 const removeOneFromList = (state, listType, status) => {
-  return state.update(listType, listMap => listMap.withMutations(map => {
+  return state.updateIn([listType, 'items'], (list) => list.delete(status.get('id')));
-    map.set('items', map.get('items').filter(item => item !== status.get('id')));
-  }));
 };
 
 export default function statusLists(state = initialState, action) {
@@ -139,7 +141,7 @@ export default function statusLists(state = initialState, action) {
     return removeOneFromList(state, 'pins', action.status);
   case ACCOUNT_BLOCK_SUCCESS:
   case ACCOUNT_MUTE_SUCCESS:
-    return state.updateIn(['trending', 'items'], ImmutableList(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id));
+    return state.updateIn(['trending', 'items'], ImmutableOrderedSet(), list => list.filterNot(statusId => action.statuses.getIn([statusId, 'account']) === action.relationship.id));
   default:
     return state;
   }

app/models/user.rb

@@ -525,7 +525,7 @@ class User < ApplicationRecord
   end
 
   def invite_text_required?
-    Setting.require_invite_text && !invited? && !external? && !bypass_invite_request_check?
+    Setting.require_invite_text && !open_registrations? && !invited? && !external? && !bypass_invite_request_check?
   end
 
   def trigger_webhooks

chart/.helmignore

@@ -1,37 +0,0 @@
-# A helm chart's templates and default values can be packaged into a .tgz file.
-# When doing that, not everything should be bundled into the .tgz file. This
-# file describes what to not bundle.
-#
-# Manually added by us
-# --------------------
-#
-dev-values.yaml
-mastodon-*.tgz
-
-
-# Boilerplate .helmignore from `helm create mastodon`
-# ---------------------------------------------------
-#
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

chart/Chart.lock

@@ -1,12 +0,0 @@
-dependencies:
-- name: elasticsearch
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 19.0.1
-- name: postgresql
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 11.1.3
-- name: redis
-  repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 16.13.2
-digest: sha256:17ea58a3264aa22faff18215c4269f47dabae956d0df273c684972f356416193
-generated: "2022-08-08T21:44:18.0195364+02:00"

chart/Chart.yaml

@@ -1,36 +0,0 @@
-apiVersion: v2
-name: mastodon
-description: Mastodon is a free, open-source social network server based on ActivityPub.
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v4.0.2
-
-dependencies:
-  - name: elasticsearch
-    version: 19.0.1
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-    condition: elasticsearch.enabled
-  - name: postgresql
-    version: 11.1.3
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-    condition: postgresql.enabled
-  - name: redis
-    version: 16.13.2
-    repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami

chart/README.md

@@ -1,103 +1,3 @@
-# Introduction
+# This Helm chart has moved
 
-This is a [Helm](https://helm.sh/) chart for installing Mastodon into a
+The Mastodon Helm chart is now maintained in https://github.com/mastodon/chart.
-Kubernetes cluster.  The basic usage is:
-
-1. edit `values.yaml` or create a separate yaml file for custom values
-1. `helm dep update`
-1. `helm install --namespace mastodon --create-namespace my-mastodon ./ -f path/to/additional/values.yaml`
-
-This chart is tested with k8s 1.21+ and helm 3.6.0+.
-
-# Configuration
-
-The variables that _must_ be configured are:
-
-- password and keys in the `mastodon.secrets`, `postgresql`, and `redis` groups; if
-  left blank, some of those values will be autogenerated, but will not persist
-  across upgrades.
-
-- SMTP settings for your mailer in the `mastodon.smtp` group.
-
-# Administration
-
-You can run [admin CLI](https://docs.joinmastodon.org/admin/tootctl/) commands in the web deployment.
-
-```bash
-kubectl -n mastodon exec -it deployment/mastodon-web -- bash
-tootctl accounts modify admin --reset-password
-```
-
-or
-```bash
-kubectl -n mastodon exec -it deployment/mastodon-web -- tootctl accounts modify admin --reset-password
-```
-
-# Missing features
-
-Currently this chart does _not_ support:
-
-- Hidden services
-- Swift
-
-# Upgrading
-
-Because database migrations are managed as a Job separate from the Rails and
-Sidekiq deployments, it’s possible they will occur in the wrong order.  After
-upgrading Mastodon versions, it may sometimes be necessary to manually delete
-the Rails and Sidekiq pods so that they are recreated against the latest
-migration.
-
-# Upgrades in 2.1.0
-
-## ingressClassName and tls-acme changes
-The annotations previously defaulting to nginx have been removed and support
- for ingressClassName has been added.
-```yaml
-ingress:
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    kubernetes.io/tls-acme: "true"
-```
-
-To restore the old functionality simply add the above snippet to your `values.yaml`,
-but the recommendation is to replace these with `ingress.ingressClassName` and use
-cert-manager's issuer/cluster-issuer instead of tls-acme.
-If you're uncertain about your current setup leave `ingressClassName` empty and add
-`kubernetes.io/tls-acme` to `ingress.annotations` in your `values.yaml`.
-
-# Upgrades in 2.0.0
-
-## Fixed labels
-Because of the changes in [#19706](https://github.com/mastodon/mastodon/pull/19706) the upgrade may fail with the following error:
-```Error: UPGRADE FAILED: cannot patch "mastodon-sidekiq"```
-
-If you want an easy upgrade and you're comfortable with some downtime then
-simply delete the -sidekiq, -web, and -streaming Deployments manually.
-
-If you require a no-downtime upgrade then:
-1. run `helm template` instead of `helm upgrade`
-2. Copy the new -web and -streaming services into `services.yml`
-3. Copy the new -web and -streaming deployments into `deployments.yml`
-4. Append -temp to the name of each deployment in `deployments.yml`
-5. `kubectl apply -f deployments.yml` then wait until all pods are ready
-6. `kubectl apply -f services.yml`
-7. Delete the old -sidekiq, -web, and -streaming deployments manually
-8. `helm upgrade` like normal
-9. `kubectl delete -f deployments.yml` to clear out the temporary deployments
-
-## PostgreSQL passwords
-If you've previously installed the chart and you're having problems with 
-postgres not accepting your password then make sure to set `username` to
-`postgres` and `password` and `postgresPassword` to the same passwords.
-```yaml
-postgresql:
-  auth:
-    username: postgres
-    password: <same password>
-    postgresPassword: <same password>
-```
-
-And make sure to set `password` to the same value as `postgres-password`
-in your `mastodon-postgresql` secret:
-```kubectl edit secret mastodon-postgresql```

chart/dev-values.yaml

@@ -1,25 +0,0 @@
-# Chart values used for testing the Helm chart.
-#
-mastodon:
-  secrets:
-    secret_key_base: dummy-secret_key_base
-    otp_secret: dummy-otp_secret
-    vapid:
-      private_key: dummy-vapid-private_key
-      public_key: dummy-vapid-public_key
-
-# ref: https://github.com/bitnami/charts/tree/main/bitnami/redis#parameters
-redis:
-  replica:
-    replicaCount: 1
-
-# ref: https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch#parameters
-elasticsearch:
-  master:
-    replicaCount: 1
-  data:
-    replicaCount: 1
-  coordinating:
-    replicaCount: 1
-  ingest:
-    replicaCount: 1

chart/templates/NOTES.txt

@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "mastodon.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "mastodon.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "mastodon.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "mastodon.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}

chart/templates/_helpers.tpl

@@ -1,150 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "mastodon.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "mastodon.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "mastodon.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "mastodon.labels" -}}
-helm.sh/chart: {{ include "mastodon.chart" . }}
-{{ include "mastodon.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "mastodon.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "mastodon.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Rolling pod annotations
-*/}}
-{{- define "mastodon.rollingPodAnnotations" -}}
-rollme: {{ .Release.Revision | quote }}
-checksum/config-secrets: {{ include ( print $.Template.BasePath "/secrets.yaml" ) . | sha256sum | quote }}
-checksum/config-configmap: {{ include ( print $.Template.BasePath "/configmap-env.yaml" ) . | sha256sum | quote }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "mastodon.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "mastodon.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create a default fully qualified name for dependent services.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "mastodon.elasticsearch.fullname" -}}
-{{- printf "%s-%s" .Release.Name "elasticsearch" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "mastodon.redis.fullname" -}}
-{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "mastodon.postgresql.fullname" -}}
-{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Get the mastodon secret.
-*/}}
-{{- define "mastodon.secretName" -}}
-{{- if .Values.mastodon.secrets.existingSecret }}
-    {{- printf "%s" (tpl .Values.mastodon.secrets.existingSecret $) -}}
-{{- else -}}
-    {{- printf "%s" (include "common.names.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the postgresql secret.
-*/}}
-{{- define "mastodon.postgresql.secretName" -}}
-{{- if (and (or .Values.postgresql.enabled .Values.postgresql.postgresqlHostname) .Values.postgresql.auth.existingSecret) }}
-    {{- printf "%s" (tpl .Values.postgresql.auth.existingSecret $) -}}
-{{- else if .Values.postgresql.enabled -}}
-    {{- printf "%s-postgresql" (tpl .Release.Name $) -}}
-{{- else -}}
-    {{- printf "%s" (include "common.names.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the redis secret.
-*/}}
-{{- define "mastodon.redis.secretName" -}}
-{{- if .Values.redis.auth.existingSecret }}
-    {{- printf "%s" (tpl .Values.redis.auth.existingSecret $) -}}
-{{- else if .Values.redis.existingSecret }}
-    {{- printf "%s" (tpl .Values.redis.existingSecret $) -}}
-{{- else -}}
-    {{- printf "%s-redis" (tpl .Release.Name $) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return true if a mastodon secret object should be created
-*/}}
-{{- define "mastodon.createSecret" -}}
-{{- if (or
-    (and .Values.mastodon.s3.enabled (not .Values.mastodon.s3.existingSecret))
-    (not .Values.mastodon.secrets.existingSecret )
-    (and (not .Values.postgresql.enabled) (not .Values.postgresql.auth.existingSecret))
-    ) -}}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Find highest number of needed database connections to set DB_POOL variable
-*/}}
-{{- define "mastodon.maxDbPool" -}}
-{{/* Default MAX_THREADS for Puma is 5 */}}
-{{- $poolSize := 5 }}
-{{- range .Values.mastodon.sidekiq.workers }}
-{{- $poolSize = max $poolSize .concurrency }}
-{{- end }}
-{{- $poolSize | quote }}
-{{- end }}

chart/templates/configmap-env.yaml

@@ -1,319 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "mastodon.fullname" . }}-env
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-data:
-  {{- if .Values.postgresql.enabled }}
-  DB_HOST: {{ template "mastodon.postgresql.fullname" . }}
-  DB_PORT: "5432"
-  {{- else }}
-  DB_HOST: {{ .Values.postgresql.postgresqlHostname }}
-  DB_PORT: {{ .Values.postgresql.postgresqlPort | default "5432" | quote }}
-  {{- end }}
-  DB_NAME: {{ .Values.postgresql.auth.database }}
-  DB_POOL: {{ include "mastodon.maxDbPool" . }}
-  DB_USER: {{ .Values.postgresql.auth.username }}
-  DEFAULT_LOCALE: {{ .Values.mastodon.locale }}
-  {{- if .Values.elasticsearch.enabled }}
-  ES_ENABLED: "true"
-  ES_HOST: {{ template "mastodon.elasticsearch.fullname" . }}-master-hl
-  ES_PORT: "9200"
-  {{- end }}
-  LOCAL_DOMAIN: {{ .Values.mastodon.local_domain }}
-  {{- with .Values.mastodon.web_domain }}
-  WEB_DOMAIN: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.singleUserMode }}
-  SINGLE_USER_MODE: "true"
-  {{- end }}
-  {{- with .Values.mastodon.authorizedFetch }}
-  AUTHORIZED_FETCH: {{ . | quote }}
-  {{- end }}
-  # https://devcenter.heroku.com/articles/tuning-glibc-memory-behavior
-  MALLOC_ARENA_MAX: "2"
-  NODE_ENV: "production"
-  RAILS_ENV: "production"
-  REDIS_HOST: {{ template "mastodon.redis.fullname" . }}-master
-  REDIS_PORT: "6379"
-  {{- if .Values.mastodon.s3.enabled }}
-  S3_BUCKET: {{ .Values.mastodon.s3.bucket }}
-  S3_ENABLED: "true"
-  S3_ENDPOINT: {{ .Values.mastodon.s3.endpoint }}
-  S3_HOSTNAME: {{ .Values.mastodon.s3.hostname }}
-  S3_PROTOCOL: "https"
-  {{- with .Values.mastodon.s3.region }}
-  S3_REGION: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.s3.alias_host }}
-  S3_ALIAS_HOST: {{ .Values.mastodon.s3.alias_host}}
-  {{- end }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.auth_method }}
-  SMTP_AUTH_METHOD: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.ca_file }}
-  SMTP_CA_FILE: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.delivery_method }}
-  SMTP_DELIVERY_METHOD: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.domain }}
-  SMTP_DOMAIN: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.enable_starttls }}
-  SMTP_ENABLE_STARTTLS: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.enable_starttls_auto }}
-  SMTP_ENABLE_STARTTLS_AUTO: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.from_address }}
-  SMTP_FROM_ADDRESS: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.login }}
-  SMTP_LOGIN: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.openssl_verify_mode }}
-  SMTP_OPENSSL_VERIFY_MODE: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.password }}
-  SMTP_PASSWORD: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.port }}
-  SMTP_PORT: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.reply_to }}
-  SMTP_REPLY_TO: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.server }}
-  SMTP_SERVER: {{ . }}
-  {{- end }}
-  {{- with .Values.mastodon.smtp.tls }}
-  SMTP_TLS: {{ . | quote }}
-  {{- end }}
-  STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }}
-  {{- with .Values.mastodon.streaming.base_url }}
-  STREAMING_API_BASE_URL: {{ . | quote }}
-  {{- end }}
-  {{- if .Values.externalAuth.oidc.enabled }}
-  OIDC_ENABLED: {{ .Values.externalAuth.oidc.enabled | quote }}
-  OIDC_DISPLAY_NAME: {{ .Values.externalAuth.oidc.display_name }}
-  OIDC_ISSUER: {{ .Values.externalAuth.oidc.issuer }}
-  OIDC_DISCOVERY: {{ .Values.externalAuth.oidc.discovery | quote }}
-  OIDC_SCOPE: {{ .Values.externalAuth.oidc.scope | quote }}
-  OIDC_UID_FIELD: {{ .Values.externalAuth.oidc.uid_field }}
-  OIDC_CLIENT_ID: {{ .Values.externalAuth.oidc.client_id }}
-  OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret }}
-  OIDC_REDIRECT_URI: {{ .Values.externalAuth.oidc.redirect_uri }}
-  OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED: {{ .Values.externalAuth.oidc.assume_email_is_verified | quote }}
-  {{- with .Values.externalAuth.oidc.client_auth_method }}
-  OIDC_CLIENT_AUTH_METHOD: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.response_type }}
-  OIDC_RESPONSE_TYPE: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.response_mode }}
-  OIDC_RESPONSE_MODE: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.display }}
-  OIDC_DISPLAY: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.prompt }}
-  OIDC_PROMPT: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.send_nonce }}
-  OIDC_SEND_NONCE: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.send_scope_to_token_endpoint }}
-  OIDC_SEND_SCOPE_TO_TOKEN_ENDPOINT: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.idp_logout_redirect_uri }}
-  OIDC_IDP_LOGOUT_REDIRECT_URI: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.http_scheme }}
-  OIDC_HTTP_SCHEME: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.host }}
-  OIDC_HOST: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.port }}
-  OIDC_PORT: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.jwks_uri }}
-  OIDC_JWKS_URI: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.auth_endpoint }}
-  OIDC_AUTH_ENDPOINT: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.token_endpoint }}
-  OIDC_TOKEN_ENDPOINT: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.user_info_endpoint }}
-  OIDC_USER_INFO_ENDPOINT: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.oidc.end_session_endpoint }}
-  OIDC_END_SESSION_ENDPOINT: {{ . }}
-  {{- end }}
-  {{- end }}
-  {{- if .Values.externalAuth.saml.enabled }}
-  SAML_ENABLED: {{ .Values.externalAuth.saml.enabled | quote }}
-  SAML_ACS_URL: {{ .Values.externalAuth.saml.acs_url }}
-  SAML_ISSUER: {{ .Values.externalAuth.saml.issuer }}
-  SAML_IDP_SSO_TARGET_URL: {{ .Values.externalAuth.saml.idp_sso_target_url }}
-  SAML_IDP_CERT: {{ .Values.externalAuth.saml.idp_cert | quote }}
-  {{- with .Values.externalAuth.saml.idp_cert_fingerprint }}
-  SAML_IDP_CERT_FINGERPRINT: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.name_identifier_format }}
-  SAML_NAME_IDENTIFIER_FORMAT: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.cert }}
-  SAML_CERT: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.private_key }}
-  SAML_PRIVATE_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.want_assertion_signed }}
-  SAML_SECURITY_WANT_ASSERTION_SIGNED: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.want_assertion_encrypted }}
-  SAML_SECURITY_WANT_ASSERTION_ENCRYPTED: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.assume_email_is_verified }}
-  SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.uid_attribute }}
-  SAML_UID_ATTRIBUTE: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.attributes_statements.uid }}
-  SAML_ATTRIBUTES_STATEMENTS_UID: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.attributes_statements.email }}
-  SAML_ATTRIBUTES_STATEMENTS_EMAIL: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.attributes_statements.full_name }}
-  SAML_ATTRIBUTES_STATEMENTS_FULL_NAME: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.attributes_statements.first_name }}
-  SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.attributes_statements.last_name }}
-  SAML_ATTRIBUTES_STATEMENTS_LAST_NAME: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.attributes_statements.verified }}
-  SAML_ATTRIBUTES_STATEMENTS_VERIFIED: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.saml.attributes_statements.verified_email }}
-  SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL: {{ . | quote }}
-  {{- end }}
-  {{- end }}
-  {{- with .Values.externalAuth.oauth_global.omniauth_only }}
-  OMNIAUTH_ONLY: {{ . | quote }}
-  {{- end }}
-  {{- if .Values.externalAuth.cas.enabled }}
-  CAS_ENABLED: {{ .Values.externalAuth.cas.enabled | quote }}
-  CAS_URL: {{ .Values.externalAuth.cas.url }}
-  CAS_HOST: {{ .Values.externalAuth.cas.host }}
-  CAS_PORT: {{ .Values.externalAuth.cas.port }}
-  CAS_SSL: {{ .Values.externalAuth.cas.ssl | quote }}
-  {{- with .Values.externalAuth.cas.validate_url }}
-  CAS_VALIDATE_URL: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.callback_url }}
-  CAS_CALLBACK_URL: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.logout_url }}
-  CAS_LOGOUT_URL: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.login_url }}
-  CAS_LOGIN_URL: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.uid_field }}
-  CAS_UID_FIELD: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.ca_path }}
-  CAS_CA_PATH: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.disable_ssl_verification }}
-  CAS_DISABLE_SSL_VERIFICATION: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.assume_email_is_verified }}
-  CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.uid }}
-  CAS_UID_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.name }}
-  CAS_NAME_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.email }}
-  CAS_EMAIL_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.nickname }}
-  CAS_NICKNAME_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.first_name }}
-  CAS_FIRST_NAME_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.last_name }}
-  CAS_LAST_NAME_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.location }}
-  CAS_LOCATION_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.image }}
-  CAS_IMAGE_KEY: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.cas.keys.phone }}
-  CAS_PHONE_KEY: {{ . | quote }}
-  {{- end }}
-  {{- end }}
-  {{- with .Values.externalAuth.pam.enabled }}
-  PAM_ENABLED: {{ . | quote }}
-  {{- with .Values.externalAuth.pam.email_domain }}
-  PAM_EMAIL_DOMAIN: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.pam.default_service }}
-  PAM_DEFAULT_SERVICE: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.pam.controlled_service }}
-  PAM_CONTROLLED_SERVICE: {{ . }}
-  {{- end }}
-  {{- end }}
-  {{- if .Values.externalAuth.ldap.enabled }}
-  LDAP_ENABLED: {{ .Values.externalAuth.ldap.enabled | quote }}
-  LDAP_HOST: {{ .Values.externalAuth.ldap.host }}
-  LDAP_PORT: {{ .Values.externalAuth.ldap.port }}
-  LDAP_METHOD: {{ .Values.externalAuth.ldap.method }}
-  {{- with .Values.externalAuth.ldap.base }}
-  LDAP_BASE: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.bind_on }}
-  LDAP_BIND_ON: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.password }}
-  LDAP_PASSWORD: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.uid }}
-  LDAP_UID: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.mail }}
-  LDAP_MAIL: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.search_filter }}
-  LDAP_SEARCH_FILTER: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.uid_conversion.enabled }}
-  LDAP_UID_CONVERSION_ENABLED: {{ . | quote }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.uid_conversion.search }}
-  LDAP_UID_CONVERSION_SEARCH: {{ . }}
-  {{- end }}
-  {{- with .Values.externalAuth.ldap.uid_conversion.replace }}
-  LDAP_UID_CONVERSION_REPLACE: {{ . }}
-  {{- end }}
-  {{- end }}
-  {{- with .Values.mastodon.metrics.statsd.address }}
-  STATSD_ADDR: {{ . }}
-  {{- end }}

chart/templates/cronjob-media-remove.yaml

@@ -1,77 +0,0 @@
-{{ if .Values.mastodon.cron.removeMedia.enabled -}}
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: {{ include "mastodon.fullname" . }}-media-remove
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  schedule: {{ .Values.mastodon.cron.removeMedia.schedule }}
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          name: {{ include "mastodon.fullname" . }}-media-remove
-          {{- with .Values.jobAnnotations }}
-          annotations:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-        spec:
-          restartPolicy: OnFailure
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          # ensure we run on the same node as the other rails components; only
-          # required when using PVCs that are ReadWriteOnce
-          {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-          affinity:
-            podAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                - labelSelector:
-                    matchExpressions:
-                      - key: app.kubernetes.io/part-of
-                        operator: In
-                        values:
-                          - rails
-                  topologyKey: kubernetes.io/hostname
-          {{- end }}
-          volumes:
-            - name: assets
-              persistentVolumeClaim:
-                claimName: {{ template "mastodon.fullname" . }}-assets
-            - name: system
-              persistentVolumeClaim:
-                claimName: {{ template "mastodon.fullname" . }}-system
-          {{- end }}
-          containers:
-            - name: {{ include "mastodon.fullname" . }}-media-remove
-              image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-              imagePullPolicy: {{ .Values.image.pullPolicy }}
-              command:
-                - bin/tootctl
-                - media
-                - remove
-              envFrom:
-                - configMapRef:
-                    name: {{ include "mastodon.fullname" . }}-env
-                - secretRef:
-                    name: {{ template "mastodon.secretName" . }}
-              env:
-                - name: "DB_PASS"
-                  valueFrom:
-                    secretKeyRef:
-                      name: {{ template "mastodon.postgresql.secretName" . }}
-                      key: password
-                - name: "REDIS_PASSWORD"
-                  valueFrom:
-                    secretKeyRef:
-                      name: {{ template "mastodon.redis.secretName" . }}
-                      key: redis-password
-                - name: "PORT"
-                  value: {{ .Values.mastodon.web.port | quote }}
-              {{- if (not .Values.mastodon.s3.enabled) }}
-              volumeMounts:
-                - name: assets
-                  mountPath: /opt/mastodon/public/assets
-                - name: system
-                  mountPath: /opt/mastodon/public/system
-              {{- end }}
-{{- end }}

chart/templates/deployment-sidekiq.yaml

@@ -1,132 +0,0 @@
-{{- $context := . }}
-{{- range .Values.mastodon.sidekiq.workers }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "mastodon.fullname" $context }}-sidekiq-{{ .name }}
-  labels:
-    {{- include "mastodon.labels" $context | nindent 4 }}
-    app.kubernetes.io/component: sidekiq-{{ .name }}
-    app.kubernetes.io/part-of: rails
-spec:
-  replicas: {{ .replicas }}
-  {{- if (has "scheduler" .queues) }}
-  strategy:
-    type: Recreate
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "mastodon.selectorLabels" $context | nindent 6 }}
-      app.kubernetes.io/component: sidekiq-{{ .name }}
-      app.kubernetes.io/part-of: rails
-  template:
-    metadata:
-      annotations:
-        {{- with $context.Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        # roll the pods to pick up any db migrations or other changes
-        {{- include "mastodon.rollingPodAnnotations" $context | nindent 8 }}
-      labels:
-        {{- include "mastodon.selectorLabels" $context | nindent 8 }}
-        app.kubernetes.io/component: sidekiq-{{ .name }}
-        app.kubernetes.io/part-of: rails
-    spec:
-      {{- with $context.Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "mastodon.serviceAccountName" $context }}
-      {{- with (default $context.Values.podSecurityContext $context.Values.mastodon.sidekiq.podSecurityContext) }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with (default (default $context.Values.affinity $context.Values.mastodon.sidekiq.affinity) .affinity) }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if (not $context.Values.mastodon.s3.enabled) }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" $context }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" $context }}-system
-      {{- end }}
-      containers:
-        - name: {{ $context.Chart.Name }}
-          securityContext:
-            {{- toYaml $context.Values.mastodon.sidekiq.securityContext | nindent 12 }}
-          image: "{{ $context.Values.image.repository }}:{{ $context.Values.image.tag | default $context.Chart.AppVersion }}"
-          imagePullPolicy: {{ $context.Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - sidekiq
-            - -c
-            - {{ .concurrency | quote }}
-            {{- range .queues }}
-            - -q
-            - {{ . | quote }}
-            {{- end }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" $context }}-env
-            - secretRef:
-                name: {{ template "mastodon.secretName" $context }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.postgresql.secretName" $context }}
-                  key: password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.redis.secretName" $context }}
-                  key: redis-password
-            {{- if (and $context.Values.mastodon.s3.enabled $context.Values.mastodon.s3.existingSecret) }}
-            - name: "AWS_SECRET_ACCESS_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $context.Values.mastodon.s3.existingSecret }}
-                  key: AWS_SECRET_ACCESS_KEY
-            - name: "AWS_ACCESS_KEY_ID"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: AWS_ACCESS_KEY_ID
-            {{- end }}
-            {{- if $context.Values.mastodon.smtp.existingSecret }}
-            - name: "SMTP_LOGIN"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $context.Values.mastodon.smtp.existingSecret }}
-                  key: login
-                  optional: true
-            - name: "SMTP_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $context.Values.mastodon.smtp.existingSecret }}
-                  key: password
-            {{- end }}
-          {{- if (not $context.Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-          resources:
-            {{- toYaml (default (default $context.Values.resources $context.Values.mastodon.sidekiq.resources) .resources) | nindent 12 }}
-      {{- with $context.Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with $context.Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}

chart/templates/deployment-streaming.yaml

@@ -1,88 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "mastodon.fullname" . }}-streaming
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.mastodon.streaming.replicas }}
-  selector:
-    matchLabels:
-      {{- include "mastodon.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: streaming
-  template:
-    metadata:
-      annotations:
-        {{- with (default .Values.podAnnotations .Values.mastodon.streaming.podAnnotations) }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        # roll the pods to pick up any db migrations or other changes
-        {{- include "mastodon.rollingPodAnnotations" . | nindent 8 }}
-      labels:
-        {{- include "mastodon.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: streaming
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
-      {{- with (default .Values.podSecurityContext .Values.mastodon.streaming.podSecurityContext) }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}-streaming
-          {{- with (default .Values.securityContext .Values.mastodon.streaming.securityContext) }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - node
-            - ./streaming
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.redis.secretName" . }}
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.streaming.port | quote }}
-          ports:
-            - name: streaming
-              containerPort: {{ .Values.mastodon.streaming.port }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /api/v1/streaming/health
-              port: streaming
-          readinessProbe:
-            httpGet:
-              path: /api/v1/streaming/health
-              port: streaming
-          {{- with (default .Values.resources .Values.mastodon.streaming.resources) }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with (default .Values.affinity .Values.mastodon.streaming.affinity) }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

chart/templates/deployment-web.yaml

@@ -1,128 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "mastodon.fullname" . }}-web
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.mastodon.web.replicas }}
-  selector:
-    matchLabels:
-      {{- include "mastodon.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: web
-      app.kubernetes.io/part-of: rails
-  template:
-    metadata:
-      annotations:
-        {{- with (default .Values.podAnnotations .Values.mastodon.web.podAnnotations) }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        # roll the pods to pick up any db migrations or other changes
-        {{- include "mastodon.rollingPodAnnotations" . | nindent 8 }}
-      labels:
-        {{- include "mastodon.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: web
-        app.kubernetes.io/part-of: rails
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "mastodon.serviceAccountName" . }}
-      {{- with (default .Values.podSecurityContext .Values.mastodon.web.podSecurityContext) }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}-web
-          {{- with (default .Values.securityContext .Values.mastodon.web.securityContext) }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - puma
-            - -C
-            - config/puma.rb
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.secretName" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.redis.secretName" . }}
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-            {{- if (and .Values.mastodon.s3.enabled .Values.mastodon.s3.existingSecret) }}
-            - name: "AWS_SECRET_ACCESS_KEY"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: AWS_SECRET_ACCESS_KEY
-            - name: "AWS_ACCESS_KEY_ID"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.mastodon.s3.existingSecret }}
-                  key: AWS_ACCESS_KEY_ID
-            {{- end }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.mastodon.web.port }}
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: http
-          startupProbe:
-            httpGet:
-              path: /health
-              port: http
-            failureThreshold: 30
-            periodSeconds: 5
-          {{- with (default .Values.resources .Values.mastodon.web.resources) }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with (default .Values.affinity .Values.mastodon.web.affinity) }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

chart/templates/ingress.yaml

@@ -1,71 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "mastodon.fullname" . -}}
-{{- $webPort := .Values.mastodon.web.port -}}
-{{- $streamingPort := .Values.mastodon.streaming.port -}}
-{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.ingress.ingressClassName }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            backend:
-              {{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
-              service:
-                name: {{ $fullName }}-web
-                port:
-                  number: {{ $webPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}-web
-              servicePort: {{ $webPort }}
-              {{- end }}
-            {{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
-            pathType: Prefix
-            {{- end }}
-          - path: {{ .path }}api/v1/streaming/
-            backend:
-              {{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
-              service:
-                name: {{ $fullName }}-streaming
-                port:
-                  number: {{ $streamingPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}-streaming
-              servicePort: {{ $streamingPort }}
-              {{- end }}
-            {{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
-            pathType: Exact
-            {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}

chart/templates/job-assets-precompile.yaml

@@ -1,77 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-assets-precompile
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-2"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-assets-precompile
-      {{- with .Values.jobAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                  - key: app.kubernetes.io/part-of
-                    operator: In
-                    values:
-                      - rails
-              topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-assets-precompile
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bash
-            - -c
-            - |
-                bundle exec rake assets:precompile && yarn cache clean
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.secretName" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.redis.secretName" . }}
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}

chart/templates/job-chewy-upgrade.yaml

@@ -1,79 +0,0 @@
-{{- if .Values.elasticsearch.enabled -}}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-chewy-upgrade
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-1"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-chewy-upgrade
-      {{- with .Values.jobAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                  - key: app.kubernetes.io/part-of
-                    operator: In
-                    values:
-                      - rails
-              topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-chewy-setup
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - rake
-            - chewy:upgrade
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.secretName" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.redis.secretName" . }}
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-{{- end }}

chart/templates/job-create-admin.yaml

@@ -1,84 +0,0 @@
-{{- if .Values.mastodon.createAdmin.enabled -}}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-create-admin
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-1"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-create-admin
-      {{- with .Values.jobAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-                - key: app.kubernetes.io/part-of
-                  operator: In
-                  values:
-                    - rails
-            topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-create-admin
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bin/tootctl
-            - accounts
-            - create
-            - {{ .Values.mastodon.createAdmin.username }}
-            - --email
-            - {{ .Values.mastodon.createAdmin.email }}
-            - --confirmed
-            - --role
-            - Owner
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.secretName" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.redis.secretName" . }}
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}
-{{- end }}

chart/templates/job-db-migrate.yaml

@@ -1,77 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "mastodon.fullname" . }}-db-migrate
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install,pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
-    "helm.sh/hook-weight": "-2"
-spec:
-  template:
-    metadata:
-      name: {{ include "mastodon.fullname" . }}-db-migrate
-      {{- with .Values.jobAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      restartPolicy: Never
-      {{- if (not .Values.mastodon.s3.enabled) }}
-      # ensure we run on the same node as the other rails components; only
-      # required when using PVCs that are ReadWriteOnce
-      {{- if or (eq "ReadWriteOnce" .Values.mastodon.persistence.assets.accessMode) (eq "ReadWriteOnce" .Values.mastodon.persistence.system.accessMode) }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                  - key: app.kubernetes.io/part-of
-                    operator: In
-                    values:
-                      - rails
-              topologyKey: kubernetes.io/hostname
-      {{- end }}
-      volumes:
-        - name: assets
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-assets
-        - name: system
-          persistentVolumeClaim:
-            claimName: {{ template "mastodon.fullname" . }}-system
-      {{- end }}
-      containers:
-        - name: {{ include "mastodon.fullname" . }}-db-migrate
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - bundle
-            - exec
-            - rake
-            - db:migrate
-          envFrom:
-            - configMapRef:
-                name: {{ include "mastodon.fullname" . }}-env
-            - secretRef:
-                name: {{ template "mastodon.secretName" . }}
-          env:
-            - name: "DB_PASS"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.postgresql.secretName" . }}
-                  key: password
-            - name: "REDIS_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "mastodon.redis.secretName" . }}
-                  key: redis-password
-            - name: "PORT"
-              value: {{ .Values.mastodon.web.port | quote }}
-          {{- if (not .Values.mastodon.s3.enabled) }}
-          volumeMounts:
-            - name: assets
-              mountPath: /opt/mastodon/public/assets
-            - name: system
-              mountPath: /opt/mastodon/public/system
-          {{- end }}

chart/templates/pvc-assets.yaml

@@ -1,16 +0,0 @@
-{{- if (not .Values.mastodon.s3.enabled) -}}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ template "mastodon.fullname" . }}-assets
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.mastodon.persistence.system.accessMode }}
-  {{- with .Values.mastodon.persistence.assets.resources }}
-  resources:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  storageClassName: {{ .Values.mastodon.persistence.assets.storageClassName }}
-{{- end }}

chart/templates/pvc-system.yaml

@@ -1,16 +0,0 @@
-{{- if (not .Values.mastodon.s3.enabled) -}}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ template "mastodon.fullname" . }}-system
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.mastodon.persistence.system.accessMode }}
-  {{- with .Values.mastodon.persistence.system.resources }}
-  resources:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  storageClassName: {{ .Values.mastodon.persistence.system.storageClassName }}
-{{- end }}

chart/templates/secrets.yaml

@@ -1,43 +0,0 @@
-{{- if (include "mastodon.createSecret" .) -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "mastodon.fullname" . }}
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-type: Opaque
-data:
-  {{- if .Values.mastodon.s3.enabled }}
-  {{- if not .Values.mastodon.s3.existingSecret }}
-  AWS_ACCESS_KEY_ID: "{{ .Values.mastodon.s3.access_key | b64enc }}"
-  AWS_SECRET_ACCESS_KEY: "{{ .Values.mastodon.s3.access_secret | b64enc }}"
-  {{- end }}
-  {{- end }}
-  {{- if not .Values.mastodon.secrets.existingSecret }}
-  {{- if not (empty .Values.mastodon.secrets.secret_key_base) }}
-  SECRET_KEY_BASE: "{{ .Values.mastodon.secrets.secret_key_base | b64enc }}"
-  {{- else }}
-  SECRET_KEY_BASE: {{ required "secret_key_base is required" .Values.mastodon.secrets.secret_key_base }}
-  {{- end }}
-  {{- if not (empty .Values.mastodon.secrets.otp_secret) }}
-  OTP_SECRET: "{{ .Values.mastodon.secrets.otp_secret | b64enc }}"
-  {{- else }}
-  OTP_SECRET: {{ required "otp_secret is required" .Values.mastodon.secrets.otp_secret }}
-  {{- end }}
-  {{- if not (empty .Values.mastodon.secrets.vapid.private_key) }}
-  VAPID_PRIVATE_KEY: "{{ .Values.mastodon.secrets.vapid.private_key | b64enc }}"
-  {{- else }}
-  VAPID_PRIVATE_KEY: {{ required "vapid.private_key is required" .Values.mastodon.secrets.vapid.private_key }}
-  {{- end }}
-  {{- if not (empty .Values.mastodon.secrets.vapid.public_key) }}
-  VAPID_PUBLIC_KEY: "{{ .Values.mastodon.secrets.vapid.public_key | b64enc }}"
-  {{- else }}
-  VAPID_PUBLIC_KEY: {{ required "vapid.public_key is required" .Values.mastodon.secrets.vapid.public_key }}
-  {{- end }}
-  {{- end }}
-  {{- if not .Values.postgresql.enabled }}
-  {{- if not .Values.postgresql.auth.existingSecret }}
-  password: "{{ .Values.postgresql.auth.password | b64enc }}"
-  {{- end }}
-  {{- end }}
-{{- end }}

chart/templates/service-streaming.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "mastodon.fullname" . }}-streaming
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.mastodon.streaming.port }}
-      targetPort: streaming
-      protocol: TCP
-      name: streaming
-  selector:
-    {{- include "mastodon.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: streaming

chart/templates/service-web.yaml

@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "mastodon.fullname" . }}-web
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.mastodon.web.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "mastodon.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: web

chart/templates/serviceaccount.yaml

@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "mastodon.serviceAccountName" . }}
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

chart/templates/tests/test-connection.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "mastodon.fullname" . }}-test-connection"
-  labels:
-    {{- include "mastodon.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "mastodon.fullname" . }}-web:{{ .Values.service.port }}']
-  restartPolicy: Never

chart/values.yaml

@@ -1,419 +0,0 @@
-image:
-  repository: tootsuite/mastodon
-  # https://hub.docker.com/r/tootsuite/mastodon/tags
-  #
-  # alternatively, use `latest` for the latest release or `edge` for the image
-  # built from the most recent commit
-  #
-  # tag: latest
-  tag: ""
-  # use `Always` when using `latest` tag
-  pullPolicy: IfNotPresent
-
-mastodon:
-  # -- create an initial administrator user; the password is autogenerated and will
-  # have to be reset
-  createAdmin:
-    # @ignored
-    enabled: false
-    # @ignored
-    username: not_gargron
-    # @ignored
-    email: not@example.com
-  cron:
-    # -- run `tootctl media remove` every week
-    removeMedia:
-      # @ignored
-      enabled: true
-      # @ignored
-      schedule: "0 0 * * 0"
-  # -- available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71
-  locale: en
-  local_domain: mastodon.local
-  # -- Use of WEB_DOMAIN requires careful consideration: https://docs.joinmastodon.org/admin/config/#federation
-  # You must redirect the path LOCAL_DOMAIN/.well-known/ to WEB_DOMAIN/.well-known/ as described
-  # Example: mastodon.example.com
-  web_domain: null
-  # -- If set to true, the frontpage of your Mastodon server will always redirect to the first profile in the database and registrations will be disabled.
-  singleUserMode: false
-  # -- Enables "Secure Mode" for more details see: https://docs.joinmastodon.org/admin/config/#authorized_fetch
-  authorizedFetch: false
-  persistence:
-    assets:
-      # -- ReadWriteOnce is more widely supported than ReadWriteMany, but limits
-      # scalability, since it requires the Rails and Sidekiq pods to run on the
-      # same node.
-      accessMode: ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Gi
-    system:
-      accessMode: ReadWriteOnce
-      resources:
-        requests:
-          storage: 100Gi
-  s3:
-    enabled: false
-    access_key: ""
-    access_secret: ""
-    # -- you can also specify the name of an existing Secret
-    # with keys AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
-    existingSecret: ""
-    bucket: ""
-    endpoint: ""
-    hostname: ""
-    region: ""
-    # -- If you have a caching proxy, enter its base URL here.
-    alias_host: ""
-  # these must be set manually; autogenerated keys are rotated on each upgrade
-  secrets:
-    secret_key_base: ""
-    otp_secret: ""
-    vapid:
-      private_key: ""
-      public_key: ""
-    # -- you can also specify the name of an existing Secret
-    # with keys SECRET_KEY_BASE and OTP_SECRET and
-    # VAPID_PRIVATE_KEY and VAPID_PUBLIC_KEY
-    existingSecret: ""
-  sidekiq:
-    # -- Pod security context for all Sidekiq Pods, overwrites .Values.podSecurityContext
-    podSecurityContext: {}
-    # -- (Sidekiq Container) Security Context for all Pods, overwrites .Values.securityContext
-    securityContext: {}
-    # -- Resources for all Sidekiq Deployments unless overwritten
-    resources: {}
-    # -- Affinity for all Sidekiq Deployments unless overwritten, overwrites .Values.affinity
-    affinity: {}
-    # limits:
-    #   cpu: "1"
-    #   memory: 768Mi
-    # requests:
-    #   cpu: 250m
-    #   memory: 512Mi
-    workers:
-    - name: all-queues
-      # -- Number of threads / parallel sidekiq jobs that are executed per Pod
-      concurrency: 25
-      # -- Number of Pod replicas deployed by the Deployment
-      replicas: 1
-      # -- Resources for this specific deployment to allow optimised scaling, overwrites .Values.mastodon.sidekiq.resources
-      resources: {}
-      # -- Affinity for this specific deployment, overwrites .Values.affinity and .Values.mastodon.sidekiq.affinity
-      affinity: {}
-      # -- Sidekiq queues for Mastodon that are handled by this worker. See https://docs.joinmastodon.org/admin/scaling/#concurrency
-      # See https://github.com/mperham/sidekiq/wiki/Advanced-Options#queues for how to weight queues as argument
-      queues:
-        - default
-        - push
-        - mailers
-        - pull
-        - scheduler # Make sure the scheduler queue only exists once and with a worker that has 1 replica.
-    #- name: push-pull
-    #  concurrency: 50
-    #  resources: {}
-    #  replicas: 2
-    #  queues:
-    #    - push
-    #    - pull
-    #- name: mailers
-    #  concurrency: 25
-    #  replicas: 2
-    #  queues:
-    #    - mailers
-    #- name: default
-    #  concurrency: 25
-    #  replicas: 2
-    #  queues:
-    #    - default
-  smtp:
-    auth_method: plain
-    ca_file: /etc/ssl/certs/ca-certificates.crt
-    delivery_method: smtp
-    domain:
-    enable_starttls: 'auto'
-    from_address: notifications@example.com
-    openssl_verify_mode: peer
-    port: 587
-    reply_to:
-    server: smtp.mailgun.org
-    tls: false
-    login:
-    password:
-    # -- you can also specify the name of an existing Secret
-    # with the keys login and password
-    existingSecret:
-  streaming:
-    port: 4000
-    # -- this should be set manually since os.cpus() returns the number of CPUs on
-    # the node running the pod, which is unrelated to the resources allocated to
-    # the pod by k8s
-    workers: 1
-    # -- The base url for streaming can be set if the streaming API is deployed to
-    # a different domain/subdomain.
-    base_url: null
-    # -- Number of Streaming Pods running
-    replicas: 1
-    # -- Affinity for Streaming Pods, overwrites .Values.affinity
-    affinity: {}
-    # -- Pod Security Context for Streaming Pods, overwrites .Values.podSecurityContext
-    podSecurityContext: {}
-    # -- (Streaming Container) Security Context for Streaming Pods, overwrites .Values.securityContext
-    securityContext: {}
-    # -- (Streaming Container) Resources for Streaming Pods, overwrites .Values.resources
-    resources: {}
-    # limits:
-    #   cpu: "500m"
-    #   memory: 512Mi
-    # requests:
-    #   cpu: 250m
-    #   memory: 128Mi
-  web:
-    port: 3000
-    # -- Number of Web Pods running
-    replicas: 1
-    # -- Affinity for Web Pods, overwrites .Values.affinity
-    affinity: {}
-    # -- Pod Security Context for Web Pods, overwrites .Values.podSecurityContext
-    podSecurityContext: {}
-    # -- (Web Container) Security Context for Web Pods, overwrites .Values.securityContext
-    securityContext: {}
-    # -- (Web Container) Resources for Web Pods, overwrites .Values.resources
-    resources: {}
-    # limits:
-    #   cpu: "1"
-    #   memory: 1280Mi
-    # requests:
-    #   cpu: 250m
-    #   memory: 768Mi
-
-  metrics:
-    statsd:
-      # -- Enable statsd publishing via STATSD_ADDR environment variable
-      address: ""
-
-ingress:
-  enabled: true
-  annotations:
-    # For choosing an ingress ingressClassName is preferred over annotations
-    # kubernetes.io/ingress.class: nginx
-    #
-    # To automatically request TLS certificates use one of the following
-    # kubernetes.io/tls-acme: "true"
-    # cert-manager.io/cluster-issuer: "letsencrypt"
-    #
-    # ensure that NGINX's upload size matches Mastodon's
-    #   for the K8s ingress controller:
-    # nginx.ingress.kubernetes.io/proxy-body-size: 40m
-    #   for the NGINX ingress controller:
-    # nginx.org/client-max-body-size: 40m
-  # -- you can specify the ingressClassName if it differs from the default
-  ingressClassName:
-  hosts:
-    - host: mastodon.local
-      paths:
-        - path: '/'
-  tls:
-    - secretName: mastodon-tls
-      hosts:
-        - mastodon.local
-
-# -- https://github.com/bitnami/charts/tree/master/bitnami/elasticsearch#parameters
-elasticsearch:
-  # `false` will disable full-text search
-  #
-  # if you enable ES after the initial install, you will need to manually run
-  # RAILS_ENV=production bundle exec rake chewy:sync
-  # (https://docs.joinmastodon.org/admin/optional/elasticsearch/)
-  # @ignored
-  enabled: true
-  # @ignored
-  image:
-    tag: 7
-
-# https://github.com/bitnami/charts/tree/master/bitnami/postgresql#parameters
-postgresql:
-  # -- disable if you want to use an existing db; in which case the values below
-  # must match those of that external postgres instance
-  enabled: true
-  # postgresqlHostname: preexisting-postgresql
-  # postgresqlPort: 5432
-  auth:
-    database: mastodon_production
-    username: mastodon
-    # you must set a password; the password generated by the postgresql chart will
-    # be rotated on each upgrade:
-    # https://github.com/bitnami/charts/tree/master/bitnami/postgresql#upgrade
-    password: ""
-    # Set the password for the "postgres" admin user
-    # set this to the same value as above if you've previously installed
-    # this chart and you're having problems getting mastodon to connect to the DB
-    # postgresPassword: ""
-    # you can also specify the name of an existing Secret
-    # with a key of password set to the password you want
-    existingSecret: ""
-
-# https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters
-redis:
-  # -- you must set a password; the password generated by the redis chart will be
-  # rotated on each upgrade:
-  password: ""
-  # you can also specify the name of an existing Secret
-  # with a key of redis-password set to the password you want
-  # auth:
-    # existingSecret: ""
-
-# @ignored
-service:
-  type: ClusterIP
-  port: 80
-
-externalAuth:
-  oidc:
-    # -- OpenID Connect support is proposed in PR #16221 and awaiting merge.
-    enabled: false
-    # display_name: "example-label"
-    # issuer: https://login.example.space/auth/realms/example-space
-    # discovery: true
-    # scope: "openid,profile"
-    # uid_field: uid
-    # client_id: mastodon
-    # client_secret: SECRETKEY
-    # redirect_uri: https://example.com/auth/auth/openid_connect/callback
-    # assume_email_is_verified: true
-    # client_auth_method:
-    # response_type:
-    # response_mode:
-    # display:
-    # prompt:
-    # send_nonce:
-    # send_scope_to_token_endpoint:
-    # idp_logout_redirect_uri:
-    # http_scheme:
-    # host:
-    # port:
-    # jwks_uri:
-    # auth_endpoint:
-    # token_endpoint:
-    # user_info_endpoint:
-    # end_session_endpoint:
-  saml:
-    enabled: false
-    # acs_url: http://mastodon.example.com/auth/auth/saml/callback
-    # issuer: mastodon
-    # idp_sso_target_url: https://login.example.com/auth/realms/example/protocol/saml
-    # idp_cert: '-----BEGIN CERTIFICATE-----[your_cert_content]-----END CERTIFICATE-----'
-    # idp_cert_fingerprint:
-    # name_identifier_format: urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
-    # cert:
-    # private_key:
-    # want_assertion_signed: true
-    # want_assertion_encrypted: true
-    # assume_email_is_verified: true
-    # uid_attribute: "urn:oid:0.9.2342.19200300.100.1.1"
-    # attributes_statements:
-    #   uid: "urn:oid:0.9.2342.19200300.100.1.1"
-    #   email: "urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-    #   full_name: "urn:oid:2.16.840.1.113730.3.1.241"
-    #   first_name: "urn:oid:2.5.4.42"
-    #   last_name: "urn:oid:2.5.4.4"
-    #   verified:
-    #   verified_email:
-  oauth_global:
-    # -- Automatically redirect to OIDC, CAS or SAML, and don't use local account authentication when clicking on Sign-In
-    omniauth_only: false
-  cas:
-    enabled: false
-    # url: https://sso.myserver.com
-    # host: sso.myserver.com
-    # port: 443
-    # ssl: true
-    # validate_url:
-    # callback_url:
-    # logout_url:
-    # login_url:
-    # uid_field: 'user'
-    # ca_path:
-    # disable_ssl_verification: false
-    # assume_email_is_verified: true
-    # keys:
-    #   uid: 'user'
-    #   name: 'name'
-    #   email: 'email'
-    #   nickname: 'nickname'
-    #   first_name: 'firstname'
-    #   last_name: 'lastname'
-    #   location: 'location'
-    #   image: 'image'
-    #   phone: 'phone'
-  pam:
-    enabled: false
-    # email_domain: example.com
-    # default_service: rpam
-    # controlled_service: rpam
-  ldap:
-    enabled: false
-    # host: myservice.namespace.svc
-    # port: 389
-    # method: simple_tls
-    # base:
-    # bind_on:
-    # password:
-    # uid: cn
-    # mail: mail
-    # search_filter: "(|(%{uid}=%{email})(%{mail}=%{email}))"
-    # uid_conversion:
-    #   enabled: true
-    #   search: "., -"
-    #   replace: _
-
-# -- https://github.com/mastodon/mastodon/blob/main/Dockerfile#L75
-#
-# if you manually change the UID/GID environment variables, ensure these values
-# match:
-podSecurityContext:
-  runAsUser: 991
-  runAsGroup: 991
-  fsGroup: 991
-
-# @ignored
-securityContext: {}
-
-serviceAccount:
-  # -- Specifies whether a service account should be created
-  create: true
-  # -- Annotations to add to the service account
-  annotations: {}
-  # -- The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-# -- Kubernetes manages pods for jobs and pods for deployments differently, so you might
-# need to apply different annotations to the two different sets of pods. The annotations
-# set with podAnnotations will be added to all deployment-managed pods.
-podAnnotations: {}
-
-# -- The annotations set with jobAnnotations will be added to all job pods.
-jobAnnotations: {}
-
-# -- Default resources for all Deployments and jobs unless overwritten
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-# @ignored
-nodeSelector: {}
-
-# @ignored
-tolerations: []
-
-# -- Affinity for all pods unless overwritten
-affinity: {}

config/locales/activerecord.lv.yml

@@ -36,12 +36,12 @@ lv:
         status:
           attributes:
             reblog:
-              taken: ziņa jau pastāv
+              taken: ziņai jau pastāv
         user:
           attributes:
             email:
-              blocked: lieto neatļautu epasta pakalpojuma sniedzēju
+              blocked: lieto neatļautu e-pasta pakalpojuma sniedzēju
-              unreachable: šķiet, ka neeksistē
+              unreachable: šķietami neeksistē
             role_id:
               elevated: nevar būt augstāka par tavu pašreizējo lomu
         user_role:
@@ -49,7 +49,7 @@ lv:
             permissions_as_keys:
               dangerous: ietver atļaujas, kas nav drošas pamata lomai
               elevated: nevar ietvert atļaujas, kas nepieder tavai pašreizējai lomai
-              own_role: nevar mainīt pert tavu pašreizējo lomu
+              own_role: nevar mainīt pret tavu pašreizējo lomu
             position:
               elevated: nevar būt augstāka par tavu pašreizējo lomu
-              own_role: nevar mainīt pert tavu pašreizējo lomu
+              own_role: nevar mainīt pret tavu pašreizējo lomu

config/locales/activerecord.ms.yml

@@ -24,13 +24,32 @@ ms:
         admin/webhook:
           attributes:
             url:
-              invalid: bukan merupakan URL yang sah
+              invalid: bukanlah URL yang sah
         doorkeeper/application:
           attributes:
             website:
-              invalid: bukan merupakan URL yang sah
+              invalid: bukanlah URL yang sah
+        import:
+          attributes:
+            data:
+              malformed: tersalah bentuk
+        status:
+          attributes:
+            reblog:
+              taken: hantaran sudah wujud
         user:
           attributes:
             email:
               blocked: menggunakan pembekal e-mel yang tidak dibenarkan
               unreachable: nampaknya tidak wujud
+            role_id:
+              elevated: tidak boleh lebih tinggi daripada peranan semasa anda
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: termasuklah keizinan yang tidak selamat untuk peranan asas
+              elevated: tidak boleh memasukkan kebenaran yang tidak dimiliki oleh peranan semasa anda
+              own_role: tidak boleh diubah dengan peranan semasa anda
+            position:
+              elevated: tidak boleh lebih tinggi daripada peranan semasa anda
+              own_role: tidak boleh diubah dengan peranan semasa anda

config/locales/activerecord.sk.yml

@@ -5,13 +5,51 @@ sk:
       poll:
         expires_at: Trvá do
         options: Voľby
+      user:
+        agreement: Dohoda o poskytovaní služieb
+        email: Emailová adresa
+        locale: Jazyk
+        password: Heslo
+      user/account:
+        username: Meno používateľa
+      user/invite_request:
+        text: Dôvod
     errors:
       models:
         account:
           attributes:
             username:
               invalid: iba písmená, číslice a podčiarkovníky
+              reserved: je obsadené
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nie je platnou URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nie je platnou URL
+        import:
+          attributes:
+            data:
+              malformed: je deformovaný
         status:
           attributes:
             reblog:
               taken: príspevku už existuje
+        user:
+          attributes:
+            email:
+              blocked: používa nepovoleného poskytovateľa e-mailu
+              unreachable: zdá sa, že neexistuje
+            role_id:
+              elevated: nemôže byť vyššia ako vaša súčasná rola
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: zahrnúť povolenia, ktoré nie sú bezpečné pre základnú rolu
+              elevated: nemôže obsahovať povolenia, ktoré vaša aktuálna rola nemá
+              own_role: nie je možné zmeniť s vašou aktuálnou rolou
+            position:
+              elevated: nemôže byť vyššia ako vaša súčasná rola
+              own_role: nie je možné zmeniť s vašou aktuálnou rolou

config/locales/ar.yml

@@ -1061,6 +1061,7 @@ ar:
     edit:
       add_keyword: إضافة كلمة مفتاحية
       keywords: الكلمات المفتاحية
+      statuses: المنشورات الفردية
       title: تعديل عامل التصفية
     errors:
       invalid_context: لم تقم بتحديد أي مجال أو أنّ المجال غير صالح

config/locales/be.yml

@@ -109,6 +109,11 @@ be:
       pending: Чакае праверкі
       perform_full_suspension: Выключыць
       previous_strikes: Ранейшыя скаргі
+      previous_strikes_description_html:
+        few: Гэты ўліковы запіс мае <strong>%{count}</strong> скаргі.
+        many: Гэты ўліковы запіс мае <strong>%{count}</strong> скарг.
+        one: Гэты ўліковы запіс мае <strong>адну</strong> скаргу.
+        other: Гэты ўліковы запіс мае <strong>%{count}</strong> скаргаў.
       promote: Павысіць
       protocol: Пратакол
       public: Публічны
@@ -509,6 +514,11 @@ be:
       delivery_error_hint: Калі дастаўка немагчымая на працягу %{count} дзён, яна будзе аўтаматычна пазначана як недастаўленая.
       destroyed_msg: Даныя з %{domain} цяпер стаяць у чарзе на неадкладнае выдаленне.
       empty: Даменаў не знойдзена.
+      known_accounts:
+        few: "%{count} вядомых уліковых запісы"
+        many: "%{count} вядомых уліковых запісаў"
+        one: "%{count} вядомых уліковых запісаў"
+        other: "%{count} вядомых уліковых запісаў"
       moderation:
         all: Усе
         limited: Абмежаваныя
@@ -686,7 +696,7 @@ be:
         manage_user_access_description: Дазваляе адключаць двухфактарную аўтэнтыфікацыю іншым карыстальнікам, змяняць іх паштовы адрас і скідваць пароль
         manage_users: Кіраванне карыстальнікамі
         manage_users_description: Дазваляе праглядаць звесткі іншых карыстальнікаў і іх мадэрацыю
-        manage_webhooks: Кіраванне webhook'амі
+        manage_webhooks: Кіраванне вэбхукамі
         manage_webhooks_description: Дазваляе карыстальнікам наладжваць вэб-хукі для адміністрацыйных аперацый
         view_audit_log: Кіраванне журналам аўдыту
         view_audit_log_description: Дазваляе карыстальнікам бачыць гісторыю адміністрацыйных аперацый на серверы
@@ -755,7 +765,7 @@ be:
       language: Мова
       media:
         title: Медыя
-      metadata: Метададзеныя
+      metadata: Метаданыя
       no_status_selected: Ніводная публікацыя не была зменена, бо ніводная не была выбрана
       open: Адкрыць допіс
       original_status: Зыходны допіс
@@ -775,7 +785,7 @@ be:
         silence: "%{name} абмежаваў уліковы запіс %{target}"
         suspend: Уліковы запіс %{target} выключаны %{name}
       appeal_approved: Абскарджана
-      appeal_pending: Скарга разглядаецца
+      appeal_pending: Апеляцыя разглядаецца
     system_checks:
       database_schema_check:
         message_html: Ёсць незавершаныя міграцыі базы дадзеных. Калі ласка, запусціце іх, каб пераканацца, што дадатак паводзіць сябе належным чынам
@@ -806,10 +816,19 @@ be:
         no_link_selected: Ніводная спасылка не была зменена, бо ніводная не была выбрана
         publishers:
           no_publisher_selected: Выдаўцы не былі зменены, таму што ніводзін не быў абраны
+        shared_by_over_week:
+          few: Абагулілі %{count} чалавекі за апошні тыдзень
+          many: Абагулілі %{count} чалавек за апошні тыдзень
+          one: Абагуліў адзін чалавек за апошні тыдзень
+          other: Абагулілі %{count} чалавек за апошні тыдзень
         title: Актуальныя спасылкі
+        usage_comparison: Выкарыстоўвалася %{today} разоў сёння, у параўнанні з %{yesterday} учора
       only_allowed: Толькі дазволенае
       pending_review: Чакае праверкі
       preview_card_providers:
+        allowed: Спасылкі ад гэтага выдаўца не будуць у трэндзе
+        description_html: Спасылкі з гэтых даменаў часта абагульняюцца на вашым серверы. Спасылкі не трапяць у публічныя трэнды, калі дамен спасылкі не ўхвалены. Вашае ўхваленне (ці адхіленне) распаўсюдзіцца на субдамены.
+        rejected: Спасылкі ад гэтага выдаўца не будуць у трэнде
         title: Выдаўцы
       rejected: Адхілена
       statuses:
@@ -818,6 +837,7 @@ be:
         description_html: Гэта допісы, пра якія ведае ваш сервер, што на дадзены момант часта абагульваюцца і падабаюцца людзям. Гэта можа дапамагчы вашым новым і пастаянным карыстальнікам знайсці больш людзей, на якіх можна падпісацца. Ніякія допісы не будуць паказвацца публічна, пакуль вы не зацвердзіце аўтара, а аўтар не дазволіць прапанаваць свой уліковы запіс іншым. Вы таксама можаце дазволіць або адхіліць асобныя допісы.
         disallow: Забараніць допіс
         disallow_account: Забараніць аўтара
+        no_status_selected: Ніводны папулярны допіс не быў зменены, бо ніводны не быў выбраны
         not_discoverable: Аўтар вырашыў быць нябачным
         shared_by:
           few: Пашыраны або ўпадабаны %{friendly_count} разы
@@ -826,20 +846,30 @@ be:
           other: Пашыраны або ўпадабаны %{friendly_count} разоў
         title: Актуальныя допісы
       tags:
+        current_score: Бягучы рэзультат %{score}
         dashboard:
           tag_accounts_measure: унікальнае выкарыстанне
           tag_languages_dimension: Папулярныя мовы
           tag_servers_dimension: Папулярныя серверы
           tag_servers_measure: розныя серверы
           tag_uses_measure: усяго выкарыстанняў
+        description_html: Гэтыя хэштэгі зараз з'яўляюцца у мностве допісаў, якія бачыць ваш сервер. Гэта дапаможа вашым карыстальнікам даведацца аб чым зараз больш за ўсё размаўляюць людзі. Ніякі хэштэг не з'явіцца публічна пакуль вы яго не пацвердзіце.
         listable: Можа быць прапанавана
+        no_tag_selected: Ніводны тэг не быў зменены, бо ніводны не быў выбраны
         not_listable: Не будзе прапанавана
         not_trendable: Не з'явіцца ў трэндах
         not_usable: Немагчыма выкарыстаць
         peaked_on_and_decaying: На піку %{date}, зараз спадае
         title: Актуальныя хэштэгі
         trendable: Можа з'явіцца сярод трэндаў
+        trending_rank: 'Папулярнае #%{rank}'
         usable: Магчыма выкарыстаць
+        usage_comparison: Выкарыстоўвалася %{today} разоў сёння, у параўнанні з %{yesterday} учора
+        used_by_over_week:
+          few: Выкарысталі %{count} чалавекі за апошні тыдзень
+          many: Выкарысталі %{count} чалавек за апошні тыдзень
+          one: Выкарыстаў адзін чалавек за апошні тыдзень
+          other: Выкарысталі %{count} чалавек за апошні тыдзень
       title: Актуальныя
       trending: Папулярныя
     warning_presets:
@@ -851,10 +881,11 @@ be:
     webhooks:
       add_new: Дадаць канцавую кропку
       delete: Выдаліць
+      description_html: "<strong>Вэбхук</strong> дазваляе Mastodon адпраўляць <strong>апавяшчэнні ў рэальным часе</strong> аб выбраных падзеях у вашай уласнай праграме, каб яна магла <strong>аўтаматычна рэагаваць на іх</strong>."
       disable: Адключыць
       disabled: Адключана
       edit: Рэдагаваць канцавую кропку
-      empty: У вас яшчэ няма сканфігураваных канчатковых кропак webhook'у.
+      empty: У вас яшчэ няма сканфігураваных канчатковых кропак вэбхука.
       enable: Уключыць
       enabled: Уключана
       enabled_events:
@@ -863,10 +894,12 @@ be:
         one: 1 актыўная падзея
         other: "%{count} актыўнай падзеі"
       events: Падзеі
-      new: Новая Webhook'а
+      new: Новая вэбхука
+      rotate_secret: Павярнуць сакрэт
+      secret: Падпісанне сакрэту
       status: Стан
-      title: Webhook'і
+      title: Вэбхукі
-      webhook: Webhook
+      webhook: Вэбхук
   admin_mailer:
     new_appeal:
       actions:
@@ -877,8 +910,16 @@ be:
         sensitive: пазначыць уліковы запіс як далікатны
         silence: абмежаваць уліковы запіс
         suspend: выключыць уліковы запіс
+      body: "%{target} абскарджвае рашэнне мадэратара %{action_taken_by} ад %{date}, якая была %{type}. Яны напісалі:"
+      next_steps: Вы можаце ўхваліць апеляцыю каб адмяніць рашэнне мадэратараў ці ігнараваць яе.
+      subject: "%{username} абскарджвае рашэнне мадэратараў на %{instance}"
+    new_pending_account:
+      body: Падрабязнасці новага ўліковага запісу прыведзены ніжэй. Вы можаце зацвердзіць або адхіліць гэтую заяўку.
+      subject: Новы ўліковы запіс для разгляду ў %{instance} (%{username})
     new_report:
+      body: "%{reporter} паскардзіўся на %{target}"
       body_remote: Нехта з %{domain} паскардзіўся на %{target}
+      subject: Новая скарга на %{instance} (#%{id})
     new_trends:
       body: 'Гэтыя элементы трэба праверыць, перш чым публікаваць:'
       new_trending_links:
@@ -1029,7 +1070,7 @@ be:
   disputes:
     strikes:
       action_taken: Выкананае дзеянне
-      appeal: Зварот
+      appeal: Апеляцыя
       appeal_approved: Гэтае папярэджанне паспяхова абскарджана і больш не дзейнічае
       appeal_rejected: Апеляцыя была адхілена
       appeal_submitted_at: Апеляцыя пададзена
@@ -1041,7 +1082,7 @@ be:
       created_at: Датаваны
       description_html: Гэта дзеянні, выкананыя супраць вашага ўліковага запісу, і папярэджанні, якія адпраўлены вам супрацоўнікамі %{instance}.
       recipient: Адрасавана
-      reject_appeal: Адхіліць абскарджанне
+      reject_appeal: Адхіліць апеляцыю
       status: 'Допіс #%{id}'
       status_removed: Допіс ужо выдалены з сістэмы
       title: "%{action} ад %{date}"
@@ -1054,71 +1095,144 @@ be:
         silence: Абмежаванне ўліковага запісу
         suspend: Выключэнне ўліковага запісу
       your_appeal_approved: Ваша абскарджанне было ўхвалена
-      your_appeal_pending: Вы адправілі абскарджанне
+      your_appeal_pending: Вы адправілі апеляцыю
       your_appeal_rejected: Ваша абскарджанне было адхілена
   domain_validator:
     invalid_domain: не з'яўляецца сапраўдным даменным імем
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': Запыт, які вы адправілі, памылковы або няправільны.
     '403': У вас няма дазволу на прагляд гэтай старонкі.
     '404': Няма старонкі, якую вы шукаеце.
-    '406': This page is not available in the requested format.
+    '406': Старонка недасяжная ў запатрабаваным фармаце.
     '410': Старонка, якую вы шукаеце, больш не існуе.
     '422':
       content: Памылка праверкі бяспекі. Вы заблакіравалі cookies?
       title: Памылка праверкі бяспекі
     '429': Зашмат запытаў
     '500':
+      content: Выбачце! Нешта пайшло не так на нашым баку.
       title: Старонка няспраўная
-    '503': The page could not be served due to a temporary server failure.
+    '503': Старонку немагчыма адлюстраваць з-за часовага збою сервера.
+    noscript_html: Каб выкарыстоўваць вэб-праграму Mastodon, уключыце JavaScript. Акрамя таго, паспрабуйце адну з <a href="%{apps_path}">арыгінальных праграм</a> Mastodon для вашай платформы.
+  existing_username_validator:
+    not_found: не атрымалася знайсці лакальны ўліковы запіс з такім імем карыстальніка
+    not_found_multiple: не атрымалася знайсці %{usernames}
   exports:
     archive_takeout:
       date: Дата
+      download: Спампаваць ваш архіў
       hint_html: Вы можаце зрабіць запыт архіва сваіх <strong>допісаў і запампаваных медыя</strong>. Экспартаваныя даныя будуць мець фармат ActivityPub, які можна прачытаць любым сумяшчальным праграмным забеспячэннем. Запыт архіва можна рабіць кожныя 7 дзён.
+      in_progress: Збіраем ваш архіў...
+      request: Запатрабаваць ваш архіў
       size: Памер
     blocks: Спіс блакіроўкі
     bookmarks: Закладкі
     csv: CSV
+    domain_blocks: Блакіроўкі дамена
     lists: Спісы
+    mutes: Уліковыя запісы, якія вы ігнаруеце
     storage: Медыясховішча
   featured_tags:
     add_new: Дадаць новы
+    errors:
+      limit: Вы ўжо дадалі максімальную колькасць хэштэгаў
   filters:
     contexts:
       account: Профілі
+      home: Стужка і спісы
       notifications: Апавяшчэнні
+      public: Публічныя стужкі
       thread: Размовы
     edit:
       add_keyword: Дадаць ключавое слова
       keywords: Ключавыя словы
+      statuses: Асобныя допісы
       title: Рэдагаваць фільтр
+    errors:
+      invalid_context: Дадзены кантэкст недастатковы альбо памылковы
     index:
+      contexts: Фільтры ў %{contexts}
       delete: Выдаліць
       empty: У вас няма фільтраў.
+      expires_in: Сканчаецца праз %{distance}
+      expires_on: Сканчаецца %{date}
+      keywords:
+        few: "%{count} ключавыя словы"
+        many: "%{count} ключавых слоў"
+        one: "%{count} ключавое слова"
+        other: "%{count} ключавога слова"
+      statuses:
+        few: "%{count} допісы"
+        many: "%{count} допісаў"
+        one: "%{count} допіс"
+        other: "%{count} допісу"
+      statuses_long:
+        few: "%{count} допісы схаваны"
+        many: "%{count} допісаў схавана"
+        one: "%{count} допіс схаваны"
+        other: "%{count} допісу схавана"
       title: Фільтры
     new:
       save: Захаваць новы фільтр
       title: Дадаць новы фільтр
     statuses:
+      back_to_filter: Вярнуцца да фільтра
+      batch:
+        remove: Выдаліць з фільтра
       index:
+        hint: Гэты фільтр прымяняецца для выбару асобных допісаў незалежна ад іншых крытэрыяў. Вы можаце дадаць больш допісаў у гэты фільтр з вэб-інтэрфейсу.
         title: Адфільтраваныя допісы
+  footer:
+    trending_now: Актуальнае
   generic:
     all: Усе
+    all_items_on_page_selected_html:
+      few: На гэтай старонцы абраныя ўсе <strong>%{count}</strong> элементы.
+      many: На гэтай старонцы абраныя ўсе <strong>%{count}</strong> элементаў.
+      one: На гэтай старонцы абраны <strong>%{count}</strong> элемент.
+      other: На гэтай старонцы абраныя усі <strong>%{count}</strong> элементаў.
+    all_matching_items_selected_html:
+      few: Абраныя ўсе <strong>%{count}</strong> элементы, якія адпавядаюць вашаму пошуку.
+      many: Абраныя ўсе <strong>%{count}</strong> элементаў, якія адпавядаюць вашаму пошуку.
+      one: Абраны <strong>%{count}</strong> элемент, які адпавядае вашаму пошуку.
+      other: Абраныя <strong>%{count}</strong> элементаў, якія адпавядаюць вашаму пошуку.
+    changes_saved_msg: Змены паспяхова захаваны!
     copy: Скапіяваць
     delete: Выдаліць
     deselect: Зняць вылучэнне з усіх
+    none: Нічога
     order_by: Парадак
     save_changes: Захаваць змены
+    select_all_matching_items:
+      few: Выберыце ўсе %{count} элементы, якія адпавядаюць вашаму пошуку.
+      many: Выберыце ўсе %{count} элементаў, якія адпавядаюць вашаму пошуку.
+      one: Выберыце %{count} элемент, які адпавядае вашаму пошуку.
+      other: Выберыце %{count} элементаў, якія адпавядаюць вашаму пошуку.
     today: сёння
+    validation_errors:
+      few: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылкі ніжэй
+      many: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
+      one: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце памылку ніжэй
+      other: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
+  html_validator:
+    invalid_markup: 'змяшчае несапраўдную разметку HTML: %{error}'
   imports:
+    errors:
+      invalid_csv_file: 'Несапраўдны файл CSV. Памылка: %{error}'
+      over_rows_processing_limit: колькасць радкоў большая за %{count}
     modes:
       merge: Аб'яднаць
       merge_long: Захаваць існуючыя запісы і дадаць новыя
       overwrite: Перазапісаць
+      overwrite_long: Замяніць бягучыя запісы на новыя
+    preface: Вы можаце імпартаваць даныя, экспартаваныя вамі з іншага сервера, напрыклад, спіс людзей, на якіх вы падпісаны або якіх блакуеце.
+    success: Вашы даныя паспяхова запампаваныя і будуць неўзабаве апрацаваны
     types:
       blocking: Спіс заблакіраваных
       bookmarks: Закладкі
       domain_blocking: Спіс заблакіраваных даменаў
+      following: Падпіскі
+      muting: Спіс ігнаравання
     upload: Запампаваць
   invites:
     delete: Дэактываваць
@@ -1132,10 +1246,21 @@ be:
       '86400': 1 дзень
     expires_in_prompt: Ніколі
     generate: Стварыць запрашальную спасылку
+    invited_by: 'Вас запрасіў(-ла):'
+    max_uses:
+      few: "%{count} выкарыстанні"
+      many: "%{count} выкарыстанняў"
+      one: 1 выкарыстанне
+      other: "%{count} выкарыстанняў"
     max_uses_prompt: Неабмежавана
+    prompt: Генерыруйце і абагульвайце паміж іншымі спасылкі для доступу да гэтага сервера
     table:
+      expires_at: Дзее да
       uses: Выкарыстанні
     title: Запрасіць людзей
+  lists:
+    errors:
+      limit: Вы дасягнулі макс. колькасці спісаў
   login_activities:
     authentication_methods:
       otp: праграма двухфактарнай аўтэнтыфікацыі
@@ -1149,21 +1274,51 @@ be:
     title: Гісторыя ўваходаў
   media_attachments:
     validations:
-      too_many: Няможна дадаць больш 4 файлаў
+      images_and_video: Немагчыма прымацаваць відэа да допісу, які ўжо змяшчае выявы
+      not_ready: Няможна дадаць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
+      too_many: Няможна дадаць больш за 4 файлы
   migrations:
+    acct: Перамешчана ў
+    cancel: Скасаваць перанакіраванне
+    cancel_explanation: Скасаванне перанакіравання паўторна актывуе ваш бягучы ўліковы запіс, але не верне падпісчыкаў, якія былі перамешчаны на той уліковы запіс.
+    cancelled_msg: Перанакіраванне паспяхова скасавана.
     errors:
+      already_moved: ёсць тым жа ўліковым запісам, на які вы ўжо пераехалі
       missing_also_known_as: гэта не псеўданім уліковага запісу
+      move_to_self: не можа быць бягучым уліковым запісам
       not_found: не знойдзена
     followers_count: Падпісчыкі на момант перамяшчэння
+    incoming_migrations: Пераязджаем з іншага ўліковага запісу
     incoming_migrations_html: Каб перайсці з іншага ўліковага запісу ў гэты, спачатку трэба <a href="%{path}">стварыць псеўданім уліковага запісу</a>.
+    moved_msg: Ваш уліковы запіс перанакіроўваецца на %{acct}. Туды-ж будуць перамешчаны вашы падпісчыкі.
+    not_redirecting: Ваш уліковы запіс не перанакіроўваецца на іншы ўліковы запіс.
+    on_cooldown: Вы нядаўна перамяшчалі свой уліковы запіс. Гэтая мажлівасць зноў стане даступнай праз %{count} дзн.
     past_migrations: Колішнія перамяшчэнні
     proceed_with_move: Перамясціць падпісчыкаў
+    redirected_msg: Ваш уліковы запіс цяпер перанакіроўваецца на %{acct}.
+    redirecting_to: Ваш уліковы запіс перанакіроўваецца на %{acct}.
+    set_redirect: Задаць перанакіраванне
+    warning:
+      backreference_required: Спачатку трэба наладзіць зваротнае спасыланне новага ўліковага запісу на бягучы
+      before: 'Перш чым працягнуць, калі ласка, уважліва прачытайце гэтыя заўвагі:'
+      cooldown: Пасля «пераезду» будзе перыяд чакання, на працягу якога вы не зможаце зноў «пераехаць»
+      disabled_account: Пасля гэтага ваш бягучы ўліковы запіс не будзе цалкам даступны. Аднак у вас будзе доступ да экспарту даных, а таксама да паўторнай актывацыі.
+      followers: Гэтае дзеянне будзе «пераносіць» усіх падпісчыкаў з бягучага ўліковага запісу на новы
+      only_redirect_html: Альбо вы можаце <a href="%{path}"> толькі наладзіць перанакіраванне на ваш профіль</a>.
+      other_data: Ніякія іншыя даныя не будуць перамешчаны аўтаматычна
+      redirect: Профіль вашага бягучага ўліковага запісу будзе абноўлены з паведамленнем аб перанакіраванні і выключаны з пошуку
   moderation:
     title: Мадэрацыя
+  move_handler:
+    carry_blocks_over_text: Гэты карыстальнік «перанесены» з уліковага запісу %{acct}, які вы заблакавалі.
+    carry_mutes_over_text: Гэты карыстальнік «перанесены» з уліковага запісу %{acct}, які вы ігнаруеце.
+    copy_account_note_text: 'Гэты карыстальнік «перанесены» з %{acct}, вось вашы папярэднія заўвагі пра яго:'
   navigation:
     toggle_menu: Уключыць меню
   notification_mailer:
     admin:
+      report:
+        subject: "%{name} падаў скаргу"
       sign_up:
         subject: "%{name} зарэгістраваўся"
     favourite:
@@ -1177,6 +1332,7 @@ be:
     follow_request:
       action: Кіраванне запытамі на падпіску
       body: "%{name} хоча падпісацца на вас"
+      subject: 'Падпісчык у чарзе: %{name}'
       title: Новы запыт на падпіску
     mention:
       action: Адказаць
@@ -1204,25 +1360,44 @@ be:
         units:
           billion: млрд
           million: млн
+          quadrillion: Q
           thousand: тыс.
           trillion: трлн
   otp_authentication:
+    code_hint: Каб пацвердзіць, увядзіце код, згенераваны праграмай-аўтэнтыфікатарам
+    description_html: Калі вы ўключыце <strong>двухфактарную аўтэнтыфікацыю</strong> праз праграму-аўтэнтыфікатар, то каб увайсці ва ўліковы запіс, вам трэба мець тэлефон, які будзе генераваць токены для ўводу.
     enable: Уключыць
+    instructions_html: "<strong>Скануйце гэты QR-код у Google Authenticator або ў аналагічнай TOTP-праграме на вашым тэлефоне</strong>. З гэтага моманту праграма будзе генераваць токены, якія вам трэба будзе ўводзіць пры ўваходзе ва ўліковы запіс."
+    manual_instructions: 'Калі вы не можаце сканаваць QR-код і трэба ўвесці яго ўручную, вось ключ у форме тэксту:'
     setup: Наладзіць
+    wrong_code: Уведзены несапраўдны код! Час на прыладзе адпавядае часу на серверы?
   pagination:
     newer: Навейшае
     next: Далей
     older: Старэйшае
+    prev: Папярэдні
     truncate: "&hellip;"
   polls:
     errors:
       already_voted: Вы ўжо прагаласавалі ў апытанні
       duplicate_options: змяшчае аднолькавыя варыянты
+      duration_too_long: гэта занадта далёка ў будучыні
+      duration_too_short: гэта занадта хутка
       expired: Апытанне ўжо скончана
+      invalid_choice: Абраны варыянт апытання не існуе
+      over_character_limit: не можа быць даўжэй за %{max} сімвалаў кожны
+      too_few_options: павінна быць болей за адзін варыянт
+      too_many_options: колькасць варыянтаў не можа перавышаць %{max}
   preferences:
     other: Іншае
     posting_defaults: Публікаваць па змаўчанні
     public_timelines: Публічныя стужкі
+  privacy_policy:
+    title: Палітыка канфідэнцыйнасці
+  reactions:
+    errors:
+      limit_reached: Дасягнуты ліміт розных рэакцый
+      unrecognized_emoji: невядомае эмодзі
   relationships:
     activity: Актыўнасць ул. запісу
     dormant: Занядбаны
@@ -1240,8 +1415,20 @@ be:
     remove_selected_followers: Выдаліць выбраных падпісчыкаў
     remove_selected_follows: Адпісацца ад выбраных карыстальнікаў
     status: Стан уліковага запісу
+  remote_follow:
+    missing_resource: Не ўдалося знайсці патрэбны URL перанакіравання для вашага ўліковага запісу
+  reports:
+    errors:
+      invalid_rules: не спасылаецца на дзеючыя правілы
   rss:
     content_warning: 'Папярэджанне аб змесціве:'
+    descriptions:
+      account: Публічныя допісы ад @%{acct}
+      tag: 'Публічныя допісы з хэштэгам #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Вы перавысілі ліміт ў %{limit} запланаваных на сёння допісаў
+    over_total_limit: Вы перавысілі ліміт ў %{limit} запланаваных допісаў
+    too_soon: Запланаваная дата мусіць быць у будучыні
   sessions:
     activity: Апошняя актыўнасць
     browser: Браўзер
@@ -1265,6 +1452,7 @@ be:
       weibo: Weibo
     current_session: Бягучая сесія
     description: "%{browser} на %{platform}"
+    explanation: Гэта вэб-браўзэры, з якіх выкананы ўваход у ваш уліковы запіс Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe AIR
@@ -1294,6 +1482,7 @@ be:
     development: Распрацоўка
     edit_profile: Рэдагаваць профіль
     export: Экспарт даных
+    featured_tags: Выбраныя хэштэгі
     import: Імпарт
     import_and_export: Імпарт і экспарт
     migrate: Перамяшчэнне ўліковага запісу
@@ -1302,6 +1491,7 @@ be:
     profile: Профіль
     relationships: Падпіскі і падпісчыкі
     statuses_cleanup: Аўтаматычнае выдаленне допісаў
+    strikes: Папярэджанні мадэратараў
     two_factor_authentication: Двухфактарная аўтэнтыфікацыя
     webauthn_authentication: Ключы бяспекі
   statuses:
@@ -1311,6 +1501,7 @@ be:
         many: "%{count} аўдыяфайлаў"
         one: "%{count} аўдыяфайл"
         other: "%{count} аўдыяфайла"
+      description: 'Дадаткі: %{attached}'
       image:
         few: "%{count} выявы"
         many: "%{count} выяваў"
@@ -1321,8 +1512,14 @@ be:
         many: "%{count} відэафайлаў"
         one: "%{count} відэафайл"
         other: "%{count} відэафайла"
+    boosted_from_html: Пашырыў уліковы запіс %{acct_link}
     content_warning: 'Папярэджанне аб змесціве: %{warning}'
     default_language: Такая, што і мова інтэрфэйсу
+    disallowed_hashtags:
+      few: 'змяшчае недазволеныя хэштэгі: %{tags}'
+      many: 'змяшчае недазволеныя хэштэгі: %{tags}'
+      one: 'змяшчае недазволены хэштэг: %{tags}'
+      other: 'утрымлівае недазволеныя хэштэгі: %{tags}'
     edited_at_html: Адрэдагавана %{date}
     errors:
       in_reply_not_found: Здаецца, допіс, на які вы спрабуеце адказаць, не існуе.
@@ -1348,21 +1545,35 @@ be:
     show_more: Паказаць больш
     show_newer: Паказаць навейшыя
     show_older: Паказаць старэйшыя
+    show_thread: Паказаць ланцуг
     sign_in_to_participate: Зарэгіструйцеся каб удзельнічаць у абмеркаванні
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Асабіста
       private: Для падпісчыкаў
+      private_long: Паказваць толькі падпісчыкам
       public: Публічны
       public_long: Усе могуць бачыць
+      unlisted: Не ў спісе
+      unlisted_long: Кожны можа ўбачыць гэты допіс, але ён не паказваецца ў публічных стужках
   statuses_cleanup:
     enabled: Аўтаматычна выдаляць старыя допісы
     enabled_hint: Аўтаматычна выдаляць вашыя допісы, калі яны дасягаюць вызначанага тэрміну, акрамя наступных выпадкаў
     exceptions: Выключэнні
+    explanation: Выдаленне допісаў — гэта цяжкая аперацыя. Яна павольна выконваецца ў часы, калі сервер не загружаны іншай працай. Праз гэта вашыя допісы могуць быць выдаленыя праз пэўны час пасля вызначанага тэрміну.
     ignore_favs: Ігнараваць упадабаныя
     ignore_reblogs: Ігнараваць пашырэнні
     interaction_exceptions: Выключэнні, заснаваныя на ўзаемадзеянні
+    keep_direct: Захаваць асабістыя паведамленні
+    keep_direct_hint: Не выдаляць асабістыя паведамленні
     keep_media: Захоўваць допісы з медыя дадаткамі
+    keep_media_hint: Не выдаляць вашыя допісы, якія ўтрымліваюць медыя
+    keep_pinned: Захаваць замацаваныя допісы
+    keep_pinned_hint: Не выдаляць вашыя замацаваныя допісы
     keep_polls: Працягнуць апытанне
+    keep_polls_hint: Не выдаляць вашыя апытанні
+    keep_self_bookmark: Захаваць допісы, якія вы дадалі ў закладкі
+    keep_self_bookmark_hint: Не выдаляе вашыя допісы, якія вы дадалі ў закладкі
     keep_self_fav: Пакідаць упадабаныя вамі допісы
     keep_self_fav_hint: Не выдаляе вашыя допісы, якія вы ўпадабалі
     min_age:
@@ -1374,11 +1585,20 @@ be:
       '604800': 1 тыдзень
       '63113904': 2 гады
       '7889238': 3 месяцы
+    min_age_label: Тэрмін даўнасці
+    min_favs: Захаваць допісы, якія ўпадабалі хаця б
     min_favs_hint: Не выдаляе вашыя допісы, якія спадабаліся прынамсі вызначанай колькасці людзей. Пакіньце гэтае поле пустым, каб допісы выдаляліся незалежна ад гэтай колькасці
+    min_reblogs: Захаваць допісы, якія пашырылі хаця б
+    min_reblogs_hint: Не выдаляе вашыя допісы, якія пашырыла прынамсі вызначаная колькасць людзей. Пакіньце гэтае поле пустым, каб допісы выдаляліся незалежна ад гэтай колькасці
   stream_entries:
     pinned: Замацаваны допіс
     reblogged: пашыраны
     sensitive_content: Далікатны змест
+  strikes:
+    errors:
+      too_late: Запозна абскарджваць гэтае папярэджанне
+  tags:
+    does_not_match_previous_name: не супадае з папярэднім імям
   themes:
     contrast: Mastodon (высокі кантраст)
     default: Mastodon (цёмная)
@@ -1386,6 +1606,7 @@ be:
   time:
     formats:
       default: "%d.%m.%Y %H:%M"
+      month: "%b %Y"
       time: "%H:%M"
   two_factor_authentication:
     add: Дадаць
@@ -1405,32 +1626,46 @@ be:
   user_mailer:
     appeal_approved:
       action: Перайсці ў свой уліковы запіс
+      explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
+      subject: Вашая апеляцыя ад %{date} была ўхваленая
       title: Абскарджанне ўхвалена
     appeal_rejected:
+      explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была адхілена.
+      subject: Вашая апеляцыя ад %{date} была адхіленая
       title: Абскарджанне адхілена
     backup_ready:
+      explanation: Вы запатрабавалі поўнае рэзервовае капіраванне вашага ўліковага запісу Mastodon. Цяпер яго можна спампаваць!
       subject: Ваш архіў гатовы да спампавання
+      title: Ваш архіў можна спампаваць
     suspicious_sign_in:
       change_password: змяніць свой пароль
+      details: 'Вось падрабязнасці ўваходу:'
       explanation: Мы заўважылі ўваход у ваш уліковы запіс з новага IP-адрасу.
       further_actions_html: Калі гэта былі не вы, раім вам неадкладна %{action}, а таксама ўключыць двухфактарную аўтэнтыфікацыю, каб захаваць бяспеку вашага ўліковага запісу.
       subject: У вас уліковы запіс зайшлі з новага IP-адрасу
       title: Новы ўваход
     warning:
       appeal: Падаць апеляцыю
+      appeal_description: "Калі вы лічыце гэта памылкай, вы можаце падаць апеляцыю \nсупрацоўнікам %{instance}."
       categories:
         spam: Спам
+        violation: Кантэнт парушае наступныя правілы супольнасці
       explanation:
         delete_statuses: Было выяўлена, што некаторыя з вашых допісаў парушалі адно або больш правілаў супольнасці і былі выдаленыя мадэратарамі суполкі %{instance}.
+        disable: Вы больш не можаце выкарыстоўваць свой уліковы запіс, але ваш профіль і іншыя даныя застаюцца некранутымі. Вы можаце запытаць рэзервовае капіраванне вашых даных, змяніць налады ўліковага запісу або выдаліць свой уліковы запіс.
         mark_statuses_as_sensitive: Некаторыя вашыя допісы былі пазначаныя як далікатныя мадэратарамі суполкі %{instance}. Гэта значыць, што іншым людзям давядзецца спачатку націснуць на медыя допісу каб праглядзець яго. Вы можаце ўласнаручна пазначыць медыя як далікатныя перад тым, як апублікаваць іх у будучым.
+        sensitive: Адгэтуль усе вашыя запампаваныя медыя файлы будуць пазначаны як далікатныя і будуць схаваныя па-за папярэджаннем.
         silence: Вы ўсё яшчэ можаце карыстаецца вашым уліковым запісам, але толькі ўжо падпісаныя на вас людзі змогуць бачыць вашыя публікацыі на серверы. Вы таксама можаце быць адхілены ад удзелу ў розных пошукавых функцыях, аднак іншыя ўсё роўна могуць уласнаручна падпісацца на вас.
         suspend: Вы больш не можаце выкарыстоўваць свой уліковы запіс, а профіль і іншыя даныя сталі недаступнымі. Вы ўсё яшчэ можаце ўвайсці, каб запытаць архіў сваіх даных да моманту іх выдалення праз 30 дзён, але мы захаваем вашы базавыя даныя, каб не даць вам абысці выключэнне.
       reason: 'Прычына:'
       statuses: 'Прычынныя допісы:'
       subject:
         delete_statuses: Вашыя допісы на %{acct} былі выдалены
+        disable: Ваш уліковы запіс %{acct} быў замарожаны
         mark_statuses_as_sensitive: Вашыя допісы на %{acct} былі пазначаныя як далікатныя
+        none: Папярэджанне для %{acct}
         sensitive: З гэтага моманту вашыя допісы на %{acct} будуць пазначаныя як далікатныя
+        silence: Ваш уліковы запіс %{acct} быў абмежаваны
         suspend: Ваш уліковы запіс %{acct} быў выключаны
       title:
         delete_statuses: Выдаленыя допісы
@@ -1442,17 +1677,37 @@ be:
         suspend: Уліковы запіс выключаны
     welcome:
       edit_profile_action: Наладзіць профіль
+      edit_profile_step: Вы можаце наладзіць свой профіль, запампаваўшы выяву профілю, змяніўшы адлюстраванае імя і іншае. Вы можаце праглядаць новых падпісчыкаў, перш чым ім будзе дазволена падпісацца на вас.
       explanation: Вось некаторыя парады каб пачаць
       final_action: Пачаць пісаць
       final_step: 'Пачынайце пісаць! Нават, калі ў вас няма падпісчыкаў, іншыя людзі змогуць пабачыць вашыя допісы, напрыклад, у лакальнай стужцы, або праз хэштэгі. Калі хочаце, вы можаце прадставіцца праз хэштэг #introductions.'
+      full_handle: Ваш поўны маркер
+      full_handle_hint: Гэта тое, што вы дасце сваім сябрам, каб яны маглі адпраўляць паведамленні або падпісацца на вас з іншага сервера.
       subject: Вітаем у Mastodon
       title: Рады вітаць вас, %{name}!
   users:
+    follow_limit_reached: Вы не можаце падпісацца на большую колькасць людзей чым %{limit}
+    invalid_otp_token: Няправільны код двухфактарнай аўтэнтыфікацыі
+    otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце скарыстацца %{email}
+    seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
     signed_in_as: 'Увайшлі як:'
+  verification:
+    explanation_html: 'Вы можаце <strong>пацвердзіць сябе як уладальніка спасылак у метададзеных вашага профілю</strong>. Для гэтага спасылка на вэб-сайт павінна ўтрымліваць спасылку на ваш профіль Mastodon. Зваротная спасылка <strong>павінна</strong> мець атрыбут <code>rel="me"</code>. Тэкставы змест спасылкі не мае значэння. Вось прыклад:'
+    verification: Верыфікацыя
   webauthn_credentials:
     add: Дадаць новы ключ бяспекі
+    create:
+      error: Узнікла праблема з даданнем ключа бяспекі. Паспрабуйце яшчэ раз.
+      success: Ваш ключ бяспекі быў паспяхова дададзены.
     delete: Выдаліць
     delete_confirmation: Сапраўды выдаліць гэты ключ бяспекі?
+    description_html: Калі вы ўключыце <strong>аўтэнтыфікацыю ключа бяспекі</strong>, для ўваходу вам спатрэбіцца выкарыстоўваць адзін з вашых ключоў бяспекі.
     destroy:
+      error: Узнікла праблема з выдаленнем ключа бяспекі. Паспрабуйце яшчэ раз.
       success: Ваш ключ бяспекі быў паспяхова выдалены.
     invalid_credential: Няправільны ключ бяспекі
+    nickname_hint: Увядзіце псеўданім вашага новага ключа бяспекі
+    not_enabled: Вы яшчэ не ўключылі WebAuthn
+    not_supported: Гэты браўзер не падтрымлівае ключы бяспекі
+    otp_required: Каб выкарыстоўваць ключы бяспекі, спачатку ўключыце двухфактарную аўтэнтыфікацыю.
+    registered_on: Зарэгістраваны %{date}

config/locales/cy.yml

@@ -27,7 +27,7 @@ cy:
       many: Postiadau
       one: Postiad
       other: Postiadau
-      two: Postiadu
+      two: Postiadau
       zero: Postiadau
     posts_tab_heading: Postiadau
   admin:
@@ -69,7 +69,7 @@ cy:
       disable_sign_in_token_auth: Analluogi dilysu tocynnau e-bost
       disable_two_factor_authentication: Diffodd 2FA
       disabled: Wedi rhewi
-      display_name: Enw arddangos
+      display_name: Enw sgrin
       domain: Parth
       edit: Golygu
       email: E-bost
@@ -203,7 +203,7 @@ cy:
         destroy_email_domain_block: Dileu gwaharddiad parth e-bost
         destroy_instance: Clirio Parth
         destroy_ip_block: Dileu rheol IP
-        destroy_status: Dileu Statws
+        destroy_status: Dileu Postiad
         destroy_unavailable_domain: Dileu Parth Ddim ar Gael
         destroy_user_role: Dinistrio Rôl
         disable_2fa_user: Diffodd 2FA
@@ -224,17 +224,17 @@ cy:
         resolve_report: Datrus Adroddiad
         sensitive_account: Cyfrif Grym-Sensitif
         silence_account: Cyfyngu Cyfrif
-        suspend_account: Gwahardd Cyfrif Dros Dro
+        suspend_account: Atal Cyfrif Dros Dro
         unassigned_report: Dadneilltuo Adroddiad
         unblock_email_account: Dadflocio cyfeiriad e-bost
         unsensitive_account: Dadwneud Cyfrif Grym-Sensitif
         unsilence_account: Dad-gyfyngu Cyfrif
-        unsuspend_account: Tynnu Gwahardd Cyfrif Dros Dro
+        unsuspend_account: Tynnu Ataliad Cyfrif Dros Dro
         update_announcement: Diweddaru Cyhoeddiad
         update_custom_emoji: Diweddaru Emoji Cyfaddas
         update_domain_block: Diweddaru'r Blocio Parth
         update_ip_block: Diweddaru rheol IP
-        update_status: Diweddaru Statws
+        update_status: Diweddaru Postiad
         update_user_role: Diweddaru Rôl
       actions:
         approve_appeal_html: Mae %{name} wedi cymeradwyo penderfyniad cymedroli gan %{target}
@@ -243,10 +243,10 @@ cy:
         change_email_user_html: Mae %{name} wedi newid cyfeiriad e-bost defnyddiwr %{target}
         change_role_user_html: Mae %{name} wedi newid rôl %{target}
         confirm_user_html: Mae %{name}  wedi cadarnhau cyfeiriad e-bost defnyddiwr %{target}
-        create_account_warning_html: Anfonodd %{name} rybudd at %{target}
+        create_account_warning_html: Mae %{name} wedi anfon rhybudd at %{target}
         create_announcement_html: Mae %{name} wedi creu cyhoeddiad newydd %{target}
         create_canonical_email_block_html: Mae %{name} wedi rhwystro e-bost gyda'r hash %{target}
-        create_custom_emoji_html: "%{name} wedi llwytho emoji newydd %{target}"
+        create_custom_emoji_html: Mae %{name} wedi llwytho emoji newydd %{target}
         create_domain_allow_html: Mae %{name} wedi caniatáu ffedereiddio â pharth %{target}
         create_domain_block_html: Mae %{name} wedi rhwystro parth %{target}
         create_email_domain_block_html: Mae %{name}  wedi rhwystro parth e-bost %{target}
@@ -637,7 +637,7 @@ cy:
       comment_description_html: 'I ddarparu rhagor o wybodaeth, ysgrifennodd %{name}:'
       created_at: Adroddwyd
       delete_and_resolve: Dileu postiadau
-      forwarded: Wedi'i Anfon Ymlaen
+      forwarded: Wedi'i anfon ymlaen
       forwarded_to: Wedi'i anfon ymlaen i %{domain}
       mark_as_resolved: Nodi fel wedi'i ddatrys
       mark_as_sensitive: Marcio fel sensitif
@@ -682,7 +682,7 @@ cy:
         administration: Gweinyddiaeth
         devops: DevOps
         invites: Gwahoddiadau
-        moderation: Cymedroil
+        moderation: Cymedroli
         special: Arbennig
       delete: 'Dileu:'
       description_html: Gyda <strong>rolau defnyddwyr</strong>, gallwch chi gyfaddasu pa swyddogaethau a meysydd o Mastodon y gall eich defnyddwyr gael mynediad iddyn nhw.
@@ -724,7 +724,7 @@ cy:
         manage_settings: Rheoli Gosodiadau
         manage_settings_description: Yn caniatáu i ddefnyddwyr newid gosodiadau gwefan
         manage_taxonomies: Rheoli Tacsonomeg
-        manage_taxonomies_description: Yn caniatáu i ddefnyddwyr adolygu cynnwys sy'n tueddu a diweddaru gosodiadau hashnodau
+        manage_taxonomies_description: Yn caniatáu i ddefnyddwyr adolygu cynnwys sy'n trendio a diweddaru gosodiadau hashnodau
         manage_user_access: Rheoli Mynediad Defnyddwyr
         manage_user_access_description: Yn caniatáu i ddefnyddwyr analluogi dilysu dau ffactor defnyddwyr eraill, newid eu cyfeiriad e-bost, ac ailosod eu cyfrinair
         manage_users: Rheoli Defnyddwyr
@@ -764,9 +764,9 @@ cy:
         follow_recommendations: Dilyn yr argymhellion
         preamble: Mae amlygu cynnwys diddorol yn allweddol ar gyfer derbyn defnyddwyr newydd nad ydynt efallai'n gyfarwydd ag unrhyw un Mastodon. Rheolwch sut mae nodweddion darganfod amrywiol yn gweithio ar eich gweinydd.
         profile_directory: Cyfeiriadur proffiliau
-        public_timelines: Llinellau amser cyhoeddus
+        public_timelines: Ffrydiau cyhoeddus
         title: Darganfod
-        trends: Pynciau Llosg
+        trends: Trendiau
       domain_blocks:
         all: I bawb
         disabled: I neb
@@ -799,13 +799,13 @@ cy:
       media:
         title: Cyfryngau
       metadata: Metaddata
-      no_status_selected: Heb newid statws gan na ddewiswyd dim un
+      no_status_selected: Heb newid postiad gan na ddewiswyd dim un
-      open: Agor post
+      open: Agor postiad
-      original_status: Post gwreiddiol
+      original_status: Postiad gwreiddiol
       reblogs: Ailflogiadau
-      status_changed: Post wedi'i newid
+      status_changed: Postiad wedi'i newid
       title: Postiadau cyfrif
-      trending: Trendio
+      trending: Yn trendio
       visibility: Gwelededd
       with_media: Gyda chyfryngau
     strikes:
@@ -856,23 +856,23 @@ cy:
           other: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
           two: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
           zero: Wedi'i rannu gan %{count} o bobl dros yr wythnos ddiwethaf
-        title: Dolenni sy'n tueddu
+        title: Dolenni sy'n trendio
         usage_comparison: Wedi'i rannu %{today} gwaith heddiw, o'i gymharu â %{yesterday} ddoe
       only_allowed: Derbyniwyd yn unig
       pending_review: Yn aros am adolygiad
       preview_card_providers:
         allowed: Gall dolenni gan y cyhoeddwr hwn greu tuedd
-        description_html: Mae'r rhain yn barthau lle mae dolenni'n cael eu rhannu'n aml ar eich gweinydd. Ni fydd dolenni'n dueddu'n gyhoeddus oni bai bod parth y ddolen yn cael ei gymeradwyo. Mae eich cymeradwyaeth (neu eich gwrthodiad) yn ymestyn i is-barthau.
+        description_html: Mae'r rhain yn barthau lle mae dolenni'n cael eu rhannu'n aml ar eich gweinydd. Ni fydd dolenni'n trendio'n gyhoeddus oni bai bod parth y ddolen yn cael ei gymeradwyo. Mae eich cymeradwyaeth (neu eich gwrthodiad) yn ymestyn i is-barthau.
         rejected: Ni fydd dolenni gan y cyhoeddwr hwn yn creu tuedd
         title: Cyhoeddwyr
       rejected: Gwrthodwyd
       statuses:
-        allow: Caniatáu post
+        allow: Caniatáu postiad
         allow_account: Caniatáu awdur
         description_html: Mae'r rhain yn bostiadau y mae eich gweinydd yn gwybod amdanyn nhw sy'n cael eu rhannu a'u ffafrio llawer ar hyn o bryd. Gall helpu eich defnyddwyr newydd a'ch defnyddwyr sy'n dychwelyd i ddod o hyd i fwy o bobl i'w dilyn. Ni chaiff unrhyw bostiadau eu dangos yn gyhoeddus nes i chi gymeradwyo'r awdur, ac mae'r awdur yn caniatáu i'w cyfrif gael ei awgrymu i eraill. Gallwch hefyd ganiatáu neu wrthod postiadau unigol.
-        disallow: Gwrthod post
+        disallow: Gwrthod postiad
         disallow_account: Gwrthod awdur
-        no_status_selected: Heb newid unrhyw negeseuon tuedd gan na chafodd yr un ohonyn nhw eu dewis
+        no_status_selected: Heb newid unrhyw bostiadau'n trendio gan na chafodd yr un ohonyn nhw eu dewis
         not_discoverable: Nid yw'r awdur wedi dewis bod yn ddarganfyddadwy
         shared_by:
           few: Wedi'i rannu a'i ffefrynnu %{friendly_count} gwaith
@@ -894,12 +894,12 @@ cy:
         listable: Mae modd ei awgrymu
         no_tag_selected: Heb newid unrhyw dagiau gan na chafodd yr un ohonyn nhw eu dewis
         not_listable: Ni fydd yn cael ei awgrymu
-        not_trendable: Ni fydd yn ymddangos o dan bynciau llosg
+        not_trendable: Ni fydd yn ymddangos o dan trendiau
         not_usable: Nid oes modd ei ddefnyddio
         peaked_on_and_decaying: Ar ei anterth ar %{date}, bellach yn lleihau
-        title: Hashnodau tueddiadau
+        title: Hashnodau trendiau
-        trendable: Gall ymddangos o dan bynciau llosg
+        trendable: Gall ymddangos o dan trendiau
-        trending_rank: 'Yn tueddu #%{rank}'
+        trending_rank: 'Yn trendio #%{rank}'
         usable: Mae modd ei ddefnyddio
         usage_comparison: Wedi'i ddefnyddio %{today} gwaith heddiw, o'i gymharu â %{yesterday} ddoe
         used_by_over_week:
@@ -909,7 +909,7 @@ cy:
           other: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
           two: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
           zero: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
-      title: Pynciau Llosg
+      title: Trendiau
       trending: Trendio
     warning_presets:
       add_new: Ychwanegu newydd
@@ -964,7 +964,7 @@ cy:
     new_trends:
       body: 'Mae angen adolygu''r eitemau canlynol cyn y mae modd eu dangos yn gyhoeddus:'
       new_trending_links:
-        title: Dolenni llosg
+        title: Dolenni sy'n trendio
       new_trending_statuses:
         title: Postiadau sy'n trendio
       new_trending_tags:
@@ -981,7 +981,7 @@ cy:
     remove: Dadgysylltu'r enw arall
   appearance:
     advanced_web_interface: Rhyngwyneb gwe uwch
-    advanced_web_interface_hint: 'Os ydych chi am ddefnyddio lled eich sgrin gyfan, mae''r rhyngwyneb gwe datblygedig yn caniatáu i chi ffurfweddu llawer o wahanol golofnau i weld faint bynnag o wybodaeth ar yr un pryd ag y dymunwch: Cartref, hysbysiadau, llinell amser ffederaleiddiwyd, faint bynnag o restrau a hashnodau.'
+    advanced_web_interface_hint: 'Os ydych chi am ddefnyddio lled eich sgrin gyfan, mae''r rhyngwyneb gwe datblygedig yn caniatáu i chi ffurfweddu llawer o wahanol golofnau i weld faint bynnag o wybodaeth ar yr un pryd ag y dymunwch: Cartref, hysbysiadau, ffrydiau ffederaleiddiwyd, faint bynnag o restrau a hashnodau.'
     animations_and_accessibility: Animeiddiadau a hygyrchedd
     confirmation_dialogs: Deialogau cadarnhau
     discovery: Darganfod
@@ -997,7 +997,7 @@ cy:
     settings: 'Newid gosodiadau e-bost: %{link}'
     view: 'Gweld:'
     view_profile: Gweld proffil
-    view_status: Gweld statws
+    view_status: Gweld postiad
   applications:
     created: Cais wedi ei greu'n llwyddiannus
     destroyed: Cais wedi ei ddileu'n llwyddiannus
@@ -1082,7 +1082,7 @@ cy:
       with_month_name: "%b %d %Y"
   datetime:
     distance_in_words:
-      about_x_hours: "%{count}awr"
+      about_x_hours: "%{count}a"
       about_x_months: "%{count}mis"
       about_x_years: "%{count}b"
       almost_x_years: "%{count}b"
@@ -1131,7 +1131,7 @@ cy:
       status_removed: Postiad sydd eisoes wedi'i dynnu o'r system
       title: "%{action} gan %{date}"
       title_actions:
-        delete_statuses: Dileu post
+        delete_statuses: Dileu postiad
         disable: Rhewi cyfrif
         mark_statuses_as_sensitive: Marcio postiadau fel rhai sensitif
         none: Rhybudd
@@ -1186,7 +1186,7 @@ cy:
       account: Proffilau
       home: Cartref a rhestrau
       notifications: Hysbysiadau
-      public: Llinellau amser cyhoeddus
+      public: Ffrydiau cyhoeddus
       thread: Sgyrsiau
     edit:
       add_keyword: Ychwanegu allweddair
@@ -1236,7 +1236,7 @@ cy:
         hint: Mae'r hidlydd hwn yn berthnasol i ddethol postiadau unigol waeth beth fo'r meini prawf eraill. Gallwch ychwanegu mwy o bostiadau at yr hidlydd hwn o'r rhyngwyneb gwe.
         title: Postiadau wedi'u hidlo
   footer:
-    trending_now: Pynciau llosg
+    trending_now: Trendiau
   generic:
     all: Popeth
     all_items_on_page_selected_html:
@@ -1375,7 +1375,7 @@ cy:
     title: Cymedroil
   move_handler:
     carry_blocks_over_text: Symudodd y defnyddiwr hwn o %{acct}, yr oeddech wedi'i rwystro.
-    carry_mutes_over_text: Wnaeth y defnyddiwr symud o %{acct}, a oeddech chi wedi'i anwybyddu.
+    carry_mutes_over_text: Symudodd y defnyddiwr hwn o %{acct}, lle roeddech chi wedi'i dewi.
     copy_account_note_text: 'Symudodd y defnyddiwr hwn o %{acct}, dyma oedd eich nodiadau blaenorol amdanynt:'
   navigation:
     toggle_menu: Toglo'r ddewislen
@@ -1386,8 +1386,8 @@ cy:
       sign_up:
         subject: Mae %{name} wedi cofrestru
     favourite:
-      body: 'Cafodd eich statws ei hoffi gan %{name}:'
+      body: 'Cafodd eich postiad ei hoffi gan %{name}:'
-      subject: Hoffodd %{name} eich statws
+      subject: Hoffodd %{name} eich postiad
       title: Ffefryn newydd
     follow:
       body: Mae %{name} bellach yn eich dilyn!
@@ -1404,7 +1404,7 @@ cy:
       subject: Cawsoch eich crybwyll gan %{name}
       title: Crywbylliad newydd
     poll:
-      subject: Mae arolwg barn gan %{name} wedi dod i ben
+      subject: Mae arolwg gan %{name} wedi dod i ben
     reblog:
       body: 'Cafodd eich postiad ei hybu gan %{name}:'
       subject: Rhoddodd %{name} hwb i'ch postiad
@@ -1443,11 +1443,11 @@ cy:
     truncate: "&hellip;"
   polls:
     errors:
-      already_voted: Rydych chi barod wedi pleidleisio ar y pleidlais hon
+      already_voted: Rydych chi eisoes wedi pleidleisio ar yr arolwg hwn
       duplicate_options: yn cynnwys eitemau dyblyg
       duration_too_long: yn rhy bell yn y dyfodol
       duration_too_short: yn rhy fuan
-      expired: Mae'r arolwg barn eisoes wedi dod i ben
+      expired: Mae'r arolwg eisoes wedi dod i ben
       invalid_choice: Nid yw'r dewis pleidlais hyn yn bodoli
       over_character_limit: ni all fod yn hwy na %{max} nod yr un
       too_few_options: rhaid cael mwy nag un eitem
@@ -1616,7 +1616,7 @@ cy:
         one: "%{count} bleidlais"
         other: "%{count} pleidlais"
         two: "%{count} pleidlais"
-        zero: "%{count} o pleidleisiau"
+        zero: "%{count} o bleidleisiau"
       vote: Pleidlais
     show_more: Dangos mwy
     show_newer: Dangos y diweddaraf
@@ -1631,7 +1631,7 @@ cy:
       public: Cyhoeddus
       public_long: Gall pawb weld
       unlisted: Heb ei restru
-      unlisted_long: Gall pawb weld, ond heb eu rhestru ar linellau amser cyhoeddus
+      unlisted_long: Gall pawb weld, ond heb eu rhestru ar ffrydiau cyhoeddus
   statuses_cleanup:
     enabled: Dileu hen bostiadau'n awtomatig
     enabled_hint: Yn dileu eich postiadau yn awtomatig ar ôl iddyn nhw gyrraedd trothwy oed penodedig, oni bai eu bod yn cyfateb i un o'r eithriadau isod
@@ -1640,15 +1640,15 @@ cy:
     ignore_favs: Anwybyddu ffefrynnau
     ignore_reblogs: Anwybyddu hybiau
     interaction_exceptions: Eithriadau yn seiliedig ar ryngweithio
-    interaction_exceptions_explanation: Sylwch nad oes unrhyw sicrwydd y bydd postiadau'n cael eu dileu os ydyn nhw'n mynd o dan y trothwy ffefrynnau neu fwstio ar ôl mynd drostyn nhw unwaith.
+    interaction_exceptions_explanation: Sylwch nad oes unrhyw sicrwydd y bydd postiadau'n cael eu dileu os ydyn nhw'n mynd o dan y trothwy ffefrynnau neu hybu ar ôl mynd drostyn nhw unwaith.
     keep_direct: Cadw negeseuon uniongyrchol
     keep_direct_hint: Nid yw'n dileu unrhyw un o'ch negeseuon uniongyrchol
     keep_media: Cadw postiadau gydag atodiadau cyfryngau
     keep_media_hint: Nid yw'n dileu unrhyw un o'ch postiadau sydd ag atodiadau cyfryngau
     keep_pinned: Cadw postiadau wedi'u pinio
     keep_pinned_hint: Nid yw'n dileu unrhyw un o'ch postiadau wedi'u pinio
-    keep_polls: Cadw polau
+    keep_polls: Cadw arolygon
-    keep_polls_hint: Nid yw'n dileu unrhyw un o'ch polau
+    keep_polls_hint: Nid yw'n dileu unrhyw un o'ch arolygon
     keep_self_bookmark: Cadw y postiadau wedi'u cadw fel nodau tudalen
     keep_self_bookmark_hint: Nid yw'n dileu eich postiadau eich hun os ydych wedi rhoi nod tudalen arnyn nhw
     keep_self_fav: Cadw'r postiadau yr oeddech yn eu ffefrynnu
@@ -1663,7 +1663,7 @@ cy:
       '63113904': 2 flynedd
       '7889238': 3 mis
     min_age_label: Trothwy oedran
-    min_favs: Cadw postiadau ffafriwyd m o leiaf
+    min_favs: Cadw postiadau ffafriwyd am o leiaf
     min_favs_hint: Nid yw'n dileu unrhyw un o'ch postiadau sydd wedi derbyn o leiaf y swm hwn o ffefrynnau. Gadewch yn wag i ddileu postiadau waeth beth fo'u ffefrynnau
     min_reblogs: Cadw postiadau wedi eu hybu o leiaf
     min_reblogs_hint: Nid yw'n dileu unrhyw un o'ch postiadau sydd wedi cael eu hybu o leiaf y nifer hwn o weithiau. Gadewch yn wag i ddileu postiadau waeth beth fo'u nifer o hybiadau
@@ -1751,13 +1751,13 @@ cy:
         none: Rhybudd
         sensitive: Cyfrif wedi'i nodi'n sensitif
         silence: Cyfrif cyfyngedig
-        suspend: Cyfrif wedi'i rewi
+        suspend: Cyfrif wedi'i atal
     welcome:
       edit_profile_action: Sefydlu proffil
       edit_profile_step: Gallwch addasu'ch proffil trwy lwytho llun proffil, newid eich enw dangos a mwy. Gallwch ddewis i adolygu dilynwyr newydd cyn iddyn nhw gael caniatâd i'ch dilyn.
       explanation: Dyma ambell nodyn i'ch helpu i ddechrau
       final_action: Dechrau postio
-      final_step: 'Dechreuwch bostio! Hyd yn oed heb ddilynwyr, efallai y bydd eraill yn gweld eich postiadau cyhoeddus, er enghraifft ar y llinell amser leol neu mewn hashnodau. Efallai y byddwch am gyflwyno eich hun ar yr hashnod #cyflwyniadau neu/a #introductions.'
+      final_step: 'Dechreuwch bostio! Hyd yn oed heb ddilynwyr, efallai y bydd eraill yn gweld eich postiadau cyhoeddus, er enghraifft ar y ffrwd leol neu mewn hashnodau. Efallai y byddwch am gyflwyno eich hun ar yr hashnod #cyflwyniadau neu/a #introductions.'
       full_handle: Eich enw llawn
       full_handle_hint: Dyma beth fyddech chi'n ei ddweud wrth eich ffrindiau fel y gallant anfon neges neu eich dilyn o weinydd arall.
       subject: Croeso i Mastodon

config/locales/da.yml

@@ -10,7 +10,7 @@ da:
     follow: Følg
     followers:
       one: Følger
-      other: Følgere
+      other: tilhængere
     following: Følger
     instance_actor_flash: Denne konto er en virtuel aktør repræsenterende selve serveren og ikke en individuel bruger. Den anvendes til fællesformål og bør ikke suspenderes.
     last_active: senest aktiv
@@ -429,6 +429,8 @@ da:
       resolved_through_html: Opløst via %{domain}
       title: Blokerede e-maildomæner
     export_domain_allows:
+      new:
+        title: Importeret domæne tillader
       no_file: Ingen fil valgt
     export_domain_blocks:
       import:
@@ -439,6 +441,7 @@ da:
         title: Import af domæneblokeringer
       new:
         title: Import af domæneblokeringer
+      no_file: Ingen fill udvalgt
     follow_recommendations:
       description_html: "<strong>Følg-anbefalinger hjælpe nye brugere til hurtigt at finde interessant indhold</strong>. Når en bruger ikke har interageret nok med andre til at generere personlige følg-anbefalinger, anbefales disse konti i stedet. De revurderes dagligt baseret på en blanding af konti med de flest nylige engagementer og fleste lokale følger-antal for et givet sprog."
       language: For sprog
@@ -1265,7 +1268,7 @@ da:
       other_data: Ingen øvrige data flyttes automatisk
       redirect: Din nuværende kontoprofil opdateres med en omdirigeringsnotits og ekskluderes fra søgninger
   moderation:
-    title: Moderatering
+    title: Moderation
   move_handler:
     carry_blocks_over_text: Denne bruger er flyttet fra %{acct}, som du har haft blokeret.
     carry_mutes_over_text: Denne bruger er flyttet fra %{acct}, som du har haft tavsgjort.

config/locales/de.yml

@@ -177,17 +177,17 @@ de:
         create_canonical_email_block: E-Mail-Sperre erstellen
         create_custom_emoji: Eigene Emojis erstellen
         create_domain_allow: Domain erlauben
-        create_domain_block: Domain blockieren
+        create_domain_block: Domain sperren
-        create_email_domain_block: E-Mail-Domainsperre erstellen
+        create_email_domain_block: E-Mail-Domain-Sperre erstellen
         create_ip_block: IP-Regel erstellen
         create_unavailable_domain: Nicht verfügbare Domain erstellen
         create_user_role: Rolle erstellen
         demote_user: Benutzer*in herabstufen
         destroy_announcement: Ankündigung löschen
-        destroy_canonical_email_block: E-Mail-Blockade löschen
+        destroy_canonical_email_block: E-Mail-Sperre entfernen
         destroy_custom_emoji: Eigenes Emojis löschen
         destroy_domain_allow: Erlaube das Löschen von Domains
-        destroy_domain_block: Domainsperre löschen
+        destroy_domain_block: Domain-Sperre entfernen
         destroy_email_domain_block: E-Mail-Domain-Sperre löschen
         destroy_instance: Domain-Daten entfernen
         destroy_ip_block: IP-Regel löschen
@@ -220,7 +220,7 @@ de:
         unsuspend_account: Konto nicht mehr sperren
         update_announcement: Ankündigung aktualisieren
         update_custom_emoji: Eigenes Emoji aktualisieren
-        update_domain_block: Domainsperre aktualisieren
+        update_domain_block: Domain-Sperre aktualisieren
         update_ip_block: IP-Regel aktualisieren
         update_status: Beitrag aktualisieren
         update_user_role: Rolle aktualisieren
@@ -236,9 +236,9 @@ de:
         create_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} gesperrt"
         create_custom_emoji_html: "%{name} hat neues Emoji hochgeladen: %{target}"
         create_domain_allow_html: "%{name} hat die Domain %{target} gewhitelistet"
-        create_domain_block_html: "%{name} hat die Domain %{target} blockiert"
+        create_domain_block_html: "%{name} hat die Domain %{target} gesperrt"
         create_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} gesperrt"
-        create_ip_block_html: "%{name} hat eine Regel für IP %{target} erstellt"
+        create_ip_block_html: "%{name} hat eine IP-Regel für %{target} erstellt"
         create_unavailable_domain_html: "%{name} hat die Lieferung an die Domain %{target} eingestellt"
         create_user_role_html: "%{name} hat die Rolle %{target} erstellt"
         demote_user_html: "%{name} hat %{target} heruntergestuft"
@@ -246,10 +246,10 @@ de:
         destroy_canonical_email_block_html: "%{name} hat die E-Mail mit dem Hash %{target} entsperrt"
         destroy_custom_emoji_html: "%{name} hat das Emoji gelöscht: %{target}"
         destroy_domain_allow_html: "%{name} hat die Domain %{target} von der Whitelist entfernt"
-        destroy_domain_block_html: "%{name} hat die Domain %{target} entblockt"
+        destroy_domain_block_html: "%{name} hat die Domain %{target} entsperrt"
         destroy_email_domain_block_html: "%{name} hat die E-Mail-Domain %{target} entsperrt"
         destroy_instance_html: "%{name} hat die Daten der Domain %{target} entfernt"
-        destroy_ip_block_html: "%{name} hat eine Regel für IP %{target} gelöscht"
+        destroy_ip_block_html: "%{name} hat eine IP-Regel für %{target} entfernt"
         destroy_status_html: "%{name} hat einen Beitrag von %{target} entfernt"
         destroy_unavailable_domain_html: "%{name} setzte die Lieferung an die Domain %{target} fort"
         destroy_user_role_html: "%{name} hat die Rolle %{target} gelöscht"
@@ -279,7 +279,7 @@ de:
         unsuspend_account_html: "%{name} hat die Kontosperre von %{target} aufgehoben"
         update_announcement_html: "%{name} aktualisierte Ankündigung %{target}"
         update_custom_emoji_html: "%{name} hat das Emoji geändert: %{target}"
-        update_domain_block_html: "%{name} hat den Domain-Block für %{target} aktualisiert"
+        update_domain_block_html: "%{name} hat die Domain-Sperre für %{target} aktualisiert"
         update_ip_block_html: "%{name} hat die Regel für IP %{target} geändert"
         update_status_html: "%{name} hat einen Beitrag von %{target} aktualisiert"
         update_user_role_html: "%{name} hat die Rolle %{target} geändert"
@@ -377,55 +377,55 @@ de:
       import: Importieren
       undo: Von der Whitelist entfernen
     domain_blocks:
-      add_new: Neue Domainblockade hinzufügen
+      add_new: Neue Domain-Sperre hinzufügen
-      created_msg: Die Domain ist jetzt blockiert bzw. eingeschränkt
+      created_msg: Die Domain ist jetzt gesperrt bzw. eingeschränkt
-      destroyed_msg: Die Domainsperre wurde rückgängig gemacht
+      destroyed_msg: Die Domain-Sperre wurde aufgehoben
       domain: Domain
-      edit: Domainsperre bearbeiten
+      edit: Domain-Sperre bearbeiten
       existing_domain_block: Du hast %{name} bereits stärker eingeschränkt.
       existing_domain_block_html: Du hast bereits strengere Beschränkungen für die Domain %{name} verhängt. Du musst diese erst <a href="%{unblock_url}">aufheben</a>.
       export: Exportieren
       import: Importieren
       new:
-        create: Blockade einrichten
+        create: Sperre einrichten
         hint: Die Domainsperre wird nicht verhindern, dass Konteneinträge in der Datenbank erstellt werden, sondern rückwirkend und automatisch alle Moderationsmethoden auf diese Konten anwenden.
         severity:
           desc_html: "<strong>Stummschaltung</strong> wird die Beiträge von Konten unter dieser Domain für alle unsichtbar machen, die den Konten nicht folgen. Eine <strong>Sperre</strong> wird alle Inhalte, Medien und Profildaten für Konten dieser Domain von deinem Server entfernen. Verwende <strong>keine,</strong> um nur Mediendateien abzulehnen."
           noop: Kein
           silence: Stummschaltung
           suspend: Sperren
-        title: Neue Domainsperre
+        title: Neue Domain-Sperre
-      no_domain_block_selected: Keine Domains blockiert, weil keine ausgewählt wurde
+      no_domain_block_selected: Keine Domains gesperrt, weil keine ausgewählt wurde(n)
-      not_permitted: Du bist nicht berechtigt, diese Aktion durchzuführen
+      not_permitted: Dir ist es nicht erlaubt, diese Handlung durchzuführen
-      obfuscate: Domainname verschleiern
+      obfuscate: Domain-Name verschleiern
-      obfuscate_hint: Den Domainnamen in der Liste teilweise verschleiern, wenn die Liste der Domänenbeschränkungen aktiviert ist
+      obfuscate_hint: Den Domain-Namen öffentlich nur teilweise bekannt geben, sofern die Liste der Domain-Beschränkungen aktiviert ist
-      private_comment: Privater Kommentar
+      private_comment: Private bzw. nicht-öffentliche Notiz
       private_comment_hint: Kommentar zu dieser Domain-Beschränkung für die interne Nutzung durch die Moderator*innen.
-      public_comment: Öffentlicher Kommentar
+      public_comment: Öffentliche Notiz
-      public_comment_hint: Kommentar zu dieser Domain-Beschränkung für die allgemeine Öffentlichkeit, wenn das Veröffentlichen der Blockliste aktiviert ist.
+      public_comment_hint: Öffentlicher Hinweis zu dieser Domain-Beschränkung, sofern das Veröffentlichen von Sperrlisten grundsätzlich aktiviert ist.
       reject_media: Mediendateien ablehnen
       reject_media_hint: Entfernt lokal gespeicherte Mediendateien und verhindert deren künftiges Herunterladen. Für Sperren irrelevant
       reject_reports: Meldungen ablehnen
       reject_reports_hint: Alle Meldungen von dieser Domain ignorieren. Irrelevant für Sperrungen.
-      undo: Domainsperre rückgängig machen
+      undo: Domain-Sperre aufheben
-      view: Domainsperre ansehen
+      view: Domain-Sperre ansehen
     email_domain_blocks:
       add_new: Neue hinzufügen
       attempts_over_week:
-        one: "%{count} Registrierungsversuch in der letzten Woche"
+        one: "%{count} Registrierungsversuch in der vergangenen Woche"
-        other: "%{count} Registrierungsversuche in der letzten Woche"
+        other: "%{count} Registrierungsversuche in der vergangenen Woche"
       created_msg: E-Mail-Domain erfolgreich gesperrt
-      delete: Löschen
+      delete: Entfernen
       dns:
         types:
-          mx: MX-Record
+          mx: MX-RR-Eintrag
       domain: Domain
       new:
         create: E-Mail-Domain hinzufügen
         resolve: Domain auflösen
         title: Neue E-Mail-Domain sperren
-      no_email_domain_block_selected: Keine E-Mail-Domainsperren wurden geändert, da keine ausgewählt wurden
+      no_email_domain_block_selected: Keine E-Mail-Domain-Sperren wurden geändert, da keine ausgewählt wurden
-      resolved_dns_records_hint_html: Der Domain-Name wird an die folgenden MX-Domains aufgelöst, die letztendlich für die Annahme von E-Mails verantwortlich sind. Das Blockieren einer MX-Domain blockiert Anmeldungen von jeder E-Mail-Adresse, welche dieselbe MX-Domain verwendet, auch wenn der sichtbare Domainname anders ist. <strong>Achte darauf, große E-Mail-Anbieter nicht zu blockieren.</strong>
+      resolved_dns_records_hint_html: Der Domain-Name wird an die folgenden MX-Domains aufgelöst, die letztendlich für die Annahme von E-Mails zuständig sind. Das Sperren einer MX-Domain sperrt Anmeldungen aller E-Mail-Adressen, die dieselbe MX-Domain verwenden, auch wenn die sichtbare Domain anders lautet. <strong>Achte daher darauf, große E-Mail-Anbieter versehentlich nicht auszusperren.</strong>
       resolved_through_html: Durch %{domain} aufgelöst
       title: Gesperrte E-Mail-Domains
     export_domain_allows:
@@ -434,13 +434,13 @@ de:
       no_file: Keine Datei ausgewählt
     export_domain_blocks:
       import:
-        description_html: Du bist dabei, eine Liste von Domainsperren zu importieren. Bitte überprüfe diese Liste sehr sorgfältig, insbesondere wenn du sie nicht selbst erstellt hast.
+        description_html: Du bist dabei, eine Liste von Domain-Sperren zu importieren. Bitte überprüfe diese Liste sehr sorgfältig, insbesondere dann, wenn du sie nicht selbst erstellt hast.
         existing_relationships_warning: Bestehende Folgebeziehungen
-        private_comment_description_html: 'Damit du nachvollziehen kannst, woher die importierten Sperren stammen, werden diese mit dem folgenden privaten Kommentar erstellt: <q>%{comment}</q>'
+        private_comment_description_html: 'Damit du später nachvollziehen kannst, woher die importierten Sperren stammen, kannst du diesem Eintrag eine private Notiz hinzufügen: <q>%{comment}</q>'
         private_comment_template: Importiert von %{source} am %{date}
-        title: Domainsperren importieren
+        title: Domain-Sperren importieren
       new:
-        title: Domainsperren importieren
+        title: Domain-Sperren importieren
       no_file: Keine Datei ausgewählt
     follow_recommendations:
       description_html: "<strong>Folgeempfehlungen helfen neuen Nutzer*innen, interessante Inhalte schnell zu finden</strong>. Wenn ein*e Nutzer*in noch nicht genug mit anderen interagiert hat, um personalisierte Folgeempfehlungen zu erhalten, werden stattdessen diese Profile verwendet. Sie werden täglich, basierend auf einer Mischung aus am meisten interagierenden Konten und jenen mit den meisten Followern für eine bestimmte Sprache, neu berechnet."
@@ -453,8 +453,8 @@ de:
     instances:
       availability:
         description_html:
-          one: Wenn die Auslieferung an die Domain seit <strong>%{count} Tag</strong> ohne Erfolg ist, werden keine weiteren Versandversuche unternommen, es sei denn, es ist eine Lieferung <em>von</em> der Domain.
+          one: Wenn die Zustellung an die Domain seit <strong>%{count} Tag</strong> erfolglos bleibt, werden keine weiteren Zustellungsversuche unternommen, es sei denn, eine Zustellung <em>von</em> dieser Domain wird empfangen.
-          other: Wenn die Auslieferung an die Domain seit <strong>%{count} Tagen</strong> ohne Erfolg ist, werden keine weiteren Versandversuche unternommen, es sei denn, es ist eine Lieferung <em>von</em> der Domain.
+          other: Wenn die Zustellung an die Domain seit <strong>%{count} Tagen</strong> erfolglos bleibt, werden keine weiteren Zustellungsversuche unternommen, es sei denn, eine Zustellung <em>von</em> dieser Domain wird empfangen.
         failure_threshold_reached: Fehlschlag-Schwelle am %{date} erreicht.
         failures_recorded:
           one: Fehlgeschlagener Versuch am %{count}. Tag.
@@ -511,7 +511,7 @@ de:
       purge: Löschen
       purge_description_html: Wenn du glaubst, dass diese Domain endgültig offline ist, kannst du alle Account-Datensätze und zugehörigen Daten aus dieser Domain löschen. Das kann eine Weile dauern.
       title: Externe Instanzen
-      total_blocked_by_us: Von uns blockiert
+      total_blocked_by_us: Von uns gesperrt
       total_followed_by_them: Gefolgt von denen
       total_followed_by_us: Gefolgt von uns
       total_reported: Beschwerden über sie
@@ -528,7 +528,7 @@ de:
     ip_blocks:
       add_new: Regel erstellen
       created_msg: Neue IP-Regel erfolgreich hinzugefügt
-      delete: Löschen
+      delete: Entfernen
       expires_in:
         '1209600': 2 Wochen
         '15778476': 6 Monate
@@ -538,7 +538,7 @@ de:
         '94670856': 3 Jahre
       new:
         title: Neue IP-Regel erstellen
-      no_ip_block_selected: Keine IP-Regeln wurden geändert, weil keine ausgewählt wurden
+      no_ip_block_selected: Keine IP-Regeln wurden geändert, weil keine ausgewählt wurde(n)
       title: IP-Regeln
     relationships:
       title: Beziehungen von %{acct}
@@ -652,11 +652,11 @@ de:
         manage_appeals: Einsprüche verwalten
         manage_appeals_description: Erlaubt es Benutzer*innen, Entscheidungen der Moderator*innen zu widersprechen
         manage_blocks: Sperrungen verwalten
-        manage_blocks_description: Erlaubt Benutzer*innen, E-Mail-Provider und IP-Adressen zu blockieren
+        manage_blocks_description: Erlaubt Benutzer*innen das Sperren von E-Mail-Providern und IP-Adressen
         manage_custom_emojis: Eigene Emojis verwalten
         manage_custom_emojis_description: Erlaubt es Benutzer*innen, eigene Emojis auf dem Server zu verwalten
         manage_federation: Föderation verwalten
-        manage_federation_description: Erlaubt es Benutzer*innen, den Zusammenschluss mit anderen Domains zu blockieren oder zuzulassen und die Zustellbarkeit zu kontrollieren
+        manage_federation_description: Erlaubt es Benutzer*innen, Domains anderer Mastodon-Instanzen zu sperren oder zuzulassen – und die Zustellbarkeit zu steuern.
         manage_invites: Einladungen verwalten
         manage_invites_description: Erlaubt es Benutzer*innen, Einladungslinks zu durchsuchen und zu deaktivieren
         manage_reports: Meldungen verwalten
@@ -911,7 +911,7 @@ de:
     advanced_web_interface: Erweitertes Webinterface
     advanced_web_interface_hint: Wenn du mehr aus deiner Bildschirmbreite herausholen möchtest, kannst du mit dem erweiterten Webinterface weitere Spalten hinzufügen und dadurch mehr Informationen auf einmal sehen, z. B. deine Startseite, die Mitteilungen, die föderierte Timeline sowie beliebig viele deiner Listen und Hashtags.
     animations_and_accessibility: Animationen und Barrierefreiheit
-    confirmation_dialogs: Bestätigungsfenster
+    confirmation_dialogs: Bestätigungsdialoge
     discovery: Entdecken
     localization:
       body: Mastodon wird von Freiwilligen übersetzt.
@@ -942,7 +942,7 @@ de:
       prefix_invited_by_user: "@%{name} lädt dich ein, diesem Server von Mastodon beizutreten!"
       prefix_sign_up: Registriere dich noch heute bei Mastodon!
       suffix: Mit einem Konto kannst du Profilen folgen, neue Beiträge veröffentlichen, Nachrichten mit Personen von jedem Mastodon-Server austauschen und vieles mehr!
-    didnt_get_confirmation: Keine Bestätigungs-Mail erhalten?
+    didnt_get_confirmation: Keine Bestätigungsanweisungen erhalten?
     dont_have_your_security_key: Hast du keinen Sicherheitsschlüssel?
     forgot_password: Passwort vergessen?
     invalid_reset_password_token: Das Token zum Zurücksetzen des Passworts ist ungültig oder abgelaufen. Bitte fordere ein neues an.
@@ -960,7 +960,7 @@ de:
       saml: SAML
     register: Registrieren
     registration_closed: "%{instance} akzeptiert keine neuen Mitglieder"
-    resend_confirmation: Bestätigungs-Mail erneut versenden
+    resend_confirmation: Bestätigungsanweisungen erneut senden
     reset_password: Passwort zurücksetzen
     rules:
       preamble: Diese werden von den %{domain}-Moderator*innen festgelegt und erzwungen.
@@ -976,7 +976,7 @@ de:
       title: Okay, lass uns mit %{domain} anfangen.
     status:
       account_status: Kontostatus
-      confirming: Warte auf die Bestätigung deiner E-Mail-Adresse.
+      confirming: Auf die Bestätigung deiner E-Mail-Adresse wird gewartet.
       functional: Dein Konto ist voll funktionsfähig.
       pending: Die Prüfung deiner Bewerbung steht noch aus. Dies kann einige Zeit in Anspruch nehmen. Sobald deine Bewerbung genehmigt wurde, erhältst du eine E-Mail.
       redirecting_to: Dein Konto ist inaktiv, weil es zu %{acct} umgezogen ist.
@@ -1078,7 +1078,7 @@ de:
     '406': Diese Seite ist im gewünschten Format nicht verfügbar.
     '410': Die Seite, nach der du gesucht hast, existiert hier nicht mehr.
     '422':
-      content: Sicherheitsüberprüfung fehlgeschlagen. Blockierst du Cookies?
+      content: Sicherheitsüberprüfung fehlgeschlagen. Sperrst du Cookies aus?
       title: Sicherheitsüberprüfung fehlgeschlagen
     '429': Du wurdest gedrosselt
     '500':
@@ -1097,10 +1097,10 @@ de:
       in_progress: Persönliches Archiv wird erstellt …
       request: Dein Archiv anfordern
       size: Größe
-    blocks: Blockierte Accounts
+    blocks: Gesperrte Accounts
     bookmarks: Lesezeichen
     csv: CSV
-    domain_blocks: Blockierte Domains
+    domain_blocks: Gesperrte Domains
     lists: Listen
     mutes: Stummgeschaltete Accounts
     storage: Medienspeicher
@@ -1186,12 +1186,12 @@ de:
       merge_long: Behalte existierende Datensätze und füge neue hinzu
       overwrite: Überschreiben
       overwrite_long: Ersetze aktuelle Datensätze mit neuen
-    preface: Daten, die du aus einem anderen Server exportiert hast, kannst du hier importieren. Beispielsweise die Liste derjenigen, denen du folgst oder die du blockiert hast.
+    preface: Daten, die du von einem anderen Server exportiert hast, kannst du hierher importieren. Das betrifft beispielsweise die Listen von Profilen, denen du folgst oder die du gesperrt hast.
     success: Deine Daten wurden erfolgreich hochgeladen und werden in Kürze verarbeitet
     types:
-      blocking: Blockierliste
+      blocking: Sperrliste
       bookmarks: Lesezeichen
-      domain_blocking: Domainsperrliste
+      domain_blocking: Domain-Sperrliste
       following: Folgeliste
       muting: Stummschaltungsliste
     upload: Liste importieren
@@ -1270,7 +1270,7 @@ de:
   moderation:
     title: Moderation
   move_handler:
-    carry_blocks_over_text: Dieses Konto ist von %{acct}, das du blockiert hast, umgezogen.
+    carry_blocks_over_text: Dieses Konto ist von %{acct}, das du gesperrt hast, umgezogen.
     carry_mutes_over_text: Dieses Konto ist von %{acct}, das du stummgeschaltet hast, umgezogen.
     copy_account_note_text: 'Dieses Konto ist von %{acct} umgezogen. Hier deine damals verfassten Notizen zum Profil:'
   navigation:
@@ -1510,7 +1510,7 @@ de:
       unlisted_long: Für alle sichtbar, aber in öffentlichen Timelines nicht aufgelistet
   statuses_cleanup:
     enabled: Automatisch alte Beiträge löschen
-    enabled_hint: Löscht automatisch deine Beiträge, sobald sie ein von dir definiertes Alter erreicht haben, es sei denn, sie entsprechen einer der nachfolgenden Ausnahmen
+    enabled_hint: Löscht automatisch deine Beiträge, sobald sie die angegebene Altersgrenze erreicht haben, es sei denn, sie entsprechen einer der unten angegebenen Ausnahmen
     exceptions: Ausnahmen
     explanation: Damit Mastodon nicht durch das Löschen von Beiträgen ausgebremst wird, wartet der Server damit, bis wenig los ist. Aus diesem Grund werden deine Beiträge ggf. erst einige Zeit nach Erreichen der Altersgrenze gelöscht.
     ignore_favs: Favoriten ignorieren

config/locales/devise.eo.yml

@@ -12,7 +12,7 @@ eo:
       last_attempt: Vi ankoraŭ povas provi unufoje antaŭ ol via konto estos ŝlosita.
       locked: Via konto estas ŝlosita.
       not_found_in_database: Nevalida %{authentication_keys} aŭ pasvorto.
-      pending: Via konto ankoraŭ estas kontrolanta.
+      pending: Via konto ankoraŭ estas kontrolata.
       timeout: Via seanco eksvalidiĝis. Bonvolu ensaluti denove por daŭrigi.
       unauthenticated: Vi devas ensaluti aŭ registriĝi antaŭ ol daŭrigi.
       unconfirmed: Vi devas konfirmi vian retadreson antaŭ ol daŭrigi.
@@ -45,11 +45,11 @@ eo:
         explanation: Vi petis novan pasvorton por via konto.
         extra: Se vi ne petis ĉi tion, bonvolu ignori ĉi tiun retmesaĝon. Via pasvorto ne ŝanĝiĝos se vi ne aliras la supran ligilon kaj kreas novan.
         subject: 'Mastodon: Instrukcioj por ŝanĝi pasvorton'
-        title: Pasvorto estis restarigita
+        title: Pasvorto restarigita
       two_factor_disabled:
         explanation: Dufaktora aŭtentigo por via konto malebligis. Ensalutado nun eblas per nur retpoŝtadreso kaj pasvorto.
         subject: 'Mastodon: dufaktora aŭtentigo malebligita'
-        title: la du-etapa aŭtentigo estas malŝaltita
+        title: 2FA estas malŝaltita
       two_factor_enabled:
         explanation: Dufaktora aŭtentigo sukcese ebligita por via akonto. Vi bezonos ĵetonon kreitan per parigitan aplikaĵon por ensaluti.
         subject: 'Mastodon: Dufaktora aŭtentigo ebligita'

config/locales/devise.lv.yml

@@ -3,8 +3,8 @@ lv:
   devise:
     confirmations:
       confirmed: Tava e-pasta adrese ir veiksmīgi apstiprināta.
-      send_instructions: Pēc dažām minūtēm jūs saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e -pasta adresi. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_instructions: Pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
-      send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm saņemsi e-pastu ar norādījumiem, kā apstiprināt savu e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
     failure:
       already_authenticated: Jau esi pierakstījies.
       inactive: Tavs konts vēl nav aktivizēts.
@@ -19,10 +19,10 @@ lv:
     mailer:
       confirmation_instructions:
         action: Apstiprini savu e-pasta adresi
-        action_with_app: Apstiprini un atgriezies %{app}
+        action_with_app: Apstiprināt un atgriezties %{app}
         explanation: Ar šo e-pasta adresi esi izveidojis kontu vietnē %{host}. Tu esi viena klikšķa attālumā no tā aktivizēšanas. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
-        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pieteikties, lai mainītu savu informāciju vai dzēstu savu kontu, taču nevari piekļūt lielākajai daļai funkciju, kamēr tavs konts nav apstiprināts. Ja tavs pieteikums tiks noraidīts, tavi dati tiks noņemti, tāpēc tev nebūs jāveic nekādas darbības. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
+        explanation_when_pending: Tu pieteicies uzaicinājumam uz %{host} ar šo e-pasta adresi. Kad būsi apstiprinājis savu e-pasta adresi, mēs izskatīsim pieteikumu. Tu vari pierakstīties, lai mainītu savu informāciju vai dzēstu savu kontu, taču nevari piekļūt lielākajai daļai funkciju, kamēr tavs konts nav apstiprināts. Ja tavs pieteikums tiks noraidīts, tavi dati tiks noņemti, tāpēc tev nebūs jāveic nekādas darbības. Ja tas nebiji tu, lūdzu, ignorē šo e-pasta ziņojumu.
-        extra_html: Lūdzu, pārbaudi arī <a href="%{terms_path}">servera nosacījumus</a> un <a href="%{policy_path}"> mūsu pakalpojumu sniegšanas noteikumi</a>.
+        extra_html: Lūdzu, pārskati arī <a href="%{terms_path}">servera noteikumus</a> un <a href="%{policy_path}"> mūsu pakalpojumu sniegšanas noteikumus</a>.
         subject: 'Mastodon: Apstiprināšanas norādījumi %{instance}'
         title: Apstiprini savu e-pasta adresi
       email_changed:
@@ -51,27 +51,27 @@ lv:
         subject: 'Mastodon: Divfaktoru autentifikācija atspējota'
         title: 2FA atspējota
       two_factor_enabled:
-        explanation: Tavam kontam ir iespējota divfaktoru autentifikācija. Lai pieteiktos, būs nepieciešams marķieris, ko ģenerējusi pārī savienotā TOTP lietotne.
+        explanation: Tavam kontam ir iespējota divfaktoru autentifikācija. Lai pieteiktos, būs nepieciešams kods, ko ģenerējusi pārī savienotā TOTP lietotne.
         subject: 'Mastodon: Divfaktoru autentifikācija iespējota'
         title: 2FA iespējota
       two_factor_recovery_codes_changed:
         explanation: Iepriekšējie atkopšanas kodi ir atzīti par nederīgiem un ģenerēti jauni.
-        subject: 'Mastodon: Divfaktoru autkopšanas kodi pārģenerēti'
+        subject: 'Mastodon: Divfaktoru atkopšanas kodi pārģenerēti'
         title: 2FA atkopšanas kodi mainīti
       unlock_instructions:
         subject: 'Mastodon: Norādījumi atbloķēšanai'
       webauthn_credential:
         added:
           explanation: Tavam kontam ir pievienota šāda drošības atslēga
-          subject: 'Mastodon: Jaunā drošības atslēga'
+          subject: 'Mastodon: Jauna drošības atslēga'
           title: Tika pievienota jauna drošības atslēga
         deleted:
           explanation: Tālāk norādītā drošības atslēga ir izdzēsta no tava konta
           subject: 'Mastodon: Drošības atslēga izdzēsta'
           title: Viena no tavām drošības atslēgām tika izdzēsta
       webauthn_disabled:
-        explanation: Tavam kontam ir atspējota autentifikācija ar drošības atslēgām. Pieteikšanās tagad ir iespējama, izmantojot tikai marķieri, ko ģenerējusi pārī savienotā TOTP lietotne.
+        explanation: Tavam kontam ir atspējota autentifikācija ar drošības atslēgām. Pieteikšanās tagad ir iespējama, izmantojot tikai kodu, ko ģenerējusi pārī savienotā TOTP lietotne.
-        subject: 'Mastodon: Atutentifikācija ar drošības atslēgām ir atspējota'
+        subject: 'Mastodon: Autentifikācija ar drošības atslēgām ir atspējota'
         title: Drošības atslēgas atspējotas
       webauthn_enabled:
         explanation: Tavam kontam ir iespējota drošības atslēgas autentifikācija. Tavu drošības atslēgu tagad var izmantot, lai pieteiktos.
@@ -82,8 +82,8 @@ lv:
       success: Veiksmīgi autentificēts no %{kind} konta.
     passwords:
       no_token: Tu nevari piekļūt šai lapai, ja neesi saņēmis paroles atiestatīšanas e-pasta ziņojumu. Ja ienāci no paroles atiestatīšanas e-pasta, lūdzu, pārliecinies, vai izmanto visu norādīto URL.
-      send_instructions: Ja tava e pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
-      send_paranoid_instructions: Ja tava e pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_paranoid_instructions: Ja tava e-pasta adrese ir mūsu datu bāzē, pēc dažām minūtēm uz savu e-pasta adresi saņemsi paroles atkopšanas saiti. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       updated: Tava parole ir veiksmīgi nomainīta. Tagad tu esi pierakstījies.
       updated_not_active: Tava parole ir veiksmīgi nomainīta.
     registrations:
@@ -92,16 +92,16 @@ lv:
       signed_up_but_inactive: Tava reģistrācija bija veiksmīga. Tomēr mēs nevarējām tevi pierakstīt, jo tavs konts vēl nav aktivizēts.
       signed_up_but_locked: Tava reģistrācija bija veiksmīga. Tomēr mēs nevarējām tevi pierakstīt, jo tavs konts ir bloķēts.
       signed_up_but_pending: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Pēc noklikšķināšanas uz saites mēs izskatīsim tavu pieteikumu. Tu tiksi informēts, ja tas tiks apstiprināts.
-      signed_up_but_unconfirmed: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Lūdzu, seko saitei, lai aktivizētu savu kontu. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      signed_up_but_unconfirmed: Uz tavu e-pasta adresi ir nosūtīts ziņojums ar apstiprinājuma saiti. Lūdzu, seko saitei, lai aktivizētu savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
-      update_needs_confirmation: Tu veiksmīgi atjaunināji savu kontu, taču mums ir jāverificē teva jaunā e-pasta adrese. Lūdzu, pārbaudi savu e-pastu un seko apstiprinājuma saitei, lai apstiprinātu savu jauno e-pasta adresi. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      update_needs_confirmation: Tu veiksmīgi atjaunināji savu kontu, taču mums ir jāverificē teva jaunā e-pasta adrese. Lūdzu, pārbaudi savu e-pastu un seko apstiprinājuma saitei, lai apstiprinātu savu jauno e-pasta adresi. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       updated: Tavs konts ir veiksmīgi atjaunināts.
     sessions:
       already_signed_out: Veiksmīgi izrakstījies.
       signed_in: Veiksmīgi pierakstījies.
       signed_out: Veiksmīgi izrakstījies.
     unlocks:
-      send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
-      send_paranoid_instructions: Ja tavs konts eksistē, dažu minūšu laikā tu saņemsi e-pastu ar norādījumiem, kā to atbloķēt. Lūdzu, pārbaudi surogātpasta mapi, ja neesi saņēmis šo e-pastu.
+      send_paranoid_instructions: Ja tavs konts eksistē, dažu minūšu laikā tu saņemsi e-pastu ar norādījumiem, kā to atbloķēt. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       unlocked: Tavs konts ir veiksmīgi atbloķēts. Lūdzu, pieraksties, lai turpinātu.
   errors:
     messages:

config/locales/devise.ms.yml

@@ -9,33 +9,77 @@ ms:
       already_authenticated: Anda sudah daftar masuk.
       inactive: Akaun anda belum diaktifkan.
       invalid: "%{authentication_keys} atau kata laluan tidak sah."
+      last_attempt: Anda mempunyai satu lagi percubaan sebelum akaun anda dikunci.
+      locked: Akaun anda dikunci.
+      not_found_in_database: "%{authentication_keys} atau kata laluan tidak sah."
       pending: Akaun anda masih dalam semakan.
+      timeout: Sesi anda telah tamat. Sila daftar masuk semula.
       unauthenticated: Anda perlu daftar masuk atau mendaftar sebelum meneruskan.
       unconfirmed: Anda perlu menyesahkan alamat e-mel anda sebelum meneruskan.
     mailer:
       confirmation_instructions:
         action: Sahkan alamat e-mel
+        action_with_app: Sahkan dan kembali ke %{app}
         explanation: Anda telah mencipta akaun pada %{host} dengan alamat e-mel ini. Anda satu klik sahaja daripada mengaktifkannya. Jika anda tidak mencipta akaun tersebut, sila abaikan e-mel ini.
+        explanation_when_pending: Anda telah memohon untuk undangan ke %{host} dengan alamat e-mel ini. Setelah anda mengesahkan alamat e-mel anda, kami akan menyemak permohonan tersebut. Anda boleh melog masuk untuk mengubah butiran atau menghapuskan akaun anda, tetapi anda tidak boleh mencapai kebanyakan fungsi sehinggalah akaun anda diluluskan. Jika permohonan anda ditolak, data anda akan dibuang dan tiada tindakan lanjut diperlukan. Jika ini bukan anda, sila abaikan e-mel ini.
+        extra_html: Sila periksa <a href="%{terms_path}">peraturan pelayan</a> serta <a href="%{policy_path}">terma perkhidmatan kami juga</a>.
+        subject: 'Mastodon: Arahan pengesahan untuk %{instance}'
         title: Sahkan alamat e-mel
       email_changed:
         explanation: 'Alamat e-mel untuk akaun anda sedang diubah kepada:'
+        extra: Jika anda tidak mengubah alamat e-mel anda, berkemungkinan seseorang telah memperoleh capaian kepada akaun anda. Sila ubah kata laluan anda dengan segera atau hubungi pentadbir pelayan jika anda dikunci daripada akaun anda.
         subject: 'Mastodon: E-mel ditukar'
         title: Alamat e-mel baru
       password_change:
         explanation: Kata laluan untuk akaun anda telah ditukar.
+        extra: Jika anda tidak mengubah kata laluan anda, berkemungkinan seseorang telah memperoleh capaian kepada akaun anda. Sila ubah kata laluan anda dengan segera atau hubungi pentadbir pelayan jika anda dikunci daripada akaun anda.
         subject: 'Mastodon: Kata laluan diubah'
         title: Kata laluan ditukar
       reconfirmation_instructions:
         explanation: Sahkan alamat baru untuk menukarkan e-mel anda.
+        extra: Jika perubahan ini tidak anda lakukan, sila abaikan e-mel ini. Alamat e-mel untuk akaun Mastodon tidak akan berubah sehinggalah anda mencapai pautan di atas.
+        subject: 'Mastodon: Sahkan e-mel untuk %{instance}'
         title: Sahkan alamat e-mel
       reset_password_instructions:
         action: Tukar kata laluan
         explanation: Anda meminta kata laluan baru untuk akaun anda.
+        extra: Jika anda tidak membuat permintaan ini, sila abaikan e-mel ini. Kata laluan anda tidak akan berubah sehinggalah anda mencapai pautan di atas dan membuat yang baharu.
+        subject: 'Mastodon: Arahan set semula kata laluan'
         title: Set semula kata laluan
       two_factor_disabled:
+        explanation: Pengesahan dwifaktor untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan alamat e-mel dan kata laluan.
+        subject: 'Mastodon: Pengesahan dwifaktor dilumpuhkan'
         title: 2FA dinyahaktifkan
       two_factor_enabled:
+        explanation: Pengesahan dwifaktor untuk akaun anda telah didayakan. Satu token yang dijanakan oleh aplikasi TOTP diperlukan untuk melog masuk.
+        subject: 'Mastodon: Pengesahan dwifaktor didayakan'
         title: 2FA diaktifkan
+      two_factor_recovery_codes_changed:
+        explanation: Kod pemulihan lama tidak lagi sah dan kod baharu telah dijanakan.
+        subject: 'Mastodon: Kod pemulihan dwifaktor dijanakan semula'
+        title: Kod pemulihan 2FA diubah
+      unlock_instructions:
+        subject: 'Mastodon: Arahan membuka kunci'
+      webauthn_credential:
+        added:
+          explanation: Kunci keselamatan berikut telah ditambahkan kepada akaun anda
+          subject: 'Mastodon: Kunci keselamatan baharu'
+          title: Kunci keselamatan baharu telah ditambahkan
+        deleted:
+          explanation: Kunci keselamatan berikut telah dihapuskan daripada akaun anda
+          subject: 'Mastodon: Kunci keselamatan dihapuskan'
+          title: Salah satu daripada kunci keselamatan anda telah dihapuskan
+      webauthn_disabled:
+        explanation: Pengesahan dengan kunci keselamatan untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan token yang dijanakan oleh aplikasi TOTP.
+        subject: 'Mastodon: Pengesahan dengan kunci keselamatan dilumpuhkan'
+        title: Kunci keselamatan dilumpuhkan
+      webauthn_enabled:
+        explanation: Pengesahan kunci keselamatan untuk akaun anda kini didayakan. Kunci keselamatan anda kini boleh digunakan untuk melog masuk.
+        subject: 'Mastodon: Pengesahan kunci keselamatan didayakan'
+        title: Kunci keselamatan didayakan
+    omniauth_callbacks:
+      failure: Tidak dapat mengesahkan anda daripada %{kind} disebabkan oleh “%{reason}”.
+      success: Berjaya disahkan daripada akaun %{kind}.
     passwords:
       updated: Kata laluan anda telah berjaya ditukar. Anda telah didaftar masuk.
       updated_not_active: Kata laluan anda telah berjaya ditukar.

config/locales/devise.sco.yml

@@ -55,7 +55,7 @@ sco:
         subject: 'Mastodon: Twa-factor authentication turnt on'
         title: 2FA turnt on
       two_factor_recovery_codes_changed:
-        explanation: The last recovery codes hae been pit in the bucket an new anes makkit.
+        explanation: The last recovery codes haes been pit in the bucket an new anes makkit.
         subject: 'Mastodon: Twa-factor recovery codes re-jigged'
         title: 2FA recovery codes chynged
       unlock_instructions:

config/locales/devise.sk.yml

@@ -21,6 +21,7 @@ sk:
         action: Potvrď emailovú adresu
         action_with_app: Potvrď a vráť sa na %{app}
         explanation: S touto emailovou adresou si si vytvoril/a účet na %{host}. Si iba jeden klik od jeho aktivácie. Pokiaľ si to ale nebol/a ty, prosím ignoruj tento email.
+        explanation_when_pending: S touto e-mailovou adresou ste požiadali o pozvánku na %{host}. Po potvrdení vašej e-mailovej adresy vašu žiadosť skontrolujeme. Môžete sa prihlásiť, aby ste zmenili svoje údaje alebo vymazali svoje konto, ale kým nebude vaše konto schválené, nebudete mať prístup k väčšine funkcií. Ak bude vaša žiadosť zamietnutá, vaše údaje budú odstránené, takže sa od vás nebudú vyžadovať žiadne ďalšie kroky. Ak ste to neboli vy, tento e-mail ignorujte.
         extra_html: Prosím, pozri sa aj na <a href="%{terms_path}"> pravidlá tohto servera,</a> a <a href="%{policy_path}"> naše užívaťeľské podiemky</a>.
         subject: 'Mastodon: Potvrdzovacie pokyny pre %{instance}'
         title: Potvrď emailovú adresu
@@ -59,6 +60,23 @@ sk:
         title: Obnovovacie kódy pre dvoj-faktorové overovanie zmenené
       unlock_instructions:
         subject: 'Mastodon: Pokyny na odomknutie účtu'
+      webauthn_credential:
+        added:
+          explanation: Do vášho konta bol pridaný nasledujúci bezpečnostný kľúč
+          subject: 'Mastodon: Nový bezpečnostný kľúč'
+          title: Bol pridaný nový bezpečnostný kľúč
+        deleted:
+          explanation: Z vášho účtu bol odstránený nasledujúci bezpečnostný kľúč
+          subject: 'Mastodon: Bezpečnostný kľúč odstránený'
+          title: Jeden z vašich bezpečnostných kľúčov bol odstránený
+      webauthn_disabled:
+        explanation: Overovanie pomocou bezpečnostných kľúčov bolo pre vaše konto vypnuté. Prihlásenie je teraz možné len pomocou tokenu vygenerovaného spárovanou aplikáciou TOTP.
+        subject: 'Mastodon: Overovanie s vypnutými bezpečnostnými kľúčmi'
+        title: Bezpečnostné kľúče sú vypnuté
+      webauthn_enabled:
+        explanation: Pre vaše konto bolo povolené overovanie bezpečnostným kľúčom. Váš bezpečnostný kľúč teraz môžete použiť na prihlásenie.
+        subject: 'Mastodon: Povolené overovanie bezpečnostného kľúča'
+        title: Povolené bezpečnostné kľúče
     omniauth_callbacks:
       failure: Nebolo možné ťa overiť z %{kind}, lebo "%{reason}".
       success: Úspešné overenie z účtu %{kind}.

config/locales/doorkeeper.el.yml

@@ -112,6 +112,7 @@ el:
         read/write: Πρόσβαση ανάγνωσης και εγγραφής
         write: Πρόσβαση μόνο για εγγραφή
       title:
+        accounts: Λογαριασμοί
         admin/accounts: Διαχείριση λογαριασμών
         admin/all: Όλες οι λειτουργίες διαχείρησης
         admin/reports: Διαχείριση αναφορών

config/locales/doorkeeper.es-AR.yml

@@ -60,7 +60,7 @@ es-AR:
       error:
         title: Ocurrió un error
       new:
-        prompt_html: "%{client_name} solicitaa permiso para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confiás en ella, no deberías autorizarla.</strong>"
+        prompt_html: "%{client_name} solicita permiso para acceder a tu cuenta. Es una aplicación de terceros. <strong>Si no confiás en ella, no deberías autorizarla.</strong>"
         review_permissions: Revisar permisos
         title: Autorización requerida
       show:

config/locales/doorkeeper.sco.yml

@@ -25,7 +25,7 @@ sco:
         edit: Edit
         submit: Pit in
       confirmations:
-        destroy: Ye sure?
+        destroy: Ye shuir?
       edit:
         title: Edit application
       form:
@@ -69,10 +69,10 @@ sco:
       buttons:
         revoke: Tak awa
       confirmations:
-        revoke: Ye sure?
+        revoke: Ye shuir?
       index:
         authorized_at: Authorized on %{date}
-        description_html: This is the applications thit kin access yer accoont uisin the API. Gin there applications thit ye dinnae recognize here, or a application isnae behavinnricht, ye kin tak awa its access.
+        description_html: This is the applications thit kin access yer accoont uisin the API. Gin there applications thit ye dinnae recognize here, or a application isnae behavin richt, ye kin tak awa its access.
         last_used_at: Last uised on %{date}
         never_used: Never uised
         scopes: Permissions

config/locales/doorkeeper.sk.yml

@@ -38,6 +38,7 @@ sk:
         application: Aplikácia
         callback_url: Návratová URL
         delete: Vymaž
+        empty: Nemáte žiadne aplikácie.
         name: Názov
         new: Nová aplikácia
         scopes: Oprávnenia
@@ -59,6 +60,8 @@ sk:
       error:
         title: Nastala chyba
       new:
+        prompt_html: "%{client_name} žiada o povolenie na prístup k vášmu účtu. Ide o aplikáciu tretej strany. <strong>Ak jej nedôverujete, nemali by ste ju autorizovať.</strong>"
+        review_permissions: Preskúmať povolenia
         title: Je potrebná autorizácia
       show:
         title: Skopíruj tento autorizačný kód a vlož ho do aplikácie.
@@ -68,6 +71,12 @@ sk:
       confirmations:
         revoke: Si si istý?
       index:
+        authorized_at: Autorizované dňa %{date}
+        description_html: Ide o aplikácie, ktoré môžu pristupovať k vášmu účtu pomocou rozhrania API. Ak sa tu nachádzajú aplikácie, ktoré nepoznáte, alebo ak sa niektorá aplikácia správa nesprávne, môžete jej zrušiť prístup.
+        last_used_at: Posledne použitý dňa %{date}
+        never_used: Nikdy nepoužité
+        scopes: Oprávnenia
+        superapp: Interný
         title: Tvoje povolené aplikácie
     errors:
       messages:
@@ -76,6 +85,10 @@ sk:
         invalid_client: Overenie klienta zlyhalo. Neznámy klient, chýbajú údaje o klientovi alebo nepodporovaná metóda overovania.
         invalid_grant: Dané oprávnenie je neplatné, vypršané, zrušené, nesúhlasí s presmerovacou URI použitou v autorizačnej požiadavke, alebo bolo vydané pre iný klient.
         invalid_redirect_uri: Presmerovacia URI je neplatná.
+        invalid_request:
+          missing_param: 'Chýba požadovaný parameter: %{value}.'
+          request_not_authorized: Žiadosť je potrebné autorizovať. Chýba požadovaný parameter pre autorizáciu žiadosti alebo je neplatný.
+          unknown: V požiadavke chýba požadovaný parameter, obsahuje nepodporovanú hodnotu parametra alebo je inak chybne vytvorená.
         invalid_resource_owner: Uvedené prihlasovacie údaje sú neplatné alebo nenájdené
         invalid_scope: Požadovaný rozsah je neplatný, neznámy alebo poškodený.
         invalid_token:
@@ -100,9 +113,32 @@ sk:
         destroy:
           notice: Oprávnenia aplikácie zrušené.
     grouped_scopes:
+      access:
+        read: Prístup len na čítanie
+        read/write: Prístup na čítanie a zápis
+        write: Prístup len na zápis
       title:
+        accounts: Účty
+        admin/accounts: Správa účtov
+        admin/all: Všetky administratívne funkcie
+        admin/reports: Správa reportov
+        all: Všetko
         blocks: Blokovania
+        bookmarks: Záložky
+        conversations: Konverzácie
+        crypto: Šifrovanie End-to-end
+        favourites: Obľúbené
+        filters: Filtre
+        follow: Vzťahy
+        follows: Sledovania
+        lists: Zoznamy
+        media: Mediálne prílohy
         mutes: Nevšímané
+        notifications: Oznámenia
+        push: Push notifikácie
+        reports: Reporty
+        search: Hľadať
+        statuses: Príspevky
     layouts:
       admin:
         nav:
@@ -117,6 +153,7 @@ sk:
       admin:write: uprav všetky dáta na serveri
       admin:write:accounts: urob moderovacie úkony na účtoch
       admin:write:reports: urob moderovacie úkony voči hláseniam
+      crypto: používať end-to-end šifrovanie
       follow: uprav vzťahy svojho účtu
       push: dostávaj oboznámenia ohľadom tvojho účtu na obrazovku
       read: prezri si všetky dáta ohľadom svojho účetu

config/locales/el.yml

@@ -58,7 +58,7 @@ el:
       disabled: Απενεργοποιημένο
       display_name: Όνομα εμφάνισης
       domain: Τομέας
-      edit: Αλλαγή
+      edit: Επεξεργασία
       email: Email
       email_status: Κατάσταση email
       enable: Ενεργοποίηση
@@ -156,6 +156,7 @@ el:
         approve_user: Έγκριση Χρήστη
         assigned_to_self_report: Ανάθεση Αναφοράς
         change_email_user: Αλλαγή email για χρήστη
+        change_role_user: Αλλαγή του ρόλου του χρήστη
         confirm_user: Επιβεβαίωση Χρήστη
         create_account_warning: Δημιουργία Προειδοποίησης
         create_announcement: Δημιουργία Ανακοίνωσης
@@ -164,6 +165,7 @@ el:
         create_domain_block: Δημιουργία Αποκλεισμένου Τομέα
         create_email_domain_block: Δημουργία Αποκλεισμένου Τομέα email
         create_ip_block: Δημιουργία κανόνα IP
+        create_user_role: Δημιουργία ρόλου
         demote_user: Υποβιβασμός Χρήστη
         destroy_announcement: Διαγραφή Ανακοίνωσης
         destroy_custom_emoji: Διαγραφή Προσαρμοσμένου Emoji
@@ -198,6 +200,7 @@ el:
         update_announcement: Ενημέρωση Ανακοίνωσης
         update_custom_emoji: Ενημέρωση Προσαρμοσμένου Emoji
         update_status: Ενημέρωση Κατάστασης
+        update_user_role: Ενημέρωση ρόλου
       actions:
         approve_user_html: "%{name} εγκρίθηκε εγγραφή από %{target}"
         destroy_email_domain_block_html: Ο/Η %{name} ξεμπλόκαρε το email domain %{target}
@@ -273,6 +276,8 @@ el:
       updated_msg: Επιτυχής ενημέρωση του emoji!
       upload: Ανέβασμα
     dashboard:
+      active_users: ενεργοί χρήστες
+      new_users: νέοι χρήστες
       software: Λογισμικό
       space: Κατανάλωση χώρου
       title: Ταμπλό
@@ -291,7 +296,7 @@ el:
       created_msg: Ο αποκλεισμός τομέα είναι υπό επεξεργασία
       destroyed_msg: Ο αποκλεισμός τομέα άρθηκε
       domain: Τομέας
-      edit: Διαχείρηση αποκλεισμένου τομέα
+      edit: Επεξεργασία αποκλεισμένου τομέα
       existing_domain_block: Έχετε ήδη επιβάλει αυστηρότερα όρια στο %{name}.
       existing_domain_block_html: Έχεις ήδη επιβάλλει αυστηρότερους περιορισμούς στο %{name}, πρώτα θα πρέπει να τους <a href="%{unblock_url}">αναιρέσεις</a>.
       export: Εξαγωγή
@@ -334,10 +339,13 @@ el:
     export_domain_blocks:
       no_file: Δεν επιλέχθηκε αρχείο
     follow_recommendations:
+      language: Για τη γλώσσα
       status: Κατάσταση
     instances:
       by_domain: Τομέας
       confirm_purge: Είστε βέβαιοι ότι θέλετε να διαγράψετε μόνιμα τα δεδομένα από αυτόν τον τομέα;
+      dashboard:
+        instance_languages_dimension: Κορυφαίες γλώσσες
       delivery:
         failing: Αποτυγχάνει
       delivery_available: Διαθέσιμη παράδοση
@@ -372,9 +380,9 @@ el:
         '1209600': 2 εβδομάδες
         '15778476': 6 μήνες
         '2629746': 1 μήνας
-        '31556952': 1 έτος
+        '31556952': 1 χρόνος
         '86400': 1 ημέρα
-        '94670856': 3 έτη
+        '94670856': 3 χρόνια
       new:
         title: Δημιουργία νέου κανόνα IP
       title: Κανόνες IP
@@ -459,8 +467,20 @@ el:
         devops: Devops
         invites: Προσκλήσεις
       delete: Διαγραφή
+      edit: Επεξεργασία ρόλου '%{name}'
+      everyone: Προεπιλεγμένα δικαιώματα
+      permissions_count:
+        one: "%{count} δικαίωμα"
+        other: "%{count} δικαιώματα"
       privileges:
+        administrator: Διαχειριστής
+        invite_users: Πρόσκληση χρηστών
+        manage_announcements: Διαχείριση ανακοινώσεων
+        manage_roles: Διαχείριση ρόλων
+        manage_settings: Διαχείριση ρυθμίσεων
+        manage_users: Διαχείριση χρηστών
         view_devops: DevOps
+      title: Ρόλοι
     rules:
       add_new: Προσθήκη κανόνα
       delete: Διαγραφή
@@ -530,6 +550,11 @@ el:
     title: Διαχείριση
     trends:
       only_allowed: Μόνο επιτρεπόμενα
+      tags:
+        dashboard:
+          tag_languages_dimension: Κορυφαίες γλώσσες
+          tag_servers_dimension: Κορυφαίοι διακομιστές
+          tag_servers_measure: διαφορετικοί διακομιστές
       trending: Δημοφιλή
     warning_presets:
       add_new: Πρόσθεση νέου
@@ -962,14 +987,27 @@ el:
     browser: Φυλλομετρητής (Browser)
     browsers:
       blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
       generic: Άγνωστος φυλλομετρητής
+      ie: Internet Explorer
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
       uc_browser: UC Browser
     current_session: Τρέχουσα σύνδεση
     description: "%{browser} σε %{platform}"
     explanation: Αυτοί είναι οι φυλλομετρητές (browsers) που είναι συνδεδεμένοι στον λογαριασμό σου στο Mastodon αυτή τη στιγμή.
     platforms:
+      android: Android
       blackberry: BlackBerry
       chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
       mac: Mac
       other: άγνωστη πλατφόρμα
     revoke: Ανακάλεσε
@@ -1045,14 +1083,14 @@ el:
       unlisted_long: Βλέπει οποιοσδήποτε, αλλά δεν καταχωρείται στις δημόσιες ροές
   statuses_cleanup:
     min_age:
-      '1209600': 2 weeks
+      '1209600': 2 εβδομάδες
-      '15778476': 6 months
+      '15778476': 6 μήνες
-      '2629746': 1 month
+      '2629746': 1 μήνας
-      '31556952': 1 year
+      '31556952': 1 χρόνος
-      '5259492': 2 months
+      '5259492': 2 μήνες
       '604800': 1 εβδομάδα
-      '63113904': 2 years
+      '63113904': 2 χρόνια
-      '7889238': 3 months
+      '7889238': 3 μήνες
   stream_entries:
     pinned: Καρφιτσωμένο τουτ
     reblogged: προωθημένο
@@ -1083,6 +1121,8 @@ el:
       explanation: Είχες ζητήσει εφεδρικό αντίγραφο του λογαριασμού σου στο Mastodon. Είναι έτοιμο για κατέβασμα!
       subject: Το εφεδρικό αντίγραφό σου είναι έτοιμο για κατέβασμα
       title: Λήψη εφεδρικού αρχείου
+    suspicious_sign_in:
+      change_password: αλλάξτε τον κωδικό πρόσβασής σας
     warning:
       categories:
         spam: Ανεπιθύμητο

config/locales/eo.yml

@@ -1,7 +1,7 @@
 ---
 eo:
   about:
-    about_mastodon_html: 'La socia reto de la estonteco: sen reklamo, sen firmaa superrigardo, etika fasonado kaj malcentrigo! Regu viajn datumojn per Mastodon!'
+    about_mastodon_html: 'La socia retejo de la estonteco: sen reklamo, sen kompania observado, etika desegno, kaj malcentrigo! Regu viajn datumojn per Mastodon!'
     contact_missing: Ne elektita
     contact_unavailable: Ne disponebla
     hosted_on: "%{domain} estas nodo de Mastodon"
@@ -57,17 +57,17 @@ eo:
       deleted: Forigita
       demote: Degradi
       destroyed_msg: Datumoj de %{username} nun enviciĝis por esti forigita baldaǔ
-      disable: Malebligi
+      disable: Frostigi
       disable_sign_in_token_auth: Malŝalti aŭtentigon de retpoŝta ĵetono
       disable_two_factor_authentication: Malŝalti 2FA-n
-      disabled: Malebligita
+      disabled: Frostigita
       display_name: Montrata nomo
       domain: Domajno
       edit: Redakti
       email: Retpoŝto
       email_status: Stato de retpoŝto
-      enable: Ebligi
+      enable: Malfrostigi
-      enable_sign_in_token_auth: Ŝalti retpoŝtan ĵetonan aŭtentigon
+      enable_sign_in_token_auth: Ŝalti aŭtentigon de retpoŝta ĵetono por uzanto
       enabled: Ebligita
       enabled_msg: Sukcese malfrostigis konton de %{username}
       followers: Sekvantoj
@@ -139,7 +139,7 @@ eo:
       shared_inbox_url: URL de kunhavigita leterkesto
       show:
         created_reports: Faritaj raportoj
-        targeted_reports: Raporitaj de aliaj
+        targeted_reports: Raporitaj de la aliaj
       silence: Limigi
       silenced: Silentigita
       statuses: Afiŝoj
@@ -196,10 +196,10 @@ eo:
         destroy_user_role: Detrui Rolon
         disable_2fa_user: Malebligi 2FA
         disable_custom_emoji: Malebligi proprajn emoĝiojn
-        disable_sign_in_token_auth_user: Malaktivigi aŭtentigon de retpoŝta ĵetono por uzanto
+        disable_sign_in_token_auth_user: Malŝalti aŭtentigon de retpoŝta ĵetono por la uzanto
         disable_user: Neebligi la uzanton
         enable_custom_emoji: Ebligi Propran Emoĝion
-        enable_sign_in_token_auth_user: Ebligi retpoŝtan ĵetonan aŭtentigon por la uzanto
+        enable_sign_in_token_auth_user: Ŝalti aŭtentigon de retpoŝta ĵetono por la uzanto
         enable_user: Ebligi uzanton
         memorialize_account: Memorigu Konton
         promote_user: Promocii Uzanton
@@ -254,11 +254,11 @@ eo:
         destroy_unavailable_domain_html: "%{name} daurigis sendon al domajno %{target}"
         destroy_user_role_html: "%{name} forigis rolon de %{target}"
         disable_2fa_user_html: "%{name} malebligis dufaktoran aŭtentigon por uzanto %{target}"
-        disable_custom_emoji_html: "%{name} malebligis emoĝion %{target}"
+        disable_custom_emoji_html: "%{name} malebligis la emoĝion %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} malebligis retpoŝtoĵetonautentigon por %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} malŝaltis la aŭtentigon de retpoŝta ĵetono por %{target}"
         disable_user_html: "%{name} malebligis ensaluton por uzanto %{target}"
-        enable_custom_emoji_html: "%{name} ebligis emoĝion %{target}"
+        enable_custom_emoji_html: "%{name} ebligis la emoĝion %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} ebligis retpoŝtoĵetonautentigon por %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ŝaltis la aŭtentigon de retpoŝta ĵetono por %{target}"
         enable_user_html: "%{name} ebligis ensaluton por uzanto %{target}"
         memorialize_account_html: "%{name} ŝanĝis la konton de %{target} al memora paĝo"
         promote_user_html: "%{name} plirangigis uzanton %{target}"
@@ -284,10 +284,10 @@ eo:
         update_status_html: "%{name} ĝisdatigis mesaĝon de %{target}"
         update_user_role_html: "%{name} ŝanĝis rolon %{target}"
       deleted_account: forigita konto
-      empty: Neniu protokolo trovita.
+      empty: Neniu ĵurnalo trovita.
       filter_by_action: Filtri per ago
       filter_by_user: Filtri per uzanto
-      title: Kontrola protokolo
+      title: Ĵurnalo de revizo
     announcements:
       destroyed_msg: Anonco sukcese forigita!
       edit:
@@ -361,7 +361,7 @@ eo:
       software: Programo
       sources: Fontoj de konto-kreado
       space: Memorspaca uzado
-      title: Kontrolpanelo
+      title: Panelo
       top_languages: Plej aktivaj lingvoj
       top_servers: Plej aktivaj serviloj
       website: Retejo
@@ -567,7 +567,7 @@ eo:
         notes:
           one: "%{count} noto"
           other: "%{count} notoj"
-      action_log: Kontrola protokolo
+      action_log: Ĵurnalo de revizo
       action_taken_by: Ago farita de
       actions:
         delete_description_html: Raportitaj mesaĝoj forigotas kaj admono rekorditas.
@@ -630,7 +630,7 @@ eo:
         administration: Administrado
         devops: Programado kaj Operaciado
         invites: Invitoj
-        moderation: Kontrolado
+        moderation: Moderigado
         special: Specialaj
       delete: Forigi
       description_html: Per <strong>uzantoroloj</strong>, vi povas personecigi funkciojn kaj areon de Mastodon.
@@ -677,7 +677,7 @@ eo:
         manage_webhooks_description: Permesi uzantojn komenci rethokojn por administraj eventoj
         view_audit_log: Vidi protokolon
         view_audit_log_description: Permesi uzantojn vidi historion de administraj agoj ĉe la servilo
-        view_dashboard: Vidi kontrolpanelon
+        view_dashboard: Vidi panelon
         view_dashboard_description: Permesi uzantojn aliri la kontrolpanelon kaj diversajn mezurarojn
         view_devops: Programado kaj Operaciado
         view_devops_description: Permesi uzantojn aliri Sidekiq kaj pgHero-kontrolpanelojn
@@ -815,8 +815,8 @@ eo:
         no_status_selected: Neniuj popularaj mesaĝoj ŝanĝitas ĉar nenio elektitas
         not_discoverable: Autoro ne volonte estas malkovrebla
         shared_by:
-          one: Diskonigita kaj stelumita unufoje
+          one: Kundividita kaj stelumita unufoje
-          other: Diskonigita kaj stelumita %{friendly_count}-foje
+          other: Kundividita kaj stelumita %{friendly_count}-foje
         title: Tendencantaj afiŝoj
       tags:
         current_score: Nuna puento %{score}
@@ -940,7 +940,7 @@ eo:
     delete_account_html: Se vi deziras forigi vian konton, vi povas <a href="%{path}">fari tion ĉi tie</a>. Vi bezonos konfirmi vian peton.
     description:
       prefix_invited_by_user: "@%{name} invitigi vin aligiĝi ĉi tiu servilo de Mastodon!"
-      prefix_sign_up: Registriĝu ĉe Mastodon hodiaŭ!
+      prefix_sign_up: Registriĝu en Mastodon hodiaŭ!
       suffix: Per konto, vi povos sekvi aliajn homojn, afiŝi kaj interŝanĝi mesaĝojn kun uzantoj de ajna Mastodona servilo kaj multe pli!
     didnt_get_confirmation: Ĉu vi ne ricevis la instrukciojn por konfirmi?
     dont_have_your_security_key: Ne havas vi vian sekurecan ŝlosilon?
@@ -949,7 +949,7 @@ eo:
     link_to_otp: Enigu 2-faktorkodo de via telefono au regajnkodo
     link_to_webauth: Uzi vian sekurecan ŝlosilon
     log_in_with: Ensaluti per
-    login: Ensaluti
+    login: Saluti
     logout: Adiaŭi
     migrate_account: Movi al alia konto
     migrate_account_html: Se vi deziras alidirekti ĉi tiun konton al alia, vi povas <a href="%{path}">agordi ĝin ĉi tie</a>.
@@ -1214,7 +1214,7 @@ eo:
       one: 1 uzo
       other: "%{count} uzoj"
     max_uses_prompt: Neniu limo
-    prompt: Krei kaj diskonigi ligilojn al aliaj por doni aliron al ĉi tiu servilo
+    prompt: Generi kaj kundividi ligilojn kun la aliaj por doni aliron al ĉi tiu servilo
     table:
       expires_at: Eksvalidiĝas je
       uses: Uzoj
@@ -1304,7 +1304,7 @@ eo:
     poll:
       subject: Enketo de %{name} finitas
     reblog:
-      body: "%{name} diskonigis vian mesaĝon:"
+      body: 'Via mesaĝo estis diskonigita de %{name}:'
       subject: "%{name} diskonigis vian mesaĝon"
       title: Nova diskonigo
     status:
@@ -1328,7 +1328,7 @@ eo:
   otp_authentication:
     code_hint: Enmetu la kodon kreitan de via aŭtentiga aplikaĵo por konfirmi
     description_html: Se vi ebligas <strong>dufaktoran aŭtentigon</strong> per autentilprogramaro, ensaluto bezonas vi havi vian telefonon.
-    enable: Ebligi
+    enable: Ŝalti
     instructions_html: "<strong>Skanu ĉi tiun QR-kodon per Google Authenticator aŭ per simila aplikaĵo en via poŝtelefono</strong>. De tiam, la aplikaĵo kreos nombrojn, kiujn vi devos enmeti."
     manual_instructions: 'Se vi ne povas skani la QR-kodon kaj bezonas enmeti ĝin mane, jen la tut-teksta sekreto:'
     setup: Agordi
@@ -1540,7 +1540,7 @@ eo:
     min_favs: Konservi mesaĝojn stelumitajn almenaŭ
     min_favs_hint: Ne forigas mesaĝojn de vi kiuj ricevis almenaŭ tiom da stelumoj. Lasu malplena por forigi mesaĝojn sendepende de la nombro de stelumoj
     min_reblogs: Konservi diskonitajn mesaĝojn almenau
-    min_reblogs_hint: Ne forigi ajn viajn mesaĝojn kiu diskonitas almenau ĉifoje
+    min_reblogs_hint: Oni ne forigas viajn afiŝojn kiuj estas diskonigitaj almenaŭ ĉi tiun nombron da fojoj. Lasu malplena por forigi afiŝojn sendepende de iliaj nombroj da diskonigoj
   stream_entries:
     pinned: Alpinglita
     reblogged: diskonigita

config/locales/es-AR.yml

@@ -592,7 +592,7 @@ es-AR:
       forwarded: Reenviado
       forwarded_to: Reenviado a %{domain}
       mark_as_resolved: Marcar como resuelta
-      mark_as_sensitive: Marcado como sensible
+      mark_as_sensitive: Marcar como sensible
       mark_as_unresolved: Marcar como no resuelta
       no_one_assigned: Nadie
       notes:
@@ -1430,7 +1430,7 @@ es-AR:
     revoke: Revocar
     revoke_success: Sesión revocada exitosamente
     title: Sesiones
-    view_authentication_history: Ver historial de autenticación de tu cuenta
+    view_authentication_history: Ver historial de autenticación de tu cuenta.
   settings:
     account: Cuenta
     account_settings: Config. de la cuenta
@@ -1536,9 +1536,9 @@ es-AR:
       '7889238': 3 meses
     min_age_label: Umbral de edad
     min_favs: Conservar mensajes marcados como favoritos de por lo menos
-    min_favs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de favoritos. Dejá en blanco para eliminar mensajes independientemente de su número de favoritos
+    min_favs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de favoritos. Dejá en blanco para eliminar mensajes independientemente de su número de favoritos.
     min_reblogs: Conservar adhesiones de por lo menos
-    min_reblogs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de adhesiones. Dejá en blanco para eliminar mensajes independientemente de su número de adhesiones
+    min_reblogs_hint: No elimina ninguno de tus mensajes que haya recibido más de esta cantidad de adhesiones. Dejá en blanco para eliminar mensajes independientemente de su número de adhesiones.
   stream_entries:
     pinned: Mensaje fijado
     reblogged: adhirió a este mensaje

config/locales/fa.yml

@@ -176,8 +176,10 @@ fa:
         create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
         create_ip_block: ایجاد قاعدهٔ آی‌پی
         create_unavailable_domain: ایجاد دامنهٔ ناموجود
+        create_user_role: ایجاد نقش
         demote_user: تنزل کاربر
         destroy_announcement: حذف اعلامیه
+        destroy_canonical_email_block: پاک کردن انسداد ایمیل
         destroy_custom_emoji: حذف اموجی سفارشی
         destroy_domain_allow: حذف اجازهٔ دامنه
         destroy_domain_block: حذف انسداد دامنه

config/locales/gd.yml

@@ -956,7 +956,7 @@ gd:
     notification_preferences: Atharraich roghainnean a’ phuist-d
     salutation: "%{name},"
     settings: 'Atharraich roghainnean a’ phuist-d: %{link}'
-    view: 'Seall:'
+    view: 'Faic:'
     view_profile: Seall a’ phròifil
     view_status: Seall am post
   applications:

config/locales/gl.yml

@@ -578,7 +578,7 @@ gl:
         suspend_description_html: O perfil e tódolos seus contidos será inaccesbles e finalmente eliminados. A interacción coa conta non será posible. Reversible durante 30 días.
       actions_description_html: Decide que acción tomar respecto desta denuncia. Se tomas accións punitivas contra a conta denunciada, enviaráselles un email coa notificación, excepto se está seleccionada a categoría <strong>Spam</strong>.
       add_to_report: Engadir máis á denuncia
-      are_you_sure: Estás seguro?
+      are_you_sure: Tes certeza?
       assign_to_self: Asignarme
       assigned: Moderador asignado
       by_target_domain: Dominio da conta denunciada

config/locales/he.yml

@@ -70,14 +70,14 @@ he:
       edit: עריכה
       email: דוא״ל
       email_status: מצב דוא״ל
-      enable: להפשיר
+      enable: ביטול הקפאה
       enable_sign_in_token_auth: הפעלת אסימון הזדהות בדוא״ל
       enabled: מופעל
       enabled_msg: ביטול השעית החשבון של %{username} בוצע בהצלחה
       followers: עוקבים
       follows: נעקבים
       header: כותרת
-      inbox_url: כתובת תיבה נכנסת
+      inbox_url: כתובת תיבת דואר נכנס
       invite_request_text: סיבות להצטרפות
       invited_by: הוזמן על ידי
       ip: כתובת IP
@@ -338,7 +338,7 @@ he:
       overwrite: לדרוס
       shortcode: קוד קצר
       shortcode_hint: לפחות 2 תוים, אלפאנומריים או קו תחתי
-      title: יצגנים מותאמים אישית
+      title: אמוג'י שהעלינו
       uncategorized: לא מסווגים
       unlist: בטל רישום
       unlisted: לא רשומים
@@ -1197,6 +1197,11 @@ he:
     trending_now: נושאים חמים
   generic:
     all: הכל
+    all_items_on_page_selected_html:
+      many: "<strong>%{count}</strong> פריטים נבחרו בעמוד זה."
+      one: פריט <strong>%{count}</strong> נבחר בעמוד זה.
+      other: "<strong>%{count}</strong> פריטים נבחרו בעמוד זה."
+      two: "<strong>%{count}</strong> פריטים נבחרו בעמוד זה."
     all_matching_items_selected_html:
       many: נבחרו <strong>%{count}</strong> פריטים שתאמו לחיפוש בעמוד זה.
       one: נבחר פריט <strong>%{count}</strong> שתאם לחיפוש בעמוד זה.
@@ -1209,6 +1214,11 @@ he:
     none: כלום
     order_by: מיין לפי
     save_changes: שמור שינויים
+    select_all_matching_items:
+      many: בחר.י %{count} פריטים שתאמו לחיפוש שלך.
+      one: בחר.י פריט %{count} שתאם לחיפוש שלך.
+      other: בחר.י %{count} פריטים שתאמו לחיפוש שלך.
+      two: בחר. י %{count} פריטים שתאמו לחיפוש שלך.
     today: היום
     validation_errors:
       many: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן

config/locales/ku.yml

@@ -1027,7 +1027,7 @@ ku:
   deletes:
     challenge_not_passed: Zanyariyên ku te nivîsandî ne rast in
     confirm_password: Borînpeyva xwe ya heyî binivîsine da ku nasnameya xwe piştrast bikî
-    confirm_username: Navê bikarhêneriyê xwe binivîse da ku prosedurê piştrast bike
+    confirm_username: Navê bikarhêneriyê xwe binivîse da ku pêvajoyê piştrast bikî
     proceed: Ajimêr jê bibe
     success_msg: Ajimêra te bi serkeftî hate jêbirin
     warning:
@@ -1514,7 +1514,7 @@ ku:
     ignore_favs: Ecibandinan paşguh bike
     ignore_reblogs: Bilindkirinan piştguh bike
     interaction_exceptions: Awarteyên li ser bingehên têkiliyan
-    interaction_exceptions_explanation: Bizanibe ku heke şandiyeke ku ji binî ve têkeve jêrî bijare an bilindkirin ê piştî ku carek din di ser wan re derbas bibe, garantiyek tune ku werin jêbirin.
+    interaction_exceptions_explanation: Bizanibe ku şandiyeke ku ji binî ve têkeve jêrî bijarte yan bilindkirinê piştî ku carek din di ser wan re derbas bibe, garantiyek tune ku werin jêbirin.
     keep_direct: Peyamên rasterast veşêre
     keep_direct_hint: Tu peyamên te yekcar jê naçe
     keep_media: Peyamên bi pêvekên medyayê ve ne biveşêre

config/locales/lv.yml

@@ -927,7 +927,7 @@ lv:
     remove: Atsaistīt aizstājvārdu
   appearance:
     advanced_web_interface: Paplašinātā tīmekļa saskarne
-    advanced_web_interface_hint: 'Ja vēlies izmantot visu ekrāna platumu, uzlabotā tīmekļa saskarne ļauj konfigurēt daudzas dažādas kolonnas, lai vienlaikus redzētu tik daudz informācijas, cik vēlies: Sākums, paziņojumi, federētā ziņu lenta, neierobežots skaits sarakstu un tēmturu.'
+    advanced_web_interface_hint: 'Ja vēlies izmantot visu ekrāna platumu, uzlabotā tīmekļa saskarne ļauj konfigurēt daudzas dažādas kolonnas, lai vienlaikus redzētu tik daudz informācijas, cik vēlies: Sākums, paziņojumi, apvienotā ziņu lenta, neierobežots skaits sarakstu un tēmturu.'
     animations_and_accessibility: Animācijas un pieejamība
     confirmation_dialogs: Apstiprināšanas dialogi
     discovery: Atklāšana

config/locales/ms.yml

@@ -102,6 +102,9 @@ ms:
       not_subscribed: Tiada langganan
       pending: Menunggu semak semula
       perform_full_suspension: Gantung
+      previous_strikes: Pelanggaran sebelumnya
+      previous_strikes_description_html:
+        other: Akaun ini mempunyai <strong>%{count}</strong> pelanggaran.
       promote: Naikkan taraf
       protocol: Protokol
       public: Awam
@@ -137,6 +140,7 @@ ms:
       silence: Hadkan
       silenced: Dihadkan
       statuses: Hantaran
+      strikes: Pelanggaran sebelumnya
       subscribe: Langgan
       suspend: Gantung
       suspended: Digantung
@@ -144,6 +148,7 @@ ms:
       suspension_reversible_hint_html: Akaun ini telah digantung, dan datanya akan dibuang pada %{date}. Sebelum tarikh itu, akaun ini boleh diperoleh semula tanpa kesan buruk. Jika anda mahu memadamkan kesemua data akaun ini serta-merta, anda boleh melakukannya di bawah.
       title: Akaun
       unblock_email: Menyahsekat alamat e-mel
+      unblocked_email_msg: Alamat e-mel %{username} berjaya dinyahsekat
       unconfirmed_email: E-mel belum disahkan
       undo_sensitized: Nyahtanda sensitif
       undo_silenced: Nyahdiamkan
@@ -188,8 +193,10 @@ ms:
         destroy_user_role: Padamkan Peranan
         disable_2fa_user: Nyahdayakan 2FA
         disable_custom_emoji: Nyahdayakan Emoji Tersendiri
+        disable_sign_in_token_auth_user: Melumpuhkan pengesahan token e-mel untuk pengguna
         disable_user: Nyahdayakan Pengguna
         enable_custom_emoji: Dayakan Emoji Tersendiri
+        enable_sign_in_token_auth_user: Mendayakan pengesahan token e-mel untuk pengguna
         enable_user: Dayakan Pengguna
         memorialize_account: Jadikan Akaun Kenangan
         promote_user: Naikkan Taraf Pengguna
@@ -215,11 +222,15 @@ ms:
         update_status: Kemas Kini Hantaran
         update_user_role: Kemas Kini Peranan
       actions:
+        approve_appeal_html: "%{name} meluluskan rayuan keputusan penyederhanaan daripada %{target}"
+        approve_user_html: "%{name} meluluskan pendaftaran daripada %{target}"
         assigned_to_self_report_html: "%{name} menugaskan laporan %{target} kepada dirinya sendiri"
         change_email_user_html: "%{name} telah mengubah alamat e-mel pengguna %{target}"
+        change_role_user_html: "%{name} mengubah peranan %{target}"
         confirm_user_html: "%{name} telah mengesahkan alamat e-mel pengguna %{target}"
         create_account_warning_html: "%{name} telah memberi amaran kepada %{target}"
         create_announcement_html: "%{name} telah mencipta pengumuman baharu %{target}"
+        create_canonical_email_block_html: "%{name} menyekat e-mel dengan cincangan %{target}"
         create_custom_emoji_html: "%{name} telah memuat naik emoji baharu %{target}"
         create_domain_allow_html: "%{name} membenarkan persekutuan dengan domain %{target}"
         create_domain_block_html: "%{name} telah menyekat domain %{target}"
@@ -241,26 +252,34 @@ ms:
         destroy_user_role_html: "%{name} telah memadam peranan %{target}"
         disable_2fa_user_html: "%{name} menyahdayakan keperluan dua faktor bagi pengguna %{target}"
         disable_custom_emoji_html: "%{name} telah menyahdayakan emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} melumpuhkan pengesahan token e-mel untuk %{target}"
         disable_user_html: "%{name} telah menyahdayakan log masuk bagi pengguna %{target}"
         enable_custom_emoji_html: "%{name} telah mendayakan emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} mendayakan pengesahan token e-mel untuk %{target}"
         enable_user_html: "%{name} telah mendayakan log masuk untuk pengguna %{target}"
         memorialize_account_html: "%{name} telah mengubah akaun %{target} menjadi halaman kenangan"
         promote_user_html: "%{name} telah menaikkan taraf pengguna %{target}"
+        reject_appeal_html: "%{name} menolak rayuan keputusan penyederhanaan daripada %{target}"
+        reject_user_html: "%{name} menolak pendaftaran daripada %{target}"
         remove_avatar_user_html: "%{name} telah membuang avatar %{target}"
         reopen_report_html: "%{name} telah membuka semula laporan %{target}"
+        resend_user_html: "%{name} menghantar semula e-mel pengesahan untuk %{target}"
         reset_password_user_html: "%{name} telah menetapkan semula kata laluan pengguna %{target}"
         resolve_report_html: "%{name} telah menyelesaikan laporan %{target}"
         sensitive_account_html: "%{name} telah menanda media %{target} sebagai sensitif"
         silence_account_html: "%{name} telah mendiamkan akaun %{target}"
         suspend_account_html: "%{name} telah menggantung akaun %{target}"
         unassigned_report_html: "%{name} telah menyahtugaskan laporan %{target}"
+        unblock_email_account_html: "%{name} menyahsekat alamat e-mel %{target}"
         unsensitive_account_html: "%{name} telah menyahtanda media %{target} sebagai sensitif"
         unsilence_account_html: "%{name} telah menyahdiamkan akaun %{target}"
         unsuspend_account_html: "%{name} telah menyahgantungkan akaun %{target}"
         update_announcement_html: "%{name} telah mengemaskini pengumuman %{target}"
         update_custom_emoji_html: "%{name} telah mengemaskini emoji %{target}"
         update_domain_block_html: "%{name} telah mengemaskini penyekatan domain untuk %{target}"
+        update_ip_block_html: "%{name} telah mengubah peraturan IP %{target}"
         update_status_html: "%{name} telah mengemaskini hantaran oleh %{target}"
+        update_user_role_html: "%{name} telah mengubah peranan %{target}"
       deleted_account: akaun dipadamkan
       empty: Tiada log dijumpai.
       filter_by_action: Tapis mengikut tindakan
@@ -300,10 +319,12 @@ ms:
       enable: Dayakan
       enabled: Didayakan
       enabled_msg: Emoji tersebut berjaya didayakan
+      image_hint: PNG atau GIF sehingga %{size}
       list: Senarai
       listed: Disenaraikan
       new:
         title: Tambah emoji sendiri baharu
+      no_emoji_selected: Tiada emoji diubah kerana tiada yang dipilih
       not_permitted: Anda tidak dibenarkan untuk membuat tindakan ini
       overwrite: Tulis ganti
       shortcode: Kod pendek
@@ -321,6 +342,14 @@ ms:
       media_storage: Penyimpanan media
       new_users: pengguna baru
       opened_reports: laporan dibuka
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> rayuan masih belum selesai"
+      pending_reports_html:
+        other: "<strong>%{count}</strong> laporan masih belum selesai"
+      pending_tags_html:
+        other: "<strong>%{count}</strong> tanda pagar masih belum selesai"
+      pending_users_html:
+        other: "<strong>%{count}</strong> pengguna masih menunggu"
       resolved_reports: laporan diselesaikan
       software: Perisian
       sources: Sumber pendaftaran
@@ -346,6 +375,7 @@ ms:
       destroyed_msg: Sekatan domain telah diundurkan
       domain: Domain
       edit: Sunting penyekatan domain
+      existing_domain_block: Anda telah pun mengenakan had yang lebih ketat kepada %{name}.
       existing_domain_block_html: Anda telah mengenakan pengehadan yang lebih tegas ke atas %{name}, anda perlu <a href="%{unblock_url}">menyahsekatinya</a> dahulu.
       export: Eksport
       import: Import
@@ -354,8 +384,11 @@ ms:
         hint: Sekatan domain tidak akan menghindarkan penciptaan entri akaun dalam pangkalan data, tetapi akan dikenakan kaedah penyederhanaan khusus tertentu pada akaun-akaun tersebut secara retroaktif dan automatik.
         severity:
           noop: Tiada
+          silence: Hadkan
           suspend: Gantungkan
         title: Sekatan domain baharu
+      no_domain_block_selected: Tiada sekatan domain diubah kerana tiada yang dipilih
+      not_permitted: Anda tidak dibenarkan untuk melaksanakan tindakan ini
       obfuscate: Mengaburkan nama domain
       obfuscate_hint: Mengaburkan nama domain secara separa dalam senarai sekiranya pengehadan pengiklanan senarai domain didayakan
       private_comment: Ulasan peribadi
@@ -370,6 +403,8 @@ ms:
       view: Lihat penyekatan domain
     email_domain_blocks:
       add_new: Tambah baharu
+      attempts_over_week:
+        other: "%{count} cubaan pendaftaran sepanjang minggu lepas"
       created_msg: Telah berjaya menyekat domain e-mel
       delete: Padam
       dns:
@@ -378,10 +413,19 @@ ms:
       domain: Domain
       new:
         create: Tambah domain
+        resolve: Menyelesaikan domain
         title: Sekat domain e-mel baharu
+      no_email_domain_block_selected: Tiada sekatan domain e-mel diubah kerana tiada yang dipilih
+      resolved_through_html: Diselesaikan melalui %{domain}
       title: Domain e-mel disekat
     export_domain_allows:
+      new:
+        title: Import kebenaran domain
       no_file: Tiada fail dipilih
+    export_domain_blocks:
+      import:
+        existing_relationships_warning: Hubungan ikut sedia ada
+      no_file: Tiada fail yang dipilih
     follow_recommendations:
       description_html: "<strong>Saranan ikutan membantu pengguna baharu mencari kandungan menarik dengan cepat</strong>. Apabila pengguna belum cukup berinteraksi dengan akaun lain untuk membentuk saranan ikutan tersendiri, akaun-akaun inilah yang akan disarankan. Ia dinilai semula setiap hari dari gabungan keterlibatan tertinggi terkini dan juga jumlah pengikut tempatan tertinggi mengikut bahasa masing-masing."
       language: Untuk bahasa
@@ -391,11 +435,18 @@ ms:
       title: Saranan ikutan
       unsuppress: Tetap semula saranan ikutan
     instances:
+      availability:
+        title: Ketersediaan
+        warning: Percubaan terakhir untuk menyambung ke pelayan ini tidak berjaya
       back_to_all: Semua
       back_to_limited: Terhad
       back_to_warning: Amaran
       by_domain: Domain
+      confirm_purge: Adakah anda pasti mahu menghapuskan senarai ini secara kekal daripada domain ini?
       content_policies:
+        comment: Catatan dalaman
+        policies:
+          silence: Hadkan
         policy: Dasar
         reason: Sebab awam
         title: Dasar kandungan
@@ -404,9 +455,13 @@ ms:
         instance_accounts_measure: akaun disimpan
         instance_followers_measure: pengikut kami di situ
         instance_follows_measure: pengikut mereka di sini
+        instance_languages_dimension: Bahasa teratas
+        instance_reports_measure: laporan mengenai mereka
+        instance_statuses_measure: Hantaran yang disimpan
       delivery:
         all: Semua
         clear: Buang ralat penghantaran
+        failing: Gagal
         restart: Mulakan semula penghantaran
         stop: Hentikan penghantaran
         unavailable: Tidak tersedia
@@ -470,12 +525,18 @@ ms:
     report_notes:
       created_msg: Catatan laporan telah berjaya dicipta!
       destroyed_msg: Catatan laporan telah berjaya dipadam!
+      today_at: Hari ini pada %{time}
     reports:
       account:
         notes:
           other: "%{count} catatan"
       action_log: Log audit
       action_taken_by: Tindakan diambil oleh
+      actions:
+        delete_description_html: Hantaran yang dilaporkan akan dihapuskan dan pelanggaran itu akan direkodkan bagi membantu anda menguruskan pelanggaran pada akaun yang sama di masa akan datang.
+        mark_as_sensitive_description_html: Media di dalam hantaran yang dilaporkan akan ditandakan sebagai sensitif dan pelanggaran itu akan direkodkan bagi membantu anda menguruskan pelanggaran pada akaun yang sama di masa akan datang.
+        resolve_description_html: Tiada tindakan akan diambil terhadap akaun yang dilaporkan, tiada pelanggaran direkodkan dan laporan akan ditutup.
+      add_to_report: Tambahkan lebih banyak pada laporan
       are_you_sure: Adakah anda pasti?
       assign_to_self: Menugaskan kepada saya
       assigned: Penyederhana yang ditugaskan
@@ -504,7 +565,10 @@ ms:
       reported_by: Dilaporkan oleh
       resolved: Diselesaikan
       resolved_msg: Laporan berjaya diselesaikan!
+      skip_to_actions: Langkau ke tindakan
       status: Status
+      statuses: Kandungan yang dilaporkan
+      target_origin: Asalan akaun yang dilaporkan
       title: Laporan
       unassign: Nyahtugaskan
       unresolved: Nyahselesaikan
@@ -516,22 +580,55 @@ ms:
         other: "%{count} pengguna"
       categories:
         administration: Pentadbiran
+        devops: DevOps
         invites: Undangan
+        moderation: Penyederhanaan
         special: Khas
       delete: Padam
+      edit: Sunting peranan '%{name}'
       everyone: Kebenaran lalai
       permissions_count:
         other: "%{count} kebenaran"
       privileges:
         administrator: Pentadbir
         delete_user_data: Padamkan Data Pengguna
+        delete_user_data_description: Membenarkan pengguna menghapuskan data pengguna lain tanpa bertangguh
+        invite_users: Mengundang pengguna
+        invite_users_description: Membenarkan pengguna mengundang orang baharu ke pelayan
+        manage_announcements: Menguruskan pengumuman
+        manage_announcements_description: Membenarkan pengguna menguruskan pengumuman pada pelayan
+        manage_appeals: Menguruskan rayuan
+        manage_appeals_description: Membenarkan pengguna menyemak rayuan terhadap tindakan penyederhanaan
+        manage_blocks: Menguruskan sekatan
+        manage_blocks_description: Membenarkan pengguna menyekat pembekal e-mel dan alamat IP
+        manage_custom_emojis: Menguruskan emoji tersuai
+        manage_custom_emojis_description: Membenarkan pengguna menguruskan emoji tersuai pada pelayan
+        manage_federation: Menguruskan persekutuan
+        manage_federation_description: Membenarkan pengguna menyekat atau membenarkan persekutuan dengan domain yang lain dan mengawal kebolehhantaran
+        manage_invites: Menguruskan undangan
+        manage_invites_description: Membenarkan pengguna mengimbas dan menyahaktifkan pautan undangan
         manage_reports: Uruskan Laporan
+        manage_reports_description: Membenarkan pengguna menyemak laporan dan melaksanakan tindakan penyederhanaan terhadapnya
         manage_roles: Uruskan Peranan
+        manage_roles_description: Membenarkan pengguna mengurus dan menetapkan peranan di bawah mereka
         manage_rules: Uruskan Peraturan
+        manage_rules_description: Membenarkan pengguna mengubah peraturan pelayan
         manage_settings: Uruskan Tetapan
+        manage_settings_description: Membenarkan pengguna mengubah tetapan tapak
         manage_taxonomies: Uruskan Taksonomi
+        manage_taxonomies_description: Membenarkan pengguna menyemak kandungan sohor kini dan mengemas kini tetapan tanda pagar
         manage_user_access: Uruskan Akses Pengguna
+        manage_user_access_description: Membenarkan pengguna melumpuhkan pengesahan dwifaktor pengguna lain, mengubah alamat e-mel dan menetapkan semula kata laluan mereka
         manage_users: Uruskan Pengguna
+        manage_users_description: Membenarkan pengguna melihat butiran pengguna lain dan melaksanakan tindakan penyederhanaan terhadapnya
+        manage_webhooks: Menguruskan webhook
+        manage_webhooks_description: Membenarkan pengguna menyediakan webhook bagi acara pentadbiran
+        view_audit_log: Melihat log audit
+        view_audit_log_description: Membenarkan pengguna melihat sejarah tindakan pentadbiran pada pelayan
+        view_dashboard: Melihat papan pemuka
+        view_dashboard_description: Membenarkan pengguna mencapai papan pemuka dan pelbagai metrik
+        view_devops: DevOps
+        view_devops_description: Membenarkan pengguna mencapai papan pemuka Sidekiq dan pgHero
       title: Peranan
     rules:
       add_new: Tambah peraturan
@@ -543,9 +640,27 @@ ms:
     settings:
       about:
         manage_rules: Uruskan peraturan pelayan
+        preamble: Memberikan maklumat mendalam mengenai cara pelayan dikendalikan, disederhanakan, dibiayai.
+        rules_hint: Terdapat kawasan khas untuk peraturan yang dijangka untuk dipatuhi oleh pengguna anda.
+        title: Tentang
+      appearance:
+        preamble: Menyesuaikan antara muka web Mastodon.
+        title: Penampilan
+      branding:
+        title: Penjenamaan
+      content_retention:
+        title: Pengekalan kandungan
       discovery:
         profile_directory: Direktori profil
+        public_timelines: Garis masa awam
+        title: Penemuan
+        trends: Sohor kini
+      domain_blocks:
+        all: Kepada semua orang
+        disabled: Tidak kepada sesiapa
+        users: Kepada pengguna tempatan yang telah dilog masuk
       registrations:
+        preamble: Kawal siapa yang boleh membuat akaun pada pelayan anda.
         title: Pendaftaran
       registrations_mode:
         modes:
@@ -553,33 +668,69 @@ ms:
           none: Tiada siapa boleh mendaftar
           open: Sesiapapun boleh mendaftar
       title: Tetapan Pelayan
+    site_uploads:
+      delete: Hapuskan fail yang dimuat naik
+      destroyed_msg: Muat naik tapak berjaya dihapuskan!
     statuses:
       account: Penulis
       deleted: Dipadamkan
       favourites: Gemaran
       history: Sejarah versi
       language: Bahasa
+      media:
+        title: Media
+      metadata: Metadata
+      no_status_selected: Tiada hantaran diubah kerana tiada yang dipilih
       open: Buka hantaran
+      original_status: Hantaran asal
+      reblogs: Ulang siar
+      status_changed: Hantaran diubah
     strikes:
       actions:
         delete_statuses: "%{name} memadam hantaran %{target}"
+        disable: "%{name} membekukan akaun %{target}"
+        mark_statuses_as_sensitive: "%{name} menandakan hantaran %{target} sebagai sensitif"
+        none: "%{name} menghantar amaran kepada %{target}"
+        sensitive: "%{name} menandakan akaun %{target} sebagai sensitif"
+        silence: "%{name} telah mengehadkan akaun %{target}"
+        suspend: "%{name} telah menggantungkan akaun %{target}"
       appeal_approved: Dirayu
+      appeal_pending: Rayuan yang belum selesai
     tags:
       review: Semak status
     title: Pentadbiran
     trends:
       allow: Izin
       approved: Diluluskan
+      links:
+        allow: Membenarkan pautan
+        allow_provider: Membenarkan penerbit
+        title: Pautan yang sedang sohor kini
       preview_card_providers:
+        rejected: Pautan daripada penerbit ini tidak akan menjadi sohor kini
         title: Penerbit
       rejected: Ditolak
       statuses:
         allow: Izinkan hantaran
         allow_account: Izinkan penulis
+        disallow: Tidak membenarkan hantaran
+        disallow_account: Tidak membenarkan penulis
         title: Hantaran hangat
       tags:
+        current_score: Markah semasa %{score}
         dashboard:
+          tag_accounts_measure: pengguna unik
+          tag_languages_dimension: Bahasa teratas
+          tag_servers_dimension: Pelayan teratas
           tag_servers_measure: pelayan lain
+          tag_uses_measure: penggunaan keseluruhan
+        listable: Boleh dicadangkan
+        not_usable: Tidak boleh digunakan
+        peaked_on_and_decaying: Di atas pada %{date}, kini menurun
+        title: Tanda pagar sedang sohor kini
+        trendable: Boleh muncul di bawah sohor kini
+        trending_rank: 'Sohor kini #%{rank}'
+        usable: Boleh digunakan
     webhooks:
       delete: Padam
       enable: Dayakan
@@ -612,6 +763,7 @@ ms:
     security: Keselamatan
     status:
       account_status: Status akaun
+      view_strikes: Lihat pelanggaran yang lepas terhadap akaun anda
     use_security_key: Gunakan kunci keselamatan
   authorize_follow:
     follow: Ikut
@@ -631,19 +783,32 @@ ms:
     strikes:
       action_taken: Tindakan diambil
       appeal: Rayu
+      appeal_approved: Rayuan pelanggaran ini telah berjaya dan tidak lagi sah
       appeal_rejected: Rayuan ini telah ditolak
       appeal_submitted_at: Rayuan dihantar
+      appealed_msg: Rayuan anda sudah dikemukakan. Jika diluluskan, anda akan diberitahu.
       appeals:
         submit: Hantar rayuan
       approve_appeal: Luluskan rayuan
       associated_report: Laporan berkaitan
+      created_at: Tarikh
+      description_html: Ini ialah tindakan yang diambil terhadap akaun anda dan amaran telah dihantarkan kepada anda oleh staf %{instance}.
+      recipient: Ditujukan kepada
       reject_appeal: Tolak rayuan
       status: 'Hantaran #%{id}'
+      status_removed: Hantaran sudah dikeluarkan daripada sistem
+      title: "%{action} dari %{date}"
       title_actions:
         delete_statuses: Pemadaman hantaran
+        disable: Pembekuan akaun
+        mark_statuses_as_sensitive: Menandakan hantaran sebagai sensitif
         none: Amaran
+        sensitive: Menandakan akaun sebagai sensitif
+        silence: Keterbatasan akaun
+        suspend: Penggantungan akaun
       your_appeal_approved: Rayuan anda telah diluluskan
       your_appeal_pending: Anda telah menghantar rayuan
+      your_appeal_rejected: Rayuan anda telah ditolak
   errors:
     '400': Permintaan yang anda serahkan tidak sah atau salah bentuk.
     '403': Anda tidak mempunyai kebenaran untuk melihat halaman ini.
@@ -764,6 +929,7 @@ ms:
     profile: Profil
     relationships: Ikutan dan pengikut
     statuses_cleanup: Pemadaman hantaran automatik
+    strikes: Pelanggaran penyederhanaan
     two_factor_authentication: Pengesahan Dua Faktor
     webauthn_authentication: Kunci keselamatan
   statuses:
@@ -801,6 +967,9 @@ ms:
   stream_entries:
     pinned: Hantaran disemat
     sensitive_content: Kandungan sensitif
+  strikes:
+    errors:
+      too_late: Rayuan pelanggaran ini sudah terlalu lambat
   two_factor_authentication:
     add: Tambah
     disable: Nyahdayakan 2FA
@@ -810,8 +979,10 @@ ms:
   user_mailer:
     appeal_approved:
       action: Pergi ke akaun anda
+      explanation: Rayuan pelanggaran yang dikemukakan pada %{appeal_date} terhadap akaun anda pada %{strike_date} telah diluluskan. Akaun anda kini dalam kedudukan yang baik.
       title: Rayuan diluluskan
     appeal_rejected:
+      explanation: Rayuan pelanggaran yang dikemukakan pada %{appeal_date} terhadap akaun anda pada %{strike_date} telah ditolak.
       title: Rayuan ditolak
     suspicious_sign_in:
       title: Daftar masuk baru

config/locales/ru.yml

@@ -834,6 +834,7 @@ ru:
         allow_account: Разрешить автора
         disallow: Запретить пост
         disallow_account: Запретить автора
+        not_discoverable: Автор решил не раскрывать себя
         shared_by:
           few: Поделились или добавили в избранное %{friendly_count} раза
           many: Поделились или добавили в избранное %{friendly_count} раз
@@ -849,6 +850,7 @@ ru:
           tag_servers_measure: разные сервера
           tag_uses_measure: всего использований
         listable: Может предлагаться
+        no_tag_selected: Теги небыли изменены, поскольку ни один из них не выбран
         not_listable: Не будет предлагаться
         not_trendable: Не будет появляться в списке «актуального»
         not_usable: Не может использоваться
@@ -1616,6 +1618,7 @@ ru:
   user_mailer:
     appeal_approved:
       action: Перейти к своему профилю
+      explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись снова на хорошем счету.
       subject: Ваше обжалование от %{date} была одобрено
       title: Обжалование одобрено
     appeal_rejected:

config/locales/sco.yml

@@ -34,7 +34,7 @@ sco:
       add_email_domain_block: Dingie email domain
       approve: Approve
       approved_msg: Successfully approvit %{username}'s sign-up application
-      are_you_sure: Ye sure?
+      are_you_sure: Ye shuir?
       avatar: Avatar
       by_domain: Domain
       change_email:

config/locales/simple_form.be.yml

@@ -12,6 +12,7 @@ be:
       admin_account_action:
         include_statuses: Карыстальнік пабачыць, якія допісы ёсць прычынай мадэрацыі ці папярэджання
         send_email_notification: Карыстальнік атрымае тлумачэнне аб тым, што здарылася з яго ўліковым запісам
+        text_html: Неабавязкова. Вы можаце выкарыстоўваць сінтаксіс допісаў. <a href="%{path}">Дадайце шаблоны папярэджанняў</a>, якія будуць эканоміць час
         type_html: Выберы што рабіць з <strong>%{acct}</strong>
         types:
           disable: Перадухіліць выкарыстанне акаунтаў, але не выдаляць і не хаваць іх змесціва.
@@ -158,6 +159,7 @@ be:
         show_domain_blocks: Паказаць заблакіраваныя дамены
         show_domain_blocks_rationale: Паказваць прычыну блакавання даменаў
         site_contact_email: Электронная пошта для сувязі
+        site_contact_username: Назва рахунку суразмоўцы
         site_extended_description: Падрабязнае апісанне
         site_short_description: Апісанне сервера
         site_terms: Палітыка канфідэнцыйнасці

config/locales/simple_form.de.yml

@@ -57,7 +57,7 @@ de:
         setting_hide_network: Wem du folgst und wer dir folgt, wird in deinem Profil nicht angezeigt
         setting_noindex: Betrifft alle öffentlichen Daten deines Profils, z. B. deine Beiträge, Account-Empfehlungen und „Über mich“
         setting_show_application: Die Anwendung die du nutzt wird in der detaillierten Ansicht deiner Beiträge angezeigt
-        setting_use_blurhash: Die Farbverläufe basieren auf den Farben der verborgenen Medien, aber verstecken jegliche Details
+        setting_use_blurhash: Die Farbverläufe basieren auf den Farben der verborgenen Medien, verschleiern aber jegliche Details
         setting_use_pending_items: Neue Beiträge hinter einem Klick verstecken, anstatt des automatischen Bildlaufs
         username: Dein Profilname wird auf %{domain} einmalig sein
         whole_word: Wenn das Wort oder die Formulierung nur aus Buchstaben oder Zahlen besteht, tritt der Filter nur dann in Kraft, wenn er exakt dieser Zeichenfolge entspricht
@@ -170,7 +170,7 @@ de:
         context: Filter nach Bereichen
         current_password: Derzeitiges Passwort
         data: Daten
-        discoverable: Dieses Profil im Profilverzeichnis zeigen
+        discoverable: Konto für andere empfehlen
         display_name: Anzeigename
         email: E-Mail-Adresse
         expires_in: Läuft ab

config/locales/simple_form.el.yml

@@ -222,6 +222,8 @@ el:
         name: Ετικέτα
         trendable: Εμφάνιση της ετικέτας στις τάσεις
         usable: Χρήση της ετικέτας σε τουτ
+      user:
+        role: Ρόλος
     'no': Όχι
     recommended: Προτείνεται
     required:

config/locales/simple_form.es-AR.yml

@@ -31,7 +31,7 @@ es-AR:
         text: Sólo podés apelar un incumplimiento una vez
       defaults:
         autofollow: Los usuarios que se registren mediante la invitación te seguirán automáticamente
-        avatar: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles'
+        avatar: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
         bot: Esta cuenta ejecuta principalmente acciones automatizadas y podría no ser monitorizada
         context: Uno o múltiples contextos en los que debe aplicarse el filtro
         current_password: Por razones de seguridad, por favor, ingresá la contraseña de la cuenta actual
@@ -40,7 +40,7 @@ es-AR:
         discoverable: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras funciones
         email: Se te enviará un correo electrónico de confirmación
         fields: Podés tener hasta 4 elementos mostrados en una tabla en tu perfil
-        header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles'
+        header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
         inbox_url: Copiá la dirección web desde la página principal del relé que querés usar
         irreversible: Los mensajes filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado después
         locale: El idioma de la interface de usuario, correos electrónicos y notificaciones push

config/locales/simple_form.ms.yml

@@ -2,7 +2,36 @@
 ms:
   simple_form:
     hints:
+      account_alias:
+        acct: Tentukan namapengguna@domain akaun yang ingin anda alihkan daripada
+      account_migration:
+        acct: Tentukan namapengguna@domain akaun yang ingin anda alihkan ke
+      account_warning_preset:
+        text: Anda boleh menggunakan sintaks hantaran seperti URL, tanda pagar dan sebutan
+        title: Pilihan. Penerima tidak dapat melihatnya
+      admin_account_action:
+        include_statuses: Pengguna akan melihat kiriman mana yang menyebabkan tindakan atau amaran penyederhanaan
+        send_email_notification: Pengguna akan menerima penjelasan tentang apa yang berlaku dengan akaun mereka
+        text_html: Pilihan. Anda boleh menggunakan sintaks hantaran. Anda juga boleh <a href="%{path}">menambahkan praset amaran</a> untuk menjimatkan masa
+        type_html: Pilih apa yang ingin dilakukan dengan <strong>%{acct}</strong>
+        types:
+          disable: Halang pengguna daripada menggunakan akaun mereka, tetapi jangan hapus atau sorokkan kandungan mereka.
+          none: Gunakan ini untuk menghantar amaran kepada pengguna, tanpa mencetuskan sebarang tindakan lain.
+          sensitive: Memaksa semua lampiran media pengguna ini ditandakan sebagai sensitif.
+          silence: Halang pengguna daripada membuat hantaran secara awam, menyorokkan hantaran dan pemberitahuan mereka daripada orang yang tidak mengikuti mereka.
+          suspend: Halang sebarang interaksi daripada atau kepada akaun ini dan menghapuskan kandungannya. Boleh dikembalikan dalam 30 hari.
+        warning_preset_id: Pilihan. Anda masih boleh menambah teks tersuai pada akhir praset
+      announcement:
+        all_day: Apabila diperiksa, hanya tarikh dalam julat masa yang akan dipaparkan
+        ends_at: Pilihan. Pengumuman akan dinyahterbitkan secara automatik pada masa ini
+        scheduled_at: Biarkan kosong untuk menerbitkan pengumuman dengan segera
+        starts_at: Pilihan. Sekiranya pengumuman anda terikat pada julat masa tertentu
+        text: Anda boleh menggunakan sintaks hantaran. Sila ambil perhatian tentang ruang yang akan digunakan oleh pengumuman pada skrin pengguna
+      appeal:
+        text: Anda boleh membuat rayuan terhadap pelanggaran sekali sahaja
       defaults:
+        autofollow: Orang yang mendaftar melalui undangan akan mengikuti anda secara automatik
+        avatar: PNG, GIF atau JPG. Kebanyakannya %{size}. Saiz akan dikecilkan kepada %{dimensions}px
         email: Anda akan dihantar e-mel pengesahan
         locale: Bahasa untuk antara muka pengguna, e-mel dan pemberitahuan segera
         password: Gunakan sekurang-kurangnya 8 aksara

config/locales/simple_form.sco.yml

@@ -15,7 +15,7 @@ sco:
         text_html: Optional. Ye kin uise post syntax. Ye kin <a href="%{path}">add warnin presets</a> tae save time
         type_html: Pick whit tae dae wi <strong>%{acct}</strong>
         types:
-          disable: Stap the uiser fae uisin their accoont, but dinnae delete or hide therir content.
+          disable: Stap the uiser fae uisin their accoont, but dinnae delete or hide their content.
           none: Uise this fir tae sen a warnin tae the uiser, athoot stertin onie ither actions.
           sensitive: Mak aw this uiser's media attachments hae a flag sayin it's sensitive.
           silence: Stap the uiser fae bein able tae post wi public visibility, plank their posts an notes fae fowk no follaein them.
@@ -30,7 +30,7 @@ sco:
       appeal:
         text: Ye kin ainly appeal a strike the wance
       defaults:
-        autofollow: Fowk thit sign up throu the invite wull follae ye automatic
+        autofollow: Fowk thit signs up throu the invite wull follae ye automatic
         avatar: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
         bot: Signal tae ithers thit the accoont maistly performs automatit actions an mibbie wullnae be monitort
         context: Ae or mair contexts whaur the filter shuid apply
@@ -40,7 +40,7 @@ sco:
         discoverable: Alloo yer accoont fir tae get discovert bi strangers throu recommendations, trends an ither features
         email: Ye'll be sent a confirmation email
         fields: Ye kin hae up tae 4 items displayed as a table on yer profile
-        header: PNG, GIF or JPG. At maist %{size}. Wull het doonscaled tae %{dimensions}px
+        header: PNG, GIF or JPG. At maist %{size}. Wull get doonscaled tae %{dimensions}px
         inbox_url: Copy the URL fae the frontpage o the relay thit ye'r wantin tae uise
         irreversible: Filtert posts wull dizappear irreversibly, even if filter is taen aff efter
         locale: The leid o the uiser interface, emails an push notes
@@ -48,7 +48,7 @@ sco:
         password: Uise at least 8 chairecters
         phrase: Wull get matched regairdless o case in text or content warnin o a post
         scopes: Whit APIs the application wull be allooed tae access. Gin ye dinnae pick a tap-level scope, ye dinnae need tae pick anes ane at a time.
-        setting_aggregate_reblogs: Dinnae shaw new heezes fir posts thit hae been juist heezed (ainly affects new-received heezes)
+        setting_aggregate_reblogs: Dinnae shaw new heezes fir posts thit haes been juist heezed (ainly affects new-received heezes)
         setting_always_send_emails: Uisually email notes wullnae get sent whan ye'r uisin Mastodon at the time
         setting_default_sensitive: Sensitive media is hid bi defaut an kin be revealt wi a chap
         setting_display_media_default: Hide media mairked sensitive
@@ -57,7 +57,7 @@ sco:
         setting_hide_network: Wha ye follae an thaim thit follaes ye wull get hid on yer profile
         setting_noindex: Affects yer public profile an post pages
         setting_show_application: The application thit ye uise fir tae post wull be displayed in the detailt view o yer posts
-        setting_use_blurhash: Gradients are based aff o the colors o the image thit's hid, but ye cannae see onie details
+        setting_use_blurhash: Gradients is based aff o the colors o the image thit's hid, but ye cannae see onie details
         setting_use_pending_items: Plank timeline updates ahin a chap insteid o automatic scrowin o the feed
         username: Yer uisernemm wull be a ane aff on %{domain}
         whole_word: Whan the keywird or phrase is alphanumeric ainly, it wull ainly get applied if it matches the haill wird

config/locales/simple_form.sr.yml

@@ -10,19 +10,34 @@ sr:
         text: Можете користити синтаксу труба, као што су нпр. УРЛ-ова, тарабе и помињања
         title: Опционо. Није видљиво примаоцу
       admin_account_action:
+        include_statuses: Корисник ће видети које су објаве проузроковале модерирање или упозорење
         send_email_notification: Корисник ће добити објашњење тога шта му се десило са налога
         text_html: Опционално. Можете користити синтаксу труба. Можете <a href="%{path}">додати упозоравајућа преподешавање</a> да сачувате време
         type_html: Изаберите шта да радите са <strong>%{acct}</strong>
         types:
+          disable: Спречи корисника да користи свој налог, али немој брисати или сакривати његов садржај.
+          none: Користи ово да пошаљеш упозорење кориснику, без покретања било које друге акције.
+          sensitive: Учини да сви медијски прилози овог корисника присилно буду означени као осетљиви.
           silence: Онемогући корисника да објављује јавно, сакриј све његове своје објаве и обавештења од корисника који га не прате.
           suspend: Спречи било какву интеракцију са овог налога или са њим и избриши његов садржај. Може да се опозове у року од 30 дана.
         warning_preset_id: Опционално. Можете и даље додати прилагођени текст на крај пресета
+      announcement:
+        all_day: Биће приказани само датуми временског опсега који су означени
+        ends_at: Опционо. Објава ће бити аутоматски опозвана у овом тренутку
+        scheduled_at: Остави празно да би најава била одмах објављена
+        starts_at: Опционо. У случају да је најава везана за одређени временски распон
+        text: Можеш користити пост синтаксу. Води рачуна о простору који ће објава заузимати на екрану корисника
+      appeal:
+        text: На брисање се можеш жалити само једном
       defaults:
         autofollow: Особе које се пријаве кроз позивнице ће вас аутоматски запратити
         avatar: PNG, GIF или JPG. Највише %{size}. Биће смањена на %{dimensions}px
         bot: Овај налог углавном врши аутоматизоване радње и можда се не надгледа
         context: Један или више контекста у којима треба да се примени филтер
+        current_password: Унеси лозинку текућег налога из безбедносних разлога
+        current_username: Унеси корисничко име текућег налога за потврду
         digest: Послато после дужег периода неактивности са прегледом свих битних ствари које сте добили док сте били одсутни
+        discoverable: Дозволи непознатим корисницима да открију твој налог путем препорука, трендова и других функција
         email: Биће вам послата е-пошта са потврдом
         fields: Можете имати до 4 ставке приказане као табела на вашем налогу
         header: PNG, GIF или JPG. Највише %{size}. Биће смањена на %{dimensions}px
@@ -34,41 +49,89 @@ sr:
         phrase: Биће упарена без обзира на велико или мало слово у тексту или упозорења о садржају трубе
         scopes: Којим API-јима ће апликација дозволити приступ. Ако изаберете опсег највишег нивоа, не морате одабрати појединачне.
         setting_aggregate_reblogs: Не показуј нова дељења за трубе које су недавно подељене (утиче само на недавно примљена дељења)
+        setting_always_send_emails: Обавештења е-поштом се по правилу неће слати када активно користиш Мастодон
+        setting_default_sensitive: Осетљиви медији су подразумевано скривени и могу се открити кликом
         setting_display_media_default: Сакриј медије означене као осетљиве
         setting_display_media_hide_all: Увек сакриј све медије
         setting_display_media_show_all: Увек прикажи медије означене као осетљиве
         setting_hide_network: Кога пратите и ко вас прати неће бити приказано на вашем налогу
         setting_noindex: Утиче на Ваш јавни налог и статусне стране
+        setting_show_application: Апликација коју користиш за објављивање биће приказана у детаљном приказу твојих објава
+        setting_use_blurhash: Градијент се заснива на бојама скривених визуелних приказа, али прикрива све детаље
         username: Ваш надимак ће бити јединствен на %{domain}
         whole_word: Када је кључна реч или фраза искључиво алфанумеричка, биће примењена само ако се подудара са целом речи
+      form_admin_settings:
+        closed_registrations_message: Приказује се када су пријаве затворене
+        content_cache_retention_period: Када се постави на позитивну вредност, објаве са других сервера ће бити избрисане након наведеног броја дана. Ово може бити неповратно.
+        custom_css: Можеш да примениш прилагођене стилове на веб верзији Мастодона.
+        mascot: Замењује илустрацију у напредном веб интерфејсу.
+        media_cache_retention_period: Када се постави на позитивну вредност, преузете медијске датотеке ће бити избрисане након наведеног броја дана, и поново преузете на захтев.
+        profile_directory: Директоријум профила наводи све кориснике који су се определили да буду видљиви.
+        require_invite_text: Када регистрације захтевају ручно одобрење, постави да унос текста „Зашто желиш да се придружиш?“ буде обавезан, а не опциони
+        site_contact_email: Како корисници могу да те контактирају за правна питања или питања у вези подршке.
+        site_contact_username: Како корисници могу да те контактирају на Мастодону.
       imports:
         data: CSV фајл извезен са друге Мастодонт инстанце
       ip_block:
+        comment: Опционо. Запамти зашто си додао ово правило.
+        expires_in: IP адресе су ограничени ресурс, понекад се деле и често мењају корисника. Због тога се IP блокови на неограничено време не препоручују.
+        ip: Унеси IPv4 или IPv6 адресу. Можеш блокирати читаве опсеге користећи CIDR синтаксу. Води рачуна да себе не закључаш!
         severities:
           no_access: Блокирај приступ свим ресурсима
           sign_up_block: Нове пријаве неће бити могуће
           sign_up_requires_approval: Нове пријаве ће захтевати твоје одобрење
+        severity: Изабери шта ће се десити са захтевима са ове IP адресе
+      rule:
+        text: Опиши правило или захтев за кориснике на овом серверу. Потруди се да опис буде кратак и једноставан
       sessions:
         otp: 'Унесите двофакторски код са Вашег телефона или користите један од кодова за опоравак:'
+        webauthn: Ако је то USB кључ, обавезно га убаци и, ако је потребно, притисни га.
+      tag:
+        name: Могу се само променити мала слова у велика, на пример, да би било читљивије
       user:
         chosen_languages: Када означите, трубе у изабраним језицима ће се приказати на јавној временској линији
+        role: Улога контролише које дозволе корисник има
+      user_role:
+        color: Боја која ће се користити за улогу у целом корисничком интерфејсу, као RGB, у хексадецималном формату
+        highlighted: Ово чини улогу јавно видљивом
+        name: Јавни назив улоге, ако је улога подешена да се приказује као значка
+        permissions_as_keys: Корисници са овом улогом ће имати приступ...
+        position: Виша улога одлучује о решавању сукоба у одређеним ситуацијама. Одређене радње се могу извршити само на улогама са нижим приоритетом
+      webhook:
+        events: Изаберите догађаје за слање
+        url: Где ће се догађаји слати
     labels:
       account:
         fields:
           name: Етикета
           value: Садржај
+      account_alias:
+        acct: Ручица (@) старог налога
+      account_migration:
+        acct: Ручица (@) новог налога
       account_warning_preset:
         text: Текст пресета
+        title: Наслов
       admin_account_action:
+        include_statuses: Укључи пријављене објаве у е-пошту
         send_email_notification: Обавести корисника преко е-поште
         text: Прилагођено упозорење
         type: Радња
         types:
           disable: Онемогући
           none: Не ради ништа
+          sensitive: Осетљиво
           silence: Утишај
           suspend: Обуставите и неповратно избришите податке о налогу
         warning_preset_id: Користи упозоравајући пресет
+      announcement:
+        all_day: Целодневни догађај
+        ends_at: Крај догађаја
+        scheduled_at: Планирај објављивање
+        starts_at: Почетак догађаја
+        text: Најава
+      appeal:
+        text: Објасни зашто ову одлуку треба поништити
       defaults:
         autofollow: Позовите да прати ваш налог
         avatar: Аватар
@@ -85,6 +148,7 @@ sr:
         expires_in: Истиче након
         fields: Метаподаци налога
         header: Заглавље
+        honeypot: "%{label} (не попуњавај)"
         inbox_url: URL од релејног пријемног сандучета
         irreversible: Испустити уместо сакрити
         locale: Језик
@@ -95,13 +159,17 @@ sr:
         otp_attempt: Двофакторски код
         password: Лозинка
         phrase: Кључна реч или фраза
+        setting_advanced_layout: Омогући напредни веб интерфејс
         setting_aggregate_reblogs: Групиши дељења у временским линијама
+        setting_always_send_emails: Увек шаљи обавештења е-поштом
         setting_auto_play_gif: Аутоматски пуштај анимиране GIF-ове
         setting_boost_modal: Прикажи дијалог за потврду пре давања подршке
+        setting_crop_images: Изрежи слике у непроширеним објавама на 16x9
         setting_default_language: Језик објављивања
         setting_default_privacy: Приватност објава
         setting_default_sensitive: Увек означи мултимедију као осетљиву
         setting_delete_modal: Прикажи дијалог за потврду пре брисања тута
+        setting_disable_swiping: Онемогући покрете превлачења
         setting_display_media: Приказ медија
         setting_display_media_default: Подразумевано
         setting_display_media_hide_all: Сакриј све
@@ -110,15 +178,38 @@ sr:
         setting_hide_network: Сакриј своју мрежу
         setting_noindex: Одјави се од индексирања search engine-а
         setting_reduce_motion: Смањи покрете у анимацијама
+        setting_show_application: Откриј апликацију која се користи за слање постова
         setting_system_font_ui: Користи системски фонт
         setting_theme: Тема сајта
+        setting_trends: Прикажи данашње трендове
         setting_unfollow_modal: Прикажи дијалог за потврду пре него што отпратите некога
+        setting_use_blurhash: Прикажи градијенте у боји за скривене медије
+        setting_use_pending_items: Спори режим
         severity: Оштрина
+        sign_in_token_attempt: Сигурносни код
+        title: Наслов
         type: Тип увоза
         username: Корисничко име
         username_or_email: Корисничко име или Е-пошта
         whole_word: Цела реч
+      email_domain_block:
+        with_dns_records: Укључите MX записе и IP адресе домена
+      featured_tag:
+        name: Хеш ознака
+      filters:
+        actions:
+          hide: Сакриј у потпуности
+          warn: Сакриј уз упозорење
       form_admin_settings:
+        backups_retention_period: Период чувања корисничке архиве
+        bootstrap_timeline_accounts: Увек препоручи ове налоге новим корисницима
+        closed_registrations_message: Прилагођена порука када пријаве нису могуће
+        content_cache_retention_period: Период чувања кеша садржаја
+        custom_css: Прилагођени CSS
+        mascot: Прилагођена маскота (наслеђе)
+        media_cache_retention_period: Период чувања кеша медија
+        profile_directory: Омогући директоријум профила
+        registrations_mode: Ко може да се пријави
         require_invite_text: Затражи разлог за приступање
         show_domain_blocks: Пприкажи блокове домена
         show_domain_blocks_rationale: Покажи зашто су домени блокирани

config/locales/simple_form.th.yml

@@ -47,7 +47,7 @@ th:
         locked: ควบคุมผู้ที่สามารถติดตามคุณด้วยตนเองได้โดยอนุมัติคำขอติดตาม
         password: ใช้อย่างน้อย 8 ตัวอักษร
         phrase: จะถูกจับคู่โดยไม่คำนึงถึงตัวพิมพ์ใหญ่เล็กในข้อความหรือคำเตือนเนื้อหาของโพสต์
-        scopes: API ใดที่จะอนุญาตให้แอปพลิเคชันเข้าถึง หากคุณเลือกขอบเขตระดับบนสุด คุณไม่จำเป็นต้องเลือกแต่ละขอบเขต
+        scopes: API ใดที่จะอนุญาตให้แอปพลิเคชันเข้าถึง หากคุณเลือกขอบเขตระดับบนสุด คุณไม่จำเป็นต้องเลือกขอบเขตแต่ละรายการ
         setting_aggregate_reblogs: ไม่แสดงการดันใหม่สำหรับโพสต์ที่เพิ่งดัน (มีผลต่อการดันที่ได้รับใหม่เท่านั้น)
         setting_always_send_emails: โดยปกติจะไม่ส่งการแจ้งเตือนอีเมลเมื่อคุณกำลังใช้ Mastodon อยู่
         setting_default_sensitive: ซ่อนสื่อที่ละเอียดอ่อนเป็นค่าเริ่มต้นและสามารถเปิดเผยได้ด้วยการคลิก
@@ -92,7 +92,7 @@ th:
         theme: ชุดรูปแบบที่ผู้เยี่ยมชมที่ออกจากระบบและผู้ใช้ใหม่เห็น
         thumbnail: แสดงภาพ 2:1 โดยประมาณควบคู่ไปกับข้อมูลเซิร์ฟเวอร์ของคุณ
         timeline_preview: ผู้เยี่ยมชมที่ออกจากระบบจะสามารถเรียกดูโพสต์สาธารณะล่าสุดที่มีในเซิร์ฟเวอร์
-        trendable_by_default: ข้ามการตรวจทานเนื้อหาที่กำลังนิยมด้วยตนเอง ยังคงสามารถเอาแต่ละรายการออกจากแนวโน้มได้หลังเกิดเหตุ
+        trendable_by_default: ข้ามการตรวจทานเนื้อหาที่กำลังนิยมด้วยตนเอง ยังคงสามารถเอารายการแต่ละรายการออกจากแนวโน้มได้หลังเกิดเหตุ
         trends: แนวโน้มแสดงว่าโพสต์, แฮชแท็ก และเรื่องข่าวใดกำลังได้รับความสนใจในเซิร์ฟเวอร์ของคุณ
       form_challenge:
         current_password: คุณกำลังเข้าสู่พื้นที่ปลอดภัย

config/locales/sk.yml

@@ -14,6 +14,7 @@ sk:
       one: Sledujúci
       other: Sledovatelia
     following: Nasledujem
+    instance_actor_flash: Toto konto je virtuálny aktér, ktorý predstavuje samotný server, a nie konkrétneho používateľa. Používa sa na účely federácie a nemal by byť pozastavený.
     last_active: naposledy aktívny
     link_verified_on: Vlastníctvo tohto odkazu bolo skontrolované %{date}
     nothing_here: Nič tu nie je!
@@ -36,10 +37,12 @@ sk:
     accounts:
       add_email_domain_block: Pridaj e-mailovú doménu na zoznam zakázaných
       approve: Schváľ
+      approved_msg: Úspešne schválená prihláška %{username}
       are_you_sure: Si si istý/á?
       avatar: Maskot
       by_domain: Doména
       change_email:
+        changed_msg: E-mail úspešne zmenený!
         current_email: Súčasný email
         label: Zmeň email
         new_email: Nový email
@@ -57,15 +60,20 @@ sk:
       delete: Vymaž dáta
       deleted: Vymazané
       demote: Degraduj
+      destroyed_msg: "%{username} je teraz zaradený do fronty na okamžité vymazanie"
       disable: Zablokuj
+      disable_sign_in_token_auth: Zakázanie overovania e-mailovým tokenom
       disable_two_factor_authentication: Vypni dvoj-faktorové overovanie
       disabled: Blokovaný
       display_name: Ukáž meno
       domain: Doména
       edit: Uprav
+      email: Email
       email_status: Stav emailu
       enable: Povoľ
+      enable_sign_in_token_auth: Povolenie overovania e-mailovým tokenom
       enabled: Povolený
+      enabled_msg: Úspešne rozmrazené konto %{username}
       followers: Sledujúci
       follows: Sledovania
       header: Záhlavie
@@ -82,6 +90,8 @@ sk:
       login_status: Stav prihlásenia
       media_attachments: Prílohy
       memorialize: Zmeň na "Navždy budeme spomínať"
+      memorialized: Spomienka na
+      memorialized_msg: Úspešne zmenené %{username} na spomienkové konto
       moderation:
         active: Aktívny/a
         all: Všetko
@@ -98,14 +108,19 @@ sk:
       not_subscribed: Neodoberá
       pending: Vyžaduje posúdenie
       perform_full_suspension: Vylúč
+      previous_strikes: Predchádzajúce údery
       promote: Vyzdvihni
       protocol: Protokol
       public: Verejná časová os
       push_subscription_expires: PuSH odoberanie expiruje
       redownload: Obnov profil
+      redownloaded_msg: Úspešne obnovený profil %{username} z pôvodného
       reject: Zamietni
+      rejected_msg: Úspešne zamietnutá prihláška %{username}
       remove_avatar: Vymaž avatar
       remove_header: Vymaž záhlavie
+      removed_avatar_msg: Úspešne odstránený obrázok avatara %{username}
+      removed_header_msg: Úspešne odstránený obrázok hlavičky %{username}
       resend_confirmation:
         already_confirmed: Tento užívateľ je už potvrdený
         send: Odošli potvrdzovací email znovu
@@ -120,6 +135,7 @@ sk:
       security_measures:
         only_password: Iba heslo
         password_and_2fa: Heslo a dvoj-faktorové overovanie
+      sensitive: Citlivé na silu
       sensitized: Označený ako chúlostivý
       shared_inbox_url: URL zdieľanej schránky
       show:
@@ -128,18 +144,25 @@ sk:
       silence: Stíš
       silenced: Stíšený/é
       statuses: Príspevkov
+      strikes: Predchádzajúce údery
       subscribe: Odoberaj
       suspend: Vylúč
       suspended: Vylúčený/á
+      suspension_irreversible: Údaje tohto účtu boli nenávratne vymazané. Účet môžete zrušiť, aby sa dal používať, ale neobnovia sa žiadne údaje, ktoré predtým mal.
+      suspension_reversible_hint_html: Účet bol pozastavený a údaje budú úplne odstránené dňa %{date}. Dovtedy je možné účet obnoviť bez akýchkoľvek nepriaznivých účinkov. Ak chcete okamžite odstrániť všetky údaje účtu, môžete tak urobiť nižšie.
       title: Účty
       unblock_email: Odblokuj emailovú adresu
+      unblocked_email_msg: Úspešné odblokovanie e-mailovej adresy %{username}
       unconfirmed_email: Nepotvrdený email
+      undo_sensitized: Zrušenie citlivosti na silu
       undo_silenced: Zruš stíšenie
       undo_suspension: Zruš blokovanie
+      unsilenced_msg: Úspešne zrušené obmedzenie účtu %{username}
       unsubscribe: Prestaň odoberať
       username: Prezývka
       view_domain: Ukáž súhrn pre doménu
       warn: Varuj
+      web: Web
       whitelisted: Na bielej listine
     action_logs:
       action_types:
@@ -154,6 +177,7 @@ sk:
         create_domain_block: Vytvor zákaz domény
         create_email_domain_block: Vytvor zákaz emailovej domény
         create_ip_block: Vytvor IP pravidlo
+        create_user_role: Vytvoriť rolu
         demote_user: Zniž užívateľskú rolu
         destroy_announcement: Vymaž oboznámenie
         destroy_custom_emoji: Vymaž vlastné emotikony
@@ -184,7 +208,9 @@ sk:
         unsuspend_account: Odblokuj účet
         update_announcement: Aktualizuj oboznámenie
         update_domain_block: Aktualizuj zákaz domény
+        update_ip_block: Aktualizovať IP pravidlo
         update_status: Aktualizuj stav
+        update_user_role: Aktualizovať rolu
       actions:
         assigned_to_self_report_html: "%{name} pridelil/a hlásenie užívateľa %{target} sebe"
         change_email_user_html: "%{name} zmenil/a emailovú adresu užívateľa %{target}"

config/locales/th.yml

@@ -671,6 +671,7 @@ th:
     rules:
       add_new: เพิ่มกฎ
       delete: ลบ
+      description_html: ขณะที่ส่วนใหญ่อ้างว่าได้อ่านและยอมรับเงื่อนไขการให้บริการ ผู้คนมักจะไม่อ่านจนกว่าหลังจากปัญหาเกิดขึ้น <strong>ทำให้การดูกฎของเซิร์ฟเวอร์ของคุณอย่างรวดเร็วง่ายขึ้นโดยการระบุกฎของเซิร์ฟเวอร์ในรายการสัญลักษณ์แสดงหัวข้อย่อยแบบแบน</strong> พยายามทำให้กฎแต่ละข้อสั้นและเรียบง่าย แต่พยายามอย่าแบ่งกฎเป็นหลายรายการแยกเช่นกัน
       edit: แก้ไขกฎ
       empty: ยังไม่ได้กำหนดกฎของเซิร์ฟเวอร์
       title: กฎของเซิร์ฟเวอร์
@@ -684,6 +685,7 @@ th:
         preamble: ปรับแต่งส่วนติดต่อเว็บของ Mastodon
         title: ลักษณะที่ปรากฏ
       branding:
+        preamble: ตราสินค้าของเซิร์ฟเวอร์ของคุณสร้างความแตกต่างตราสินค้าของเซิร์ฟเวอร์ของคุณจากเซิร์ฟเวอร์อื่น ๆ ในเครือข่าย อาจแสดงข้อมูลนี้ข้ามสภาพแวดล้อมที่หลากหลาย เช่น ส่วนติดต่อเว็บของ Mastodon, แอปพลิเคชันเนทีฟ, ในการแสดงตัวอย่างลิงก์ในเว็บไซต์อื่น ๆ และภายในแอปการส่งข้อความ และอื่น ๆ ด้วยเหตุผลนี้ จึงเป็นการดีที่สุดที่จะทำให้ข้อมูลนี้ชัดเจน สั้น และกระชับ
         title: ตราสินค้า
       content_retention:
         preamble: ควบคุมวิธีการจัดเก็บเนื้อหาที่ผู้ใช้สร้างขึ้นใน Mastodon
@@ -771,7 +773,7 @@ th:
       links:
         allow: อนุญาตลิงก์
         allow_provider: อนุญาตผู้เผยแพร่
-        description_html: นี่คือลิงก์ที่กำลังได้รับการแบ่งปันเป็นจำนวนมากโดยบัญชีที่เซิร์ฟเวอร์ของคุณเห็นโพสต์จากในปัจจุบัน ลิงก์สามารถช่วยให้ผู้ใช้ของคุณค้นหาสิ่งที่กำลังเกิดขึ้นในโลก จะไม่แสดงลิงก์เป็นสาธารณะจนกว่าคุณจะอนุมัติผู้เผยแพร่ คุณยังสามารถอนุญาตหรือปฏิเสธแต่ละลิงก์
+        description_html: นี่คือลิงก์ที่กำลังได้รับการแบ่งปันเป็นจำนวนมากโดยบัญชีที่เซิร์ฟเวอร์ของคุณเห็นโพสต์จากในปัจจุบัน ลิงก์สามารถช่วยให้ผู้ใช้ของคุณค้นหาสิ่งที่กำลังเกิดขึ้นในโลก จะไม่แสดงลิงก์เป็นสาธารณะจนกว่าคุณจะอนุมัติผู้เผยแพร่ คุณยังสามารถอนุญาตหรือปฏิเสธลิงก์แต่ละรายการ
         disallow: ไม่อนุญาตลิงก์
         disallow_provider: ไม่อนุญาตผู้เผยแพร่
         no_link_selected: ไม่มีการเปลี่ยนแปลงลิงก์เนื่องจากไม่มีการเลือก
@@ -792,6 +794,7 @@ th:
       statuses:
         allow: อนุญาตโพสต์
         allow_account: อนุญาตผู้สร้าง
+        description_html: นี่คือโพสต์ที่เซิร์ฟเวอร์ของคุณทราบเกี่ยวกับที่กำลังได้รับการแบ่งปันและชื่นชอบเป็นจำนวนมากในปัจจุบันในขณะนี้ โพสต์สามารถช่วยให้ผู้ใช้ใหม่และที่กลับมาของคุณค้นหาผู้คนเพิ่มเติมที่จะติดตาม จะไม่แสดงโพสต์เป็นสาธารณะจนกว่าคุณจะอนุมัติผู้สร้าง และผู้สร้างอนุญาตให้แนะนำบัญชีของเขากับผู้อื่น คุณยังสามารถอนุญาตหรือปฏิเสธโพสต์แต่ละรายการ
         disallow: ไม่อนุญาตโพสต์
         disallow_account: ไม่อนุญาตผู้สร้าง
         no_status_selected: ไม่มีการเปลี่ยนแปลงโพสต์ที่กำลังนิยมเนื่องจากไม่มีการเลือก
@@ -1098,8 +1101,8 @@ th:
     edit:
       add_keyword: เพิ่มคำสำคัญ
       keywords: คำสำคัญ
-      statuses: โพสต์
+      statuses: โพสต์แต่ละรายการ
-      statuses_hint_html: ตัวกรองนี้นำไปใช้เพื่อเลือกแต่ละโพสต์โดยไม่คำนึงถึงว่าโพสต์ตรงกับคำสำคัญด้านล่างหรือไม่ <a href="%{path}">ตรวจทานหรือเอาโพสต์ออกจากตัวกรอง</a>
+      statuses_hint_html: ตัวกรองนี้นำไปใช้เพื่อเลือกโพสต์แต่ละรายการโดยไม่คำนึงถึงว่าโพสต์ตรงกับคำสำคัญด้านล่างหรือไม่ <a href="%{path}">ตรวจทานหรือเอาโพสต์ออกจากตัวกรอง</a>
       title: แก้ไขตัวกรอง
     errors:
       deprecated_api_multiple_keywords: ไม่สามารถเปลี่ยนพารามิเตอร์เหล่านี้จากแอปพลิเคชันนี้เนื่องจากพารามิเตอร์นำไปใช้กับคำสำคัญของตัวกรองมากกว่าหนึ่ง ใช้แอปพลิเคชันที่ใหม่กว่าหรือส่วนติดต่อเว็บ
@@ -1115,7 +1118,7 @@ th:
       statuses:
         other: "%{count} โพสต์"
       statuses_long:
-        other: มีการซ่อน %{count} โพสต์
+        other: มีการซ่อน %{count} โพสต์แต่ละรายการ
       title: ตัวกรอง
     new:
       save: บันทึกตัวกรองใหม่
@@ -1125,7 +1128,7 @@ th:
       batch:
         remove: เอาออกจากตัวกรอง
       index:
-        hint: ตัวกรองนี้นำไปใช้เพื่อเลือกแต่ละโพสต์โดยไม่คำนึงถึงเกณฑ์อื่น ๆ คุณสามารถเพิ่มโพสต์เพิ่มเติมไปยังตัวกรองนี้ได้จากส่วนติดต่อเว็บ
+        hint: ตัวกรองนี้นำไปใช้เพื่อเลือกโพสต์แต่ละรายการโดยไม่คำนึงถึงเกณฑ์อื่น ๆ คุณสามารถเพิ่มโพสต์เพิ่มเติมไปยังตัวกรองนี้ได้จากส่วนติดต่อเว็บ
         title: โพสต์ที่กรองอยู่
   footer:
     trending_now: กำลังนิยม

config/locales/tr.yml

@@ -431,6 +431,9 @@ tr:
     export_domain_blocks:
       import:
         private_comment_template: "%{source} kaynağından %{date} tarihinde içe aktarıldı"
+        title: Domain bloklarını içe aktar
+      new:
+        title: Domain bloklarını içe aktar
       no_file: Dosya seçilmedi
     follow_recommendations:
       description_html: "<strong>Takip önerileri yeni kullanıcıların hızlı bir şekilde ilginç içerik bulmalarını sağlar</strong>. Eğer bir kullanıcı, kişisel takip önerileri almaya yetecek kadar başkalarıyla etkileşime girmediğinde, onun yerine bu hesaplar önerilir. Bu öneriler, verili bir dil için en yüksek takipçi sayısına ve en yüksek güncel meşguliyete sahip hesapların bir karışımdan günlük olarak hesaplanıyorlar."
@@ -1169,6 +1172,7 @@ tr:
     invalid_markup: 'geçersiz HTML markup içermektedir: %{error}'
   imports:
     errors:
+      invalid_csv_file: 'Geçersiz CSV dosyası. Hata: %{error}'
       over_rows_processing_limit: "%{count} satırdan fazlasını içeriyor"
     modes:
       merge: Birleştir